otomato-sdk 1.5.37 → 1.5.39

package/dist/src/constants/Blocks.js

@@ -1526,6 +1526,7 @@ export const ACTIONS = {
                         "to": "{{before.contractAddress}}"
                     }
                 ],
+                "before": "\n    async (env) => {\n        const otomatoSdk = await import('otomato-sdk');\n \n        if (!env.parameters.chainId)\n            throw new Error('You need to provide the chainId first');\n        \n        const getIonicTokenFromToken = (chain, tokenAddress) => {\n    const CHAINS = otomatoSdk.CHAINS;\n    if (chain == CHAINS.MODE) {\n        switch (tokenAddress.toLowerCase()) {\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDT').contractAddress.toLowerCase():\n                return '0x94812F2eEa03A49869f95e1b5868C6f3206ee3D3';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDC').contractAddress.toLowerCase():\n                return '0x2BE717340023C9e14C1Bb12cb3ecBcfd3c3fB038';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'ezETH').contractAddress.toLowerCase():\n                return '0x59e710215d45F584f44c0FEe83DA6d43D762D857';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WETH').contractAddress.toLowerCase():\n                return '0x71ef7EDa2Be775E5A7aa8afD02C45F059833e9d2';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WBTC').contractAddress.toLowerCase():\n                return '0xd70254C3baD29504789714A7c69d60Ec1127375C';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'STONE').contractAddress.toLowerCase():\n                return '0x959FA710CCBb22c7Ce1e59Da82A247e686629310';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'wrsETH').contractAddress.toLowerCase():\n                return '0x49950319aBE7CE5c3A6C90698381b45989C99b46';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'weETH.mode').contractAddress.toLowerCase():\n                return '0xA0D844742B4abbbc43d8931a6Edb00C56325aA18';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'M-BTC').contractAddress.toLowerCase():\n                return '0x19F245782b1258cf3e11Eda25784A378cC18c108';\n\n            default: throw new Error('This asset is not available on Ionic');\n        }\n    }\n}\n        \n        let ionicTokenContractAddress = getIonicTokenFromToken(\n            env.parameters.chainId,\n            env.parameters.tokenToDeposit.toLowerCase()\n        );\n        return {\n            contractAddress: ionicTokenContractAddress\n        };\n    }",
                 "output": {
                     "transactionHash": "string"
                 },
@@ -1615,6 +1616,7 @@ export const ACTIONS = {
                     }
                 ],
                 "requiredApprovals": [],
+                "before": "\n    async (env) => {\n        const otomatoSdk = await import('otomato-sdk');\n \n        if (!env.parameters.chainId)\n            throw new Error('You need to provide the chainId first');\n        \n        const getIonicTokenFromToken = (chain, tokenAddress) => {\n    const CHAINS = otomatoSdk.CHAINS;\n    if (chain == CHAINS.MODE) {\n        switch (tokenAddress.toLowerCase()) {\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDT').contractAddress.toLowerCase():\n                return '0x94812F2eEa03A49869f95e1b5868C6f3206ee3D3';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDC').contractAddress.toLowerCase():\n                return '0x2BE717340023C9e14C1Bb12cb3ecBcfd3c3fB038';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'ezETH').contractAddress.toLowerCase():\n                return '0x59e710215d45F584f44c0FEe83DA6d43D762D857';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WETH').contractAddress.toLowerCase():\n                return '0x71ef7EDa2Be775E5A7aa8afD02C45F059833e9d2';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WBTC').contractAddress.toLowerCase():\n                return '0xd70254C3baD29504789714A7c69d60Ec1127375C';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'STONE').contractAddress.toLowerCase():\n                return '0x959FA710CCBb22c7Ce1e59Da82A247e686629310';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'wrsETH').contractAddress.toLowerCase():\n                return '0x49950319aBE7CE5c3A6C90698381b45989C99b46';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'weETH.mode').contractAddress.toLowerCase():\n                return '0xA0D844742B4abbbc43d8931a6Edb00C56325aA18';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'M-BTC').contractAddress.toLowerCase():\n                return '0x19F245782b1258cf3e11Eda25784A378cC18c108';\n\n            default: throw new Error('This asset is not available on Ionic');\n        }\n    }\n}\n        \n        let ionicTokenContractAddress = getIonicTokenFromToken(\n            env.parameters.chainId,\n            env.parameters.tokenToWithdraw.toLowerCase()\n        );\n        return {\n            contractAddress: ionicTokenContractAddress\n        };\n    }",
                 "output": {
                     "transactionHash": "string"
                 },
