otomato-sdk 1.5.5 → 1.5.6

package/dist/src/constants/Blocks.js

@@ -537,6 +537,12 @@ export const ACTIONS = {
                 "permissions": {
                     "approvedTargets": [
                         "$contractAddress"
+                    ],
+                    "label": [
+                        "Transfer $tokenSymbol($chainId, $contractAddress)"
+                    ],
+                    "labelNotAuthorized": [
+                        "Transfer $otherTokenSymbol($chainId, $contractAddress)"
                     ]
                 },
                 "blockId": 100004,

package/dist/src/constants/tokens.js

@@ -22,7 +22,7 @@ export const TOKENS = {
             image: "https://static.debank.com/image/chain/logo_url/eth/42ba589cd077e7bdd97db6480b0ff61d.png"
         },
         {
-            contractAddress: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+            contractAddress: "0xdac17f958d2ee523a2206206994597c13d831ec7",
             name: "USDT",
             symbol: "USDT",
             decimals: 18,

package/dist/src/models/Action.js

@@ -21,6 +21,8 @@ export class Action extends Node {
             return null;
         const permissions = SessionKeyPermission.fromJSON(parentBlock.permissions);
         permissions.fill('contractAddress', this.getParameter('contractAddress'));
+        permissions.fill('chainId', this.getParameter('chainId'));
+        permissions.fillMethod();
         return permissions;
     }
     static fromJSON(json) {

package/dist/src/models/SessionKeyPermission.js

@@ -1,31 +1,57 @@
+import { getToken } from "../constants/tokens.js";
 export class SessionKeyPermission {
-    constructor(approvedTargets = []) {
-        if (!Array.isArray(approvedTargets)) {
-            console.error('approvedTargets should be an array. Received:', approvedTargets);
-            approvedTargets = [];
-        }
+    constructor({ approvedTargets = [], label = [], labelNotAuthorized = [], } = {}) {
         this.approvedTargets = approvedTargets;
+        this.label = label;
+        this.labelNotAuthorized = labelNotAuthorized;
     }
     fill(key, value) {
-        if (!Array.isArray(this.approvedTargets)) {
-            console.error('approvedTargets is not an array. Cannot call map on:', this.approvedTargets);
-            return;
-        }
-        this.approvedTargets = this.approvedTargets.map(target => {
+        const replacePlaceholder = (target) => {
             const placeholder = `$${key}`;
-            if (typeof target === 'string' && target.includes(placeholder)) {
-                target = target.replace(placeholder, value);
+            if (target.includes(placeholder)) {
+                return target.replace(placeholder, value);
             }
             return target;
-        });
+        };
+        this.approvedTargets = this.approvedTargets.map(replacePlaceholder);
+        this.label = this.label.map(replacePlaceholder);
+        this.labelNotAuthorized = this.labelNotAuthorized.map(replacePlaceholder);
+    }
+    fillMethod() {
+        const executeMethod = (target) => {
+            const methodPattern = /\$(\w+)\(([^)]+)\)/g;
+            return target.replace(methodPattern, (match, methodName, params) => {
+                const paramList = params.split(',').map((param) => param.trim());
+                switch (methodName) {
+                    case 'tokenSymbol': {
+                        const [chainId, address] = paramList;
+                        const token = getToken(parseInt(chainId, 10), address);
+                        return token ? token.symbol : match;
+                    }
+                    case 'otherTokenSymbol': {
+                        const [chainId, address] = paramList;
+                        const symbol = getDifferentToken(parseInt(chainId, 10), address);
+                        return symbol;
+                    }
+                    // Add other methods here as needed
+                    default:
+                        return match;
+                }
+            });
+        };
+        this.approvedTargets = this.approvedTargets.map(executeMethod);
+        this.label = this.label.map(executeMethod);
+        this.labelNotAuthorized = this.labelNotAuthorized.map(executeMethod);
     }
     toJSON() {
-        const containsPlaceholder = this.approvedTargets.some(target => typeof target === 'string' && target.includes('$'));
+        const containsPlaceholder = this.approvedTargets.some(target => target.includes('$'));
         if (containsPlaceholder) {
             throw new Error('Approved targets contain unresolved placeholders.');
         }
         return {
             approvedTargets: this.approvedTargets,
+            label: this.label,
+            labelNotAuthorized: this.labelNotAuthorized,
         };
     }
     static fromJSON(json) {
@@ -33,15 +59,29 @@ export class SessionKeyPermission {
             console.error('Invalid JSON object for SessionKeyPermission:', json);
             throw new Error('Invalid JSON object for SessionKeyPermission');
         }
-        return new SessionKeyPermission(json.approvedTargets);
+        return new SessionKeyPermission(json);
     }
     merge(other) {
-        if (!other || !Array.isArray(other.approvedTargets)) {
-            console.error('Invalid SessionKeyPermission object to merge:', other);
-            return;
-        }
+        // Merge approvedTargets
         const uniqueTargets = new Set(this.approvedTargets);
         other.approvedTargets.forEach(target => uniqueTargets.add(target));
         this.approvedTargets = Array.from(uniqueTargets);
+        // Merge labels
+        const uniqueLabels = new Set(this.label);
+        other.label.forEach(lbl => uniqueLabels.add(lbl));
+        this.label = Array.from(uniqueLabels);
+        // Merge labelNotAuthorized
+        const uniqueLabelsNotAuthorized = new Set(this.labelNotAuthorized);
+        other.labelNotAuthorized.forEach(lbl => uniqueLabelsNotAuthorized.add(lbl));
+        this.labelNotAuthorized = Array.from(uniqueLabelsNotAuthorized);
+        // Remove labels from labelNotAuthorized if they are present in label
+        this.labelNotAuthorized = this.labelNotAuthorized.filter(lbl => !this.label.includes(lbl));
     }
 }
+const getDifferentToken = (chain, contractAddress) => {
+    var _a;
+    const tokenSymbol = (_a = getToken(chain, contractAddress)) === null || _a === void 0 ? void 0 : _a.symbol;
+    if (!tokenSymbol || tokenSymbol !== 'WETH')
+        return 'WETH';
+    return 'USDT';
+};

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

@@ -199,6 +199,8 @@ export declare const ACTIONS: {
                 parameters: Parameter[];
                 permissions: {
                     approvedTargets: string[];
+                    label: string[];
+                    labelNotAuthorized: string[];
                 };
                 blockId: number;
                 image: string;

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

@@ -1,7 +1,14 @@
 export declare class SessionKeyPermission {
     approvedTargets: string[];
-    constructor(approvedTargets?: string[]);
+    label: string[];
+    labelNotAuthorized: string[];
+    constructor({ approvedTargets, label, labelNotAuthorized, }?: {
+        approvedTargets?: string[];
+        label?: string[];
+        labelNotAuthorized?: string[];
+    });
     fill(key: string, value: any): void;
+    fillMethod(): void;
     toJSON(): {
         [key: string]: any;
     };

package/package.json

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