Fix: Update detection (#314)

* fix update detection

* update version

* fix comments

modules/client/CHANGELOG.md

@@ -18,6 +18,11 @@ TEMPLATE:
 -->
 
 ## [UPCOMING]
+### Fixed
+
+- Fixed update proposal detection
+
+## [1.20.3]
 
 ### Fixed
 

modules/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aragon/sdk-client",
   "author": "Aragon Association",
-  "version": "1.20.3",
+  "version": "1.20.4",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/sdk-client.esm.js",

modules/client/src/internal/client/methods.ts

@@ -69,6 +69,7 @@ import {
   TransferSortBy,
 } from "../../types";
 import {
+  ProposalActionTypes,
   SubgraphBalance,
   SubgraphDao,
   SubgraphDaoListItem,
@@ -82,9 +83,7 @@ import {
 } from "../types";
 import {
   classifyProposalActions,
-  containsDaoUpdateAction,
-  containsPluginUpdateActionBlock,
-  containsPluginUpdateActionBlockWithRootPermission,
+  startsWithDaoUpdateAction,
   toAssetBalance,
   toDaoActions,
   toDaoDetails,
@@ -1125,7 +1124,9 @@ export class ClientMethods extends ClientCore implements IClientMethods {
     const subgraphActions = iproposal.actions;
     let actions = toDaoActions(subgraphActions);
     const classifiedActions = classifyProposalActions(actions);
-    return containsDaoUpdateAction(classifiedActions);
+    return classifiedActions.includes(
+      ProposalActionTypes.UPGRADE_TO_AND_CALL,
+    ) || classifiedActions.includes(ProposalActionTypes.UPGRADE_TO);
   }
   /**
    * Given a proposal id returns if that proposal is a plugin update proposal
@@ -1148,14 +1149,9 @@ export class ClientMethods extends ClientCore implements IClientMethods {
     if (!iproposal) {
       return false;
     }
-    const subgraphActions = iproposal.actions;
-    let actions = toDaoActions(subgraphActions);
+    let actions = toDaoActions(iproposal.actions);
     let classifiedActions = classifyProposalActions(actions);
-    if (containsDaoUpdateAction(classifiedActions)) {
-      classifiedActions = classifiedActions.slice(1);
-    }
-    return containsPluginUpdateActionBlock(classifiedActions) ||
-      containsPluginUpdateActionBlockWithRootPermission(classifiedActions);
+    return classifiedActions.includes(ProposalActionTypes.APPLY_UPDATE);
   }
   /**
    * Check if the specified proposal id is valid for updating a plugin
@@ -1198,12 +1194,12 @@ export class ClientMethods extends ClientCore implements IClientMethods {
         ],
       };
     }
-  
+
     let daoActions = toDaoActions(iproposal.actions);
     const classifiedActions = classifyProposalActions(daoActions);
 
-    // remove upgradeToAndCall action 
-    if (containsDaoUpdateAction(classifiedActions)) {
+    // remove upgradeToAndCall action
+    if (startsWithDaoUpdateAction(classifiedActions)) {
       daoActions = daoActions.slice(1);
     }
 

modules/client/src/internal/utils.ts

@@ -1408,7 +1408,7 @@ export function containsPluginUpdateActionBlock(
  * @param {ProposalActionTypes[]} actions
  * @return {*}  {boolean}
  */
-export function containsDaoUpdateAction(
+export function startsWithDaoUpdateAction(
   actions: ProposalActionTypes[],
 ): boolean {
   // UpgradeTo or UpgradeToAndCall should be the first action
@@ -1426,7 +1426,7 @@ export function validateUpdateDaoProposalActions(
   const actionErrorCauses: DaoUpdateProposalInvalidityCause[] = [];
   const proposalSettingsErrorCauses: ProposalSettingsErrorCause[] = [];
   // check if the actions are valid
-  if (!containsDaoUpdateAction(classifiedActions)) {
+  if (!startsWithDaoUpdateAction(classifiedActions)) {
     // If actions are not valid, add the cause to the causes array
     // and return
     return {

modules/client/test/integration/client/methods.test.ts

@@ -2068,7 +2068,9 @@ describe("Client", () => {
           TEST_MULTISIG_PROPOSAL_ID,
         );
         expect(res.isValid).toBe(false);
-        expect(res.proposalSettingsErrorCauses).toMatchObject([ProposalSettingsErrorCause.PROPOSAL_NOT_FOUND]);
+        expect(res.proposalSettingsErrorCauses).toMatchObject([
+          ProposalSettingsErrorCause.PROPOSAL_NOT_FOUND,
+        ]);
         expect(res.actionErrorCauses).toMatchObject([]);
       });
     });

modules/client/test/unit/client/utils.test.ts

@@ -27,7 +27,7 @@ import {
   TOKEN_VOTING_BUILD_METADATA,
 } from "../../integration/constants";
 import {
-  containsDaoUpdateAction,
+  startsWithDaoUpdateAction,
   containsPluginUpdateActionBlock,
   containsPluginUpdateActionBlockWithRootPermission,
   validateApplyUpdateFunction,
@@ -1323,7 +1323,7 @@ describe("Test client utils", () => {
       expect(result.proposalSettingsErrorCauses).toMatchObject([]);
     });
   });
-  describe("containsDaoUpdateAction", () => {
+  describe("startsWithDaoUpdateAction", () => {
     it("should return the expected output given a specific input", () => {
       const cases = [
         { input: [ProposalActionTypes.UPGRADE_TO], expected: true },
@@ -1389,7 +1389,7 @@ describe("Test client utils", () => {
         },
       ];
       for (const { input, expected } of cases) {
-        const result = containsDaoUpdateAction(input);
+        const result = startsWithDaoUpdateAction(input);
         expect(result).toEqual(expected);
       }
     });