@@ -1686,6 +1688,7 @@ export const ACTIONS = {
                     }
                 ],
                 "requiredApprovals": [],
+                "before": "\n    async (env) => {\n        const otomatoSdk = await import('otomato-sdk');\n \n        if (!env.parameters.chainId)\n            throw new Error('You need to provide the chainId first');\n        \n        const getIonicTokenFromToken = (chain, tokenAddress) => {\n    const CHAINS = otomatoSdk.CHAINS;\n    if (chain == CHAINS.MODE) {\n        switch (tokenAddress.toLowerCase()) {\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDT').contractAddress.toLowerCase():\n                return '0x94812F2eEa03A49869f95e1b5868C6f3206ee3D3';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDC').contractAddress.toLowerCase():\n                return '0x2BE717340023C9e14C1Bb12cb3ecBcfd3c3fB038';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'ezETH').contractAddress.toLowerCase():\n                return '0x59e710215d45F584f44c0FEe83DA6d43D762D857';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WETH').contractAddress.toLowerCase():\n                return '0x71ef7EDa2Be775E5A7aa8afD02C45F059833e9d2';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WBTC').contractAddress.toLowerCase():\n                return '0xd70254C3baD29504789714A7c69d60Ec1127375C';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'STONE').contractAddress.toLowerCase():\n                return '0x959FA710CCBb22c7Ce1e59Da82A247e686629310';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'wrsETH').contractAddress.toLowerCase():\n                return '0x49950319aBE7CE5c3A6C90698381b45989C99b46';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'weETH.mode').contractAddress.toLowerCase():\n                return '0xA0D844742B4abbbc43d8931a6Edb00C56325aA18';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'M-BTC').contractAddress.toLowerCase():\n                return '0x19F245782b1258cf3e11Eda25784A378cC18c108';\n\n            default: throw new Error('This asset is not available on Ionic');\n        }\n    }\n}\n        \n        let ionicTokenContractAddress = getIonicTokenFromToken(\n            env.parameters.chainId,\n            env.parameters.tokenToBorrow.toLowerCase()\n        );\n        return {\n            contractAddress: ionicTokenContractAddress\n        };\n    }",
                 "output": {
                     "transactionHash": "string"
                 },
@@ -1771,6 +1774,7 @@ export const ACTIONS = {
                         "to": "{{before.contractAddress}}"
                     }
                 ],
+                "before": "\n    async (env) => {\n        const otomatoSdk = await import('otomato-sdk');\n \n        if (!env.parameters.chainId)\n            throw new Error('You need to provide the chainId first');\n        \n        const getIonicTokenFromToken = (chain, tokenAddress) => {\n    const CHAINS = otomatoSdk.CHAINS;\n    if (chain == CHAINS.MODE) {\n        switch (tokenAddress.toLowerCase()) {\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDT').contractAddress.toLowerCase():\n                return '0x94812F2eEa03A49869f95e1b5868C6f3206ee3D3';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'USDC').contractAddress.toLowerCase():\n                return '0x2BE717340023C9e14C1Bb12cb3ecBcfd3c3fB038';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'ezETH').contractAddress.toLowerCase():\n                return '0x59e710215d45F584f44c0FEe83DA6d43D762D857';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WETH').contractAddress.toLowerCase():\n                return '0x71ef7EDa2Be775E5A7aa8afD02C45F059833e9d2';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'WBTC').contractAddress.toLowerCase():\n                return '0xd70254C3baD29504789714A7c69d60Ec1127375C';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'STONE').contractAddress.toLowerCase():\n                return '0x959FA710CCBb22c7Ce1e59Da82A247e686629310';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'wrsETH').contractAddress.toLowerCase():\n                return '0x49950319aBE7CE5c3A6C90698381b45989C99b46';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'weETH.mode').contractAddress.toLowerCase():\n                return '0xA0D844742B4abbbc43d8931a6Edb00C56325aA18';\n            case otomatoSdk.getTokenFromSymbol(CHAINS.MODE, 'M-BTC').contractAddress.toLowerCase():\n                return '0x19F245782b1258cf3e11Eda25784A378cC18c108';\n\n            default: throw new Error('This asset is not available on Ionic');\n        }\n    }\n}\n        \n        let ionicTokenContractAddress = getIonicTokenFromToken(\n            env.parameters.chainId,\n            env.parameters.tokenToRepay.toLowerCase()\n        );\n        return {\n            contractAddress: ionicTokenContractAddress\n        };\n    }",
                 "output": {
                     "transactionHash": "string"
                 },

