otomato-sdk 1.2.0 → 1.2.1

package/src/models/Node.ts

@@ -92,7 +92,15 @@ export class Node {
 
   getParameters(): { [key: string]: any } {
     return Object.keys(this.parameters).reduce((acc, key) => {
-      acc[key] = this.parameters[key].value;
+      if (key.startsWith('abiParams.')) {
+        const abiKey = key.replace('abiParams.', '');
+        if (!acc.abi) {
+          acc.abi = { parameters: {} };
+        }
+        acc.abi.parameters[abiKey] = this.parameters[key].value;
+      } else {
+        acc[key] = this.parameters[key].value;
+      }
       return acc;
     }, {} as { [key: string]: any });
   }
@@ -102,9 +110,7 @@ export class Node {
       id: this.id,
       ref: this.ref,
       type: this.class,
-      data: {
-        parameters: this.getParameters(),
-      }
+      parameters: this.getParameters(),
     };
     if (this.position) {
       json.position = this.position;

package/src/models/Parameter.ts

@@ -2,5 +2,5 @@ export interface Parameter {
     key: string;
     type: string;
     description: string;
-    value: any;
+    value?: any;
   }

package/src/models/Trigger.ts

@@ -9,24 +9,28 @@ export class Trigger extends Node {
     this.type = trigger.type;
   }
 
+  private notAPollingTrigger(): boolean {
+    return this.type === 0;
+  }
+
   setCondition(value: string): void {
-    if (this.type !== 1) {
+    if (this.notAPollingTrigger()) {
       throw new Error('Condition setting is not applicable for subscription based triggers.');
     }
     this.setParameter('condition', value);
   }
 
   setComparisonValue(value: number): void {
-    if (this.type !== 1) {
+    if (this.notAPollingTrigger()) {
       throw new Error('Comparison value setting is not applicable for subscription based triggers.');
     }
     this.setParameter('comparisonValue', value);
   }
 
   setInterval(value: number): void {
-    if (this.type !== 1) {
+    if (this.notAPollingTrigger()) {
       throw new Error('Interval setting is not applicable for subscription based triggers.');
     }
     this.setParameter('interval', value);
   }
-}
+}

package/src/utils/typeValidator.ts

@@ -24,10 +24,11 @@ export function validateType(expectedType: string, value: any): boolean {
             return typeof value === 'string' && isValidUrl(value);
         case 'phone_number':
             return typeof value === 'string' && isValidPhoneNumber(value);
+        case 'string':
         case 'paragraph':
             return typeof value === 'string';
         case 'logic_operator':
-            const validOperators = new Set(['<', '>', '<=', '>=', '==', '!=']);
+            const validOperators = new Set(['gte', 'gt', 'lte', 'lt', 'eq', 'neq']);
             return typeof value === 'string' && validOperators.has(value);
         case 'any':
             return true;

package/test/action.spec.ts

@@ -39,6 +39,8 @@ describe('Action Class', () => {
     const json = transferAction.toJSON();
     expect(json).to.deep.equal({
       id: ACTIONS.TOKENS.ERC20.TRANSFER.id,
+      ref: transferAction.getRef(),
+      type: 'action',
       parameters: {
         chainId: CHAINS.ETHEREUM,
         'abiParams.value': 1000,
@@ -48,7 +50,7 @@ describe('Action Class', () => {
     });
   });
 
-  it('should create an SMS action and set parameters correctly', () => {
+  /*it('should create an SMS action and set parameters correctly', () => {
     const smsAction = new Action(ACTIONS.NOTIFICATIONS.SMS);
     smsAction.setParams("phoneNumber", "+1234567890");
     smsAction.setParams("text", "Hello, this is a test message!");
@@ -56,16 +58,16 @@ describe('Action Class', () => {
     const params = smsAction.getParameters();
     expect(params.phoneNumber).to.equal("+1234567890");
     expect(params.text).to.equal("Hello, this is a test message!");
-  });
+  });*/
 
   it('should create a Slack action and set parameters correctly', () => {
-    const slackAction = new Action(ACTIONS.NOTIFICATIONS.SLACK);
+    const slackAction = new Action(ACTIONS.NOTIFICATIONS.SLACK.SEND_MESSAGE);
     slackAction.setParams("webhook", "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX");
-    slackAction.setParams("text", "This is a test message!");
+    slackAction.setParams("message", "This is a test message!");
 
     const params = slackAction.getParameters();
     expect(params.webhook).to.equal("https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX");
-    expect(params.text).to.equal("This is a test message!");
+    expect(params.message).to.equal("This is a test message!");
   });
 
   it('should throw an error for invalid parameter type', () => {
@@ -79,12 +81,12 @@ describe('Action Class', () => {
   });
 
   it('should throw an error for invalid URL', () => {
-    const slackAction = new Action(ACTIONS.NOTIFICATIONS.SLACK);
+    const slackAction = new Action(ACTIONS.NOTIFICATIONS.SLACK.SEND_MESSAGE);
     expect(() => slackAction.setParams("webhook", "invalid_url")).to.throw('Invalid type for parameter webhook. Expected url.');
   });
 
-  it('should throw an error for invalid phone number', () => {
+  /*it('should throw an error for invalid phone number', () => {
     const smsAction = new Action(ACTIONS.NOTIFICATIONS.SMS);
     expect(() => smsAction.setParams("phoneNumber", "invalid_phone_number")).to.throw('Invalid type for parameter phoneNumber. Expected phone_number.');
-  });
+  });*/
 });

package/test/automation.spec.ts

@@ -18,9 +18,9 @@ describe('Automation Class', () => {
     action1.setContractAddress(getToken(CHAINS.ETHEREUM, 'USDC').contractAddress);
     action1.setPosition(1, 0);
 
-    const action2 = new Action(ACTIONS.NOTIFICATIONS.SMS);
-    action2.setParams("phoneNumber", "+1234567890");
-    action2.setParams("text", "This is a test message");
+    const action2 = new Action(ACTIONS.NOTIFICATIONS.SLACK.SEND_MESSAGE);
+    action2.setParams("webhook", "https://webhook.url");
+    action2.setParams("message", "This is a test message");
     action2.setPosition(2, 0);
 
     const automation = new Automation("Test Automation", [trigger, action1, action2]);
@@ -29,6 +29,7 @@ describe('Automation Class', () => {
     expect(json).to.deep.equal({
       name: "Test Automation",
       nodes: [trigger.toJSON(), action1.toJSON(), action2.toJSON()],
+      edges: []
     });
   });
 
@@ -74,9 +75,9 @@ describe('Automation Class', () => {
     action1.setContractAddress(getToken(CHAINS.ETHEREUM, 'USDC').contractAddress);
     action1.setPosition(1, 0);
 
-    const action2 = new Action(ACTIONS.NOTIFICATIONS.SMS);
-    action2.setParams("phoneNumber", "+1234567890");
-    action2.setParams("text", "This is a test message");
+    const action2 = new Action(ACTIONS.NOTIFICATIONS.SLACK.SEND_MESSAGE);
+    action2.setParams("webhook", "https://webhook.url");
+    action2.setParams("message", "This is a test message");
     action2.setPosition(2, 0);
 
     const automation = new Automation("Test Automation", [trigger]);

package/test/node.spec.ts

@@ -81,12 +81,10 @@ describe('Node Class', () => {
     expect(json).to.deep.equal({
       id: 5,
       ref: node.getRef(),
-      class: 'testClass',
-      data: {
-        parameters: {
-          chainId: 1,
-          contractAddress: "0x0000000000000000000000000000000000000000"
-        }
+      type: 'testClass',
+      parameters: {
+        chainId: 1,
+        contractAddress: "0x0000000000000000000000000000000000000000"
       }
     });
   });
@@ -106,14 +104,12 @@ describe('Node Class', () => {
 
     const json = node.toJSON();
     expect(json).to.deep.equal({
+      type: 'testClass',
       id: 6,
       ref: node.getRef(),
-      class: 'testClass',
-      data: {
-        parameters: {
-          chainId: 1,
-          contractAddress: "0x0000000000000000000000000000000000000000"
-        }
+      parameters: {
+        chainId: 1,
+        contractAddress: "0x0000000000000000000000000000000000000000"
       },
       position: {x: 1, y: 2}
     });

package/test/trigger.spec.ts

@@ -37,12 +37,16 @@ describe('Trigger Class', () => {
     transferTrigger.setContractAddress(getToken(CHAINS.ETHEREUM, 'USDC').contractAddress);
 
     const json = transferTrigger.toJSON();
+    console.log(json);
     expect(json).to.deep.equal({
       id: TRIGGERS.TOKENS.ERC20.TRANSFER.id,
+      ref: transferTrigger.getRef(),
+      type: 'trigger',
       parameters: {
         chainId: CHAINS.ETHEREUM,
         'abiParams.value': 1000,
         'abiParams.to': DEFAULT_ADDRESS,
+        'abiParams.from': null,
         contractAddress: getToken(CHAINS.ETHEREUM, 'USDC').contractAddress
       }
     });
@@ -53,7 +57,7 @@ describe('Trigger Class', () => {
     balanceTrigger.setChainId(CHAINS.ETHEREUM);
     balanceTrigger.setParams("account", DEFAULT_ADDRESS);
     balanceTrigger.setContractAddress(getToken(CHAINS.ETHEREUM, 'USDC').contractAddress);
-    balanceTrigger.setCondition(">");
+    balanceTrigger.setCondition("gte");
     balanceTrigger.setComparisonValue(45000);
     balanceTrigger.setInterval(5000);
 
@@ -61,7 +65,8 @@ describe('Trigger Class', () => {
     expect(params.chainId).to.equal(CHAINS.ETHEREUM);
     expect(params['abiParams.account']).to.equal(DEFAULT_ADDRESS);
     expect(params.contractAddress).to.equal(getToken(CHAINS.ETHEREUM, 'USDC').contractAddress);
-    expect(balanceTrigger.toJSON().parameters.condition).to.equal(">");
+    console.log(balanceTrigger.toJSON());
+    expect(balanceTrigger.toJSON().parameters.condition).to.equal("gte");
     expect(balanceTrigger.toJSON().parameters.comparisonValue).to.equal(45000);
     expect(balanceTrigger.toJSON().parameters.interval).to.equal(5000);
   });

package/test/typeValidator.spec.ts

@@ -58,7 +58,8 @@ describe('Type Validator Utility Functions', () => {
         });
 
         it('should validate logic operators', () => {
-            expect(validateType('logic_operator', '>')).to.be.true;
+            expect(validateType('logic_operator', 'gte')).to.be.true;
+            expect(validateType('logic_operator', '>')).to.be.false;
             expect(validateType('logic_operator', 'invalid_operator')).to.be.false;
         });
 

package/src/constants/json.json

@@ -1,16 +0,0 @@
-{
-    "id": 1,
-    "refId": "n-1",
-    "data": {
-        "parameters": {
-            "chainId": 1,
-            "abiParams.value": null,
-            "abiParams.to": null,
-            "contractAddress": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-        },
-    },
-    "position": {
-        "x": 0,
-        "y": 0
-    }
-}