@avaprotocol/sdk-js 2.6.8 → 2.6.10

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @avaprotocol/sdk-js
 
+## 2.6.10
+
+### Patch Changes
+
+- c0afaa3: Fix BranchNode runNodeImmediately response format
+
+## 2.6.9
+
+### Patch Changes
+
+- 83af57c: Updated MethodCallType type definitions
+- Updated dependencies [83af57c]
+  - @avaprotocol/types@2.4.9
+
 ## 2.6.8
 
 ### Patch Changes

package/dist/index.js

@@ -16026,7 +16026,9 @@ var EventTrigger2 = class _EventTrigger extends Trigger {
         }
         const abiValueList = queryData.contractAbi.map((item) => {
           const value = new google_protobuf_struct_pb.Value();
-          value.setStructValue(google_protobuf_struct_pb.Struct.fromJavaScript(item));
+          value.setStructValue(
+            google_protobuf_struct_pb.Struct.fromJavaScript(item)
+          );
           return value;
         });
         query.setContractAbiList(abiValueList);
@@ -16047,7 +16049,10 @@ var EventTrigger2 = class _EventTrigger extends Trigger {
           (methodCallData) => {
             const methodCall = new avs_pb4.EventTrigger.MethodCall();
             methodCall.setMethodName(methodCallData.methodName);
-            methodCall.setCallData(methodCallData.callData);
+            methodCall.setMethodParamsList(methodCallData.methodParams);
+            if (methodCallData.callData) {
+              methodCall.setCallData(methodCallData.callData);
+            }
             if (methodCallData.applyToFields && methodCallData.applyToFields.length > 0) {
               methodCall.setApplyToFieldsList(methodCallData.applyToFields);
             }
@@ -16646,7 +16651,14 @@ var GraphQLQueryNode2 = class _GraphQLQueryNode extends Node {
   }
   static fromOutputData(outputData) {
     const graphqlOutput = outputData.getGraphql();
-    return graphqlOutput?.toObject() || null;
+    if (!graphqlOutput) {
+      return null;
+    }
+    const rawData = graphqlOutput.getData();
+    if (rawData) {
+      return convertProtobufValueToJs(rawData);
+    }
+    return null;
   }
 };
 var graphqlQuery_default = GraphQLQueryNode2;
@@ -16742,25 +16754,23 @@ var ContractReadNode2 = class _ContractReadNode extends Node {
     config.setContractAddress(configData.contractAddress);
     const abiValueList = configData.contractAbi.map((item) => {
       const value = new google_protobuf_struct_pb3.Value();
-      value.setStructValue(google_protobuf_struct_pb3.Struct.fromJavaScript(item));
+      value.setStructValue(
+        google_protobuf_struct_pb3.Struct.fromJavaScript(item)
+      );
       return value;
     });
     config.setContractAbiList(abiValueList);
     const methodCalls = configData.methodCalls || [];
     methodCalls.forEach((methodCall) => {
       const methodCallMsg = new avs_pb13.ContractReadNode.MethodCall();
+      methodCallMsg.setMethodName(methodCall.methodName);
+      methodCallMsg.setMethodParamsList(methodCall.methodParams);
       if (methodCall.callData) {
         methodCallMsg.setCallData(methodCall.callData);
       }
-      if (methodCall.methodName) {
-        methodCallMsg.setMethodName(methodCall.methodName);
-      }
       if (methodCall.applyToFields) {
         methodCallMsg.setApplyToFieldsList(methodCall.applyToFields);
       }
-      if (methodCall.methodParams) {
-        methodCallMsg.setMethodParamsList(methodCall.methodParams);
-      }
       config.addMethodCalls(methodCallMsg);
     });
     node.setConfig(config);
@@ -16773,9 +16783,7 @@ var ContractReadNode2 = class _ContractReadNode extends Node {
     const protobufData = config.toObject();
     const data = {
       contractAddress: protobufData.contractAddress,
-      contractAbi: config.getContractAbiList().map(
-        (value) => convertProtobufValueToJs(value)
-      ),
+      contractAbi: config.getContractAbiList().map((value) => convertProtobufValueToJs(value)),
       methodCalls: protobufData.methodCallsList?.map((call) => ({
         methodName: call.methodName,
         applyToFields: call.applyToFieldsList || [],
@@ -16851,7 +16859,14 @@ var ETHTransferNode2 = class _ETHTransferNode extends Node {
   }
   static fromOutputData(outputData) {
     const ethTransferOutput = outputData.getEthTransfer();
-    return ethTransferOutput?.toObject() || null;
+    if (!ethTransferOutput) {
+      return null;
+    }
+    const rawData = ethTransferOutput.getData();
+    if (rawData) {
+      return convertProtobufValueToJs(rawData);
+    }
+    return null;
   }
 };
 var ethTransfer_default = ETHTransferNode2;
@@ -16903,7 +16918,14 @@ var BranchNode2 = class _BranchNode extends Node {
   }
   static fromOutputData(outputData) {
     const branchOutput = outputData.getBranch();
-    return branchOutput?.toObject() || null;
+    if (!branchOutput) {
+      return null;
+    }
+    const rawData = branchOutput.getData();
+    if (rawData) {
+      return convertProtobufValueToJs(rawData);
+    }
+    return null;
   }
   // TODO: do we need a getConditionId() to avoid exporting BranchNodeData?
 };
@@ -17153,11 +17175,11 @@ var LoopNode2 = class _LoopNode extends Node {
     }
     const customCodeOutput = outputData.getCustomCode();
     if (customCodeOutput) {
-      const result = customCodeOutput.toObject();
-      if (result && typeof result === "object" && Object.keys(result).length === 1 && "data" in result) {
-        return result.data;
+      const rawData = customCodeOutput.getData();
+      if (rawData) {
+        return convertProtobufValueToJs(rawData);
       }
-      return result;
+      return null;
     }
     return null;
   }

package/dist/index.mjs

@@ -16006,7 +16006,9 @@ var EventTrigger2 = class _EventTrigger extends Trigger {
         }
         const abiValueList = queryData.contractAbi.map((item) => {
           const value = new google_protobuf_struct_pb.Value();
-          value.setStructValue(google_protobuf_struct_pb.Struct.fromJavaScript(item));
+          value.setStructValue(
+            google_protobuf_struct_pb.Struct.fromJavaScript(item)
+          );
           return value;
         });
         query.setContractAbiList(abiValueList);
@@ -16027,7 +16029,10 @@ var EventTrigger2 = class _EventTrigger extends Trigger {
           (methodCallData) => {
             const methodCall = new avs_pb4.EventTrigger.MethodCall();
             methodCall.setMethodName(methodCallData.methodName);
-            methodCall.setCallData(methodCallData.callData);
+            methodCall.setMethodParamsList(methodCallData.methodParams);
+            if (methodCallData.callData) {
+              methodCall.setCallData(methodCallData.callData);
+            }
             if (methodCallData.applyToFields && methodCallData.applyToFields.length > 0) {
               methodCall.setApplyToFieldsList(methodCallData.applyToFields);
             }
@@ -16638,7 +16643,14 @@ var GraphQLQueryNode2 = class _GraphQLQueryNode extends Node {
   }
   static fromOutputData(outputData) {
     const graphqlOutput = outputData.getGraphql();
-    return graphqlOutput?.toObject() || null;
+    if (!graphqlOutput) {
+      return null;
+    }
+    const rawData = graphqlOutput.getData();
+    if (rawData) {
+      return convertProtobufValueToJs(rawData);
+    }
+    return null;
   }
 };
 var graphqlQuery_default = GraphQLQueryNode2;
@@ -16738,25 +16750,23 @@ var ContractReadNode2 = class _ContractReadNode extends Node {
     config.setContractAddress(configData.contractAddress);
     const abiValueList = configData.contractAbi.map((item) => {
       const value = new google_protobuf_struct_pb3.Value();
-      value.setStructValue(google_protobuf_struct_pb3.Struct.fromJavaScript(item));
+      value.setStructValue(
+        google_protobuf_struct_pb3.Struct.fromJavaScript(item)
+      );
       return value;
     });
     config.setContractAbiList(abiValueList);
     const methodCalls = configData.methodCalls || [];
     methodCalls.forEach((methodCall) => {
       const methodCallMsg = new avs_pb13.ContractReadNode.MethodCall();
+      methodCallMsg.setMethodName(methodCall.methodName);
+      methodCallMsg.setMethodParamsList(methodCall.methodParams);
       if (methodCall.callData) {
         methodCallMsg.setCallData(methodCall.callData);
       }
-      if (methodCall.methodName) {
-        methodCallMsg.setMethodName(methodCall.methodName);
-      }
       if (methodCall.applyToFields) {
         methodCallMsg.setApplyToFieldsList(methodCall.applyToFields);
       }
-      if (methodCall.methodParams) {
-        methodCallMsg.setMethodParamsList(methodCall.methodParams);
-      }
       config.addMethodCalls(methodCallMsg);
     });
     node.setConfig(config);
@@ -16769,9 +16779,7 @@ var ContractReadNode2 = class _ContractReadNode extends Node {
     const protobufData = config.toObject();
     const data = {
       contractAddress: protobufData.contractAddress,
-      contractAbi: config.getContractAbiList().map(
-        (value) => convertProtobufValueToJs(value)
-      ),
+      contractAbi: config.getContractAbiList().map((value) => convertProtobufValueToJs(value)),
       methodCalls: protobufData.methodCallsList?.map((call) => ({
         methodName: call.methodName,
         applyToFields: call.applyToFieldsList || [],
@@ -16849,7 +16857,14 @@ var ETHTransferNode2 = class _ETHTransferNode extends Node {
   }
   static fromOutputData(outputData) {
     const ethTransferOutput = outputData.getEthTransfer();
-    return ethTransferOutput?.toObject() || null;
+    if (!ethTransferOutput) {
+      return null;
+    }
+    const rawData = ethTransferOutput.getData();
+    if (rawData) {
+      return convertProtobufValueToJs(rawData);
+    }
+    return null;
   }
 };
 var ethTransfer_default = ETHTransferNode2;
@@ -16903,7 +16918,14 @@ var BranchNode2 = class _BranchNode extends Node {
   }
   static fromOutputData(outputData) {
     const branchOutput = outputData.getBranch();
-    return branchOutput?.toObject() || null;
+    if (!branchOutput) {
+      return null;
+    }
+    const rawData = branchOutput.getData();
+    if (rawData) {
+      return convertProtobufValueToJs(rawData);
+    }
+    return null;
   }
   // TODO: do we need a getConditionId() to avoid exporting BranchNodeData?
 };
@@ -17158,11 +17180,11 @@ var LoopNode2 = class _LoopNode extends Node {
     }
     const customCodeOutput = outputData.getCustomCode();
     if (customCodeOutput) {
-      const result = customCodeOutput.toObject();
-      if (result && typeof result === "object" && Object.keys(result).length === 1 && "data" in result) {
-        return result.data;
+      const rawData = customCodeOutput.getData();
+      if (rawData) {
+        return convertProtobufValueToJs(rawData);
       }
-      return result;
+      return null;
     }
     return null;
   }

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

@@ -1 +1 @@
-{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../../src/models/node/branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAKhD,cAAM,UAAW,SAAQ,IAAI;gBACf,KAAK,EAAE,eAAe;IAIlC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,UAAU;IAsBrD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAiC5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAMrE;AACD,eAAe,UAAU,CAAC"}
+{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../../src/models/node/branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAKhD,cAAM,UAAW,SAAQ,IAAI;gBACf,KAAK,EAAE,eAAe;IAIlC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,UAAU;IAsBrD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAiC5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAgBrE;AACD,eAAe,UAAU,CAAC"}

package/dist/models/node/branch.js

@@ -1,6 +1,7 @@
 import { NodeType, } from "@avaprotocol/types";
 import Node from "./interface";
 import * as avs_pb from "@/grpc_codegen/avs_pb";
+import { convertProtobufValueToJs } from "../../utils";
 // Required props for constructor: id, name, type and data: { conditions }
 class BranchNode extends Node {
     constructor(props) {
@@ -47,7 +48,15 @@ class BranchNode extends Node {
     }
     static fromOutputData(outputData) {
         const branchOutput = outputData.getBranch();
-        return branchOutput?.toObject() || null;
+        if (!branchOutput) {
+            return null;
+        }
+        // Use convertProtobufValueToJs to get clean JavaScript objects
+        const rawData = branchOutput.getData();
+        if (rawData) {
+            return convertProtobufValueToJs(rawData);
+        }
+        return null;
     }
 }
 export default BranchNode;

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;AAEhD,OAAO,EAEL,oBAAoB,EACpB,qBAAqB,EAEtB,MAAM,oBAAoB,CAAC;AAO5B,cAAM,gBAAiB,SAAQ,IAAI;gBACrB,KAAK,EAAE,qBAAqB;IAIxC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAAC,gBAAgB;IAuCpF,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,gBAAgB;IA8B3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAe5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,OAAO,GAAG,IAAI;CAUhF;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;AAEhD,OAAO,EAEL,oBAAoB,EACpB,qBAAqB,EAEtB,MAAM,oBAAoB,CAAC;AAK5B,cAAM,gBAAiB,SAAQ,IAAI;gBACrB,KAAK,EAAE,qBAAqB;IAIxC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CACvB,UAAU,EAAE,oBAAoB,GAC/B,MAAM,CAAC,gBAAgB;IAuC1B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,gBAAgB;IA8B3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAe5B,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,MAAM,CAAC,qBAAqB,GACvC,OAAO,GAAG,IAAI;CAUlB;AAED,eAAe,gBAAgB,CAAC"}

package/dist/models/node/contractRead.js

@@ -2,7 +2,7 @@ import Node from "./interface";
 import * as avs_pb from "@/grpc_codegen/avs_pb";
 import * as google_protobuf_struct_pb from "google-protobuf/google/protobuf/struct_pb";
 import { NodeType, } from "@avaprotocol/types";
-import { convertProtobufValueToJs, } from "../../utils";
+import { convertProtobufValueToJs } from "../../utils";
 // Required props for constructor: id, name, type and data
 class ContractReadNode extends Node {
     constructor(props) {
@@ -18,7 +18,7 @@ class ContractReadNode extends Node {
         const config = new avs_pb.ContractReadNode.Config();
         config.setContractAddress(configData.contractAddress);
         // Convert array to protobuf Value list
-        const abiValueList = configData.contractAbi.map(item => {
+        const abiValueList = configData.contractAbi.map((item) => {
             const value = new google_protobuf_struct_pb.Value();
             value.setStructValue(google_protobuf_struct_pb.Struct.fromJavaScript(item));
             return value;
@@ -28,19 +28,16 @@ class ContractReadNode extends Node {
         const methodCalls = configData.methodCalls || [];
         methodCalls.forEach((methodCall) => {
             const methodCallMsg = new avs_pb.ContractReadNode.MethodCall();
-            // Set callData only if provided (now optional)
+            methodCallMsg.setMethodName(methodCall.methodName);
+            methodCallMsg.setMethodParamsList(methodCall.methodParams);
+            // Optional: Set callData if provided
             if (methodCall.callData) {
                 methodCallMsg.setCallData(methodCall.callData);
             }
-            if (methodCall.methodName) {
-                methodCallMsg.setMethodName(methodCall.methodName);
-            }
+            // Optional: Set applyToFields if provided
             if (methodCall.applyToFields) {
                 methodCallMsg.setApplyToFieldsList(methodCall.applyToFields);
             }
-            if (methodCall.methodParams) {
-                methodCallMsg.setMethodParamsList(methodCall.methodParams);
-            }
             config.addMethodCalls(methodCallMsg);
         });
         node.setConfig(config);
@@ -55,7 +52,9 @@ class ContractReadNode extends Node {
         // Convert protobuf data to our custom interface
         const data = {
             contractAddress: protobufData.contractAddress,
-            contractAbi: config.getContractAbiList().map(value => convertProtobufValueToJs(value)),
+            contractAbi: config
+                .getContractAbiList()
+                .map((value) => convertProtobufValueToJs(value)),
             methodCalls: protobufData.methodCallsList?.map((call) => ({
                 methodName: call.methodName,
                 applyToFields: call.applyToFieldsList || [],

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

@@ -1 +1 @@
-{"version":3,"file":"ethTransfer.d.ts","sourceRoot":"","sources":["../../../src/models/node/ethTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,oBAAoB,EAErB,MAAM,oBAAoB,CAAC;AAK5B,cAAM,eAAgB,SAAQ,IAAI;gBACpB,KAAK,EAAE,oBAAoB;IAIvC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE;QACpC,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,MAAM,CAAC,eAAe;IAW1B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,eAAe;IAgB1D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAe5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAIrE;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ethTransfer.d.ts","sourceRoot":"","sources":["../../../src/models/node/ethTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,oBAAoB,EAErB,MAAM,oBAAoB,CAAC;AAK5B,cAAM,eAAgB,SAAQ,IAAI;gBACpB,KAAK,EAAE,oBAAoB;IAIvC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE;QACpC,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,MAAM,CAAC,eAAe;IAW1B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,eAAe;IAgB1D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAe5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAcrE;AAED,eAAe,eAAe,CAAC"}

package/dist/models/node/ethTransfer.js

@@ -1,6 +1,7 @@
 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: { destination, amount }
 class ETHTransferNode extends Node {
     constructor(props) {
@@ -42,7 +43,15 @@ class ETHTransferNode extends Node {
     }
     static fromOutputData(outputData) {
         const ethTransferOutput = outputData.getEthTransfer();
-        return ethTransferOutput?.toObject() || null;
+        if (!ethTransferOutput) {
+            return null;
+        }
+        // Use convertProtobufValueToJs to get clean JavaScript objects
+        const rawData = ethTransferOutput.getData();
+        if (rawData) {
+            return convertProtobufValueToJs(rawData);
+        }
+        return null;
     }
 }
 export default ETHTransferNode;

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

@@ -1 +1 @@
-{"version":3,"file":"graphqlQuery.d.ts","sourceRoot":"","sources":["../../../src/models/node/graphqlQuery.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,qBAAqB,EAEtB,MAAM,oBAAoB,CAAC;AAK5B,cAAM,gBAAiB,SAAQ,IAAI;gBACrB,KAAK,EAAE,qBAAqB;IAQxC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE;QACpC,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;KACxC,GAAG,MAAM,CAAC,gBAAgB;IAkB3B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,gBAAgB;IAc3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAe5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAIrE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"graphqlQuery.d.ts","sourceRoot":"","sources":["../../../src/models/node/graphqlQuery.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,qBAAqB,EAEtB,MAAM,oBAAoB,CAAC;AAK5B,cAAM,gBAAiB,SAAQ,IAAI;gBACrB,KAAK,EAAE,qBAAqB;IAQxC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE;QACpC,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;KACxC,GAAG,MAAM,CAAC,gBAAgB;IAkB3B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,gBAAgB;IAc3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAe5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAcrE;AAED,eAAe,gBAAgB,CAAC"}

package/dist/models/node/graphqlQuery.js

@@ -1,6 +1,7 @@
 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: { url, query, variablesMap }
 class GraphQLQueryNode extends Node {
     constructor(props) {
@@ -51,7 +52,15 @@ class GraphQLQueryNode extends Node {
     }
     static fromOutputData(outputData) {
         const graphqlOutput = outputData.getGraphql();
-        return graphqlOutput?.toObject() || null;
+        if (!graphqlOutput) {
+            return null;
+        }
+        // Use convertProtobufValueToJs to get clean JavaScript objects
+        const rawData = graphqlOutput.getData();
+        if (rawData) {
+            return convertProtobufValueToJs(rawData);
+        }
+        return null;
     }
 }
 export default GraphQLQueryNode;

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;AAO/B,OAAO,EAGL,aAAa,EAId,MAAM,oBAAoB,CAAC;AAG5B,cAAM,QAAS,SAAQ,IAAI;gBACb,KAAK,EAAE,aAAa;IAIhC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ;IA8BnD,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAsBxC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAe3C,OAAO,CAAC,0BAA0B;IA4BlC,SAAS,IAAI,MAAM,CAAC,QAAQ;IA8B5B,OAAO,CAAC,mBAAmB;IA+G3B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,OAAO;CAwCzE;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;AAO/B,OAAO,EAGL,aAAa,EAId,MAAM,oBAAoB,CAAC;AAG5B,cAAM,QAAS,SAAQ,IAAI;gBACb,KAAK,EAAE,aAAa;IAIhC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ;IA8BnD,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAsBxC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAe3C,OAAO,CAAC,0BAA0B;IA4BlC,SAAS,IAAI,MAAM,CAAC,QAAQ;IA8B5B,OAAO,CAAC,mBAAmB;IA+G3B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,OAAO;CAkCzE;AAED,eAAe,QAAQ,CAAC"}

package/dist/models/node/loop.js

@@ -213,15 +213,12 @@ class LoopNode extends Node {
         // Fallback: For immediate execution, data might come as CustomCode format
         const customCodeOutput = outputData.getCustomCode();
         if (customCodeOutput) {
-            const result = customCodeOutput.toObject();
-            // Handle nested data structure
-            if (result &&
-                typeof result === "object" &&
-                Object.keys(result).length === 1 &&
-                "data" in result) {
-                return result.data;
+            // Use convertProtobufValueToJs to get clean JavaScript objects
+            const rawData = customCodeOutput.getData();
+            if (rawData) {
+                return convertProtobufValueToJs(rawData);
             }
-            return result;
+            return null;
         }
         return null;
     }

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;AAEhD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAGL,kBAAkB,EAClB,iBAAiB,EAIlB,MAAM,oBAAoB,CAAC;AAkD5B,cAAM,YAAa,SAAQ,OAAO;gBACpB,KAAK,EAAE,iBAAiB;IAIpC,SAAS,IAAI,MAAM,CAAC,WAAW;IA6G/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,YAAY;IAwF1D;;;;OAIG;IACH,SAAS,IAAI,kBAAkB,GAAG,SAAS;IAI3C;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CA0B9D;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;AAEhD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAGL,kBAAkB,EAClB,iBAAiB,EAIlB,MAAM,oBAAoB,CAAC;AA8C5B,cAAM,YAAa,SAAQ,OAAO;gBACpB,KAAK,EAAE,iBAAiB;IAIpC,SAAS,IAAI,MAAM,CAAC,WAAW;IAsH/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,YAAY;IAoF1D;;;;OAIG;IACH,SAAS,IAAI,kBAAkB,GAAG,SAAS;IAI3C;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CA0B9D;AAED,eAAe,YAAY,CAAC"}

package/dist/models/trigger/event.js

@@ -2,7 +2,7 @@ import * as avs_pb from "@/grpc_codegen/avs_pb";
 import * as google_protobuf_struct_pb from "google-protobuf/google/protobuf/struct_pb";
 import Trigger from "./interface";
 import { TriggerType, } from "@avaprotocol/types";
-import { convertProtobufValueToJs, } from "../../utils";
+import { convertProtobufValueToJs } from "../../utils";
 // Ref: https://github.com/AvaProtocol/EigenLayer-AVS/issues/94
 // The trigger is an array of Condition, which can be topics, dateRage, etc.
 // We imply or operator among all conditions.
@@ -90,10 +90,10 @@ class EventTrigger extends Trigger {
             if (queryData.contractAbi) {
                 // Strictly require array format (no string support)
                 if (!Array.isArray(queryData.contractAbi)) {
-                    throw new Error('contractAbi must be an array of ABI elements');
+                    throw new Error("contractAbi must be an array of ABI elements");
                 }
                 // Convert array to protobuf Value list
-                const abiValueList = queryData.contractAbi.map(item => {
+                const abiValueList = queryData.contractAbi.map((item) => {
                     const value = new google_protobuf_struct_pb.Value();
                     value.setStructValue(google_protobuf_struct_pb.Struct.fromJavaScript(item));
                     return value;
@@ -117,7 +117,12 @@ class EventTrigger extends Trigger {
                 const methodCallMessages = queryData.methodCalls.map((methodCallData) => {
                     const methodCall = new avs_pb.EventTrigger.MethodCall();
                     methodCall.setMethodName(methodCallData.methodName);
-                    methodCall.setCallData(methodCallData.callData);
+                    methodCall.setMethodParamsList(methodCallData.methodParams);
+                    // Optional: Set callData if provided
+                    if (methodCallData.callData) {
+                        methodCall.setCallData(methodCallData.callData);
+                    }
+                    // Optional: Set applyToFields if provided
                     if (methodCallData.applyToFields &&
                         methodCallData.applyToFields.length > 0) {
                         methodCall.setApplyToFieldsList(methodCallData.applyToFields);
@@ -169,7 +174,7 @@ class EventTrigger extends Trigger {
                         // Extract contractAbi
                         const contractAbi = query.getContractAbiList();
                         if (contractAbi && contractAbi.length > 0) {
-                            queryData.contractAbi = contractAbi.map(value => convertProtobufValueToJs(value));
+                            queryData.contractAbi = contractAbi.map((value) => convertProtobufValueToJs(value));
                         }
                         // Extract conditions
                         const conditions = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avaprotocol/sdk-js",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "A JavaScript/TypeScript SDK designed to simplify integration with Ava Protocol's AVS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
     "prepare": "node ../../scripts/prepare-package.js"
   },
   "dependencies": {
-    "@avaprotocol/types": "^2.4.8",
+    "@avaprotocol/types": "^2.4.9",
     "@grpc/grpc-js": "^1.11.3",
     "@grpc/proto-loader": "^0.7.13",
     "dotenv": "^16.4.5",