@avaprotocol/sdk-js 2.3.17 → 2.4.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;IA8B3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAqC5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAmBrE;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,EAGL,qBAAqB,EAEtB,MAAM,oBAAoB,CAAC;AAS5B,cAAM,gBAAiB,SAAQ,IAAI;gBACrB,KAAK,EAAE,qBAAqB;IAIxC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,gBAAgB;IAgC3D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAgD5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAyBrE;AAED,eAAe,gBAAgB,CAAC"}

package/dist/models/node/contractRead.js

@@ -1,7 +1,7 @@
 import Node from "./interface";
 import * as avs_pb from "@/grpc_codegen/avs_pb";
-import { NodeType } from "@avaprotocol/types";
-import { convertInputToProtobuf, extractInputFromProtobuf } from "../../utils";
+import { NodeType, } from "@avaprotocol/types";
+import { convertProtobufValueToJs, convertInputToProtobuf, extractInputFromProtobuf, } from "../../utils";
 // Required props for constructor: id, name, type and data
 class ContractReadNode extends Node {
     constructor(props) {
@@ -15,9 +15,10 @@ class ContractReadNode extends Node {
         const data = {
             contractAddress: protobufData.contractAddress,
             contractAbi: protobufData.contractAbi,
-            methodCalls: protobufData.methodCallsList?.map(call => ({
+            methodCalls: protobufData.methodCallsList?.map((call) => ({
                 callData: call.callData,
                 methodName: call.methodName,
+                applyToFields: call.applyToFieldsList || [],
             })) || [],
         };
         // Extract input data from top-level TaskNode.input field (not nested ContractReadNode.input)
@@ -49,6 +50,9 @@ class ContractReadNode extends Node {
             if (methodCall.methodName) {
                 methodCallMsg.setMethodName(methodCall.methodName);
             }
+            if (methodCall.applyToFields) {
+                methodCallMsg.setApplyToFieldsList(methodCall.applyToFields);
+            }
             config.addMethodCalls(methodCallMsg);
         });
         node.setConfig(config);
@@ -63,20 +67,26 @@ class ContractReadNode extends Node {
     }
     static fromOutputData(outputData) {
         const contractReadOutput = outputData.getContractRead();
-        if (contractReadOutput && contractReadOutput.getResultsList()) {
-            const resultsList = contractReadOutput.getResultsList();
-            return {
-                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()
-                    }))
-                }))
-            };
+        if (contractReadOutput && contractReadOutput.getData()) {
+            // The new structure uses getData() which returns a protobuf Value
+            const data = contractReadOutput.getData();
+            if (data) {
+                // Convert protobuf Value to JavaScript object
+                const jsData = convertProtobufValueToJs(data);
+                // The data should now be directly an array of results
+                if (Array.isArray(jsData)) {
+                    return jsData.map((result) => ({
+                        methodName: result.methodName,
+                        success: result.success,
+                        error: result.error || "",
+                        data: result.data || {},
+                    }));
+                }
+                else {
+                    // Fallback for old format or unexpected structure
+                    return jsData;
+                }
+            }
         }
         return null;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"contractWrite.d.ts","sourceRoot":"","sources":["../../../src/models/node/contractWrite.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAmC,sBAAsB,EAAa,MAAM,oBAAoB,CAAC;AAMxG,cAAM,iBAAkB,SAAQ,IAAI;gBACtB,KAAK,EAAE,sBAAsB;IAIzC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,iBAAiB;IA+B5D,SAAS,IAAI,MAAM,CAAC,QAAQ;IAsC5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAyDrE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"contractWrite.d.ts","sourceRoot":"","sources":["../../../src/models/node/contractWrite.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,sBAAsB,EAEvB,MAAM,oBAAoB,CAAC;AAM5B,cAAM,iBAAkB,SAAQ,IAAI;gBACtB,KAAK,EAAE,sBAAsB;IAIzC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,iBAAiB;IAgC5D,SAAS,IAAI,MAAM,CAAC,QAAQ;IA0C5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAcrE;AAED,eAAe,iBAAiB,CAAC"}

package/dist/models/node/contractWrite.js

@@ -1,7 +1,8 @@
 import Node from "./interface";
 import * as avs_pb from "@/grpc_codegen/avs_pb";
-import { NodeType } from "@avaprotocol/types";
+import { NodeType, } from "@avaprotocol/types";
 import { convertInputToProtobuf, extractInputFromProtobuf } from "../../utils";
+import { convertProtobufValueToJs } from "../../utils";
 // Required props for constructor: id, name, type and data: { config: { contractAddress, callData, contractAbi, methodCallsList? } }
 class ContractWriteNode extends Node {
     constructor(props) {
@@ -16,7 +17,7 @@ class ContractWriteNode extends Node {
             contractAddress: protobufData.contractAddress,
             callData: protobufData.callData,
             contractAbi: protobufData.contractAbi,
-            methodCalls: protobufData.methodCallsList?.map(call => ({
+            methodCalls: protobufData.methodCallsList?.map((call) => ({
                 callData: call.callData,
                 methodName: call.methodName,
             })) || [],
@@ -43,7 +44,7 @@ class ContractWriteNode extends Node {
         config.setContractAddress(this.data.contractAddress);
         config.setCallData(this.data.callData);
         config.setContractAbi(this.data.contractAbi);
-        // Handle method calls array if present
+        // Handle method calls array
         const methodCalls = this.data.methodCalls || [];
         methodCalls.forEach((methodCall) => {
             const methodCallMsg = new avs_pb.ContractWriteNode.MethodCall();
@@ -67,56 +68,14 @@ class ContractWriteNode extends Node {
         const contractWriteOutput = outputData.getContractWrite();
         if (!contractWriteOutput)
             return null;
-        const outputObj = contractWriteOutput.toObject();
-        // Transform the new enhanced response structure for easier consumption
-        const transformedResults = outputObj.resultsList?.map((result) => ({
-            methodName: result.methodName,
-            success: result.success,
-            transaction: result.transaction ? {
-                hash: result.transaction.hash,
-                status: result.transaction.status,
-                blockNumber: result.transaction.blockNumber,
-                blockHash: result.transaction.blockHash,
-                gasUsed: result.transaction.gasUsed,
-                gasLimit: result.transaction.gasLimit,
-                gasPrice: result.transaction.gasPrice,
-                effectiveGasPrice: result.transaction.effectiveGasPrice,
-                from: result.transaction.from,
-                to: result.transaction.to,
-                value: result.transaction.value,
-                nonce: result.transaction.nonce,
-                transactionIndex: result.transaction.transactionIndex,
-                confirmations: result.transaction.confirmations,
-                timestamp: result.transaction.timestamp,
-            } : null,
-            events: result.eventsList?.map((event) => ({
-                eventName: event.eventName,
-                address: event.address,
-                topics: event.topicsList || [],
-                data: event.data,
-                decoded: event.decodedMap || {},
-            })) || [],
-            error: result.error ? {
-                code: result.error.code,
-                message: result.error.message,
-                revertReason: result.error.revertReason,
-            } : null,
-            returnData: result.returnData ? {
-                name: result.returnData.name,
-                type: result.returnData.type,
-                value: result.returnData.value,
-            } : null,
-            inputData: result.inputData,
-        })) || [];
-        return {
-            results: transformedResults,
-            // For backward compatibility, provide legacy fields from first result
-            ...(transformedResults.length > 0 && {
-                transaction: transformedResults[0].transaction,
-                success: transformedResults[0].success,
-                hash: transformedResults[0].transaction?.hash,
-            }),
-        };
+        // Use the new getData() method instead of the old resultsList
+        const data = contractWriteOutput.getData();
+        if (!data)
+            return null;
+        // Convert protobuf Value to JavaScript object
+        const jsData = convertProtobufValueToJs(data);
+        // Return the array directly, matching ContractRead format
+        return Array.isArray(jsData) ? jsData : [jsData];
     }
 }
 export default ContractWriteNode;

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,EAGL,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAI5B,cAAM,QAAS,SAAQ,IAAI;gBACb,KAAK,EAAE,aAAa;IAIhC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ;IAuCnD,SAAS,IAAI,MAAM,CAAC,QAAQ;IA8I5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAuCrE;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,EAGL,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAI5B,cAAM,QAAS,SAAQ,IAAI;gBACb,KAAK,EAAE,aAAa;IAIhC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ;IAuCnD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAiJ5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAuCrE;AAED,eAAe,QAAQ,CAAC"}

package/dist/models/node/loop.js

@@ -104,6 +104,9 @@ class LoopNode extends Node {
                     if (methodCall.methodName) {
                         methodCallMsg.setMethodName(methodCall.methodName);
                     }
+                    if (methodCall.applyToFields) {
+                        methodCallMsg.setApplyToFieldsList(methodCall.applyToFields);
+                    }
                     config.addMethodCalls(methodCallMsg);
                 });
                 contractRead.setConfig(config);

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;AAMhD,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,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAc5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAgBnB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IA8T9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;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;AAMhD,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,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAc5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAgBnB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IAiX9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;AAED,eAAe,IAAI,CAAC"}

package/dist/models/step.js

@@ -92,6 +92,24 @@ class Step {
                     ? step.getEventTrigger()
                     : step.eventTrigger;
                 if (eventTrigger) {
+                    // Check for the new data field structure
+                    if (typeof eventTrigger.hasData === "function" &&
+                        eventTrigger.hasData()) {
+                        try {
+                            return convertProtobufValueToJs(eventTrigger.getData());
+                        }
+                        catch (error) {
+                            console.warn("Failed to convert event trigger data from protobuf Value:", error);
+                            return eventTrigger.getData();
+                        }
+                    }
+                    else if (eventTrigger.data) {
+                        // For plain objects, try to convert or use directly
+                        return typeof eventTrigger.data.getKindCase === "function"
+                            ? convertProtobufValueToJs(eventTrigger.data)
+                            : eventTrigger.data;
+                    }
+                    // Fallback to old structure for backward compatibility
                     if (typeof eventTrigger.hasEvmLog === "function" &&
                         eventTrigger.hasEvmLog()) {
                         return eventTrigger.getEvmLog()?.toObject();
@@ -214,23 +232,54 @@ class Step {
                     ? step.getContractRead()
                     : step.contractRead;
                 if (contractReadOutput) {
-                    // Get the raw output object
+                    // Check if the output has a data field that's a protobuf Value
+                    if (typeof contractReadOutput.hasData === "function" &&
+                        contractReadOutput.hasData()) {
+                        try {
+                            // Convert protobuf Value to JavaScript object
+                            const data = convertProtobufValueToJs(contractReadOutput.getData());
+                            // Always return the array directly for contract read outputs
+                            if (Array.isArray(data)) {
+                                return data;
+                            }
+                            else {
+                                // If it's a single object, wrap it in an array for consistency
+                                return [data];
+                            }
+                        }
+                        catch (error) {
+                            console.warn("Failed to convert contract read data from protobuf Value:", error);
+                            // Fallback to raw data
+                            return contractReadOutput.getData();
+                        }
+                    }
+                    else if (contractReadOutput.data) {
+                        // For plain objects, try to convert or use directly
+                        const data = typeof contractReadOutput.data.getKindCase === "function"
+                            ? convertProtobufValueToJs(contractReadOutput.data)
+                            : contractReadOutput.data;
+                        // Always return the array directly for contract read outputs
+                        if (Array.isArray(data)) {
+                            return data;
+                        }
+                        else {
+                            // If it's a single object, wrap it in an array for consistency
+                            return [data];
+                        }
+                    }
+                    // Fallback to old structure for backward compatibility
                     const outputObj = typeof contractReadOutput.toObject === "function"
                         ? contractReadOutput.toObject()
                         : contractReadOutput;
                     // Convert resultsList to results for consistency with ContractReadNode.fromOutputData
                     if (outputObj && outputObj.resultsList) {
-                        // Exclude resultsList from the spread to avoid duplication
-                        const { resultsList, ...cleanOutputObj } = outputObj;
-                        return {
-                            ...cleanOutputObj,
-                            results: resultsList.map((result) => ({
-                                methodName: result.methodName,
-                                success: result.success,
-                                error: result.error,
-                                data: result.dataList || [],
-                            })),
-                        };
+                        // Return the results array directly
+                        return outputObj.resultsList.map((result) => ({
+                            methodName: result.methodName,
+                            success: result.success,
+                            error: result.error,
+                            data: result.dataList || [],
+                        }));
                     }
                     return outputObj;
                 }
@@ -240,69 +289,57 @@ class Step {
                     ? step.getContractWrite()
                     : step.contractWrite;
                 if (contractWriteOutput) {
-                    // Get the raw output object
+                    // Check if the output has a data field that's a protobuf Value
+                    if (typeof contractWriteOutput.hasData === "function" &&
+                        contractWriteOutput.hasData()) {
+                        try {
+                            // Convert protobuf Value to JavaScript object
+                            const data = convertProtobufValueToJs(contractWriteOutput.getData());
+                            // Always return the array directly for contract write outputs
+                            if (Array.isArray(data)) {
+                                return data;
+                            }
+                            else {
+                                // If it's a single object, wrap it in an array for consistency
+                                return [data];
+                            }
+                        }
+                        catch (error) {
+                            console.warn("Failed to convert contract write data from protobuf Value:", error);
+                            // Fallback to raw data
+                            return contractWriteOutput.getData();
+                        }
+                    }
+                    else if (contractWriteOutput.data) {
+                        // For plain objects, try to convert or use directly
+                        const data = typeof contractWriteOutput.data.getKindCase === "function"
+                            ? convertProtobufValueToJs(contractWriteOutput.data)
+                            : contractWriteOutput.data;
+                        // Always return the array directly for contract write outputs
+                        if (Array.isArray(data)) {
+                            return data;
+                        }
+                        else {
+                            // If it's a single object, wrap it in an array for consistency
+                            return [data];
+                        }
+                    }
+                    // Fallback to old structure for backward compatibility
                     const outputObj = typeof contractWriteOutput.toObject === "function"
                         ? contractWriteOutput.toObject()
                         : contractWriteOutput;
                     // Convert resultsList to results for consistency with ContractWriteNode.fromOutputData
                     if (outputObj && outputObj.resultsList) {
-                        const transformedResults = outputObj.resultsList.map((result) => ({
+                        // Return the results array directly
+                        return outputObj.resultsList.map((result) => ({
                             methodName: result.methodName,
                             success: result.success,
-                            transaction: result.transaction
-                                ? {
-                                    hash: result.transaction.hash,
-                                    status: result.transaction.status,
-                                    blockNumber: result.transaction.blockNumber,
-                                    blockHash: result.transaction.blockHash,
-                                    gasUsed: result.transaction.gasUsed,
-                                    gasLimit: result.transaction.gasLimit,
-                                    gasPrice: result.transaction.gasPrice,
-                                    effectiveGasPrice: result.transaction.effectiveGasPrice,
-                                    from: result.transaction.from,
-                                    to: result.transaction.to,
-                                    value: result.transaction.value,
-                                    nonce: result.transaction.nonce,
-                                    transactionIndex: result.transaction.transactionIndex,
-                                    confirmations: result.transaction.confirmations,
-                                    timestamp: result.transaction.timestamp,
-                                }
-                                : null,
-                            events: result.eventsList?.map((event) => ({
-                                eventName: event.eventName,
-                                address: event.address,
-                                topics: event.topicsList || [],
-                                data: event.data,
-                                decoded: event.decodedMap || {},
-                            })) || [],
-                            error: result.error
-                                ? {
-                                    code: result.error.code,
-                                    message: result.error.message,
-                                    revertReason: result.error.revertReason,
-                                }
-                                : null,
-                            returnData: result.returnData
-                                ? {
-                                    name: result.returnData.name,
-                                    type: result.returnData.type,
-                                    value: result.returnData.value,
-                                }
-                                : null,
+                            error: result.error,
+                            transaction: result.transaction,
+                            events: result.eventsList || [],
+                            returnData: result.returnData,
                             inputData: result.inputData,
                         }));
-                        // Exclude resultsList from the spread to avoid duplication
-                        const { resultsList, ...cleanOutputObj } = outputObj;
-                        return {
-                            ...cleanOutputObj,
-                            results: transformedResults,
-                            // For backward compatibility, provide legacy fields from first result
-                            ...(transformedResults.length > 0 && {
-                                transaction: transformedResults[0].transaction,
-                                success: transformedResults[0].success,
-                                hash: transformedResults[0].transaction?.hash,
-                            }),
-                        };
                     }
                     return outputObj;
                 }

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,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAGL,kBAAkB,EAClB,iBAAiB,EAElB,MAAM,oBAAoB,CAAC;AA8C5B,cAAM,YAAa,SAAQ,OAAO;gBACpB,KAAK,EAAE,iBAAiB;IAIpC,SAAS,IAAI,MAAM,CAAC,WAAW;IAmE/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,YAAY;IA8D1D;;;;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,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;IAwG/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"}

package/dist/models/trigger/event.js

@@ -1,7 +1,7 @@
 import * as avs_pb from "@/grpc_codegen/avs_pb";
 import Trigger from "./interface";
 import { TriggerType, } from "@avaprotocol/types";
-import { convertInputToProtobuf, extractInputFromProtobuf } from "../../utils";
+import { convertInputToProtobuf, extractInputFromProtobuf, 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.
@@ -85,6 +85,36 @@ class EventTrigger extends Trigger {
             if (queryData.maxEventsPerBlock !== undefined) {
                 query.setMaxEventsPerBlock(queryData.maxEventsPerBlock);
             }
+            // Set contractAbi if provided
+            if (queryData.contractAbi) {
+                query.setContractAbi(queryData.contractAbi);
+            }
+            // Set conditions if provided
+            if (queryData.conditions && queryData.conditions.length > 0) {
+                const conditionMessages = queryData.conditions.map((conditionData) => {
+                    const condition = new avs_pb.EventCondition();
+                    condition.setFieldName(conditionData.fieldName);
+                    condition.setOperator(conditionData.operator);
+                    condition.setValue(conditionData.value);
+                    condition.setFieldType(conditionData.fieldType);
+                    return condition;
+                });
+                query.setConditionsList(conditionMessages);
+            }
+            // Set method calls if provided
+            if (queryData.methodCalls && queryData.methodCalls.length > 0) {
+                const methodCallMessages = queryData.methodCalls.map((methodCallData) => {
+                    const methodCall = new avs_pb.EventTrigger.MethodCall();
+                    methodCall.setMethodName(methodCallData.methodName);
+                    methodCall.setCallData(methodCallData.callData);
+                    if (methodCallData.applyToFields &&
+                        methodCallData.applyToFields.length > 0) {
+                        methodCall.setApplyToFieldsList(methodCallData.applyToFields);
+                    }
+                    return methodCall;
+                });
+                query.setMethodCallsList(methodCallMessages);
+            }
             return query;
         });
         config.setQueriesList(queryMessages);
@@ -122,7 +152,7 @@ class EventTrigger extends Trigger {
                                 // Don't convert empty strings back to null - preserve the original values
                                 // The backend may legitimately use empty strings, and we shouldn't assume
                                 // they were originally null values from the client
-                                values: topics.getValuesList() || []
+                                values: topics.getValuesList() || [],
                             }));
                         }
                         // Extract maxEventsPerBlock
@@ -130,6 +160,28 @@ class EventTrigger extends Trigger {
                         if (maxEvents && maxEvents > 0) {
                             queryData.maxEventsPerBlock = maxEvents;
                         }
+                        // Extract contractAbi
+                        const contractAbi = query.getContractAbi();
+                        if (contractAbi) {
+                            queryData.contractAbi = contractAbi;
+                        }
+                        // Extract conditions
+                        const conditions = [];
+                        if (query.getConditionsList &&
+                            query.getConditionsList().length > 0) {
+                            query.getConditionsList().forEach((condition) => {
+                                const conditionData = {
+                                    fieldName: condition.getFieldName(),
+                                    operator: condition.getOperator(),
+                                    value: condition.getValue(),
+                                    fieldType: condition.getFieldType(),
+                                };
+                                conditions.push(conditionData);
+                            });
+                        }
+                        if (conditions.length > 0) {
+                            queryData.conditions = conditions;
+                        }
                         queries.push(queryData);
                     });
                 }
@@ -161,13 +213,25 @@ class EventTrigger extends Trigger {
      * @returns Plain JavaScript object with event trigger data
      */
     static fromOutputData(outputData) {
+        // Try to get data from protobuf structure first
         const eventOutput = outputData.getEventTrigger();
         if (eventOutput) {
-            if (eventOutput.hasEvmLog()) {
-                return eventOutput.getEvmLog()?.toObject();
-            }
-            else if (eventOutput.hasTransferLog()) {
-                return eventOutput.getTransferLog()?.toObject();
+            const dataValue = eventOutput.getData();
+            if (dataValue) {
+                try {
+                    // Convert protobuf Value to JavaScript object
+                    const convertedData = convertProtobufValueToJs(dataValue);
+                    // If the converted data is an empty string, return null
+                    if (convertedData === "") {
+                        return null;
+                    }
+                    return convertedData;
+                }
+                catch (error) {
+                    console.warn("Failed to convert event trigger data from protobuf Value:", error);
+                    // Return the raw protobuf Value object as fallback
+                    return dataValue;
+                }
             }
         }
         return null;

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,YAAY,MAAM,SAAS,CAAC;AACnC,OAAO,WAAW,MAAM,QAAQ,CAAC;AACjC,OAAO,YAAY,MAAM,SAAS,CAAC;AACnC,OAAO,gBAAgB,MAAM,aAAa,CAAC;AAC3C,OAAO,aAAa,MAAM,UAAU,CAAC;AACrC,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAEL,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAG5B,cAAM,cAAc;IAClB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAkB3C;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,OAAO;IAiBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAsD9D;AAED,eAAe,cAAc,CAAC;AAG9B,OAAO,EACL,OAAO,EACP,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,aAAa,GACd,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,GACnB,CAAC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,YAAY,MAAM,SAAS,CAAC;AACnC,OAAO,WAAW,MAAM,QAAQ,CAAC;AACjC,OAAO,YAAY,MAAM,SAAS,CAAC;AACnC,OAAO,gBAAgB,MAAM,aAAa,CAAC;AAC3C,OAAO,aAAa,MAAM,UAAU,CAAC;AACrC,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAEL,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAG5B,cAAM,cAAc;IAClB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAkB3C;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,OAAO;IAiBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAkB9D;AAED,eAAe,cAAc,CAAC;AAG9B,OAAO,EACL,OAAO,EACP,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,aAAa,GACd,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,GACnB,CAAC"}

package/dist/models/trigger/factory.js

@@ -6,7 +6,6 @@ import FixedTimeTrigger from "./fixedTime";
 import ManualTrigger from "./manual";
 import Trigger from "./interface";
 import { TriggerType } from "@avaprotocol/types";
-import { convertProtobufValueToJs } from "../../utils";
 class TriggerFactory {
     /**
      * Static factory method to create Trigger instances
@@ -51,52 +50,22 @@ class TriggerFactory {
         }
     }
     static fromOutputData(outputData) {
-        // Generic approach: try to extract data from any output type using getData() method
-        // This works for all trigger types that follow the pattern of having a getData() method
-        let triggerOutput = null;
-        let rawData = null;
-        // Get the specific trigger output based on the case
+        // Delegate to the specific trigger type's fromOutputData method
         switch (outputData.getOutputDataCase()) {
             case avs_pb.RunTriggerResp.OutputDataCase.BLOCK_TRIGGER:
-                triggerOutput = outputData.getBlockTrigger();
-                break;
+                return BlockTrigger.fromOutputData(outputData);
             case avs_pb.RunTriggerResp.OutputDataCase.FIXED_TIME_TRIGGER:
-                triggerOutput = outputData.getFixedTimeTrigger();
-                break;
+                return FixedTimeTrigger.fromOutputData(outputData);
             case avs_pb.RunTriggerResp.OutputDataCase.CRON_TRIGGER:
-                triggerOutput = outputData.getCronTrigger();
-                break;
+                return CronTrigger.fromOutputData(outputData);
             case avs_pb.RunTriggerResp.OutputDataCase.EVENT_TRIGGER:
-                triggerOutput = outputData.getEventTrigger();
-                if (triggerOutput) {
-                    if (triggerOutput.hasEvmLog()) {
-                        return triggerOutput.getEvmLog()?.toObject();
-                    }
-                    else if (triggerOutput.hasTransferLog()) {
-                        return triggerOutput.getTransferLog()?.toObject();
-                    }
-                }
-                return null;
+                return EventTrigger.fromOutputData(outputData);
             case avs_pb.RunTriggerResp.OutputDataCase.MANUAL_TRIGGER:
-                triggerOutput = outputData.getManualTrigger();
-                break;
+                return ManualTrigger.fromOutputData(outputData);
             case avs_pb.RunTriggerResp.OutputDataCase.OUTPUT_DATA_NOT_SET:
             default:
-                throw new Error(`Unsupported output data case: ${outputData.getOutputDataCase()}`);
-        }
-        if (!triggerOutput) {
-            return null;
-        }
-        // Try to get data using getData() method (works for most trigger types)
-        if (typeof triggerOutput.getData === 'function') {
-            rawData = triggerOutput.getData();
-            if (rawData) {
-                return convertProtobufValueToJs(rawData);
-            }
+                return null;
         }
-        // For trigger types that don't have getData() or have special structures,
-        // fall back to toObject() for now (can be specialized later if needed)
-        return triggerOutput.toObject();
     }
 }
 export default TriggerFactory;

package/dist/utils.d.ts

@@ -77,4 +77,10 @@ export declare function convertInputToProtobuf(input?: Record<string, any>): Pro
  * @returns JavaScript object or undefined
  */
 export declare function extractInputFromProtobuf(inputValue?: ProtobufValue | Record<string, any>): Record<string, any> | undefined;
+/**
+ * Clean up gRPC error messages by extracting the actual message
+ * @param message - The raw gRPC error message
+ * @returns {string} - The cleaned error message
+ */
+export declare function cleanGrpcErrorMessage(message: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,aAAa,EAGvB,MAAM,2CAA2C,CAAC;AAGnD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,CAAC,EAAE,aAAa,GAAG,GAAG,CAiCnE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAkDxD;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,GAAG,aAAa,CA6BlE;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAkB5E;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CA0BzE;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CASzE;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,aAAa,GAAG,SAAS,CAK7F;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CA6B1H"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,aAAa,EAGvB,MAAM,2CAA2C,CAAC;AAGnD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,CAAC,EAAE,aAAa,GAAG,GAAG,CAiCnE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAkDxD;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,GAAG,aAAa,CA6BlE;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAkB5E;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CA0BzE;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CASzE;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,aAAa,GAAG,SAAS,CAK3B;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC/C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAiCjC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAsB7D"}