package/dist/src/models/Action.js

@@ -16,13 +16,18 @@ export class Action extends Node {
         super(Object.assign(Object.assign({}, action), { class: 'action', parentInfo: findActionByBlockId(action.blockId).parentInfo }));
     }
     getSessionKeyPermissions() {
-        const parentBlock = findActionByBlockId(this.blockId).block;
-        if (!parentBlock.permissions)
-            return null;
-        const permissions = SessionKeyPermission.fromJSON(parentBlock.permissions);
-        permissions.fillParameters(this.getParameters());
-        permissions.fillMethod();
-        return permissions;
+        return __awaiter(this, void 0, void 0, function* () {
+            const parentBlock = findActionByBlockId(this.blockId).block;
+            if (!parentBlock.permissions)
+                return null;
+            const permissions = SessionKeyPermission.fromJSON(parentBlock.permissions);
+            permissions.fillParameters(this.getParameters());
+            permissions.fillMethod();
+            if (parentBlock.before) {
+                yield permissions.fillBeforeVariables(parentBlock.before, this.getParameters());
+            }
+            return permissions;
+        });
     }
     static fromJSON(json) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/src/models/SessionKeyPermission.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { getToken } from "../constants/tokens.js";
 export class SessionKeyPermission {
     constructor({ approvedTargets = [], label = [], labelNotAuthorized = [], } = {}) {
@@ -5,6 +14,7 @@ export class SessionKeyPermission {
         this.label = label;
         this.labelNotAuthorized = labelNotAuthorized;
     }
+    // Existing method to replace placeholders with actual values
     fill(key, value) {
         const replacePlaceholder = (target) => {
             const placeholder = new RegExp(`{{${key}}}`, 'g');
@@ -14,15 +24,50 @@ export class SessionKeyPermission {
         this.label = this.label.map(replacePlaceholder);
         this.labelNotAuthorized = this.labelNotAuthorized.map(replacePlaceholder);
     }
+    /**
+     * Fill placeholders using variables returned by the 'before' string execution.
+     * @param beforeCode - A string representing the 'before' logic to execute.
+     */
+    fillBeforeVariables(beforeCode, parameters) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // Prepare the environment with parameters
+                const env = { parameters };
+                // Replace the import statement in the beforeCode string if needed
+                const beforeCodeUpdated = beforeCode.replace("import('otomato-sdk')", "import('../index.js')");
+                // Wrap the beforeCode in an async function and immediately invoke it
+                const asyncBeforeFn = new Function('env', `
+      return (async function() {
+        return await (${beforeCodeUpdated})(env);
+      })();
+    `);
+                // Execute the async function and await the result
+                const beforeResult = yield asyncBeforeFn(env);
+                // Replace placeholders like {{before.variableName}} with the corresponding values
+                if (beforeResult && typeof beforeResult === 'object') {
+                    Object.keys(beforeResult).forEach(key => {
+                        this.fill(`before.${key}`, beforeResult[key]);
+                    });
+                }
+                else {
+                    console.error("Before function did not return an object:", beforeResult);
+                }
+            }
+            catch (error) {
+                console.error('Error executing before code:', error);
+            }
+        });
+    }
+    // The rest of your existing code
     fillParameters(params) {
         var _a;
-        // 1. replace non abi params
+        // 1. replace non-ABI params
         for (let key in params) {
             if (key !== 'abi') {
                 this.fill(`parameters.${key}`, params[key]);
             }
         }
-        // 2. replace abi params
+        // 2. replace ABI params
         const abiParams = (_a = params.abi) === null || _a === void 0 ? void 0 : _a.parameters;
         for (let key in abiParams) {
             this.fill(`parameters.abiParams.${key}`, abiParams[key]);
@@ -89,6 +134,7 @@ export class SessionKeyPermission {
         this.labelNotAuthorized = this.labelNotAuthorized.filter(lbl => !this.label.includes(lbl));
     }
 }
+// Helper function to get a different token
 const getDifferentToken = (chain, contractAddress) => {
     var _a;
     const tokenSymbol = (_a = getToken(chain, contractAddress)) === null || _a === void 0 ? void 0 : _a.symbol;

package/dist/src/models/Workflow.js

@@ -202,20 +202,22 @@ export class Workflow {
         });
     }
     getSessionKeyPermissions() {
-        const permissions = new SessionKeyPermission();
-        for (const node of this.nodes) {
-            try {
-                if (node.class === 'action' && 'getSessionKeyPermissions' in node) {
-                    const nodePermissions = node.getSessionKeyPermissions();
-                    if (nodePermissions) {
-                        permissions.merge(nodePermissions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const permissions = new SessionKeyPermission();
+            for (const node of this.nodes) {
+                try {
+                    if (node.class === 'action' && 'getSessionKeyPermissions' in node) {
+                        const nodePermissions = yield node.getSessionKeyPermissions();
+                        if (nodePermissions) {
+                            permissions.merge(nodePermissions);
+                        }
                     }
                 }
+                catch (error) {
+                    console.error(`Error getting session key permissions for node ${node.getRef()}:`, error);
+                }
             }
-            catch (error) {
-                console.error(`Error getting session key permissions for node ${node.getRef()}:`, error);
-            }
-        }
-        return permissions;
+            return permissions;
+        });
     }
 }

package/dist/types/src/constants/Blocks.d.ts

@@ -642,6 +642,7 @@ export declare const ACTIONS: {
                     amount: string;
                     to: string;
                 }[];
+                before: string;
                 output: {
                     transactionHash: string;
                 };
@@ -684,6 +685,7 @@ export declare const ACTIONS: {
                     })[];
                 }[];
                 requiredApprovals: never[];
