upgrade platform-sdk

OpenZeppelin · Jul 30, 2023 · c986d35 · c986d35
2 parents 8b2cd36 + 07740af
commit c986d35
Show file tree

Hide file tree

Showing 18 changed files with 88 additions and 71 deletions.
diff --git a/examples/platform-test-project/package.json b/examples/platform-test-project/package.json
@@ -17,7 +17,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@openzeppelin/platform-as-code": "^1.3.1",
+    "@openzeppelin/platform-as-code": "^1.3.2",
     "serverless": "^3.20.0"
   }
 }
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@openzeppelin/platform-sdk": "^0.1.0",
+    "@openzeppelin/platform-sdk": "^0.2.0",
     "keccak256": "^1.0.6",
     "lodash": "^4.17.21",
     "prompt": "^1.3.0"

diff --git a/src/cmd/deploy.ts b/src/cmd/deploy.ts
@@ -222,7 +222,7 @@ export default class PlatformDeploy {
     const formattedResources = {
       actions:
         withResources.actions.length > 0
-          ? withResources.actions.map((a) => `${a.stackResourceId ?? a.name} (${a.actionkId})`)
+          ? withResources.actions.map((a) => `${a.stackResourceId ?? a.name} (${a.actionId})`)
           : undefined,
       monitors:
         withResources.monitors.length > 0
@@ -902,7 +902,7 @@ export default class PlatformDeploy {
           encodedZippedCode: code,
         });
         const { codeDigest } = await client.get({
-          actionId: match.actionkId,
+          actionId: match.actionId,
         });
 
         const isSchedule = (
@@ -933,15 +933,15 @@ export default class PlatformDeploy {
         ) {
           return {
             name: match.stackResourceId!,
-            id: match.actionkId,
+            id: match.actionId,
             success: false,
             response: match,
             notice: `Skipped ${match.stackResourceId} - no changes detected`,
           };
         }
 
         const updatesAction = await client.update({
-          actionId: match.actionkId,
+          actionId: match.actionId,
           name: action.name,
           paused: action.paused,
           trigger: {
@@ -955,19 +955,19 @@ export default class PlatformDeploy {
         if (newDigest === codeDigest) {
           return {
             name: match.stackResourceId!,
-            id: match.actionkId,
+            id: match.actionId,
             success: true,
             notice: `Skipped code upload - no changes detected for ${match.stackResourceId}`,
             response: updatesAction,
           };
         } else {
           await client.updateCodeFromFolder({
-            actionId: match.actionkId,
+            actionId: match.actionId,
             path: action.path,
           });
           return {
             name: match.stackResourceId!,
-            id: match.actionkId,
+            id: match.actionId,
             success: true,
             response: updatesAction,
           };
@@ -1001,14 +1001,14 @@ export default class PlatformDeploy {
         });
         return {
           name: stackResourceId,
-          id: createdAction.actionkId,
+          id: createdAction.actionId,
           success: true,
           response: createdAction,
         };
       },
       // on remove
       async (actions: PlatformAction[]) => {
-        await Promise.all(actions.map(async (a) => await client.delete({ actionId: a.actionkId })));
+        await Promise.all(actions.map(async (a) => await client.delete({ actionId: a.actionId })));
       },
       undefined,
       output,

diff --git a/src/cmd/info.ts b/src/cmd/info.ts
@@ -135,7 +135,7 @@ export default class PlatformInfo {
       'Actions',
       this.resources.actions,
       listActions,
-      (resource: PlatformAction) => `${resource.stackResourceId}: ${resource.actionkId}`,
+      (resource: PlatformAction) => `${resource.stackResourceId}: ${resource.actionId}`,
       stdOut.actions,
     );
 

diff --git a/src/cmd/invoke.ts b/src/cmd/invoke.ts
@@ -42,7 +42,7 @@ export default class PlatformInvoke {
       const platformAction = getEquivalentResourceByKey<PlatformAction>(this.options.function!, list);
       if (platformAction) {
         const response = await client.runAction({
-          actionId: platformAction.actionkId,
+          actionId: platformAction.actionId,
           data: payload,
         });
         this.log.notice(JSON.stringify(response, null, 2));

diff --git a/src/cmd/remove.ts b/src/cmd/remove.ts
@@ -165,9 +165,9 @@ export default class PlatformRemove {
       async (actions: PlatformAction[]) => {
         await Promise.all(
           actions.map(async (e) => {
-            this.log.progress('component-remove-extra', `Removing ${e.stackResourceId} (${e.actionkId}) from Platform`);
-            await actionClient.delete({ actionId: e.actionkId });
-            this.log.success(`Removed ${e.stackResourceId} (${e.actionkId})`);
+            this.log.progress('component-remove-extra', `Removing ${e.stackResourceId} (${e.actionId}) from Platform`);
+            await actionClient.delete({ actionId: e.actionId });
+            this.log.success(`Removed ${e.stackResourceId} (${e.actionId})`);
           }),
         );
       },

diff --git a/src/types/docs-schemas/definitions.schema.json b/src/types/docs-schemas/definitions.schema.json
@@ -47,6 +47,7 @@
         "x-dfk-avax-chain-test",
         "zksync",
         "zksync-goerli",
+        "base",
         "base-goerli",
         "linea-goerli"
       ]

diff --git a/src/types/docs/definitions-definitions-blockexplorerapikey.md b/src/types/docs/definitions-definitions-blockexplorerapikey.md
@@ -89,6 +89,7 @@
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 

diff --git a/src/types/docs/definitions-definitions-blockmonitor.md b/src/types/docs/definitions-definitions-blockmonitor.md
@@ -127,6 +127,7 @@
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 

diff --git a/src/types/docs/definitions-definitions-contract.md b/src/types/docs/definitions-definitions-contract.md
@@ -122,6 +122,7 @@
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 

diff --git a/src/types/docs/definitions-definitions-fortamonitor.md b/src/types/docs/definitions-definitions-fortamonitor.md
@@ -128,6 +128,7 @@
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 

diff --git a/src/types/docs/definitions-definitions-network.md b/src/types/docs/definitions-definitions-network.md
@@ -42,6 +42,7 @@
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 

diff --git a/src/types/docs/definitions-definitions-relayer.md b/src/types/docs/definitions-definitions-relayer.md
@@ -93,6 +93,7 @@
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 

diff --git a/src/types/docs/definitions.md b/src/types/docs/definitions.md
@@ -217,6 +217,7 @@ Reference this group by using
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 
@@ -420,6 +421,7 @@ Reference this group by using
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 
@@ -1639,6 +1641,7 @@ Reference this group by using
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 
@@ -2003,6 +2006,7 @@ Reference this group by using
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 
@@ -2461,6 +2465,7 @@ Reference this group by using
 | `"x-dfk-avax-chain-test"` |             |
 | `"zksync"`                |             |
 | `"zksync-goerli"`         |             |
+| `"base"`                  |             |
 | `"base-goerli"`           |             |
 | `"linea-goerli"`          |             |
 

diff --git a/src/types/schemas/definitions.schema.json b/src/types/schemas/definitions.schema.json
diff --git a/src/types/types/resources.schema.d.ts b/src/types/types/resources.schema.d.ts
@@ -40,6 +40,7 @@ export type Network =
   | 'x-dfk-avax-chain-test'
   | 'zksync'
   | 'zksync-goerli'
+  | 'base'
   | 'base-goerli'
   | 'linea-goerli';
 export type WhitelistReceivers = string[];
@@ -133,6 +134,7 @@ export type Network1 =
   | 'x-dfk-avax-chain-test'
   | 'zksync'
   | 'zksync-goerli'
+  | 'base'
   | 'base-goerli'
   | 'linea-goerli';
 export type AbiType = StringABI | ArrayABI;
@@ -174,6 +176,7 @@ export type Network2 =
   | 'x-dfk-avax-chain-test'
   | 'zksync'
   | 'zksync-goerli'
+  | 'base'
   | 'base-goerli'
   | 'linea-goerli';
 export type Address1 = string;
@@ -217,6 +220,7 @@ export type Network3 =
   | 'x-dfk-avax-chain-test'
   | 'zksync'
   | 'zksync-goerli'
+  | 'base'
   | 'base-goerli'
   | 'linea-goerli';
 export type Address2 = string;
@@ -259,6 +263,7 @@ export type Network4 =
   | 'x-dfk-avax-chain-test'
   | 'zksync'
   | 'zksync-goerli'
+  | 'base'
   | 'base-goerli'
   | 'linea-goerli';
 

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -286,8 +286,8 @@ export const constructMonitor = (
     addresses: monitor.addresses,
     abi: monitor.abi && JSON.stringify(typeof monitor.abi === 'string' ? JSON.parse(monitor.abi) : monitor.abi),
     paused: monitor.paused,
-    autotaskCondition: actionCondition && actionCondition.actionkId,
-    autotaskTrigger: actionTrigger && actionTrigger.actionkId,
+    autotaskCondition: actionCondition && actionCondition.actionId,
+    autotaskTrigger: actionTrigger && actionTrigger.actionId,
     alertThreshold: threshold && {
       amount: threshold.amount,
       windowSeconds: threshold['window-seconds'],