@avaprotocol/sdk-js 2.0.4 → 2.1.1

package/dist/models/node/contractRead.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contractRead.d.ts","sourceRoot":"","sources":["../../../src/models/node/contractRead.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAkC,qBAAqB,EAAa,MAAM,oBAAoB,CAAC;AAMtG,cAAM,gBAAiB,SAAQ,IAAI;gBACrB,KAAK,EAAE,qBAAqB;IAIxC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,gBAAgB;IAU3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAoB5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAUrE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"contractRead.d.ts","sourceRoot":"","sources":["../../../src/models/node/contractRead.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAkC,qBAAqB,EAAa,MAAM,oBAAoB,CAAC;AAMtG,cAAM,gBAAiB,SAAQ,IAAI;gBACrB,KAAK,EAAE,qBAAqB;IAIxC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,gBAAgB;IAU3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IA8B5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAmBrE;AAED,eAAe,gBAAgB,CAAC"}

package/dist/models/node/contractRead.js

@@ -1,7 +1,6 @@
 import Node from "./interface";
 import * as avs_pb from "@/grpc_codegen/avs_pb";
 import { NodeType } from "@avaprotocol/types";
-import { convertProtobufValueToJs } from "../../utils";
 // Required props for constructor: id, name, type and data
 class ContractReadNode extends Node {
     constructor(props) {
@@ -23,18 +22,36 @@ class ContractReadNode extends Node {
         const nodeData = new avs_pb.ContractReadNode();
         const config = new avs_pb.ContractReadNode.Config();
         config.setContractAddress(this.data.contractAddress);
-        config.setCallData(this.data.callData);
         config.setContractAbi(this.data.contractAbi);
+        // Handle method calls array - use camelCase property name from protobuf AsObject
+        const methodCalls = this.data.methodCallsList || [];
+        methodCalls.forEach((methodCall) => {
+            const methodCallMsg = new avs_pb.ContractReadNode.MethodCall();
+            methodCallMsg.setCallData(methodCall.callData);
+            if (methodCall.methodName) {
+                methodCallMsg.setMethodName(methodCall.methodName);
+            }
+            config.addMethodCalls(methodCallMsg);
+        });
         nodeData.setConfig(config);
         request.setContractRead(nodeData);
         return request;
     }
     static fromOutputData(outputData) {
         const contractReadOutput = outputData.getContractRead();
-        if (contractReadOutput && contractReadOutput.getDataList()) {
-            const dataList = contractReadOutput.getDataList();
+        if (contractReadOutput && contractReadOutput.getResultsList()) {
+            const resultsList = contractReadOutput.getResultsList();
             return {
-                dataList: dataList.map((value) => convertProtobufValueToJs(value))
+                results: resultsList.map((result) => ({
+                    methodName: result.getMethodName(),
+                    success: result.getSuccess(),
+                    error: result.getError(),
+                    data: result.getDataList().map((field) => ({
+                        name: field.getName(),
+                        type: field.getType(),
+                        value: field.getValue()
+                    }))
+                }))
             };
         }
         return null;

package/dist/models/node/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../../src/models/node/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAA0B,aAAa,EAAa,MAAM,oBAAoB,CAAC;AAKtF,cAAM,QAAS,SAAQ,IAAI;gBACb,KAAK,EAAE,aAAa;IAIhC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ;IA+BnD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAkG5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAIrE;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../../src/models/node/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAA0B,aAAa,EAAa,MAAM,oBAAoB,CAAC;AAKtF,cAAM,QAAS,SAAQ,IAAI;gBACb,KAAK,EAAE,aAAa;IAIhC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ;IA+BnD,SAAS,IAAI,MAAM,CAAC,QAAQ;IA6G5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAIrE;AAED,eAAe,QAAQ,CAAC"}

package/dist/models/node/loop.js

@@ -71,8 +71,17 @@ class LoopNode extends Node {
             if (data.contractRead.config) {
                 const config = new avs_pb.ContractReadNode.Config();
                 config.setContractAddress(data.contractRead.config.contractAddress);
-                config.setCallData(data.contractRead.config.callData);
                 config.setContractAbi(data.contractRead.config.contractAbi);
+                // Handle method calls array
+                const methodCalls = data.contractRead.config.methodCallsList || [];
+                methodCalls.forEach((methodCall) => {
+                    const methodCallMsg = new avs_pb.ContractReadNode.MethodCall();
+                    methodCallMsg.setCallData(methodCall.callData);
+                    if (methodCall.methodName) {
+                        methodCallMsg.setMethodName(methodCall.methodName);
+                    }
+                    config.addMethodCalls(methodCallMsg);
+                });
                 contractRead.setConfig(config);
             }
             loopNode.setContractRead(contractRead);

package/dist/models/secret.d.ts

@@ -0,0 +1,16 @@
+import * as avs_pb from "@/grpc_codegen/avs_pb";
+import { SecretProps } from "@avaprotocol/types";
+declare class Secret implements SecretProps {
+    name: string;
+    secret?: string;
+    workflowId?: string;
+    orgId?: string;
+    createdAt?: number;
+    updatedAt?: number;
+    createdBy?: string;
+    description?: string;
+    constructor(props: SecretProps);
+    toRequest(): avs_pb.CreateOrUpdateSecretReq;
+}
+export default Secret;
+//# sourceMappingURL=secret.d.ts.map

package/dist/models/step.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../src/models/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAKhD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEhE,cAAM,IAAK,YAAW,SAAS;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAa5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAenB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IA8F9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAgBvD;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../src/models/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAKhD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEhE,cAAM,IAAK,YAAW,SAAS;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAa5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAenB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IA0H9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAgBvD;AAED,eAAe,IAAI,CAAC"}

package/dist/models/step.js

@@ -89,11 +89,40 @@ class Step {
             case avs_pb.Execution.Step.OutputDataCase.CONTRACT_READ:
                 nodeOutputMessage = step.getContractRead();
                 if (nodeOutputMessage) {
-                    return nodeOutputMessage
-                        .getDataList()
-                        .map((val) => convertProtobufValueToJs(val));
+                    const results = nodeOutputMessage.getResultsList();
+                    if (results && results.length > 0) {
+                        // If single result, return it directly for backward compatibility
+                        if (results.length === 1) {
+                            const result = results[0];
+                            const structuredData = {};
+                            result.getDataList().forEach((field) => {
+                                structuredData[field.getName()] = field.getValue();
+                            });
+                            return {
+                                methodName: result.getMethodName(),
+                                success: result.getSuccess(),
+                                error: result.getError(),
+                                data: structuredData,
+                            };
+                        }
+                        else {
+                            // Multiple results - return as array
+                            return results.map((result) => {
+                                const structuredData = {};
+                                result.getDataList().forEach((field) => {
+                                    structuredData[field.getName()] = field.getValue();
+                                });
+                                return {
+                                    methodName: result.getMethodName(),
+                                    success: result.getSuccess(),
+                                    error: result.getError(),
+                                    data: structuredData,
+                                };
+                            });
+                        }
+                    }
                 }
-                return [];
+                return undefined;
             case avs_pb.Execution.Step.OutputDataCase.CONTRACT_WRITE:
                 return step.getContractWrite()?.toObject();
             case avs_pb.Execution.Step.OutputDataCase.CUSTOM_CODE:

package/dist/models/trigger/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/event.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAA0B,MAAM,aAAa,CAAC;AACrD,OAAO,EAAqC,kBAAkB,EAAE,iBAAiB,EAAgB,MAAM,oBAAoB,CAAC;AAwB5H,cAAM,YAAa,SAAQ,OAAO;gBACpB,KAAK,EAAE,iBAAiB;IAIpC,SAAS,IAAI,MAAM,CAAC,WAAW;IAyC/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,YAAY;IAiC1D;;;;OAIG;IACH,SAAS,IAAI,kBAAkB,GAAG,SAAS;IAI3C;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAW9D;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/event.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAA0B,MAAM,aAAa,CAAC;AACrD,OAAO,EAAqC,kBAAkB,EAAE,iBAAiB,EAAgB,MAAM,oBAAoB,CAAC;AA6C5H,cAAM,YAAa,SAAQ,OAAO;gBACpB,KAAK,EAAE,iBAAiB;IAIpC,SAAS,IAAI,MAAM,CAAC,WAAW;IAuD/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,YAAY;IAoD1D;;;;OAIG;IACH,SAAS,IAAI,kBAAkB,GAAG,SAAS;IAI3C;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAW9D;AAED,eAAe,YAAY,CAAC"}

package/dist/models/trigger/event.js

@@ -1,4 +1,3 @@
-import * as _ from "lodash";
 import * as avs_pb from "@/grpc_codegen/avs_pb";
 import Trigger from "./interface";
 import { TriggerType } from "@avaprotocol/types";
@@ -20,7 +19,28 @@ import { TriggerType } from "@avaprotocol/types";
 // }
 // ]
 // ```
-// Required props for constructor: id, name, type and data: { expression, matcherList }
+// Required props for constructor: id, name, type and data: { queriesList }
+// EventTrigger now uses queries-based filtering instead of expression/matcher
+// Each query represents an independent filter that creates its own subscription
+// For FROM-OR-TO scenarios, provide two queries: one for FROM, one for TO.
+//
+// Example queries structure:
+// ```
+// [
+//   {
+//     addressesList: ["0xA0b86a33E6441e6067ec0da4Cc2C8ae77d85e7b1"],
+//     topicsList: [
+//       {
+//         valuesList: [
+//           "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+//           null,
+//           "0x000000000000000000000000c60e71bd0f2e6d8832fea1a2d56091c48493c788"
+//         ]
+//       }
+//     ]
+//   }
+// ]
+// ```
 class EventTrigger extends Trigger {
     constructor(props) {
         super({ ...props, type: TriggerType.Event, data: props.data });
@@ -34,23 +54,36 @@ class EventTrigger extends Trigger {
             throw new Error(`Trigger data is missing for ${this.type}`);
         }
         const trigger = new avs_pb.EventTrigger();
-        const dataConfig = this.data;
         const config = new avs_pb.EventTrigger.Config();
-        const expression = dataConfig.expression;
-        const matcherList = dataConfig.matcherList;
-        if (_.isUndefined(expression) || _.isNull(expression)) {
-            throw new Error(`Expression is undefined for ${this.type}`);
-        }
-        config.setExpression(expression);
-        if (matcherList && matcherList.length > 0) {
-            const matchers = matcherList.map((element) => {
-                const m = new avs_pb.EventTrigger.Matcher();
-                m.setType(element.type);
-                m.setValueList(element.valueList || []);
-                return m;
-            });
-            config.setMatcherList(matchers);
+        const dataConfig = this.data;
+        const queries = dataConfig.queriesList;
+        if (!queries || queries.length === 0) {
+            throw new Error(`Queries array is required for ${this.type}`);
         }
+        const queryMessages = queries.map((queryData) => {
+            const query = new avs_pb.EventTrigger.Query();
+            // Set addresses if provided
+            if (queryData.addressesList && queryData.addressesList.length > 0) {
+                query.setAddressesList(queryData.addressesList);
+            }
+            // Set topics if provided
+            if (queryData.topicsList && queryData.topicsList.length > 0) {
+                const topicsMessages = queryData.topicsList.map((topicData) => {
+                    const topics = new avs_pb.EventTrigger.Topics();
+                    if (topicData.valuesList) {
+                        topics.setValuesList(topicData.valuesList);
+                    }
+                    return topics;
+                });
+                query.setTopicsList(topicsMessages);
+            }
+            // Set maxEventsPerBlock if provided
+            if (queryData.maxEventsPerBlock !== undefined) {
+                query.setMaxEventsPerBlock(queryData.maxEventsPerBlock);
+            }
+            return query;
+        });
+        config.setQueriesList(queryMessages);
         trigger.setConfig(config);
         request.setEvent(trigger);
         return request;
@@ -58,22 +91,36 @@ class EventTrigger extends Trigger {
     static fromResponse(raw) {
         // Convert the raw object to TriggerProps, which should keep name and id
         const obj = raw.toObject();
-        let data = { expression: "", matcherList: [] };
+        let data = { queriesList: [] };
         if (raw.getEvent() && raw.getEvent().hasConfig()) {
             const config = raw.getEvent().getConfig();
             if (config) {
-                data = {
-                    expression: config.getExpression(),
-                    matcherList: []
-                };
-                if (config.getMatcherList && config.getMatcherList().length > 0) {
-                    data.matcherList = config.getMatcherList().map((item) => {
-                        return {
-                            type: item.getType(),
-                            valueList: item.getValueList() || [],
+                const queries = [];
+                if (config.getQueriesList && config.getQueriesList().length > 0) {
+                    config.getQueriesList().forEach((query) => {
+                        const queryData = {
+                            addressesList: [],
+                            topicsList: [],
                         };
+                        // Extract addresses
+                        if (query.getAddressesList && query.getAddressesList().length > 0) {
+                            queryData.addressesList = query.getAddressesList();
+                        }
+                        // Extract topics
+                        if (query.getTopicsList && query.getTopicsList().length > 0) {
+                            queryData.topicsList = query.getTopicsList().map((topics) => ({
+                                valuesList: topics.getValuesList() || []
+                            }));
+                        }
+                        // Extract maxEventsPerBlock
+                        const maxEvents = query.getMaxEventsPerBlock();
+                        if (maxEvents && maxEvents > 0) {
+                            queryData.maxEventsPerBlock = maxEvents;
+                        }
+                        queries.push(queryData);
                     });
                 }
+                data = { queriesList: queries };
             }
         }
         return new EventTrigger({

package/dist/utils.d.ts

@@ -0,0 +1,60 @@
+import { Value as ProtobufValue } from "google-protobuf/google/protobuf/struct_pb";
+/**
+ * Convert a protobuf Value to a JavaScript value
+ *
+ * **🏆 RECOMMENDED for modern protobuf usage**
+ *
+ * This is the primary implementation using proper TypeScript types and getKindCase()
+ * for the latest protobuf libraries. Use this for all new code.
+ *
+ * @param value - The protobuf Value to convert
+ * @returns The converted JavaScript value
+ */
+export declare function convertProtobufValueToJs(value?: ProtobufValue): any;
+/**
+ * Convert a protobuf Value to a JavaScript value
+ *
+ * **⚠️ DEPRECATED - Use convertProtobufValueToJs() for new code**
+ *
+ * This is a legacy compatibility version for existing code that may use
+ * dynamically typed protobuf objects. It uses older has*() methods and
+ * fallback logic. Only use this if you need backward compatibility.
+ *
+ * @deprecated Use convertProtobufValueToJs() instead for better type safety
+ * @param value - The protobuf Value object (may be dynamically typed)
+ * @returns The converted JavaScript value
+ */
+export declare function convertProtobufValueToJS(value: any): any;
+/**
+ * Convert a JavaScript value to a protobuf Value
+ *
+ * Uses proper TypeScript types for modern protobuf usage.
+ *
+ * @param value - The JavaScript value to convert
+ * @returns The protobuf Value object
+ */
+export declare function convertJSValueToProtobuf(value: any): ProtobufValue;
+/**
+ * Convert protobuf trigger type string to SDK trigger type string
+ *
+ * @param protobufType - The protobuf trigger type string (e.g., "TRIGGER_TYPE_MANUAL")
+ * @returns The SDK trigger type string (e.g., "manualTrigger")
+ */
+export declare function convertProtobufTriggerTypeToSdk(protobufType: string): string;
+/**
+ * Convert protobuf node type string to SDK node type string
+ *
+ * @param protobufType - The protobuf node type string (e.g., "NODE_TYPE_CUSTOM_CODE")
+ * @returns The SDK node type string (e.g., "customCode")
+ */
+export declare function convertProtobufNodeTypeToSdk(protobufType: string): string;
+/**
+ * Convert protobuf step type string to SDK step type string
+ *
+ * Automatically detects whether the type is a trigger or node type and converts accordingly.
+ *
+ * @param protobufType - The protobuf type string (e.g., "TRIGGER_TYPE_MANUAL" or "NODE_TYPE_CUSTOM_CODE")
+ * @returns The SDK type string (e.g., "manualTrigger" or "customCode")
+ */
+export declare function convertProtobufStepTypeToSdk(protobufType: string): string;
+//# sourceMappingURL=utils.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avaprotocol/sdk-js",
-  "version": "2.0.4",
+  "version": "2.1.1",
   "description": "A JavaScript/TypeScript SDK designed to simplify integration with Ava Protocol's AVS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",