+                before: string;
                 output: {
                     transactionHash: string;
                 };
@@ -713,6 +715,7 @@ export declare const ACTIONS: {
                     })[];
                 }[];
                 requiredApprovals: never[];
+                before: string;
                 output: {
                     transactionHash: string;
                 };
@@ -752,6 +755,7 @@ export declare const ACTIONS: {
                     amount: string;
                     to: string;
                 }[];
+                before: string;
                 output: {
                     transactionHash: string;
                 };

package/dist/types/src/models/Action.d.ts

@@ -16,7 +16,7 @@ export declare class Action extends Node {
         parentInfo?: ParentInfo;
         state?: NodeState;
     });
-    getSessionKeyPermissions(): SessionKeyPermission | null;
+    getSessionKeyPermissions(): Promise<SessionKeyPermission | null>;
     static fromJSON(json: {
         [key: string]: any;
     }): Promise<Action>;

package/dist/types/src/models/SessionKeyPermission.d.ts

@@ -8,6 +8,13 @@ export declare class SessionKeyPermission {
         labelNotAuthorized?: string[];
     });
     fill(key: string, value: any): void;
+    /**
+     * Fill placeholders using variables returned by the 'before' string execution.
+     * @param beforeCode - A string representing the 'before' logic to execute.
+     */
+    fillBeforeVariables(beforeCode: string, parameters: {
+        [key: string]: any;
+    }): Promise<void>;
     fillParameters(params: {
         [key: string]: any;
     }): void;

package/dist/types/src/models/Workflow.d.ts

@@ -49,5 +49,5 @@ export declare class Workflow {
         success: boolean;
         error?: string;
     }>;
-    getSessionKeyPermissions(): SessionKeyPermission;
+    getSessionKeyPermissions(): Promise<SessionKeyPermission>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "otomato-sdk",
-  "version": "1.5.37",
+  "version": "1.5.39",
   "description": "An SDK for building and managing automations on Otomato",
   "main": "dist/src/index.js",
   "types": "dist/types/src/index.d.ts",