otomato-sdk 2.0.63 → 2.0.65

package/dist/src/constants/Blocks.js

@@ -151,7 +151,7 @@ export const TRIGGERS = {
                 "description": "Fetches the balance of an ERC20 and checks it against the specified condition.",
                 "prototype": "erc20Balance",
                 "type": 1,
-                "method": "function balanceOf(address account) view returns (uint256)",
+                "method": "function balanceOf(address account) view returns ((uint256 balance))",
                 "output": {
                     "balance": "float"
                 },
@@ -1555,6 +1555,8 @@ export const TRIGGERS = {
                 "output": {
                     "sender": "address",
                     "recipient": "address",
+                    "token0": "erc20",
+                    "token1": "erc20",
                     "amount0": "int256",
                     "amount1": "int256",
                     "sqrtPriceX96": "uint160",
@@ -1643,6 +1645,8 @@ export const TRIGGERS = {
                 "type": 0,
                 "output": {
                     "sender": "address",
+                    "token0": "erc20",
+                    "token1": "erc20",
                     "amount0In": "uint256",
                     "amount1In": "uint256",
                     "amount0Out": "uint256",
@@ -1751,6 +1755,8 @@ export const TRIGGERS = {
                 "output": {
                     "sender": "address",
                     "recipient": "address",
+                    "token0": "erc20",
+                    "token1": "erc20",
                     "amount0": "int256",
                     "amount1": "int256",
                     "sqrtPriceX96": "uint160",
@@ -1840,6 +1846,8 @@ export const TRIGGERS = {
                 "output": {
                     "sender": "address",
                     "to": "address",
+                    "token0": "erc20",
+                    "token1": "erc20",
                     "amount0In": "uint256",
                     "amount1In": "uint256",
                     "amount0Out": "uint256",
@@ -1925,7 +1933,7 @@ export const TRIGGERS = {
         "VELODROME": {
             "description": "Monitors swaps on Velodrome pools",
             "chains": [
-                8453
+                34443
             ],
             "image": "https://otomato-sdk-images.s3.eu-west-1.amazonaws.com/velodrome.jpg",
             "SWAP_IN_CONCENTRATED_POOL": {
@@ -1935,6 +1943,8 @@ export const TRIGGERS = {
                 "output": {
                     "sender": "address",
                     "recipient": "address",
+                    "token0": "erc20",
+                    "token1": "erc20",
                     "amount0": "int256",
                     "amount1": "int256",
                     "sqrtPriceX96": "uint160",
@@ -1946,7 +1956,7 @@ export const TRIGGERS = {
                     {
                         "key": "chainId",
                         "type": "chainId",
-                        "description": "The network to monitor swaps on (Base).",
+                        "description": "The network to monitor swaps on (MODE).",
                         "mandatory": true,
                         "category": 0
                     },
@@ -2001,15 +2011,15 @@ export const TRIGGERS = {
                 "examples": [
                     {
                         "name": "Monitor all swaps in concentrated pool",
-                        "description": "Triggers whenever a swap occurs in a Velodrome concentrated liquidity pool (WETH/MODE 0.3%).",
+                        "description": "Triggers whenever a swap occurs in a Velodrome concentrated liquidity pool (WETH/USDC 0.05%).",
                         "parameters": [
                             {
                                 "key": "chainId",
-                                "value": 8453
+                                "value": 34443
                             },
                             {
                                 "key": "contractAddress",
-                                "value": "0x1E41CDE26b30646bb3DBBea48A63708b00470c1c"
+                                "value": "0x3Adf15f77F2911f84b0FE9DbdfF43ef60D40012c"
                             }
                         ]
                     }
@@ -2034,7 +2044,7 @@ export const TRIGGERS = {
                     {
                         "key": "chainId",
                         "type": "chainId",
-                        "description": "The network to monitor swaps on (Base).",
+                        "description": "The network to monitor swaps on (MODE).",
                         "mandatory": true,
                         "category": 0
                     },
@@ -2093,7 +2103,7 @@ export const TRIGGERS = {
                         "parameters": [
                             {
                                 "key": "chainId",
-                                "value": 8453
+                                "value": 34443
                             },
                             {
                                 "key": "contractAddress",
@@ -2594,7 +2604,9 @@ export const ACTIONS = {
                     "tokenIn": "erc20",
                     "amountOut": "uint256",
                     "tokenOut": "erc20",
-                    "transactionHash": "string"
+                    "transactionHash": "string",
+                    "exchangeRate": "float",
+                    "logs": "Object"
                 },
                 "frontendHelpers": {
                     "output": {
@@ -4477,7 +4489,9 @@ export const ACTIONS = {
                     "tokenIn": "erc20",
                     "amountOut": "uint256",
                     "tokenOut": "erc20",
-                    "transactionHash": "string"
+                    "transactionHash": "string",
+                    "exchangeRate": "float",
+                    "logs": "Object"
                 },
                 "frontendHelpers": {
                     "output": {

package/dist/src/constants/version.js

@@ -1,4 +1,4 @@
-export const SDK_VERSION = '2.0.63';
+export const SDK_VERSION = '2.0.64';
 export function compareVersions(v1, v2) {
     // Split the version strings into parts
     const v1Parts = v1.split('.').map(Number);

package/dist/src/utils/WorkflowNodePositioner.js

@@ -1,69 +1,146 @@
-// Note: Using 'dagre' for layered DAG layout
-import dagre from 'dagre-esm-wrapper';
-console.log(dagre);
-// or: import * as dagre from 'dagre';
-export const xSpacing = 700; // used by dagre as node separation
-export const ySpacing = 75;
-export const ROOT_X = 400; // we’ll keep references, but Dagre decides actual positions
+export const xSpacing = 500;
+export const ySpacing = 120;
+export const ROOT_X = 400;
 export const ROOT_Y = 120;
+export function positionWorkflowNodesAvoidOverlap(workflow) {
+    // 1) Lay out nodes using existing logic
+    positionWorkflowNodes(workflow);
+    // 2) Group nodes by 'level' based on vertical position
+    const levels = new Map();
+    workflow.nodes.forEach((node) => {
+        if (node.position) {
+            const level = Math.round(node.position.y / ySpacing);
+            if (!levels.has(level)) {
+                levels.set(level, []);
+            }
+            levels.get(level).push(node);
+        }
+    });
+    // 3) Resolve horizontal overlaps among *all* nodes in each level
+    levels.forEach((levelNodes) => {
+        // Sort the nodes in this level by X
+        levelNodes.sort((a, b) => { var _a, _b; return ((_a = a.position.x) !== null && _a !== void 0 ? _a : 0) - ((_b = b.position.x) !== null && _b !== void 0 ? _b : 0); });
+        // Walk left-to-right, shifting nodes that would collide with the previous one
+        for (let i = 1; i < levelNodes.length; i++) {
+            const prev = levelNodes[i - 1];
+            const current = levelNodes[i];
+            // Compute how close they are
+            const dx = current.position.x - prev.position.x;
+            // If they are too close, shift the current node (and its children) to the right
+            if (dx < xSpacing) {
+                const shift = xSpacing - dx;
+                moveNodeAndChildren(current, shift, workflow.edges);
+            }
+        }
+    });
+    // 4) Re-center parents above their children in a bottom-up pass
+    centerParentXPositions(workflow);
+}
 /**
- * Dagre-based layout for the “top-down” pass. We’re effectively ignoring the old
- * manual code. Instead, we:
- *  1) Build a dagre graph
- *  2) Add all nodes & edges
- *  3) dagre.layout(g)
- *  4) Extract positions & write them back to workflow.nodes
+ * Lays out the workflow nodes in a rough top-down manner,
+ * then positions each node relative to its parent.
  */
 export function positionWorkflowNodes(workflow) {
-    // 1) Create a new directed graph
-    // doc: https://github.com/dagrejs/dagre
-    const g = new dagre.graphlib.Graph({ multigraph: false, compound: false });
-    g.setGraph({
-        // Some layout options:
-        rankdir: 'TB', // "top-bottom" layering
-        nodesep: xSpacing * 0.5, // horizontal spacing 
-        ranksep: ySpacing, // vertical spacing between levels
-        marginx: 20, // how much margin to leave around the left/right
-        marginy: 20, // how much margin to leave around the top/bottom
-    });
-    g.setDefaultEdgeLabel(() => ({}));
-    // 2) Add nodes to the graph
-    // Dagre requires each node have an id and some approximate width/height
-    workflow.nodes.forEach((node) => {
-        const nodeId = node.getRef();
-        // For a typical text-based node, approximate width & height
-        g.setNode(nodeId, {
-            label: nodeId,
-            width: 100,
-            height: 50
+    try {
+        // Step 1: Find the starting nodes
+        const startingNodes = identityStartingNodes(workflow);
+        // Step 2: Place the starting nodes
+        let xPosition = ROOT_X;
+        startingNodes.forEach((startNode) => {
+            startNode.setPosition(xPosition, ROOT_Y);
+            xPosition += xSpacing;
         });
+        // Step 3: For all other nodes, position them based on their parent(s)
+        const nodesToPosition = workflow.nodes.filter((node) => !startingNodes.includes(node));
+        nodesToPosition.forEach((node) => positionNode(node, workflow.edges, xSpacing, ySpacing, workflow));
+    }
+    catch (e) {
+        console.error(e);
+    }
+}
+export function positionNode(node, edges, xSpacing, ySpacing, workflow) {
+    const parents = getParents(node, edges);
+    if (!parents.length)
+        return; // Edge case: no parents?
+    // Sort children of the first parent by edge labels (true/false) so "true" is left, "false" is right
+    const children = getChildren(parents[0], edges).sort((a, b) => {
+        var _a, _b;
+        const edgeA = edges.find((edge) => edge.source === parents[0] && edge.target === a);
+        const edgeB = edges.find((edge) => edge.source === parents[0] && edge.target === b);
+        const labelA = (_a = edgeA === null || edgeA === void 0 ? void 0 : edgeA.label) !== null && _a !== void 0 ? _a : "";
+        const labelB = (_b = edgeB === null || edgeB === void 0 ? void 0 : edgeB.label) !== null && _b !== void 0 ? _b : "";
+        if (labelA === "true" && labelB !== "true")
+            return -1;
+        if (labelB === "true" && labelA !== "true")
+            return 1;
+        if (labelA === "false" && labelB !== "false")
+            return 1;
+        if (labelB === "false" && labelA !== "false")
+            return -1;
+        return 0;
     });
-    // 3) Add edges
-    // Dagre identifies edges by (sourceId, targetId). We don’t need labels for layout,
-    // but we can store them if we want. If you rely on “true/false” ordering, we can tweak
-    // e.g. use edge label as a tie-break. (See advanced docs.)
-    workflow.edges.forEach((edge) => {
-        var _a;
-        const fromId = edge.source.getRef();
-        const toId = edge.target.getRef();
-        g.setEdge(fromId, toId, { label: (_a = edge.label) !== null && _a !== void 0 ? _a : '' });
-    });
-    // 4) Run Dagre layout
-    dagre.layout(g);
-    // 5) Extract positions from Dagre graph and store them back to your Node objects
-    g.nodes().forEach((nodeId) => {
-        const dagreNode = g.node(nodeId); // { x, y, width, height, ... }
-        const nodeObj = workflow.nodes.find((n) => n.getRef() === nodeId);
-        if (!nodeObj || !dagreNode)
-            return;
-        // Store x,y in your node’s position
-        nodeObj.setPosition(dagreNode.x, dagreNode.y);
+    const parentX = parents.reduce((sum, p) => { var _a, _b; return sum + ((_b = (_a = p.position) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : ROOT_X); }, 0) /
+        parents.length;
+    const parentY = Math.max(...parents.map((p) => { var _a, _b; return (_b = (_a = p.position) === null || _a === void 0 ? void 0 : _a.y) !== null && _b !== void 0 ? _b : ROOT_Y; }));
+    if (children.length <= 1) {
+        node.setPosition(parentX, parentY + ySpacing);
+    }
+    else {
+        // This node’s index among siblings
+        const index = children.indexOf(node);
+        const offset = index - (children.length - 1) / 2;
+        node.setPosition(parentX + offset * xSpacing, parentY + ySpacing);
+    }
+}
+/**
+ * Repositions each parent node so that its X = average of its children’s X.
+ */
+function centerParentXPositions(workflow) {
+    var _a, _b;
+    // Identify the leaf nodes to start a bottom-up pass
+    const queue = identifyLeafNodes(workflow);
+    while (queue.length > 0) {
+        const child = queue.shift();
+        const parents = getParents(child, workflow.edges);
+        for (const parent of parents) {
+            const children = getChildren(parent, workflow.edges);
+            if (children.length) {
+                const sumX = children.reduce((acc, c) => { var _a, _b; return acc + ((_b = (_a = c.position) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0); }, 0);
+                const avgX = sumX / children.length;
+                parent.setPosition(avgX, (_b = (_a = parent.position) === null || _a === void 0 ? void 0 : _a.y) !== null && _b !== void 0 ? _b : 0);
+            }
+            // Push this parent upward in the queue to continue up the chain
+            if (!queue.includes(parent)) {
+                queue.push(parent);
+            }
+        }
+    }
+}
+/**
+ * Recursively shifts a node and all its descendants by `shift` in the x-direction.
+ */
+function moveNodeAndChildren(node, shift, edges) {
+    node.setPosition(node.position.x + shift, node.position.y);
+    edges
+        .filter((edge) => edge.source === node)
+        .forEach((edge) => {
+        moveNodeAndChildren(edge.target, shift, edges);
     });
 }
 /**
- * We keep these helper functions the same for external usage (if your code or tests need them),
- * but we’re not actively using them in the new Dagre-based layout.
+ * A "leaf" node is one that has no children (it’s never the source of an edge).
  */
+export function identifyLeafNodes(workflow) {
+    const sources = new Set(workflow.edges.map((edge) => edge.source.getRef()));
+    return workflow.nodes.filter((node) => !sources.has(node.getRef()));
+}
+/**
+ * Identify starting nodes (no incoming edges).
+ */
+export function identityStartingNodes(workflow) {
+    const childRefs = new Set(workflow.edges.map((edge) => edge.target.getRef()));
+    return workflow.nodes.filter((node) => !childRefs.has(node.getRef()));
+}
 export function getChildren(node, edges) {
     return edges
         .filter((edge) => edge.source === node)
@@ -84,20 +161,7 @@ export function getEndNodePositions(workflow) {
         var _a, _b, _c, _d;
         return ({
             x: (_b = (_a = node.position) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0,
-            y: ((_d = (_c = node.position) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0) + ySpacing * 2,
+            y: ((_d = (_c = node.position) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0) + ySpacing,
         });
     });
 }
-/**
- * In Dagre, we no longer do an explicit “identify leaf nodes” or “center parents by average,”
- * because the layout library handles that.
- * But here’s your old method if something else depends on it.
- */
-export function identifyLeafNodes(workflow) {
-    const sources = new Set(workflow.edges.map((edge) => edge.source.getRef()));
-    return workflow.nodes.filter((node) => !sources.has(node.getRef()));
-}
-export function identityStartingNodes(workflow) {
-    const childRefs = new Set(workflow.edges.map((edge) => edge.target.getRef()));
-    return workflow.nodes.filter((node) => !childRefs.has(node.getRef()));
-}

package/dist/types/examples/UseCases/MicroSerivcesTrigger/blur.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/examples/UseCases/MicroSerivcesTrigger/x.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/examples/UseCases/Swap/aerodrome-basic.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/examples/UseCases/Swap/aerodrome-concentrated.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/examples/UseCases/Swap/uniswap-v2.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/examples/UseCases/Swap/uniswap-v3.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/examples/UseCases/Swap/velodrome-basic.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/examples/UseCases/Swap/velodrome-concentrated.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -602,6 +602,8 @@ export declare const TRIGGERS: {
                 output: {
                     sender: string;
                     recipient: string;
+                    token0: string;
+                    token1: string;
                     amount0: string;
                     amount1: string;
                     sqrtPriceX96: string;
@@ -646,6 +648,8 @@ export declare const TRIGGERS: {
                 type: number;
                 output: {
                     sender: string;
+                    token0: string;
+                    token1: string;
                     amount0In: string;
                     amount1In: string;
                     amount0Out: string;
@@ -696,6 +700,8 @@ export declare const TRIGGERS: {
                 output: {
                     sender: string;
                     recipient: string;
+                    token0: string;
+                    token1: string;
                     amount0: string;
                     amount1: string;
                     sqrtPriceX96: string;
@@ -741,6 +747,8 @@ export declare const TRIGGERS: {
                 output: {
                     sender: string;
                     to: string;
+                    token0: string;
+                    token1: string;
                     amount0In: string;
                     amount1In: string;
                     amount0Out: string;
@@ -790,6 +798,8 @@ export declare const TRIGGERS: {
                 output: {
                     sender: string;
                     recipient: string;
+                    token0: string;
+                    token1: string;
                     amount0: string;
                     amount1: string;
                     sqrtPriceX96: string;
@@ -1137,6 +1147,8 @@ export declare const ACTIONS: {
                     amountOut: string;
                     tokenOut: string;
                     transactionHash: string;
+                    exchangeRate: string;
+                    logs: string;
                 };
                 frontendHelpers: {
                     output: {
@@ -1956,6 +1968,8 @@ export declare const ACTIONS: {
                     amountOut: string;
                     tokenOut: string;
                     transactionHash: string;
+                    exchangeRate: string;
+                    logs: string;
                 };
                 frontendHelpers: {
                     output: {

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

@@ -1,2 +1,2 @@
-export declare const SDK_VERSION = "2.0.63";
+export declare const SDK_VERSION = "2.0.64";
 export declare function compareVersions(v1: string, v2: string): number;

package/dist/types/src/utils/WorkflowNodePositioner.d.ts

@@ -1,23 +1,25 @@
 import { Workflow } from '../models/Workflow.js';
 import { Node } from '../models/Node.js';
 import { Edge } from '../models/Edge.js';
-export declare const xSpacing = 700;
-export declare const ySpacing = 75;
+export declare const xSpacing = 500;
+export declare const ySpacing = 120;
 export declare const ROOT_X = 400;
 export declare const ROOT_Y = 120;
+export declare function positionWorkflowNodesAvoidOverlap(workflow: Workflow): void;
 /**
- * Dagre-based layout for the “top-down” pass. We’re effectively ignoring the old
- * manual code. Instead, we:
- *  1) Build a dagre graph
- *  2) Add all nodes & edges
- *  3) dagre.layout(g)
- *  4) Extract positions & write them back to workflow.nodes
+ * Lays out the workflow nodes in a rough top-down manner,
+ * then positions each node relative to its parent.
  */
 export declare function positionWorkflowNodes(workflow: Workflow): void;
+export declare function positionNode(node: Node, edges: Edge[], xSpacing: number, ySpacing: number, workflow: Workflow): void;
 /**
- * We keep these helper functions the same for external usage (if your code or tests need them),
- * but we’re not actively using them in the new Dagre-based layout.
+ * A "leaf" node is one that has no children (it’s never the source of an edge).
  */
+export declare function identifyLeafNodes(workflow: Workflow): Node[];
+/**
+ * Identify starting nodes (no incoming edges).
+ */
+export declare function identityStartingNodes(workflow: Workflow): Node[];
 export declare function getChildren(node: Node, edges: Edge[]): Node[];
 export declare function getParents(node: Node, edges: Edge[]): Node[];
 export declare function getEdges(node: Node, edges: Edge[]): Edge[];
@@ -25,10 +27,3 @@ export declare function getEndNodePositions(workflow: Workflow): {
     x: number;
     y: number;
 }[];
-/**
- * In Dagre, we no longer do an explicit “identify leaf nodes” or “center parents by average,”
- * because the layout library handles that.
- * But here’s your old method if something else depends on it.
- */
-export declare function identifyLeafNodes(workflow: Workflow): Node[];
-export declare function identityStartingNodes(workflow: Workflow): Node[];

package/dist/types/test/nodePositioning.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "otomato-sdk",
-  "version": "2.0.63",
+  "version": "2.0.65",
   "description": "An SDK for building and managing automations on Otomato",
   "main": "dist/src/index.js",
   "types": "dist/types/src/index.d.ts",
@@ -44,7 +44,6 @@
   },
   "dependencies": {
     "axios": "^1.7.2",
-    "dagre-esm-wrapper": "1.0.4",
     "ethers": "^6.13.1",
     "jsonwebtoken": "^9.0.2",
     "mustache": "^4.2.0"