@avaprotocol/sdk-js 2.5.2-dev.1 → 2.6.1

package/dist/index.mjs

@@ -73,13 +73,9 @@ var require_avs_pb = __commonJS({
     goog.exportSymbol("proto.aggregator.ContractReadNode.Output", null, global);
     goog.exportSymbol("proto.aggregator.ContractWriteNode", null, global);
     goog.exportSymbol("proto.aggregator.ContractWriteNode.Config", null, global);
-    goog.exportSymbol("proto.aggregator.ContractWriteNode.ErrorData", null, global);
-    goog.exportSymbol("proto.aggregator.ContractWriteNode.EventData", null, global);
     goog.exportSymbol("proto.aggregator.ContractWriteNode.MethodCall", null, global);
     goog.exportSymbol("proto.aggregator.ContractWriteNode.MethodResult", null, global);
     goog.exportSymbol("proto.aggregator.ContractWriteNode.Output", null, global);
-    goog.exportSymbol("proto.aggregator.ContractWriteNode.ReturnData", null, global);
-    goog.exportSymbol("proto.aggregator.ContractWriteNode.TransactionData", null, global);
     goog.exportSymbol("proto.aggregator.CreateOrUpdateSecretReq", null, global);
     goog.exportSymbol("proto.aggregator.CreateSecretResp", null, global);
     goog.exportSymbol("proto.aggregator.CreateTaskReq", null, global);
@@ -378,7 +374,7 @@ var require_avs_pb = __commonJS({
       proto.aggregator.ContractWriteNode.Config.displayName = "proto.aggregator.ContractWriteNode.Config";
     }
     proto.aggregator.ContractWriteNode.MethodCall = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.ContractWriteNode.MethodCall.repeatedFields_, null);
     };
     goog.inherits(proto.aggregator.ContractWriteNode.MethodCall, jspb.Message);
     if (goog.DEBUG && !COMPILED) {
@@ -392,40 +388,12 @@ var require_avs_pb = __commonJS({
       proto.aggregator.ContractWriteNode.Output.displayName = "proto.aggregator.ContractWriteNode.Output";
     }
     proto.aggregator.ContractWriteNode.MethodResult = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.ContractWriteNode.MethodResult.repeatedFields_, null);
+      jspb.Message.initialize(this, opt_data, 0, -1, null, null);
     };
     goog.inherits(proto.aggregator.ContractWriteNode.MethodResult, jspb.Message);
     if (goog.DEBUG && !COMPILED) {
       proto.aggregator.ContractWriteNode.MethodResult.displayName = "proto.aggregator.ContractWriteNode.MethodResult";
     }
-    proto.aggregator.ContractWriteNode.TransactionData = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-    };
-    goog.inherits(proto.aggregator.ContractWriteNode.TransactionData, jspb.Message);
-    if (goog.DEBUG && !COMPILED) {
-      proto.aggregator.ContractWriteNode.TransactionData.displayName = "proto.aggregator.ContractWriteNode.TransactionData";
-    }
-    proto.aggregator.ContractWriteNode.EventData = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.ContractWriteNode.EventData.repeatedFields_, null);
-    };
-    goog.inherits(proto.aggregator.ContractWriteNode.EventData, jspb.Message);
-    if (goog.DEBUG && !COMPILED) {
-      proto.aggregator.ContractWriteNode.EventData.displayName = "proto.aggregator.ContractWriteNode.EventData";
-    }
-    proto.aggregator.ContractWriteNode.ErrorData = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-    };
-    goog.inherits(proto.aggregator.ContractWriteNode.ErrorData, jspb.Message);
-    if (goog.DEBUG && !COMPILED) {
-      proto.aggregator.ContractWriteNode.ErrorData.displayName = "proto.aggregator.ContractWriteNode.ErrorData";
-    }
-    proto.aggregator.ContractWriteNode.ReturnData = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-    };
-    goog.inherits(proto.aggregator.ContractWriteNode.ReturnData, jspb.Message);
-    if (goog.DEBUG && !COMPILED) {
-      proto.aggregator.ContractWriteNode.ReturnData.displayName = "proto.aggregator.ContractWriteNode.ReturnData";
-    }
     proto.aggregator.ContractReadNode = function(opt_data) {
       jspb.Message.initialize(this, opt_data, 0, -1, null, null);
     };
@@ -1338,8 +1306,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.FixedTimeTrigger.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.FixedTimeTrigger.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.FixedTimeTrigger.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -1364,11 +1331,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.FixedTimeTrigger.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -1391,14 +1353,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.FixedTimeTrigger.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     proto.aggregator.FixedTimeTrigger.Config.repeatedFields_ = [1];
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1479,8 +1433,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.FixedTimeTrigger.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          timestamp: jspb.Message.getFieldWithDefault(msg, 1, 0),
-          timestampIso: jspb.Message.getFieldWithDefault(msg, 2, "")
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -1501,18 +1454,9 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = (
-              /** @type {number} */
-              reader.readUint64()
-            );
-            msg.setTimestamp(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setTimestampIso(value);
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setData(value);
             break;
           default:
             reader.skipField();
@@ -1528,38 +1472,29 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.FixedTimeTrigger.Output.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getTimestamp();
-      if (f !== 0) {
-        writer.writeUint64(
+      f = message.getData();
+      if (f != null) {
+        writer.writeMessage(
           1,
-          f
-        );
-      }
-      f = message.getTimestampIso();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
-    proto.aggregator.FixedTimeTrigger.Output.prototype.getTimestamp = function() {
+    proto.aggregator.FixedTimeTrigger.Output.prototype.getData = function() {
       return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 1, 0)
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
-    proto.aggregator.FixedTimeTrigger.Output.prototype.setTimestamp = function(value) {
-      return jspb.Message.setProto3IntField(this, 1, value);
+    proto.aggregator.FixedTimeTrigger.Output.prototype.setData = function(value) {
+      return jspb.Message.setWrapperField(this, 1, value);
     };
-    proto.aggregator.FixedTimeTrigger.Output.prototype.getTimestampIso = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
+    proto.aggregator.FixedTimeTrigger.Output.prototype.clearData = function() {
+      return this.setData(void 0);
     };
-    proto.aggregator.FixedTimeTrigger.Output.prototype.setTimestampIso = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
+    proto.aggregator.FixedTimeTrigger.Output.prototype.hasData = function() {
+      return jspb.Message.getField(this, 1) != null;
     };
     proto.aggregator.FixedTimeTrigger.prototype.getConfig = function() {
       return (
@@ -1576,29 +1511,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.FixedTimeTrigger.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.FixedTimeTrigger.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.FixedTimeTrigger.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.FixedTimeTrigger.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.FixedTimeTrigger.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.CronTrigger.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.CronTrigger.toObject(opt_includeInstance, this);
       };
       proto.aggregator.CronTrigger.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.CronTrigger.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.CronTrigger.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -1623,11 +1542,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.CronTrigger.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -1650,14 +1564,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.CronTrigger.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     proto.aggregator.CronTrigger.Config.repeatedFields_ = [1];
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1736,8 +1642,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.CronTrigger.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          timestamp: jspb.Message.getFieldWithDefault(msg, 1, 0),
-          timestampIso: jspb.Message.getFieldWithDefault(msg, 2, "")
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -1758,18 +1663,9 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = (
-              /** @type {number} */
-              reader.readUint64()
-            );
-            msg.setTimestamp(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setTimestampIso(value);
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setData(value);
             break;
           default:
             reader.skipField();
@@ -1785,38 +1681,29 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.CronTrigger.Output.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getTimestamp();
-      if (f !== 0) {
-        writer.writeUint64(
+      f = message.getData();
+      if (f != null) {
+        writer.writeMessage(
           1,
-          f
-        );
-      }
-      f = message.getTimestampIso();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
-    proto.aggregator.CronTrigger.Output.prototype.getTimestamp = function() {
+    proto.aggregator.CronTrigger.Output.prototype.getData = function() {
       return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 1, 0)
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
-    proto.aggregator.CronTrigger.Output.prototype.setTimestamp = function(value) {
-      return jspb.Message.setProto3IntField(this, 1, value);
+    proto.aggregator.CronTrigger.Output.prototype.setData = function(value) {
+      return jspb.Message.setWrapperField(this, 1, value);
     };
-    proto.aggregator.CronTrigger.Output.prototype.getTimestampIso = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
+    proto.aggregator.CronTrigger.Output.prototype.clearData = function() {
+      return this.setData(void 0);
     };
-    proto.aggregator.CronTrigger.Output.prototype.setTimestampIso = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
+    proto.aggregator.CronTrigger.Output.prototype.hasData = function() {
+      return jspb.Message.getField(this, 1) != null;
     };
     proto.aggregator.CronTrigger.prototype.getConfig = function() {
       return (
@@ -1833,29 +1720,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.CronTrigger.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.CronTrigger.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.CronTrigger.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.CronTrigger.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.CronTrigger.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.BlockTrigger.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.BlockTrigger.toObject(opt_includeInstance, this);
       };
       proto.aggregator.BlockTrigger.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.BlockTrigger.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.BlockTrigger.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -1880,11 +1751,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.BlockTrigger.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -1907,14 +1773,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.BlockTrigger.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.BlockTrigger.Config.prototype.toObject = function(opt_includeInstance) {
@@ -1986,13 +1844,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.BlockTrigger.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          blockNumber: jspb.Message.getFieldWithDefault(msg, 1, 0),
-          blockHash: jspb.Message.getFieldWithDefault(msg, 2, ""),
-          timestamp: jspb.Message.getFieldWithDefault(msg, 3, 0),
-          parentHash: jspb.Message.getFieldWithDefault(msg, 4, ""),
-          difficulty: jspb.Message.getFieldWithDefault(msg, 5, ""),
-          gasLimit: jspb.Message.getFieldWithDefault(msg, 6, 0),
-          gasUsed: jspb.Message.getFieldWithDefault(msg, 7, 0)
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -2013,53 +1865,9 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = (
-              /** @type {number} */
-              reader.readUint64()
-            );
-            msg.setBlockNumber(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setBlockHash(value);
-            break;
-          case 3:
-            var value = (
-              /** @type {number} */
-              reader.readUint64()
-            );
-            msg.setTimestamp(value);
-            break;
-          case 4:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setParentHash(value);
-            break;
-          case 5:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setDifficulty(value);
-            break;
-          case 6:
-            var value = (
-              /** @type {number} */
-              reader.readUint64()
-            );
-            msg.setGasLimit(value);
-            break;
-          case 7:
-            var value = (
-              /** @type {number} */
-              reader.readUint64()
-            );
-            msg.setGasUsed(value);
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setData(value);
             break;
           default:
             reader.skipField();
@@ -2075,120 +1883,31 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.BlockTrigger.Output.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getBlockNumber();
-      if (f !== 0) {
-        writer.writeUint64(
+      f = message.getData();
+      if (f != null) {
+        writer.writeMessage(
           1,
-          f
-        );
-      }
-      f = message.getBlockHash();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
-        );
-      }
-      f = message.getTimestamp();
-      if (f !== 0) {
-        writer.writeUint64(
-          3,
-          f
-        );
-      }
-      f = message.getParentHash();
-      if (f.length > 0) {
-        writer.writeString(
-          4,
-          f
-        );
-      }
-      f = message.getDifficulty();
-      if (f.length > 0) {
-        writer.writeString(
-          5,
-          f
-        );
-      }
-      f = message.getGasLimit();
-      if (f !== 0) {
-        writer.writeUint64(
-          6,
-          f
-        );
-      }
-      f = message.getGasUsed();
-      if (f !== 0) {
-        writer.writeUint64(
-          7,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
-    proto.aggregator.BlockTrigger.Output.prototype.getBlockNumber = function() {
+    proto.aggregator.BlockTrigger.Output.prototype.getData = function() {
       return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 1, 0)
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
-    proto.aggregator.BlockTrigger.Output.prototype.setBlockNumber = function(value) {
-      return jspb.Message.setProto3IntField(this, 1, value);
+    proto.aggregator.BlockTrigger.Output.prototype.setData = function(value) {
+      return jspb.Message.setWrapperField(this, 1, value);
     };
-    proto.aggregator.BlockTrigger.Output.prototype.getBlockHash = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
+    proto.aggregator.BlockTrigger.Output.prototype.clearData = function() {
+      return this.setData(void 0);
     };
-    proto.aggregator.BlockTrigger.Output.prototype.setBlockHash = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
+    proto.aggregator.BlockTrigger.Output.prototype.hasData = function() {
+      return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.BlockTrigger.Output.prototype.getTimestamp = function() {
-      return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 3, 0)
-      );
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.setTimestamp = function(value) {
-      return jspb.Message.setProto3IntField(this, 3, value);
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.getParentHash = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 4, "")
-      );
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.setParentHash = function(value) {
-      return jspb.Message.setProto3StringField(this, 4, value);
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.getDifficulty = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 5, "")
-      );
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.setDifficulty = function(value) {
-      return jspb.Message.setProto3StringField(this, 5, value);
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.getGasLimit = function() {
-      return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 6, 0)
-      );
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.setGasLimit = function(value) {
-      return jspb.Message.setProto3IntField(this, 6, value);
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.getGasUsed = function() {
-      return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 7, 0)
-      );
-    };
-    proto.aggregator.BlockTrigger.Output.prototype.setGasUsed = function(value) {
-      return jspb.Message.setProto3IntField(this, 7, value);
-    };
-    proto.aggregator.BlockTrigger.prototype.getConfig = function() {
+    proto.aggregator.BlockTrigger.prototype.getConfig = function() {
       return (
         /** @type{?proto.aggregator.BlockTrigger.Config} */
         jspb.Message.getWrapperField(this, proto.aggregator.BlockTrigger.Config, 1)
@@ -2203,29 +1922,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.BlockTrigger.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.BlockTrigger.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.BlockTrigger.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.BlockTrigger.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.BlockTrigger.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.EventTrigger.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.EventTrigger.toObject(opt_includeInstance, this);
       };
       proto.aggregator.EventTrigger.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.EventTrigger.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.EventTrigger.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -2250,11 +1953,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.EventTrigger.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -2277,14 +1975,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.EventTrigger.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     proto.aggregator.EventTrigger.Query.repeatedFields_ = [1, 2, 5, 6];
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -2859,29 +2549,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.EventTrigger.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.EventTrigger.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.EventTrigger.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.EventTrigger.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.EventTrigger.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ManualTrigger.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.ManualTrigger.toObject(opt_includeInstance, this);
       };
       proto.aggregator.ManualTrigger.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.ManualTrigger.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.ManualTrigger.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -2906,11 +2580,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.ManualTrigger.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -2933,14 +2602,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.ManualTrigger.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ManualTrigger.Config.prototype.toObject = function(opt_includeInstance) {
@@ -3069,9 +2730,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.ManualTrigger.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f),
-          headersMap: (f = msg.getHeadersMap()) ? f.toObject(includeInstance, void 0) : [],
-          pathparamsMap: (f = msg.getPathparamsMap()) ? f.toObject(includeInstance, void 0) : []
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -3096,18 +2755,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
             msg.setData(value);
             break;
-          case 2:
-            var value = msg.getHeadersMap();
-            reader.readMessage(value, function(message, reader2) {
-              jspb.Map.deserializeBinary(message, reader2, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
-            });
-            break;
-          case 3:
-            var value = msg.getPathparamsMap();
-            reader.readMessage(value, function(message, reader2) {
-              jspb.Map.deserializeBinary(message, reader2, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
-            });
-            break;
           default:
             reader.skipField();
             break;
@@ -3130,14 +2777,6 @@ var require_avs_pb = __commonJS({
           google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
-      f = message.getHeadersMap(true);
-      if (f && f.getLength() > 0) {
-        f.serializeBinary(2, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
-      }
-      f = message.getPathparamsMap(true);
-      if (f && f.getLength() > 0) {
-        f.serializeBinary(3, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
-      }
     };
     proto.aggregator.ManualTrigger.Output.prototype.getData = function() {
       return (
@@ -3154,36 +2793,6 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ManualTrigger.Output.prototype.hasData = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.ManualTrigger.Output.prototype.getHeadersMap = function(opt_noLazyCreate) {
-      return (
-        /** @type {!jspb.Map<string,string>} */
-        jspb.Message.getMapField(
-          this,
-          2,
-          opt_noLazyCreate,
-          null
-        )
-      );
-    };
-    proto.aggregator.ManualTrigger.Output.prototype.clearHeadersMap = function() {
-      this.getHeadersMap().clear();
-      return this;
-    };
-    proto.aggregator.ManualTrigger.Output.prototype.getPathparamsMap = function(opt_noLazyCreate) {
-      return (
-        /** @type {!jspb.Map<string,string>} */
-        jspb.Message.getMapField(
-          this,
-          3,
-          opt_noLazyCreate,
-          null
-        )
-      );
-    };
-    proto.aggregator.ManualTrigger.Output.prototype.clearPathparamsMap = function() {
-      this.getPathparamsMap().clear();
-      return this;
-    };
     proto.aggregator.ManualTrigger.prototype.getConfig = function() {
       return (
         /** @type{?proto.aggregator.ManualTrigger.Config} */
@@ -3199,21 +2808,6 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ManualTrigger.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.ManualTrigger.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.ManualTrigger.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.ManualTrigger.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.ManualTrigger.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     proto.aggregator.TaskTrigger.oneofGroups_ = [[2, 3, 4, 5, 6]];
     proto.aggregator.TaskTrigger.TriggerTypeCase = {
       TRIGGER_TYPE_NOT_SET: 0,
@@ -3242,8 +2836,7 @@ var require_avs_pb = __commonJS({
           cron: (f = msg.getCron()) && proto.aggregator.CronTrigger.toObject(includeInstance, f),
           block: (f = msg.getBlock()) && proto.aggregator.BlockTrigger.toObject(includeInstance, f),
           event: (f = msg.getEvent()) && proto.aggregator.EventTrigger.toObject(includeInstance, f),
-          id: jspb.Message.getFieldWithDefault(msg, 7, ""),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          id: jspb.Message.getFieldWithDefault(msg, 7, "")
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -3309,11 +2902,6 @@ var require_avs_pb = __commonJS({
             );
             msg.setId(value);
             break;
-          case 9:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -3389,14 +2977,6 @@ var require_avs_pb = __commonJS({
           f
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          9,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     proto.aggregator.TaskTrigger.prototype.getName = function() {
       return (
@@ -3500,29 +3080,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.TaskTrigger.prototype.setId = function(value) {
       return jspb.Message.setProto3StringField(this, 7, value);
     };
-    proto.aggregator.TaskTrigger.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 9)
-      );
-    };
-    proto.aggregator.TaskTrigger.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 9, value);
-    };
-    proto.aggregator.TaskTrigger.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.TaskTrigger.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 9) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ETHTransferNode.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.ETHTransferNode.toObject(opt_includeInstance, this);
       };
       proto.aggregator.ETHTransferNode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.ETHTransferNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.ETHTransferNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -3547,11 +3111,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.ETHTransferNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -3574,14 +3133,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.ETHTransferNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ETHTransferNode.Config.prototype.toObject = function(opt_includeInstance) {
@@ -3677,7 +3228,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.ETHTransferNode.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          transactionHash: jspb.Message.getFieldWithDefault(msg, 1, "")
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -3698,11 +3249,9 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setTransactionHash(value);
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setData(value);
             break;
           default:
             reader.skipField();
@@ -3718,22 +3267,29 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.ETHTransferNode.Output.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getTransactionHash();
-      if (f.length > 0) {
-        writer.writeString(
+      f = message.getData();
+      if (f != null) {
+        writer.writeMessage(
           1,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
-    proto.aggregator.ETHTransferNode.Output.prototype.getTransactionHash = function() {
+    proto.aggregator.ETHTransferNode.Output.prototype.getData = function() {
       return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
-    proto.aggregator.ETHTransferNode.Output.prototype.setTransactionHash = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
+    proto.aggregator.ETHTransferNode.Output.prototype.setData = function(value) {
+      return jspb.Message.setWrapperField(this, 1, value);
+    };
+    proto.aggregator.ETHTransferNode.Output.prototype.clearData = function() {
+      return this.setData(void 0);
+    };
+    proto.aggregator.ETHTransferNode.Output.prototype.hasData = function() {
+      return jspb.Message.getField(this, 1) != null;
     };
     proto.aggregator.ETHTransferNode.prototype.getConfig = function() {
       return (
@@ -3750,29 +3306,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ETHTransferNode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.ETHTransferNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.ETHTransferNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.ETHTransferNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.ETHTransferNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ContractWriteNode.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.ContractWriteNode.toObject(opt_includeInstance, this);
       };
       proto.aggregator.ContractWriteNode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.ContractWriteNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.ContractWriteNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -3797,11 +3337,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.ContractWriteNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -3824,14 +3359,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.ContractWriteNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     proto.aggregator.ContractWriteNode.Config.repeatedFields_ = [4];
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -3979,6 +3506,7 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ContractWriteNode.Config.prototype.clearMethodCallsList = function() {
       return this.setMethodCallsList([]);
     };
+    proto.aggregator.ContractWriteNode.MethodCall.repeatedFields_ = [3];
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ContractWriteNode.MethodCall.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.ContractWriteNode.MethodCall.toObject(opt_includeInstance, this);
@@ -3986,7 +3514,8 @@ var require_avs_pb = __commonJS({
       proto.aggregator.ContractWriteNode.MethodCall.toObject = function(includeInstance, msg) {
         var f, obj = {
           callData: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          methodName: jspb.Message.getFieldWithDefault(msg, 2, "")
+          methodName: jspb.Message.getFieldWithDefault(msg, 2, ""),
+          methodParamsList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? void 0 : f
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -4020,6 +3549,13 @@ var require_avs_pb = __commonJS({
             );
             msg.setMethodName(value);
             break;
+          case 3:
+            var value = (
+              /** @type {string} */
+              reader.readString()
+            );
+            msg.addMethodParams(value);
+            break;
           default:
             reader.skipField();
             break;
@@ -4048,6 +3584,13 @@ var require_avs_pb = __commonJS({
           f
         );
       }
+      f = message.getMethodParamsList();
+      if (f.length > 0) {
+        writer.writeRepeatedString(
+          3,
+          f
+        );
+      }
     };
     proto.aggregator.ContractWriteNode.MethodCall.prototype.getCallData = function() {
       return (
@@ -4067,6 +3610,21 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ContractWriteNode.MethodCall.prototype.setMethodName = function(value) {
       return jspb.Message.setProto3StringField(this, 2, value);
     };
+    proto.aggregator.ContractWriteNode.MethodCall.prototype.getMethodParamsList = function() {
+      return (
+        /** @type {!Array<string>} */
+        jspb.Message.getRepeatedField(this, 3)
+      );
+    };
+    proto.aggregator.ContractWriteNode.MethodCall.prototype.setMethodParamsList = function(value) {
+      return jspb.Message.setField(this, 3, value || []);
+    };
+    proto.aggregator.ContractWriteNode.MethodCall.prototype.addMethodParams = function(value, opt_index) {
+      return jspb.Message.addToRepeatedField(this, 3, value, opt_index);
+    };
+    proto.aggregator.ContractWriteNode.MethodCall.prototype.clearMethodParamsList = function() {
+      return this.setMethodParamsList([]);
+    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ContractWriteNode.Output.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.ContractWriteNode.Output.toObject(opt_includeInstance, this);
@@ -4136,7 +3694,6 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ContractWriteNode.Output.prototype.hasData = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.ContractWriteNode.MethodResult.repeatedFields_ = [4];
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ContractWriteNode.MethodResult.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.ContractWriteNode.MethodResult.toObject(opt_includeInstance, this);
@@ -4144,16 +3701,12 @@ var require_avs_pb = __commonJS({
       proto.aggregator.ContractWriteNode.MethodResult.toObject = function(includeInstance, msg) {
         var f, obj = {
           methodName: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          success: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
-          transaction: (f = msg.getTransaction()) && proto.aggregator.ContractWriteNode.TransactionData.toObject(includeInstance, f),
-          eventsList: jspb.Message.toObjectList(
-            msg.getEventsList(),
-            proto.aggregator.ContractWriteNode.EventData.toObject,
-            includeInstance
-          ),
-          error: (f = msg.getError()) && proto.aggregator.ContractWriteNode.ErrorData.toObject(includeInstance, f),
-          returnData: (f = msg.getReturnData()) && proto.aggregator.ContractWriteNode.ReturnData.toObject(includeInstance, f),
-          inputData: jspb.Message.getFieldWithDefault(msg, 7, "")
+          methodAbi: (f = msg.getMethodAbi()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f),
+          success: jspb.Message.getBooleanFieldWithDefault(msg, 3, false),
+          error: jspb.Message.getFieldWithDefault(msg, 4, ""),
+          receipt: (f = msg.getReceipt()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f),
+          blockNumber: jspb.Message.getFieldWithDefault(msg, 6, 0),
+          value: (f = msg.getValue()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -4181,40 +3734,42 @@ var require_avs_pb = __commonJS({
             msg.setMethodName(value);
             break;
           case 2:
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setMethodAbi(value);
+            break;
+          case 3:
             var value = (
               /** @type {boolean} */
               reader.readBool()
             );
             msg.setSuccess(value);
             break;
-          case 3:
-            var value = new proto.aggregator.ContractWriteNode.TransactionData();
-            reader.readMessage(value, proto.aggregator.ContractWriteNode.TransactionData.deserializeBinaryFromReader);
-            msg.setTransaction(value);
-            break;
           case 4:
-            var value = new proto.aggregator.ContractWriteNode.EventData();
-            reader.readMessage(value, proto.aggregator.ContractWriteNode.EventData.deserializeBinaryFromReader);
-            msg.addEvents(value);
-            break;
-          case 5:
-            var value = new proto.aggregator.ContractWriteNode.ErrorData();
-            reader.readMessage(value, proto.aggregator.ContractWriteNode.ErrorData.deserializeBinaryFromReader);
-            msg.setError(value);
-            break;
-          case 6:
-            var value = new proto.aggregator.ContractWriteNode.ReturnData();
-            reader.readMessage(value, proto.aggregator.ContractWriteNode.ReturnData.deserializeBinaryFromReader);
-            msg.setReturnData(value);
-            break;
-          case 7:
             var value = (
               /** @type {string} */
               reader.readString()
             );
-            msg.setInputData(value);
+            msg.setError(value);
             break;
-          default:
+          case 5:
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setReceipt(value);
+            break;
+          case 6:
+            var value = (
+              /** @type {number} */
+              reader.readUint64()
+            );
+            msg.setBlockNumber(value);
+            break;
+          case 7:
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setValue(value);
+            break;
+          default:
             reader.skipField();
             break;
         }
@@ -4235,50 +3790,50 @@ var require_avs_pb = __commonJS({
           f
         );
       }
-      f = message.getSuccess();
-      if (f) {
-        writer.writeBool(
+      f = message.getMethodAbi();
+      if (f != null) {
+        writer.writeMessage(
           2,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
-      f = message.getTransaction();
-      if (f != null) {
-        writer.writeMessage(
+      f = message.getSuccess();
+      if (f) {
+        writer.writeBool(
           3,
-          f,
-          proto.aggregator.ContractWriteNode.TransactionData.serializeBinaryToWriter
+          f
         );
       }
-      f = message.getEventsList();
+      f = message.getError();
       if (f.length > 0) {
-        writer.writeRepeatedMessage(
+        writer.writeString(
           4,
-          f,
-          proto.aggregator.ContractWriteNode.EventData.serializeBinaryToWriter
+          f
         );
       }
-      f = message.getError();
+      f = message.getReceipt();
       if (f != null) {
         writer.writeMessage(
           5,
           f,
-          proto.aggregator.ContractWriteNode.ErrorData.serializeBinaryToWriter
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
-      f = message.getReturnData();
+      f = /** @type {number} */
+      jspb.Message.getField(message, 6);
       if (f != null) {
-        writer.writeMessage(
+        writer.writeUint64(
           6,
-          f,
-          proto.aggregator.ContractWriteNode.ReturnData.serializeBinaryToWriter
+          f
         );
       }
-      f = message.getInputData();
-      if (f.length > 0) {
-        writer.writeString(
+      f = message.getValue();
+      if (f != null) {
+        writer.writeMessage(
           7,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
@@ -4291,954 +3846,89 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ContractWriteNode.MethodResult.prototype.setMethodName = function(value) {
       return jspb.Message.setProto3StringField(this, 1, value);
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.getSuccess = function() {
-      return (
-        /** @type {boolean} */
-        jspb.Message.getBooleanFieldWithDefault(this, 2, false)
-      );
-    };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.setSuccess = function(value) {
-      return jspb.Message.setProto3BooleanField(this, 2, value);
-    };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.getTransaction = function() {
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.getMethodAbi = function() {
       return (
-        /** @type{?proto.aggregator.ContractWriteNode.TransactionData} */
-        jspb.Message.getWrapperField(this, proto.aggregator.ContractWriteNode.TransactionData, 3)
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
       );
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.setTransaction = function(value) {
-      return jspb.Message.setWrapperField(this, 3, value);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.setMethodAbi = function(value) {
+      return jspb.Message.setWrapperField(this, 2, value);
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearTransaction = function() {
-      return this.setTransaction(void 0);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearMethodAbi = function() {
+      return this.setMethodAbi(void 0);
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.hasTransaction = function() {
-      return jspb.Message.getField(this, 3) != null;
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.hasMethodAbi = function() {
+      return jspb.Message.getField(this, 2) != null;
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.getEventsList = function() {
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.getSuccess = function() {
       return (
-        /** @type{!Array<!proto.aggregator.ContractWriteNode.EventData>} */
-        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.ContractWriteNode.EventData, 4)
+        /** @type {boolean} */
+        jspb.Message.getBooleanFieldWithDefault(this, 3, false)
       );
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.setEventsList = function(value) {
-      return jspb.Message.setRepeatedWrapperField(this, 4, value);
-    };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.addEvents = function(opt_value, opt_index) {
-      return jspb.Message.addToRepeatedWrapperField(this, 4, opt_value, proto.aggregator.ContractWriteNode.EventData, opt_index);
-    };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearEventsList = function() {
-      return this.setEventsList([]);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.setSuccess = function(value) {
+      return jspb.Message.setProto3BooleanField(this, 3, value);
     };
     proto.aggregator.ContractWriteNode.MethodResult.prototype.getError = function() {
       return (
-        /** @type{?proto.aggregator.ContractWriteNode.ErrorData} */
-        jspb.Message.getWrapperField(this, proto.aggregator.ContractWriteNode.ErrorData, 5)
+        /** @type {string} */
+        jspb.Message.getFieldWithDefault(this, 4, "")
       );
     };
     proto.aggregator.ContractWriteNode.MethodResult.prototype.setError = function(value) {
+      return jspb.Message.setProto3StringField(this, 4, value);
+    };
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.getReceipt = function() {
+      return (
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 5)
+      );
+    };
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.setReceipt = function(value) {
       return jspb.Message.setWrapperField(this, 5, value);
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearError = function() {
-      return this.setError(void 0);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearReceipt = function() {
+      return this.setReceipt(void 0);
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.hasError = function() {
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.hasReceipt = function() {
       return jspb.Message.getField(this, 5) != null;
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.getReturnData = function() {
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.getBlockNumber = function() {
       return (
-        /** @type{?proto.aggregator.ContractWriteNode.ReturnData} */
-        jspb.Message.getWrapperField(this, proto.aggregator.ContractWriteNode.ReturnData, 6)
+        /** @type {number} */
+        jspb.Message.getFieldWithDefault(this, 6, 0)
       );
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.setReturnData = function(value) {
-      return jspb.Message.setWrapperField(this, 6, value);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.setBlockNumber = function(value) {
+      return jspb.Message.setField(this, 6, value);
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearReturnData = function() {
-      return this.setReturnData(void 0);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearBlockNumber = function() {
+      return jspb.Message.setField(this, 6, void 0);
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.hasReturnData = function() {
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.hasBlockNumber = function() {
       return jspb.Message.getField(this, 6) != null;
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.getInputData = function() {
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.getValue = function() {
       return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 7, "")
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 7)
       );
     };
-    proto.aggregator.ContractWriteNode.MethodResult.prototype.setInputData = function(value) {
-      return jspb.Message.setProto3StringField(this, 7, value);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.setValue = function(value) {
+      return jspb.Message.setWrapperField(this, 7, value);
     };
-    if (jspb.Message.GENERATE_TO_OBJECT) {
-      proto.aggregator.ContractWriteNode.TransactionData.prototype.toObject = function(opt_includeInstance) {
-        return proto.aggregator.ContractWriteNode.TransactionData.toObject(opt_includeInstance, this);
-      };
-      proto.aggregator.ContractWriteNode.TransactionData.toObject = function(includeInstance, msg) {
-        var f, obj = {
-          hash: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          status: jspb.Message.getFieldWithDefault(msg, 2, ""),
-          blockNumber: jspb.Message.getFieldWithDefault(msg, 3, ""),
-          blockHash: jspb.Message.getFieldWithDefault(msg, 4, ""),
-          gasUsed: jspb.Message.getFieldWithDefault(msg, 5, ""),
-          gasLimit: jspb.Message.getFieldWithDefault(msg, 6, ""),
-          gasPrice: jspb.Message.getFieldWithDefault(msg, 7, ""),
-          effectiveGasPrice: jspb.Message.getFieldWithDefault(msg, 8, ""),
-          from: jspb.Message.getFieldWithDefault(msg, 9, ""),
-          to: jspb.Message.getFieldWithDefault(msg, 10, ""),
-          value: jspb.Message.getFieldWithDefault(msg, 11, ""),
-          nonce: jspb.Message.getFieldWithDefault(msg, 12, ""),
-          transactionIndex: jspb.Message.getFieldWithDefault(msg, 13, ""),
-          confirmations: jspb.Message.getFieldWithDefault(msg, 14, ""),
-          timestamp: jspb.Message.getFieldWithDefault(msg, 15, 0),
-          simulation: jspb.Message.getBooleanFieldWithDefault(msg, 16, false),
-          simulationMode: jspb.Message.getFieldWithDefault(msg, 17, ""),
-          chainId: jspb.Message.getFieldWithDefault(msg, 18, 0)
-        };
-        if (includeInstance) {
-          obj.$jspbMessageInstance = msg;
-        }
-        return obj;
-      };
-    }
-    proto.aggregator.ContractWriteNode.TransactionData.deserializeBinary = function(bytes) {
-      var reader = new jspb.BinaryReader(bytes);
-      var msg = new proto.aggregator.ContractWriteNode.TransactionData();
-      return proto.aggregator.ContractWriteNode.TransactionData.deserializeBinaryFromReader(msg, reader);
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.clearValue = function() {
+      return this.setValue(void 0);
     };
-    proto.aggregator.ContractWriteNode.TransactionData.deserializeBinaryFromReader = function(msg, reader) {
-      while (reader.nextField()) {
-        if (reader.isEndGroup()) {
-          break;
-        }
-        var field = reader.getFieldNumber();
-        switch (field) {
-          case 1:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setHash(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setStatus(value);
-            break;
-          case 3:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setBlockNumber(value);
-            break;
-          case 4:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setBlockHash(value);
-            break;
-          case 5:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setGasUsed(value);
-            break;
-          case 6:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setGasLimit(value);
-            break;
-          case 7:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setGasPrice(value);
-            break;
-          case 8:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setEffectiveGasPrice(value);
-            break;
-          case 9:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setFrom(value);
-            break;
-          case 10:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setTo(value);
-            break;
-          case 11:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setValue(value);
-            break;
-          case 12:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setNonce(value);
-            break;
-          case 13:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setTransactionIndex(value);
-            break;
-          case 14:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setConfirmations(value);
-            break;
-          case 15:
-            var value = (
-              /** @type {number} */
-              reader.readInt64()
-            );
-            msg.setTimestamp(value);
-            break;
-          case 16:
-            var value = (
-              /** @type {boolean} */
-              reader.readBool()
-            );
-            msg.setSimulation(value);
-            break;
-          case 17:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setSimulationMode(value);
-            break;
-          case 18:
-            var value = (
-              /** @type {number} */
-              reader.readInt64()
-            );
-            msg.setChainId(value);
-            break;
-          default:
-            reader.skipField();
-            break;
-        }
-      }
-      return msg;
+    proto.aggregator.ContractWriteNode.MethodResult.prototype.hasValue = function() {
+      return jspb.Message.getField(this, 7) != null;
     };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.serializeBinary = function() {
-      var writer = new jspb.BinaryWriter();
-      proto.aggregator.ContractWriteNode.TransactionData.serializeBinaryToWriter(this, writer);
-      return writer.getResultBuffer();
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.serializeBinaryToWriter = function(message, writer) {
-      var f = void 0;
-      f = message.getHash();
-      if (f.length > 0) {
-        writer.writeString(
-          1,
-          f
-        );
-      }
-      f = message.getStatus();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
-        );
-      }
-      f = message.getBlockNumber();
-      if (f.length > 0) {
-        writer.writeString(
-          3,
-          f
-        );
-      }
-      f = message.getBlockHash();
-      if (f.length > 0) {
-        writer.writeString(
-          4,
-          f
-        );
-      }
-      f = message.getGasUsed();
-      if (f.length > 0) {
-        writer.writeString(
-          5,
-          f
-        );
-      }
-      f = message.getGasLimit();
-      if (f.length > 0) {
-        writer.writeString(
-          6,
-          f
-        );
-      }
-      f = message.getGasPrice();
-      if (f.length > 0) {
-        writer.writeString(
-          7,
-          f
-        );
-      }
-      f = message.getEffectiveGasPrice();
-      if (f.length > 0) {
-        writer.writeString(
-          8,
-          f
-        );
-      }
-      f = message.getFrom();
-      if (f.length > 0) {
-        writer.writeString(
-          9,
-          f
-        );
-      }
-      f = message.getTo();
-      if (f.length > 0) {
-        writer.writeString(
-          10,
-          f
-        );
-      }
-      f = message.getValue();
-      if (f.length > 0) {
-        writer.writeString(
-          11,
-          f
-        );
-      }
-      f = message.getNonce();
-      if (f.length > 0) {
-        writer.writeString(
-          12,
-          f
-        );
-      }
-      f = message.getTransactionIndex();
-      if (f.length > 0) {
-        writer.writeString(
-          13,
-          f
-        );
-      }
-      f = message.getConfirmations();
-      if (f.length > 0) {
-        writer.writeString(
-          14,
-          f
-        );
-      }
-      f = message.getTimestamp();
-      if (f !== 0) {
-        writer.writeInt64(
-          15,
-          f
-        );
-      }
-      f = message.getSimulation();
-      if (f) {
-        writer.writeBool(
-          16,
-          f
-        );
-      }
-      f = message.getSimulationMode();
-      if (f.length > 0) {
-        writer.writeString(
-          17,
-          f
-        );
-      }
-      f = message.getChainId();
-      if (f !== 0) {
-        writer.writeInt64(
-          18,
-          f
-        );
-      }
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getHash = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setHash = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getStatus = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setStatus = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getBlockNumber = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 3, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setBlockNumber = function(value) {
-      return jspb.Message.setProto3StringField(this, 3, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getBlockHash = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 4, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setBlockHash = function(value) {
-      return jspb.Message.setProto3StringField(this, 4, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getGasUsed = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 5, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setGasUsed = function(value) {
-      return jspb.Message.setProto3StringField(this, 5, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getGasLimit = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 6, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setGasLimit = function(value) {
-      return jspb.Message.setProto3StringField(this, 6, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getGasPrice = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 7, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setGasPrice = function(value) {
-      return jspb.Message.setProto3StringField(this, 7, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getEffectiveGasPrice = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 8, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setEffectiveGasPrice = function(value) {
-      return jspb.Message.setProto3StringField(this, 8, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getFrom = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 9, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setFrom = function(value) {
-      return jspb.Message.setProto3StringField(this, 9, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getTo = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 10, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setTo = function(value) {
-      return jspb.Message.setProto3StringField(this, 10, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getValue = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 11, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setValue = function(value) {
-      return jspb.Message.setProto3StringField(this, 11, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getNonce = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 12, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setNonce = function(value) {
-      return jspb.Message.setProto3StringField(this, 12, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getTransactionIndex = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 13, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setTransactionIndex = function(value) {
-      return jspb.Message.setProto3StringField(this, 13, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getConfirmations = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 14, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setConfirmations = function(value) {
-      return jspb.Message.setProto3StringField(this, 14, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getTimestamp = function() {
-      return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 15, 0)
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setTimestamp = function(value) {
-      return jspb.Message.setProto3IntField(this, 15, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getSimulation = function() {
-      return (
-        /** @type {boolean} */
-        jspb.Message.getBooleanFieldWithDefault(this, 16, false)
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setSimulation = function(value) {
-      return jspb.Message.setProto3BooleanField(this, 16, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getSimulationMode = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 17, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setSimulationMode = function(value) {
-      return jspb.Message.setProto3StringField(this, 17, value);
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.getChainId = function() {
-      return (
-        /** @type {number} */
-        jspb.Message.getFieldWithDefault(this, 18, 0)
-      );
-    };
-    proto.aggregator.ContractWriteNode.TransactionData.prototype.setChainId = function(value) {
-      return jspb.Message.setProto3IntField(this, 18, value);
-    };
-    proto.aggregator.ContractWriteNode.EventData.repeatedFields_ = [3];
-    if (jspb.Message.GENERATE_TO_OBJECT) {
-      proto.aggregator.ContractWriteNode.EventData.prototype.toObject = function(opt_includeInstance) {
-        return proto.aggregator.ContractWriteNode.EventData.toObject(opt_includeInstance, this);
-      };
-      proto.aggregator.ContractWriteNode.EventData.toObject = function(includeInstance, msg) {
-        var f, obj = {
-          eventName: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          address: jspb.Message.getFieldWithDefault(msg, 2, ""),
-          topicsList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? void 0 : f,
-          data: jspb.Message.getFieldWithDefault(msg, 4, ""),
-          decodedMap: (f = msg.getDecodedMap()) ? f.toObject(includeInstance, void 0) : []
-        };
-        if (includeInstance) {
-          obj.$jspbMessageInstance = msg;
-        }
-        return obj;
-      };
-    }
-    proto.aggregator.ContractWriteNode.EventData.deserializeBinary = function(bytes) {
-      var reader = new jspb.BinaryReader(bytes);
-      var msg = new proto.aggregator.ContractWriteNode.EventData();
-      return proto.aggregator.ContractWriteNode.EventData.deserializeBinaryFromReader(msg, reader);
-    };
-    proto.aggregator.ContractWriteNode.EventData.deserializeBinaryFromReader = function(msg, reader) {
-      while (reader.nextField()) {
-        if (reader.isEndGroup()) {
-          break;
-        }
-        var field = reader.getFieldNumber();
-        switch (field) {
-          case 1:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setEventName(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setAddress(value);
-            break;
-          case 3:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.addTopics(value);
-            break;
-          case 4:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setData(value);
-            break;
-          case 5:
-            var value = msg.getDecodedMap();
-            reader.readMessage(value, function(message, reader2) {
-              jspb.Map.deserializeBinary(message, reader2, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", "");
-            });
-            break;
-          default:
-            reader.skipField();
-            break;
-        }
-      }
-      return msg;
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.serializeBinary = function() {
-      var writer = new jspb.BinaryWriter();
-      proto.aggregator.ContractWriteNode.EventData.serializeBinaryToWriter(this, writer);
-      return writer.getResultBuffer();
-    };
-    proto.aggregator.ContractWriteNode.EventData.serializeBinaryToWriter = function(message, writer) {
-      var f = void 0;
-      f = message.getEventName();
-      if (f.length > 0) {
-        writer.writeString(
-          1,
-          f
-        );
-      }
-      f = message.getAddress();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
-        );
-      }
-      f = message.getTopicsList();
-      if (f.length > 0) {
-        writer.writeRepeatedString(
-          3,
-          f
-        );
-      }
-      f = message.getData();
-      if (f.length > 0) {
-        writer.writeString(
-          4,
-          f
-        );
-      }
-      f = message.getDecodedMap(true);
-      if (f && f.getLength() > 0) {
-        f.serializeBinary(5, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeString);
-      }
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.getEventName = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.setEventName = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.getAddress = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.setAddress = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.getTopicsList = function() {
-      return (
-        /** @type {!Array<string>} */
-        jspb.Message.getRepeatedField(this, 3)
-      );
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.setTopicsList = function(value) {
-      return jspb.Message.setField(this, 3, value || []);
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.addTopics = function(value, opt_index) {
-      return jspb.Message.addToRepeatedField(this, 3, value, opt_index);
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.clearTopicsList = function() {
-      return this.setTopicsList([]);
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.getData = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 4, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.setData = function(value) {
-      return jspb.Message.setProto3StringField(this, 4, value);
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.getDecodedMap = function(opt_noLazyCreate) {
-      return (
-        /** @type {!jspb.Map<string,string>} */
-        jspb.Message.getMapField(
-          this,
-          5,
-          opt_noLazyCreate,
-          null
-        )
-      );
-    };
-    proto.aggregator.ContractWriteNode.EventData.prototype.clearDecodedMap = function() {
-      this.getDecodedMap().clear();
-      return this;
-    };
-    if (jspb.Message.GENERATE_TO_OBJECT) {
-      proto.aggregator.ContractWriteNode.ErrorData.prototype.toObject = function(opt_includeInstance) {
-        return proto.aggregator.ContractWriteNode.ErrorData.toObject(opt_includeInstance, this);
-      };
-      proto.aggregator.ContractWriteNode.ErrorData.toObject = function(includeInstance, msg) {
-        var f, obj = {
-          code: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          message: jspb.Message.getFieldWithDefault(msg, 2, ""),
-          revertReason: jspb.Message.getFieldWithDefault(msg, 3, "")
-        };
-        if (includeInstance) {
-          obj.$jspbMessageInstance = msg;
-        }
-        return obj;
-      };
-    }
-    proto.aggregator.ContractWriteNode.ErrorData.deserializeBinary = function(bytes) {
-      var reader = new jspb.BinaryReader(bytes);
-      var msg = new proto.aggregator.ContractWriteNode.ErrorData();
-      return proto.aggregator.ContractWriteNode.ErrorData.deserializeBinaryFromReader(msg, reader);
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.deserializeBinaryFromReader = function(msg, reader) {
-      while (reader.nextField()) {
-        if (reader.isEndGroup()) {
-          break;
-        }
-        var field = reader.getFieldNumber();
-        switch (field) {
-          case 1:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setCode(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setMessage(value);
-            break;
-          case 3:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setRevertReason(value);
-            break;
-          default:
-            reader.skipField();
-            break;
-        }
-      }
-      return msg;
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.prototype.serializeBinary = function() {
-      var writer = new jspb.BinaryWriter();
-      proto.aggregator.ContractWriteNode.ErrorData.serializeBinaryToWriter(this, writer);
-      return writer.getResultBuffer();
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.serializeBinaryToWriter = function(message, writer) {
-      var f = void 0;
-      f = message.getCode();
-      if (f.length > 0) {
-        writer.writeString(
-          1,
-          f
-        );
-      }
-      f = message.getMessage();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
-        );
-      }
-      f = message.getRevertReason();
-      if (f.length > 0) {
-        writer.writeString(
-          3,
-          f
-        );
-      }
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.prototype.getCode = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.prototype.setCode = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.prototype.getMessage = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.prototype.setMessage = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.prototype.getRevertReason = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 3, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.ErrorData.prototype.setRevertReason = function(value) {
-      return jspb.Message.setProto3StringField(this, 3, value);
-    };
-    if (jspb.Message.GENERATE_TO_OBJECT) {
-      proto.aggregator.ContractWriteNode.ReturnData.prototype.toObject = function(opt_includeInstance) {
-        return proto.aggregator.ContractWriteNode.ReturnData.toObject(opt_includeInstance, this);
-      };
-      proto.aggregator.ContractWriteNode.ReturnData.toObject = function(includeInstance, msg) {
-        var f, obj = {
-          name: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          type: jspb.Message.getFieldWithDefault(msg, 2, ""),
-          value: jspb.Message.getFieldWithDefault(msg, 3, "")
-        };
-        if (includeInstance) {
-          obj.$jspbMessageInstance = msg;
-        }
-        return obj;
-      };
-    }
-    proto.aggregator.ContractWriteNode.ReturnData.deserializeBinary = function(bytes) {
-      var reader = new jspb.BinaryReader(bytes);
-      var msg = new proto.aggregator.ContractWriteNode.ReturnData();
-      return proto.aggregator.ContractWriteNode.ReturnData.deserializeBinaryFromReader(msg, reader);
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.deserializeBinaryFromReader = function(msg, reader) {
-      while (reader.nextField()) {
-        if (reader.isEndGroup()) {
-          break;
-        }
-        var field = reader.getFieldNumber();
-        switch (field) {
-          case 1:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setName(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setType(value);
-            break;
-          case 3:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setValue(value);
-            break;
-          default:
-            reader.skipField();
-            break;
-        }
-      }
-      return msg;
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.prototype.serializeBinary = function() {
-      var writer = new jspb.BinaryWriter();
-      proto.aggregator.ContractWriteNode.ReturnData.serializeBinaryToWriter(this, writer);
-      return writer.getResultBuffer();
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.serializeBinaryToWriter = function(message, writer) {
-      var f = void 0;
-      f = message.getName();
-      if (f.length > 0) {
-        writer.writeString(
-          1,
-          f
-        );
-      }
-      f = message.getType();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
-        );
-      }
-      f = message.getValue();
-      if (f.length > 0) {
-        writer.writeString(
-          3,
-          f
-        );
-      }
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.prototype.getName = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.prototype.setName = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.prototype.getType = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.prototype.setType = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.prototype.getValue = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 3, "")
-      );
-    };
-    proto.aggregator.ContractWriteNode.ReturnData.prototype.setValue = function(value) {
-      return jspb.Message.setProto3StringField(this, 3, value);
-    };
-    proto.aggregator.ContractWriteNode.prototype.getConfig = function() {
-      return (
-        /** @type{?proto.aggregator.ContractWriteNode.Config} */
-        jspb.Message.getWrapperField(this, proto.aggregator.ContractWriteNode.Config, 1)
-      );
+    proto.aggregator.ContractWriteNode.prototype.getConfig = function() {
+      return (
+        /** @type{?proto.aggregator.ContractWriteNode.Config} */
+        jspb.Message.getWrapperField(this, proto.aggregator.ContractWriteNode.Config, 1)
+      );
     };
     proto.aggregator.ContractWriteNode.prototype.setConfig = function(value) {
       return jspb.Message.setWrapperField(this, 1, value);
@@ -5247,22 +3937,7 @@ var require_avs_pb = __commonJS({
       return this.setConfig(void 0);
     };
     proto.aggregator.ContractWriteNode.prototype.hasConfig = function() {
-      return jspb.Message.getField(this, 1) != null;
-    };
-    proto.aggregator.ContractWriteNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.ContractWriteNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.ContractWriteNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.ContractWriteNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
+      return jspb.Message.getField(this, 1) != null;
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ContractReadNode.prototype.toObject = function(opt_includeInstance) {
@@ -5270,8 +3945,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.ContractReadNode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.ContractReadNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.ContractReadNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -5296,11 +3970,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.ContractReadNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -5323,16 +3992,8 @@ var require_avs_pb = __commonJS({
           proto.aggregator.ContractReadNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
-    proto.aggregator.ContractReadNode.MethodCall.repeatedFields_ = [3];
+    proto.aggregator.ContractReadNode.MethodCall.repeatedFields_ = [3, 4];
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ContractReadNode.MethodCall.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.ContractReadNode.MethodCall.toObject(opt_includeInstance, this);
@@ -5341,7 +4002,8 @@ var require_avs_pb = __commonJS({
         var f, obj = {
           callData: jspb.Message.getFieldWithDefault(msg, 1, ""),
           methodName: jspb.Message.getFieldWithDefault(msg, 2, ""),
-          applyToFieldsList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? void 0 : f
+          applyToFieldsList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? void 0 : f,
+          methodParamsList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? void 0 : f
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -5382,6 +4044,13 @@ var require_avs_pb = __commonJS({
             );
             msg.addApplyToFields(value);
             break;
+          case 4:
+            var value = (
+              /** @type {string} */
+              reader.readString()
+            );
+            msg.addMethodParams(value);
+            break;
           default:
             reader.skipField();
             break;
@@ -5417,6 +4086,13 @@ var require_avs_pb = __commonJS({
           f
         );
       }
+      f = message.getMethodParamsList();
+      if (f.length > 0) {
+        writer.writeRepeatedString(
+          4,
+          f
+        );
+      }
     };
     proto.aggregator.ContractReadNode.MethodCall.prototype.getCallData = function() {
       return (
@@ -5451,6 +4127,21 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ContractReadNode.MethodCall.prototype.clearApplyToFieldsList = function() {
       return this.setApplyToFieldsList([]);
     };
+    proto.aggregator.ContractReadNode.MethodCall.prototype.getMethodParamsList = function() {
+      return (
+        /** @type {!Array<string>} */
+        jspb.Message.getRepeatedField(this, 4)
+      );
+    };
+    proto.aggregator.ContractReadNode.MethodCall.prototype.setMethodParamsList = function(value) {
+      return jspb.Message.setField(this, 4, value || []);
+    };
+    proto.aggregator.ContractReadNode.MethodCall.prototype.addMethodParams = function(value, opt_index) {
+      return jspb.Message.addToRepeatedField(this, 4, value, opt_index);
+    };
+    proto.aggregator.ContractReadNode.MethodCall.prototype.clearMethodParamsList = function() {
+      return this.setMethodParamsList([]);
+    };
     proto.aggregator.ContractReadNode.Config.repeatedFields_ = [3];
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.ContractReadNode.Config.prototype.toObject = function(opt_includeInstance) {
@@ -5915,29 +4606,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.ContractReadNode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.ContractReadNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.ContractReadNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.ContractReadNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.ContractReadNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.GraphQLQueryNode.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.GraphQLQueryNode.toObject(opt_includeInstance, this);
       };
       proto.aggregator.GraphQLQueryNode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.GraphQLQueryNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.GraphQLQueryNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -5962,11 +4637,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.GraphQLQueryNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -5989,14 +4659,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.GraphQLQueryNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.GraphQLQueryNode.Config.prototype.toObject = function(opt_includeInstance) {
@@ -6118,7 +4780,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.GraphQLQueryNode.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          data: (f = msg.getData()) && google_protobuf_any_pb.Any.toObject(includeInstance, f)
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -6139,8 +4801,8 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = new google_protobuf_any_pb.Any();
-            reader.readMessage(value, google_protobuf_any_pb.Any.deserializeBinaryFromReader);
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
             msg.setData(value);
             break;
           default:
@@ -6162,14 +4824,14 @@ var require_avs_pb = __commonJS({
         writer.writeMessage(
           1,
           f,
-          google_protobuf_any_pb.Any.serializeBinaryToWriter
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
     proto.aggregator.GraphQLQueryNode.Output.prototype.getData = function() {
       return (
-        /** @type{?proto.google.protobuf.Any} */
-        jspb.Message.getWrapperField(this, google_protobuf_any_pb.Any, 1)
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
     proto.aggregator.GraphQLQueryNode.Output.prototype.setData = function(value) {
@@ -6196,29 +4858,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.GraphQLQueryNode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.GraphQLQueryNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.GraphQLQueryNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.GraphQLQueryNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.GraphQLQueryNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.RestAPINode.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.RestAPINode.toObject(opt_includeInstance, this);
       };
       proto.aggregator.RestAPINode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.RestAPINode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.RestAPINode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -6243,11 +4889,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.RestAPINode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -6270,14 +4911,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.RestAPINode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.RestAPINode.Config.prototype.toObject = function(opt_includeInstance) {
@@ -6501,29 +5134,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.RestAPINode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.RestAPINode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.RestAPINode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.RestAPINode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.RestAPINode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.CustomCodeNode.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.CustomCodeNode.toObject(opt_includeInstance, this);
       };
       proto.aggregator.CustomCodeNode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.CustomCodeNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.CustomCodeNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -6548,11 +5165,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.CustomCodeNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -6575,14 +5187,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.CustomCodeNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.CustomCodeNode.Config.prototype.toObject = function(opt_includeInstance) {
@@ -6756,29 +5360,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.CustomCodeNode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.CustomCodeNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.CustomCodeNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.CustomCodeNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.CustomCodeNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.BranchNode.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.BranchNode.toObject(opt_includeInstance, this);
       };
       proto.aggregator.BranchNode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.BranchNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.BranchNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -6803,11 +5391,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.BranchNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -6830,14 +5413,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.BranchNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.BranchNode.Condition.prototype.toObject = function(opt_includeInstance) {
@@ -7031,7 +5606,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.BranchNode.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          conditionId: jspb.Message.getFieldWithDefault(msg, 1, "")
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -7052,11 +5627,9 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setConditionId(value);
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
+            msg.setData(value);
             break;
           default:
             reader.skipField();
@@ -7072,22 +5645,29 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.BranchNode.Output.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getConditionId();
-      if (f.length > 0) {
-        writer.writeString(
+      f = message.getData();
+      if (f != null) {
+        writer.writeMessage(
           1,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
-    proto.aggregator.BranchNode.Output.prototype.getConditionId = function() {
+    proto.aggregator.BranchNode.Output.prototype.getData = function() {
       return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
-    proto.aggregator.BranchNode.Output.prototype.setConditionId = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
+    proto.aggregator.BranchNode.Output.prototype.setData = function(value) {
+      return jspb.Message.setWrapperField(this, 1, value);
+    };
+    proto.aggregator.BranchNode.Output.prototype.clearData = function() {
+      return this.setData(void 0);
+    };
+    proto.aggregator.BranchNode.Output.prototype.hasData = function() {
+      return jspb.Message.getField(this, 1) != null;
     };
     proto.aggregator.BranchNode.prototype.getConfig = function() {
       return (
@@ -7104,29 +5684,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.BranchNode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.BranchNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.BranchNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.BranchNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.BranchNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.FilterNode.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.FilterNode.toObject(opt_includeInstance, this);
       };
       proto.aggregator.FilterNode.toObject = function(includeInstance, msg) {
         var f, obj = {
-          config: (f = msg.getConfig()) && proto.aggregator.FilterNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.FilterNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -7151,11 +5715,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.FilterNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -7178,14 +5737,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.FilterNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.FilterNode.Config.prototype.toObject = function(opt_includeInstance) {
@@ -7194,7 +5745,7 @@ var require_avs_pb = __commonJS({
       proto.aggregator.FilterNode.Config.toObject = function(includeInstance, msg) {
         var f, obj = {
           expression: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          sourceId: jspb.Message.getFieldWithDefault(msg, 2, "")
+          inputNodeName: jspb.Message.getFieldWithDefault(msg, 2, "")
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -7226,7 +5777,7 @@ var require_avs_pb = __commonJS({
               /** @type {string} */
               reader.readString()
             );
-            msg.setSourceId(value);
+            msg.setInputNodeName(value);
             break;
           default:
             reader.skipField();
@@ -7249,7 +5800,7 @@ var require_avs_pb = __commonJS({
           f
         );
       }
-      f = message.getSourceId();
+      f = message.getInputNodeName();
       if (f.length > 0) {
         writer.writeString(
           2,
@@ -7266,13 +5817,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.FilterNode.Config.prototype.setExpression = function(value) {
       return jspb.Message.setProto3StringField(this, 1, value);
     };
-    proto.aggregator.FilterNode.Config.prototype.getSourceId = function() {
+    proto.aggregator.FilterNode.Config.prototype.getInputNodeName = function() {
       return (
         /** @type {string} */
         jspb.Message.getFieldWithDefault(this, 2, "")
       );
     };
-    proto.aggregator.FilterNode.Config.prototype.setSourceId = function(value) {
+    proto.aggregator.FilterNode.Config.prototype.setInputNodeName = function(value) {
       return jspb.Message.setProto3StringField(this, 2, value);
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -7281,7 +5832,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.FilterNode.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          data: (f = msg.getData()) && google_protobuf_any_pb.Any.toObject(includeInstance, f)
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -7302,8 +5853,8 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = new google_protobuf_any_pb.Any();
-            reader.readMessage(value, google_protobuf_any_pb.Any.deserializeBinaryFromReader);
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
             msg.setData(value);
             break;
           default:
@@ -7325,14 +5876,14 @@ var require_avs_pb = __commonJS({
         writer.writeMessage(
           1,
           f,
-          google_protobuf_any_pb.Any.serializeBinaryToWriter
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
     proto.aggregator.FilterNode.Output.prototype.getData = function() {
       return (
-        /** @type{?proto.google.protobuf.Any} */
-        jspb.Message.getWrapperField(this, google_protobuf_any_pb.Any, 1)
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
     proto.aggregator.FilterNode.Output.prototype.setData = function(value) {
@@ -7359,21 +5910,6 @@ var require_avs_pb = __commonJS({
     proto.aggregator.FilterNode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.FilterNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.FilterNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.FilterNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.FilterNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     proto.aggregator.LoopNode.oneofGroups_ = [[10, 11, 12, 13, 14, 15]];
     proto.aggregator.LoopNode.RunnerCase = {
       RUNNER_NOT_SET: 0,
@@ -7402,8 +5938,7 @@ var require_avs_pb = __commonJS({
           graphqlDataQuery: (f = msg.getGraphqlDataQuery()) && proto.aggregator.GraphQLQueryNode.toObject(includeInstance, f),
           restApi: (f = msg.getRestApi()) && proto.aggregator.RestAPINode.toObject(includeInstance, f),
           customCode: (f = msg.getCustomCode()) && proto.aggregator.CustomCodeNode.toObject(includeInstance, f),
-          config: (f = msg.getConfig()) && proto.aggregator.LoopNode.Config.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          config: (f = msg.getConfig()) && proto.aggregator.LoopNode.Config.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -7458,11 +5993,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.LoopNode.Config.deserializeBinaryFromReader);
             msg.setConfig(value);
             break;
-          case 2:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -7533,14 +6063,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.LoopNode.Config.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          2,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.LoopNode.Config.prototype.toObject = function(opt_includeInstance) {
@@ -7548,7 +6070,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.LoopNode.Config.toObject = function(includeInstance, msg) {
         var f, obj = {
-          sourceId: jspb.Message.getFieldWithDefault(msg, 1, ""),
+          inputNodeName: jspb.Message.getFieldWithDefault(msg, 1, ""),
           iterVal: jspb.Message.getFieldWithDefault(msg, 2, ""),
           iterKey: jspb.Message.getFieldWithDefault(msg, 3, ""),
           executionMode: jspb.Message.getFieldWithDefault(msg, 4, 0)
@@ -7576,7 +6098,7 @@ var require_avs_pb = __commonJS({
               /** @type {string} */
               reader.readString()
             );
-            msg.setSourceId(value);
+            msg.setInputNodeName(value);
             break;
           case 2:
             var value = (
@@ -7613,7 +6135,7 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.LoopNode.Config.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getSourceId();
+      f = message.getInputNodeName();
       if (f.length > 0) {
         writer.writeString(
           1,
@@ -7642,13 +6164,13 @@ var require_avs_pb = __commonJS({
         );
       }
     };
-    proto.aggregator.LoopNode.Config.prototype.getSourceId = function() {
+    proto.aggregator.LoopNode.Config.prototype.getInputNodeName = function() {
       return (
         /** @type {string} */
         jspb.Message.getFieldWithDefault(this, 1, "")
       );
     };
-    proto.aggregator.LoopNode.Config.prototype.setSourceId = function(value) {
+    proto.aggregator.LoopNode.Config.prototype.setInputNodeName = function(value) {
       return jspb.Message.setProto3StringField(this, 1, value);
     };
     proto.aggregator.LoopNode.Config.prototype.getIterVal = function() {
@@ -7684,7 +6206,7 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.LoopNode.Output.toObject = function(includeInstance, msg) {
         var f, obj = {
-          data: jspb.Message.getFieldWithDefault(msg, 1, "")
+          data: (f = msg.getData()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -7705,10 +6227,8 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
+            var value = new google_protobuf_struct_pb2.Value();
+            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
             msg.setData(value);
             break;
           default:
@@ -7726,21 +6246,28 @@ var require_avs_pb = __commonJS({
     proto.aggregator.LoopNode.Output.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
       f = message.getData();
-      if (f.length > 0) {
-        writer.writeString(
+      if (f != null) {
+        writer.writeMessage(
           1,
-          f
+          f,
+          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
         );
       }
     };
     proto.aggregator.LoopNode.Output.prototype.getData = function() {
       return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
+        /** @type{?proto.google.protobuf.Value} */
+        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 1)
       );
     };
     proto.aggregator.LoopNode.Output.prototype.setData = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
+      return jspb.Message.setWrapperField(this, 1, value);
+    };
+    proto.aggregator.LoopNode.Output.prototype.clearData = function() {
+      return this.setData(void 0);
+    };
+    proto.aggregator.LoopNode.Output.prototype.hasData = function() {
+      return jspb.Message.getField(this, 1) != null;
     };
     proto.aggregator.LoopNode.prototype.getEthTransfer = function() {
       return (
@@ -7847,21 +6374,6 @@ var require_avs_pb = __commonJS({
     proto.aggregator.LoopNode.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 1) != null;
     };
-    proto.aggregator.LoopNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 2)
-      );
-    };
-    proto.aggregator.LoopNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 2, value);
-    };
-    proto.aggregator.LoopNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
-    };
-    proto.aggregator.LoopNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 2) != null;
-    };
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.TaskEdge.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.TaskEdge.toObject(opt_includeInstance, this);
@@ -8010,8 +6522,7 @@ var require_avs_pb = __commonJS({
           branch: (f = msg.getBranch()) && proto.aggregator.BranchNode.toObject(includeInstance, f),
           filter: (f = msg.getFilter()) && proto.aggregator.FilterNode.toObject(includeInstance, f),
           loop: (f = msg.getLoop()) && proto.aggregator.LoopNode.toObject(includeInstance, f),
-          customCode: (f = msg.getCustomCode()) && proto.aggregator.CustomCodeNode.toObject(includeInstance, f),
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f)
+          customCode: (f = msg.getCustomCode()) && proto.aggregator.CustomCodeNode.toObject(includeInstance, f)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -8097,11 +6608,6 @@ var require_avs_pb = __commonJS({
             reader.readMessage(value, proto.aggregator.CustomCodeNode.deserializeBinaryFromReader);
             msg.setCustomCode(value);
             break;
-          case 19:
-            var value = new google_protobuf_struct_pb2.Value();
-            reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
-            break;
           default:
             reader.skipField();
             break;
@@ -8209,14 +6715,6 @@ var require_avs_pb = __commonJS({
           proto.aggregator.CustomCodeNode.serializeBinaryToWriter
         );
       }
-      f = message.getInput();
-      if (f != null) {
-        writer.writeMessage(
-          19,
-          f,
-          google_protobuf_struct_pb2.Value.serializeBinaryToWriter
-        );
-      }
     };
     proto.aggregator.TaskNode.prototype.getId = function() {
       return (
@@ -8371,29 +6869,14 @@ var require_avs_pb = __commonJS({
         jspb.Message.getWrapperField(this, proto.aggregator.CustomCodeNode, 18)
       );
     };
-    proto.aggregator.TaskNode.prototype.setCustomCode = function(value) {
-      return jspb.Message.setOneofWrapperField(this, 18, proto.aggregator.TaskNode.oneofGroups_[0], value);
-    };
-    proto.aggregator.TaskNode.prototype.clearCustomCode = function() {
-      return this.setCustomCode(void 0);
-    };
-    proto.aggregator.TaskNode.prototype.hasCustomCode = function() {
-      return jspb.Message.getField(this, 18) != null;
-    };
-    proto.aggregator.TaskNode.prototype.getInput = function() {
-      return (
-        /** @type{?proto.google.protobuf.Value} */
-        jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 19)
-      );
-    };
-    proto.aggregator.TaskNode.prototype.setInput = function(value) {
-      return jspb.Message.setWrapperField(this, 19, value);
+    proto.aggregator.TaskNode.prototype.setCustomCode = function(value) {
+      return jspb.Message.setOneofWrapperField(this, 18, proto.aggregator.TaskNode.oneofGroups_[0], value);
     };
-    proto.aggregator.TaskNode.prototype.clearInput = function() {
-      return this.setInput(void 0);
+    proto.aggregator.TaskNode.prototype.clearCustomCode = function() {
+      return this.setCustomCode(void 0);
     };
-    proto.aggregator.TaskNode.prototype.hasInput = function() {
-      return jspb.Message.getField(this, 19) != null;
+    proto.aggregator.TaskNode.prototype.hasCustomCode = function() {
+      return jspb.Message.getField(this, 18) != null;
     };
     proto.aggregator.Execution.repeatedFields_ = [8];
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -8567,7 +7050,7 @@ var require_avs_pb = __commonJS({
           error: jspb.Message.getFieldWithDefault(msg, 13, ""),
           log: jspb.Message.getFieldWithDefault(msg, 12, ""),
           inputsList: (f = jspb.Message.getRepeatedField(msg, 16)) == null ? void 0 : f,
-          input: (f = msg.getInput()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f),
+          config: (f = msg.getConfig()) && google_protobuf_struct_pb2.Value.toObject(includeInstance, f),
           blockTrigger: (f = msg.getBlockTrigger()) && proto.aggregator.BlockTrigger.Output.toObject(includeInstance, f),
           fixedTimeTrigger: (f = msg.getFixedTimeTrigger()) && proto.aggregator.FixedTimeTrigger.Output.toObject(includeInstance, f),
           cronTrigger: (f = msg.getCronTrigger()) && proto.aggregator.CronTrigger.Output.toObject(includeInstance, f),
@@ -8655,7 +7138,7 @@ var require_avs_pb = __commonJS({
           case 19:
             var value = new google_protobuf_struct_pb2.Value();
             reader.readMessage(value, google_protobuf_struct_pb2.Value.deserializeBinaryFromReader);
-            msg.setInput(value);
+            msg.setConfig(value);
             break;
           case 20:
             var value = new proto.aggregator.BlockTrigger.Output();
@@ -8804,7 +7287,7 @@ var require_avs_pb = __commonJS({
           f
         );
       }
-      f = message.getInput();
+      f = message.getConfig();
       if (f != null) {
         writer.writeMessage(
           19,
@@ -9008,19 +7491,19 @@ var require_avs_pb = __commonJS({
     proto.aggregator.Execution.Step.prototype.clearInputsList = function() {
       return this.setInputsList([]);
     };
-    proto.aggregator.Execution.Step.prototype.getInput = function() {
+    proto.aggregator.Execution.Step.prototype.getConfig = function() {
       return (
         /** @type{?proto.google.protobuf.Value} */
         jspb.Message.getWrapperField(this, google_protobuf_struct_pb2.Value, 19)
       );
     };
-    proto.aggregator.Execution.Step.prototype.setInput = function(value) {
+    proto.aggregator.Execution.Step.prototype.setConfig = function(value) {
       return jspb.Message.setWrapperField(this, 19, value);
     };
-    proto.aggregator.Execution.Step.prototype.clearInput = function() {
-      return this.setInput(void 0);
+    proto.aggregator.Execution.Step.prototype.clearConfig = function() {
+      return this.setConfig(void 0);
     };
-    proto.aggregator.Execution.Step.prototype.hasInput = function() {
+    proto.aggregator.Execution.Step.prototype.hasConfig = function() {
       return jspb.Message.getField(this, 19) != null;
     };
     proto.aggregator.Execution.Step.prototype.getBlockTrigger = function() {
@@ -16793,11 +15276,17 @@ var Trigger = class {
     this.type = props.type;
     this.data = props.data;
     this.output = props.output;
-    this.input = props.input;
   }
   toRequest() {
     throw new Error("Method not implemented.");
   }
+  static fromResponse(raw) {
+    const obj = raw.toObject();
+    return new this({
+      // eslint-disable-line @typescript-eslint/no-explicit-any
+      ...obj
+    });
+  }
   getOutput() {
     return this.output;
   }
@@ -16807,14 +15296,163 @@ var Trigger = class {
       name: this.name,
       type: this.type,
       data: this.data,
-      output: this.output,
-      input: this.input
+      output: this.output
     };
   }
 };
 
 // src/models/trigger/block.ts
-import { TriggerType as TriggerType3 } from "@avaprotocol/types";
+import {
+  TriggerType as TriggerType2
+} from "@avaprotocol/types";
+var BlockTrigger2 = class _BlockTrigger extends Trigger {
+  constructor(props) {
+    super({ ...props, type: TriggerType2.Block, data: props.data });
+  }
+  toRequest() {
+    const request = new avs_pb2.TaskTrigger();
+    request.setName(this.name);
+    request.setId(this.id);
+    request.setType(avs_pb2.TriggerType.TRIGGER_TYPE_BLOCK);
+    if (!this.data) {
+      throw new Error(`Trigger data is missing for block`);
+    }
+    const blockData = this.data;
+    if (blockData.interval === null || blockData.interval === void 0) {
+      throw new Error("Interval is required for block trigger");
+    }
+    if (!Number.isInteger(blockData.interval)) {
+      throw new Error(`BlockTrigger interval must be an integer, got: ${blockData.interval}`);
+    }
+    if (blockData.interval <= 0) {
+      throw new Error(`Interval must be greater than 0`);
+    }
+    const trigger = new avs_pb2.BlockTrigger();
+    const config = new avs_pb2.BlockTrigger.Config();
+    config.setInterval(blockData.interval);
+    trigger.setConfig(config);
+    request.setBlock(trigger);
+    return request;
+  }
+  static fromResponse(raw) {
+    const obj = raw.toObject();
+    let data = { interval: 0 };
+    if (raw.getBlock() && raw.getBlock().hasConfig()) {
+      const config = raw.getBlock().getConfig();
+      if (config) {
+        data = {
+          interval: config.getInterval() || 0
+        };
+      }
+    }
+    return new _BlockTrigger({
+      ...obj,
+      type: TriggerType2.Block,
+      data
+    });
+  }
+  /**
+   * Convert raw data from runNodeWithInputs response to BlockOutput format
+   * @param rawData - The raw data from the gRPC response
+   * @returns {BlockTriggerOutput | undefined} - The converted data
+   */
+  getOutput() {
+    return this.output;
+  }
+  /**
+   * Extract output data from RunTriggerResp for block triggers
+   * @param outputData - The RunTriggerResp containing block trigger output
+   * @returns Plain JavaScript object with block trigger data
+   */
+  static fromOutputData(outputData) {
+    const blockOutput = outputData.getBlockTrigger();
+    if (!blockOutput) return null;
+    const dataValue = blockOutput.getData();
+    if (!dataValue) return null;
+    const result = dataValue.toJavaScript();
+    return result;
+  }
+};
+var block_default = BlockTrigger2;
+
+// src/models/trigger/cron.ts
+var avs_pb3 = __toESM(require_avs_pb());
+import {
+  TriggerType as TriggerType4
+} from "@avaprotocol/types";
+var CronTrigger2 = class _CronTrigger extends Trigger {
+  constructor(props) {
+    super({ ...props, type: TriggerType4.Cron, data: props.data });
+  }
+  toRequest() {
+    const request = new avs_pb3.TaskTrigger();
+    request.setName(this.name);
+    request.setId(this.id);
+    request.setType(avs_pb3.TriggerType.TRIGGER_TYPE_CRON);
+    if (!this.data) {
+      throw new Error(`Trigger data is missing for ${this.type}`);
+    }
+    const cronData = this.data;
+    if (cronData.schedules === null || cronData.schedules === void 0) {
+      throw new Error("Schedules are required for cron trigger");
+    }
+    if (!Array.isArray(cronData.schedules) || cronData.schedules.length === 0) {
+      throw new Error("Schedules are required for cron trigger");
+    }
+    const trigger = new avs_pb3.CronTrigger();
+    const config = new avs_pb3.CronTrigger.Config();
+    config.setSchedulesList(cronData.schedules);
+    trigger.setConfig(config);
+    request.setCron(trigger);
+    return request;
+  }
+  static fromResponse(raw) {
+    const obj = raw.toObject();
+    let data = { schedules: [] };
+    if (raw.getCron() && raw.getCron().hasConfig()) {
+      const config = raw.getCron().getConfig();
+      if (config) {
+        data = {
+          schedules: config.getSchedulesList() || []
+        };
+      }
+    }
+    return new _CronTrigger({
+      ...obj,
+      type: TriggerType4.Cron,
+      data
+    });
+  }
+  /**
+   * Convert raw data from runTrigger response to CronOutput format
+   * @param rawData - The raw data from the gRPC response
+   * @returns {CronTriggerOutput | undefined} - The converted data
+   */
+  getOutput() {
+    return this.output;
+  }
+  /**
+   * Extract output data from RunTriggerResp for cron triggers
+   * Updated to handle timestamp and timestamp_iso instead of epoch
+   * @param outputData - The RunTriggerResp containing cron trigger output
+   * @returns Plain JavaScript object with cron trigger data
+   */
+  static fromOutputData(outputData) {
+    const cronOutput = outputData.getCronTrigger();
+    if (!cronOutput) return null;
+    const dataValue = cronOutput.getData();
+    if (!dataValue) return null;
+    const result = dataValue.toJavaScript();
+    return result;
+  }
+};
+var cron_default = CronTrigger2;
+
+// src/models/trigger/event.ts
+var avs_pb4 = __toESM(require_avs_pb());
+import {
+  TriggerType as TriggerType7
+} from "@avaprotocol/types";
 
 // src/utils.ts
 import {
@@ -16822,7 +15460,7 @@ import {
   Struct as ProtobufStruct,
   ListValue as ProtobufListValue
 } from "google-protobuf/google/protobuf/struct_pb";
-import { TriggerType, NodeType } from "@avaprotocol/types";
+import { TriggerType as TriggerType5, NodeType } from "@avaprotocol/types";
 function convertProtobufValueToJs(value) {
   if (!value) {
     return void 0;
@@ -16886,22 +15524,22 @@ function convertJSValueToProtobuf(value) {
 function convertProtobufTriggerTypeToSdk(protobufType) {
   switch (protobufType) {
     case "TRIGGER_TYPE_MANUAL":
-      return TriggerType.Manual;
+      return TriggerType5.Manual;
     // "manualTrigger"
     case "TRIGGER_TYPE_FIXED_TIME":
-      return TriggerType.FixedTime;
+      return TriggerType5.FixedTime;
     // "fixedTimeTrigger"
     case "TRIGGER_TYPE_CRON":
-      return TriggerType.Cron;
+      return TriggerType5.Cron;
     // "cronTrigger"
     case "TRIGGER_TYPE_BLOCK":
-      return TriggerType.Block;
+      return TriggerType5.Block;
     // "blockTrigger"
     case "TRIGGER_TYPE_EVENT":
-      return TriggerType.Event;
+      return TriggerType5.Event;
     // "eventTrigger"
     case "TRIGGER_TYPE_UNSPECIFIED":
-      return TriggerType.Unspecified;
+      return TriggerType5.Unspecified;
     // "unspecified"
     default:
       console.warn(`Unknown trigger type: ${protobufType}, using raw value`);
@@ -16948,226 +15586,58 @@ function convertProtobufNodeTypeToSdk(protobufType) {
 function convertProtobufStepTypeToSdk(protobufType) {
   if (protobufType.startsWith("TRIGGER_TYPE_")) {
     return convertProtobufTriggerTypeToSdk(protobufType);
-  } else if (protobufType.startsWith("NODE_TYPE_")) {
-    return convertProtobufNodeTypeToSdk(protobufType);
-  } else {
-    console.warn(`Unknown step type: ${protobufType}, using raw value`);
-    return protobufType;
-  }
-}
-function convertInputToProtobuf(input) {
-  if (!input) {
-    return void 0;
-  }
-  return convertJSValueToProtobuf(input);
-}
-function extractInputFromProtobuf(inputValue) {
-  if (!inputValue) {
-    return void 0;
-  }
-  if (typeof inputValue === "object" && !inputValue.toJavaScript) {
-    if (!Array.isArray(inputValue)) {
-      return inputValue;
-    }
-    return void 0;
-  }
-  try {
-    const protobufValue = inputValue;
-    const inputJavaScript = protobufValue.toJavaScript();
-    if (inputJavaScript && typeof inputJavaScript === "object" && !Array.isArray(inputJavaScript)) {
-      return inputJavaScript;
-    }
-  } catch (error) {
-    if (typeof inputValue === "object" && !Array.isArray(inputValue)) {
-      return inputValue;
-    }
-  }
-  return void 0;
-}
-function cleanGrpcErrorMessage(message) {
-  if (!message) return message;
-  const grpcErrorPattern = /gRPC Error \(Code \d+\): \d+ [A-Z_]+: (.+)$/;
-  const match = message.match(grpcErrorPattern);
-  if (match && match[1]) {
-    return match[1].trim();
-  }
-  const statusCodePattern = /\d+ [A-Z_]+: (.+)$/;
-  const statusMatch = message.match(statusCodePattern);
-  if (statusMatch && statusMatch[1]) {
-    return statusMatch[1].trim();
-  }
-  return message;
-}
-
-// src/models/trigger/block.ts
-var BlockTrigger2 = class _BlockTrigger extends Trigger {
-  constructor(props) {
-    super({ ...props, type: TriggerType3.Block, data: props.data });
-  }
-  toRequest() {
-    const request = new avs_pb2.TaskTrigger();
-    request.setName(this.name);
-    request.setId(this.id);
-    request.setType(avs_pb2.TriggerType.TRIGGER_TYPE_BLOCK);
-    if (!this.data) {
-      throw new Error(`Trigger data is missing for block`);
-    }
-    const blockData = this.data;
-    if (blockData.interval === null || blockData.interval === void 0) {
-      throw new Error("Interval is required for block trigger");
-    }
-    if (blockData.interval <= 0) {
-      throw new Error("Interval must be greater than 0");
-    }
-    const trigger = new avs_pb2.BlockTrigger();
-    const config = new avs_pb2.BlockTrigger.Config();
-    config.setInterval(blockData.interval);
-    trigger.setConfig(config);
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      trigger.setInput(inputValue);
-    }
-    request.setBlock(trigger);
-    return request;
-  }
-  static fromResponse(raw) {
-    const obj = raw.toObject();
-    let data = { interval: 0 };
-    let input = void 0;
-    if (raw.getBlock() && raw.getBlock().hasConfig()) {
-      const config = raw.getBlock().getConfig();
-      if (config) {
-        data = {
-          interval: config.getInterval() || 0
-        };
-      }
-      const blockTrigger = raw.getBlock();
-      if (blockTrigger.hasInput()) {
-        input = extractInputFromProtobuf(blockTrigger.getInput());
-      }
-    }
-    return new _BlockTrigger({
-      ...obj,
-      type: TriggerType3.Block,
-      data,
-      input
-    });
-  }
-  /**
-   * Convert raw data from runNodeWithInputs response to BlockOutput format
-   * @param rawData - The raw data from the gRPC response
-   * @returns {BlockTriggerOutput | undefined} - The converted data
-   */
-  getOutput() {
-    return this.output;
-  }
-  /**
-   * Extract output data from RunTriggerResp for block triggers
-   * @param outputData - The RunTriggerResp containing block trigger output
-   * @returns Plain JavaScript object with block trigger data
-   */
-  static fromOutputData(outputData) {
-    const blockOutput = outputData.getBlockTrigger();
-    return blockOutput?.toObject() || null;
+  } else if (protobufType.startsWith("NODE_TYPE_")) {
+    return convertProtobufNodeTypeToSdk(protobufType);
+  } else {
+    console.warn(`Unknown step type: ${protobufType}, using raw value`);
+    return protobufType;
   }
-};
-var block_default = BlockTrigger2;
-
-// src/models/trigger/cron.ts
-var avs_pb3 = __toESM(require_avs_pb());
-import * as google_protobuf_struct_pb from "google-protobuf/google/protobuf/struct_pb";
-import { TriggerType as TriggerType5 } from "@avaprotocol/types";
-var CronTrigger2 = class _CronTrigger extends Trigger {
-  constructor(props) {
-    super({ ...props, type: TriggerType5.Cron, data: props.data });
+}
+function convertInputToProtobuf(input) {
+  if (!input) {
+    return void 0;
   }
-  toRequest() {
-    const request = new avs_pb3.TaskTrigger();
-    request.setName(this.name);
-    request.setId(this.id);
-    request.setType(avs_pb3.TriggerType.TRIGGER_TYPE_CRON);
-    if (!this.data) {
-      throw new Error(`Trigger data is missing for ${this.type}`);
-    }
-    const cronData = this.data;
-    if (cronData.schedules === null || cronData.schedules === void 0) {
-      throw new Error("Schedules are required for cron trigger");
-    }
-    if (!Array.isArray(cronData.schedules) || cronData.schedules.length === 0) {
-      throw new Error("Schedules are required for cron trigger");
-    }
-    const trigger = new avs_pb3.CronTrigger();
-    const config = new avs_pb3.CronTrigger.Config();
-    config.setSchedulesList(cronData.schedules);
-    trigger.setConfig(config);
-    if (this.input) {
-      try {
-        const inputValue = google_protobuf_struct_pb.Value.fromJavaScript(this.input);
-        trigger.setInput(inputValue);
-      } catch (error) {
-        throw new Error(`Failed to convert input data to protobuf.Value: ${error}`);
-      }
+  return convertJSValueToProtobuf(input);
+}
+function extractInputFromProtobuf(inputValue) {
+  if (!inputValue) {
+    return void 0;
+  }
+  if (typeof inputValue === "object" && !inputValue.toJavaScript) {
+    if (!Array.isArray(inputValue)) {
+      return inputValue;
     }
-    request.setCron(trigger);
-    return request;
+    return void 0;
   }
-  static fromResponse(raw) {
-    const obj = raw.toObject();
-    let data = { schedules: [] };
-    if (raw.getCron() && raw.getCron().hasConfig()) {
-      const config = raw.getCron().getConfig();
-      if (config) {
-        data = {
-          schedules: config.getSchedulesList() || []
-        };
-      }
+  try {
+    const protobufValue = inputValue;
+    const inputJavaScript = protobufValue.toJavaScript();
+    if (inputJavaScript && typeof inputJavaScript === "object" && !Array.isArray(inputJavaScript)) {
+      return inputJavaScript;
     }
-    let input;
-    if (raw.getCron() && raw.getCron().hasInput()) {
-      const inputValue = raw.getCron().getInput();
-      if (inputValue) {
-        input = inputValue.toObject();
-      }
+  } catch (error) {
+    if (typeof inputValue === "object" && !Array.isArray(inputValue)) {
+      return inputValue;
     }
-    return new _CronTrigger({
-      ...obj,
-      type: TriggerType5.Cron,
-      data,
-      input
-      // ✨ NEW: Include input data
-    });
   }
-  /**
-   * Convert raw data from runTrigger response to CronOutput format
-   * @param rawData - The raw data from the gRPC response
-   * @returns {CronTriggerOutput | undefined} - The converted data
-   */
-  getOutput() {
-    return this.output;
+  return void 0;
+}
+function cleanGrpcErrorMessage(message) {
+  if (!message) return message;
+  const grpcErrorPattern = /gRPC Error \(Code \d+\): \d+ [A-Z_]+: (.+)$/;
+  const match = message.match(grpcErrorPattern);
+  if (match && match[1]) {
+    return match[1].trim();
   }
-  /**
-   * Extract output data from RunTriggerResp for cron triggers
-   * Updated to handle timestamp and timestamp_iso instead of epoch
-   * @param outputData - The RunTriggerResp containing cron trigger output
-   * @returns Plain JavaScript object with cron trigger data
-   */
-  static fromOutputData(outputData) {
-    const cronOutput = outputData.getCronTrigger();
-    if (!cronOutput) return null;
-    const outputObj = cronOutput.toObject();
-    return {
-      timestamp: outputObj.timestamp,
-      timestampIso: outputObj.timestampIso
-    };
+  const statusCodePattern = /\d+ [A-Z_]+: (.+)$/;
+  const statusMatch = message.match(statusCodePattern);
+  if (statusMatch && statusMatch[1]) {
+    return statusMatch[1].trim();
   }
-};
-var cron_default = CronTrigger2;
+  return message;
+}
 
 // src/models/trigger/event.ts
-var avs_pb4 = __toESM(require_avs_pb());
-import {
-  TriggerType as TriggerType7
-} from "@avaprotocol/types";
 var EventTrigger2 = class _EventTrigger extends Trigger {
   constructor(props) {
     super({ ...props, type: TriggerType7.Event, data: props.data });
@@ -17240,17 +15710,12 @@ var EventTrigger2 = class _EventTrigger extends Trigger {
     });
     config.setQueriesList(queryMessages);
     trigger.setConfig(config);
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      trigger.setInput(inputValue);
-    }
     request.setEvent(trigger);
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
     let data = { queries: [] };
-    let input = void 0;
     if (raw.getEvent() && raw.getEvent().hasConfig()) {
       const config = raw.getEvent().getConfig();
       if (config) {
@@ -17300,15 +15765,11 @@ var EventTrigger2 = class _EventTrigger extends Trigger {
         }
         data = { queries };
       }
-      if (raw.getEvent().hasInput()) {
-        input = extractInputFromProtobuf(raw.getEvent().getInput());
-      }
     }
     return new _EventTrigger({
       ...obj,
       type: TriggerType7.Event,
-      data,
-      input
+      data
     });
   }
   /**
@@ -17351,7 +15812,9 @@ var event_default = EventTrigger2;
 
 // src/models/trigger/fixedTime.ts
 var avs_pb5 = __toESM(require_avs_pb());
-import { TriggerType as TriggerType9 } from "@avaprotocol/types";
+import {
+  TriggerType as TriggerType9
+} from "@avaprotocol/types";
 var FixedTimeTrigger2 = class _FixedTimeTrigger extends Trigger {
   constructor(props) {
     super({ ...props, type: TriggerType9.FixedTime, data: props.data });
@@ -17366,19 +15829,16 @@ var FixedTimeTrigger2 = class _FixedTimeTrigger extends Trigger {
     }
     const trigger = new avs_pb5.FixedTimeTrigger();
     const config = new avs_pb5.FixedTimeTrigger.Config();
-    config.setEpochsList(this.data.epochsList || []);
+    config.setEpochsList(
+      this.data.epochsList || []
+    );
     trigger.setConfig(config);
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      trigger.setInput(inputValue);
-    }
     request.setFixedTime(trigger);
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
     let data = { epochsList: [] };
-    let input = void 0;
     if (raw.getFixedTime() && raw.getFixedTime().hasConfig()) {
       const config = raw.getFixedTime().getConfig();
       if (config) {
@@ -17386,15 +15846,11 @@ var FixedTimeTrigger2 = class _FixedTimeTrigger extends Trigger {
           epochsList: config.getEpochsList() || []
         };
       }
-      if (raw.getFixedTime().hasInput()) {
-        input = extractInputFromProtobuf(raw.getFixedTime().getInput());
-      }
     }
     return new _FixedTimeTrigger({
       ...obj,
       type: TriggerType9.FixedTime,
-      data,
-      input
+      data
     });
   }
   /**
@@ -17414,11 +15870,10 @@ var FixedTimeTrigger2 = class _FixedTimeTrigger extends Trigger {
   static fromOutputData(outputData) {
     const fixedTimeOutput = outputData.getFixedTimeTrigger();
     if (!fixedTimeOutput) return null;
-    const outputObj = fixedTimeOutput.toObject();
-    return {
-      timestamp: outputObj.timestamp,
-      timestampIso: outputObj.timestampIso
-    };
+    const dataValue = fixedTimeOutput.getData();
+    if (!dataValue) return null;
+    const result = dataValue.toJavaScript();
+    return result;
   }
 };
 var fixedTime_default = FixedTimeTrigger2;
@@ -17436,8 +15891,6 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
       data: props.data,
       input: props.input
     });
-    this.headers = props.headers;
-    this.pathParams = props.pathParams;
   }
   toRequest() {
     const trigger = new avs_pb6.TaskTrigger();
@@ -17446,24 +15899,36 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
     trigger.setType(avs_pb6.TriggerType.TRIGGER_TYPE_MANUAL);
     const manualTrigger = new avs_pb6.ManualTrigger();
     const config = new avs_pb6.ManualTrigger.Config();
-    const dataToSend = this.data ?? this.input;
-    if (dataToSend === null || dataToSend === void 0) {
+    if (this.data === null || this.data === void 0) {
       throw new Error("ManualTrigger data is required");
     }
-    const inputValue = convertInputToProtobuf(dataToSend);
-    if (!inputValue) {
-      throw new Error("Failed to convert ManualTrigger data to protobuf format");
+    let actualData = this.data;
+    let headers = {};
+    let pathParams = {};
+    if (typeof this.data === "object" && this.data !== null && !Array.isArray(this.data)) {
+      const dataObj = this.data;
+      if ("data" in dataObj) {
+        actualData = dataObj.data;
+        headers = dataObj.headers || {};
+        pathParams = dataObj.pathParams || {};
+      }
+    }
+    const dataValue = convertInputToProtobuf(actualData);
+    if (!dataValue) {
+      throw new Error(
+        "Failed to convert ManualTrigger data to protobuf format"
+      );
     }
-    config.setData(inputValue);
-    if (this.headers && Object.keys(this.headers).length > 0) {
+    config.setData(dataValue);
+    if (Object.keys(headers).length > 0) {
       const headersMap = config.getHeadersMap();
-      Object.entries(this.headers).forEach(([key, value]) => {
+      Object.entries(headers).forEach(([key, value]) => {
         headersMap.set(key, value);
       });
     }
-    if (this.pathParams && Object.keys(this.pathParams).length > 0) {
+    if (Object.keys(pathParams).length > 0) {
       const pathParamsMap = config.getPathparamsMap();
-      Object.entries(this.pathParams).forEach(([key, value]) => {
+      Object.entries(pathParams).forEach(([key, value]) => {
         pathParamsMap.set(key, value);
       });
     }
@@ -17473,45 +15938,25 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    let data = null;
-    const input = void 0;
-    let headers = void 0;
-    let pathParams = void 0;
+    let actualData = null;
     const manualTrigger = raw.getManual();
     if (manualTrigger) {
       const config = manualTrigger.getConfig();
       if (config) {
         if (config.hasData()) {
-          data = extractInputFromProtobuf(config.getData());
-        }
-        const headersMapProto = config.getHeadersMap();
-        if (headersMapProto && headersMapProto.getLength() > 0) {
-          headers = {};
-          headersMapProto.forEach((value, key) => {
-            headers[key] = value;
-          });
-        }
-        const pathParamsMapProto = config.getPathparamsMap();
-        if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
-          pathParams = {};
-          pathParamsMapProto.forEach((value, key) => {
-            pathParams[key] = value;
-          });
+          actualData = extractInputFromProtobuf(config.getData());
         }
       }
     }
+    const manualTriggerData = {
+      data: actualData
+    };
     return new _ManualTrigger({
       ...obj,
       type: TriggerType11.Manual,
-      data,
-      input,
-      headers,
-      pathParams
+      data: manualTriggerData
     });
   }
-  getInputVariables() {
-    return this.input;
-  }
   /**
    * Extract output data from RunTriggerResp for manual triggers
    * @param outputData - The RunTriggerResp containing manual trigger output
@@ -17614,13 +16059,11 @@ var avs_pb8 = __toESM(require_avs_pb());
 import { NodeType as NodeType2, NodeTypeGoConverter } from "@avaprotocol/types";
 import _ from "lodash";
 var Node = class {
-  // Use JavaScript object type for internal storage
   constructor(props) {
     this.id = props.id;
     this.name = props.name;
     this.type = props.type;
     this.data = props.data;
-    this.input = props.input;
   }
   toRequest() {
     const request = new avs_pb8.TaskNode();
@@ -17633,13 +16076,8 @@ var Node = class {
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    let input = void 0;
-    if (raw.hasInput()) {
-      input = raw.getInput().toObject();
-    }
     return new this({
-      ...obj,
-      input
+      ...obj
     });
   }
 };
@@ -17671,6 +16109,9 @@ var ContractWriteNode2 = class _ContractWriteNode extends Node {
       if (methodCall.methodName) {
         methodCallMsg.setMethodName(methodCall.methodName);
       }
+      if (methodCall.methodParams) {
+        methodCallMsg.setMethodParamsList(methodCall.methodParams);
+      }
       config.addMethodCalls(methodCallMsg);
     });
     node.setConfig(config);
@@ -17685,18 +16126,14 @@ var ContractWriteNode2 = class _ContractWriteNode extends Node {
       contractAbi: protobufData.contractAbi,
       methodCalls: protobufData.methodCallsList?.map((call) => ({
         callData: call.callData,
-        methodName: call.methodName
+        methodName: call.methodName,
+        methodParams: call.methodParamsList || []
       })) || []
     };
-    let input = void 0;
-    if (raw.hasInput()) {
-      input = extractInputFromProtobuf(raw.getInput());
-    }
     return new _ContractWriteNode({
       ...obj,
       type: NodeType3.ContractWrite,
-      data,
-      input
+      data
     });
   }
   toRequest() {
@@ -17706,10 +16143,6 @@ var ContractWriteNode2 = class _ContractWriteNode extends Node {
     const node = _ContractWriteNode.createProtobufNode(
       this.data
     );
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      request.setInput(inputValue);
-    }
     request.setContractWrite(node);
     return request;
   }
@@ -17753,15 +16186,10 @@ var CustomCodeNode2 = class _CustomCodeNode extends Node {
       lang: rawConfig.lang,
       source: rawConfig.source
     };
-    let input = void 0;
-    if (raw.hasInput()) {
-      input = extractInputFromProtobuf(raw.getInput());
-    }
     return new _CustomCodeNode({
       ...obj,
       type: NodeType4.CustomCode,
-      data: convertedConfig,
-      input
+      data: convertedConfig
     });
   }
   toRequest() {
@@ -17771,10 +16199,6 @@ var CustomCodeNode2 = class _CustomCodeNode extends Node {
     const node = _CustomCodeNode.createProtobufNode(
       this.data
     );
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      request.setInput(inputValue);
-    }
     request.setCustomCode(node);
     return request;
   }
@@ -17794,7 +16218,9 @@ var customCode_default = CustomCodeNode2;
 
 // src/models/node/graphqlQuery.ts
 var avs_pb11 = __toESM(require_avs_pb());
-import { NodeType as NodeType5 } from "@avaprotocol/types";
+import {
+  NodeType as NodeType5
+} from "@avaprotocol/types";
 var GraphQLQueryNode2 = class _GraphQLQueryNode extends Node {
   constructor(props) {
     super({
@@ -17824,12 +16250,10 @@ var GraphQLQueryNode2 = class _GraphQLQueryNode extends Node {
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    const input = extractInputFromProtobuf(raw.getGraphqlQuery()?.getInput());
     return new _GraphQLQueryNode({
       ...obj,
       type: NodeType5.GraphQLQuery,
-      data: raw.getGraphqlQuery().getConfig().toObject(),
-      input
+      data: raw.getGraphqlQuery().getConfig().toObject()
     });
   }
   toRequest() {
@@ -17839,10 +16263,6 @@ var GraphQLQueryNode2 = class _GraphQLQueryNode extends Node {
     const node = _GraphQLQueryNode.createProtobufNode(
       this.data
     );
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      node.setInput(inputValue);
-    }
     request.setGraphqlQuery(node);
     return request;
   }
@@ -17884,10 +16304,6 @@ var RestAPINode2 = class _RestAPINode extends Node {
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    let input = void 0;
-    if (raw.hasInput()) {
-      input = extractInputFromProtobuf(raw.getInput());
-    }
     return new _RestAPINode({
       ...obj,
       type: NodeType6.RestAPI,
@@ -17903,9 +16319,7 @@ var RestAPINode2 = class _RestAPINode extends Node {
           });
           return headers;
         })()
-      },
-      input
-      // Include input data from top-level TaskNode
+      }
     });
   }
   toRequest() {
@@ -17915,10 +16329,6 @@ var RestAPINode2 = class _RestAPINode extends Node {
     const nodeData = _RestAPINode.createProtobufNode(
       this.data
     );
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      request.setInput(inputValue);
-    }
     request.setRestApi(nodeData);
     return request;
   }
@@ -17966,6 +16376,9 @@ var ContractReadNode2 = class _ContractReadNode extends Node {
       if (methodCall.applyToFields) {
         methodCallMsg.setApplyToFieldsList(methodCall.applyToFields);
       }
+      if (methodCall.methodParams) {
+        methodCallMsg.setMethodParamsList(methodCall.methodParams);
+      }
       config.addMethodCalls(methodCallMsg);
     });
     node.setConfig(config);
@@ -17980,18 +16393,14 @@ var ContractReadNode2 = class _ContractReadNode extends Node {
       methodCalls: protobufData.methodCallsList?.map((call) => ({
         callData: call.callData,
         methodName: call.methodName,
-        applyToFields: call.applyToFieldsList || []
+        applyToFields: call.applyToFieldsList || [],
+        methodParams: call.methodParamsList || []
       })) || []
     };
-    let input = void 0;
-    if (raw.hasInput()) {
-      input = extractInputFromProtobuf(raw.getInput());
-    }
     return new _ContractReadNode({
       ...obj,
       type: NodeType7.ContractRead,
-      data,
-      input
+      data
     });
   }
   toRequest() {
@@ -18001,10 +16410,6 @@ var ContractReadNode2 = class _ContractReadNode extends Node {
     const node = _ContractReadNode.createProtobufNode(
       this.data
     );
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      request.setInput(inputValue);
-    }
     request.setContractRead(node);
     return request;
   }
@@ -18033,7 +16438,9 @@ var contractRead_default = ContractReadNode2;
 
 // src/models/node/ethTransfer.ts
 var avs_pb14 = __toESM(require_avs_pb());
-import { NodeType as NodeType8 } from "@avaprotocol/types";
+import {
+  NodeType as NodeType8
+} from "@avaprotocol/types";
 var ETHTransferNode2 = class _ETHTransferNode extends Node {
   constructor(props) {
     super({ ...props, type: NodeType8.ETHTransfer, data: props.data });
@@ -18053,12 +16460,11 @@ var ETHTransferNode2 = class _ETHTransferNode extends Node {
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    const input = extractInputFromProtobuf(raw.getEthTransfer()?.getInput());
+    const data = raw.getEthTransfer().getConfig().toObject();
     return new _ETHTransferNode({
       ...obj,
       type: NodeType8.ETHTransfer,
-      data: raw.getEthTransfer().getConfig().toObject(),
-      input
+      data
     });
   }
   toRequest() {
@@ -18068,10 +16474,6 @@ var ETHTransferNode2 = class _ETHTransferNode extends Node {
     const node = _ETHTransferNode.createProtobufNode(
       this.data
     );
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      node.setInput(inputValue);
-    }
     request.setEthTransfer(node);
     return request;
   }
@@ -18083,7 +16485,9 @@ var ETHTransferNode2 = class _ETHTransferNode extends Node {
 var ethTransfer_default = ETHTransferNode2;
 
 // src/models/node/branch.ts
-import { NodeType as NodeType9 } from "@avaprotocol/types";
+import {
+  NodeType as NodeType9
+} from "@avaprotocol/types";
 var avs_pb15 = __toESM(require_avs_pb());
 var BranchNode2 = class _BranchNode extends Node {
   constructor(props) {
@@ -18099,12 +16503,10 @@ var BranchNode2 = class _BranchNode extends Node {
         expression: condition.expression
       })) || []
     };
-    const input = extractInputFromProtobuf(raw.getBranch()?.getInput());
     return new _BranchNode({
       ...obj,
       type: NodeType9.Branch,
-      data,
-      input
+      data
     });
   }
   toRequest() {
@@ -18126,10 +16528,6 @@ var BranchNode2 = class _BranchNode extends Node {
       config.setConditionsList(conditionsList);
     }
     node.setConfig(config);
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      node.setInput(inputValue);
-    }
     request.setBranch(node);
     return request;
   }
@@ -18146,19 +16544,16 @@ var avs_pb16 = __toESM(require_avs_pb());
 import {
   NodeType as NodeType10
 } from "@avaprotocol/types";
-import { Value as Value2 } from "google-protobuf/google/protobuf/struct_pb";
 var FilterNode2 = class _FilterNode extends Node {
   constructor(props) {
     super({ ...props, type: NodeType10.Filter, data: props.data });
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    const input = extractInputFromProtobuf(raw.getFilter()?.getInput());
     return new _FilterNode({
       ...obj,
       type: NodeType10.Filter,
-      data: raw.getFilter().getConfig().toObject(),
-      input
+      data: raw.getFilter().getConfig().toObject()
     });
   }
   toRequest() {
@@ -18168,12 +16563,8 @@ var FilterNode2 = class _FilterNode extends Node {
     const node = new avs_pb16.FilterNode();
     const config = new avs_pb16.FilterNode.Config();
     config.setExpression(this.data.expression);
-    config.setSourceId(this.data.sourceId || "");
+    config.setInputNodeName(this.data.inputNodeName || "");
     node.setConfig(config);
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      node.setInput(inputValue);
-    }
     request.setFilter(node);
     return request;
   }
@@ -18186,11 +16577,16 @@ var FilterNode2 = class _FilterNode extends Node {
     if (!anyData) {
       throw new Error("FilterNode output data.getData() is missing");
     }
-    const value = Value2.deserializeBinary(anyData.getValue_asU8());
-    const result = value.toJavaScript();
-    if (result && typeof result === "object" && !Array.isArray(result) && result.data) {
+    const result = anyData.toJavaScript();
+    if (result && typeof result === "object" && !Array.isArray(result) && result.data && result.data.data && Array.isArray(result.data.data)) {
+      return result.data.data;
+    }
+    if (result && typeof result === "object" && !Array.isArray(result) && result.data && Array.isArray(result.data)) {
       return result.data;
     }
+    if (Array.isArray(result)) {
+      return result;
+    }
     throw new Error(
       "FilterNode output data does not contain expected data structure"
     );
@@ -18225,15 +16621,10 @@ var LoopNode2 = class _LoopNode extends Node {
         configData?.executionMode
       )
     };
-    let input = void 0;
-    if (raw.hasInput()) {
-      input = extractInputFromProtobuf(raw.getInput());
-    }
     return new _LoopNode({
       ...obj,
       type: NodeType11.Loop,
-      data,
-      input
+      data
     });
   }
   static extractRunnerFromProtobuf(loopNodeData) {
@@ -18291,16 +16682,12 @@ var LoopNode2 = class _LoopNode extends Node {
     node.setName(this.name);
     const data = this.data;
     const config = new avs_pb17.LoopNode.Config();
-    config.setSourceId(data.sourceId || "");
+    config.setInputNodeName(data.inputNodeName || "");
     config.setIterVal(data.iterVal || "");
     config.setIterKey(data.iterKey || "");
     const executionMode = this.mapExecutionModeToProtobuf(data.executionMode);
     config.setExecutionMode(executionMode);
     loopNode.setConfig(config);
-    const inputValue = convertInputToProtobuf(this.input);
-    if (inputValue) {
-      node.setInput(inputValue);
-    }
     if (data.runner) {
       this.setRunnerOnProtobuf(loopNode, data.runner);
     }
@@ -18308,86 +16695,72 @@ var LoopNode2 = class _LoopNode extends Node {
     return node;
   }
   setRunnerOnProtobuf(loopNode, runner) {
-    if (!runner || !runner.type || !runner.data) {
+    if (!runner || !runner.type) {
+      return;
+    }
+    const config = runner.config || runner.data && runner.data.config;
+    if (!config) {
       return;
     }
     switch (runner.type) {
       case "ethTransfer": {
-        const ethTransferData = runner.data;
-        if (ethTransferData.config) {
-          const ethConfig = ethTransferData.config;
-          const ethTransfer = ethTransfer_default.createProtobufNode({
-            destination: ethConfig.destination,
-            amount: ethConfig.amount
-          });
-          loopNode.setEthTransfer(ethTransfer);
-        }
+        const ethConfig = config;
+        const ethTransfer = ethTransfer_default.createProtobufNode({
+          destination: ethConfig.destination,
+          amount: ethConfig.amount
+        });
+        loopNode.setEthTransfer(ethTransfer);
         break;
       }
       case "contractWrite": {
-        const contractWriteData = runner.data;
-        if (contractWriteData.config) {
-          const writeConfig = contractWriteData.config;
-          const contractWrite = contractWrite_default.createProtobufNode({
-            contractAddress: writeConfig.contractAddress,
-            callData: writeConfig.callData,
-            contractAbi: writeConfig.contractAbi,
-            methodCalls: writeConfig.methodCallsList || []
-          });
-          loopNode.setContractWrite(contractWrite);
-        }
+        const writeConfig = config;
+        const contractWrite = contractWrite_default.createProtobufNode({
+          contractAddress: writeConfig.contractAddress,
+          callData: writeConfig.callData,
+          contractAbi: writeConfig.contractAbi,
+          methodCalls: writeConfig.methodCallsList || []
+        });
+        loopNode.setContractWrite(contractWrite);
         break;
       }
       case "contractRead": {
-        const contractReadData = runner.data;
-        if (contractReadData.config) {
-          const readConfig = contractReadData.config;
-          const contractRead = contractRead_default.createProtobufNode({
-            contractAddress: readConfig.contractAddress,
-            contractAbi: readConfig.contractAbi,
-            methodCalls: readConfig.methodCallsList || []
-          });
-          loopNode.setContractRead(contractRead);
-        }
+        const readConfig = config;
+        const contractRead = contractRead_default.createProtobufNode({
+          contractAddress: readConfig.contractAddress,
+          contractAbi: readConfig.contractAbi,
+          methodCalls: readConfig.methodCallsList || []
+        });
+        loopNode.setContractRead(contractRead);
         break;
       }
       case "graphqlDataQuery": {
-        const graphqlData = runner.data;
-        if (graphqlData.config) {
-          const gqlConfig = graphqlData.config;
-          const graphqlQuery = graphqlQuery_default.createProtobufNode({
-            url: gqlConfig.url,
-            query: gqlConfig.query,
-            variablesMap: gqlConfig.variablesMap
-          });
-          loopNode.setGraphqlDataQuery(graphqlQuery);
-        }
+        const gqlConfig = config;
+        const graphqlQuery = graphqlQuery_default.createProtobufNode({
+          url: gqlConfig.url,
+          query: gqlConfig.query,
+          variablesMap: gqlConfig.variablesMap
+        });
+        loopNode.setGraphqlDataQuery(graphqlQuery);
         break;
       }
       case "restApi": {
-        const restApiData = runner.data;
-        if (restApiData.config) {
-          const apiConfig = restApiData.config;
-          const restApi = restApi_default.createProtobufNode({
-            url: apiConfig.url,
-            method: apiConfig.method,
-            body: apiConfig.body || "",
-            headers: apiConfig.headers
-          });
-          loopNode.setRestApi(restApi);
-        }
+        const apiConfig = config;
+        const restApi = restApi_default.createProtobufNode({
+          url: apiConfig.url,
+          method: apiConfig.method,
+          body: apiConfig.body || "",
+          headers: apiConfig.headers
+        });
+        loopNode.setRestApi(restApi);
         break;
       }
       case "customCode": {
-        const customCodeData = runner.data;
-        if (customCodeData.config) {
-          const codeConfig = customCodeData.config;
-          const customCode = customCode_default.createProtobufNode({
-            lang: codeConfig.lang,
-            source: codeConfig.source
-          });
-          loopNode.setCustomCode(customCode);
-        }
+        const codeConfig = config;
+        const customCode = customCode_default.createProtobufNode({
+          lang: codeConfig.lang,
+          source: codeConfig.source
+        });
+        loopNode.setCustomCode(customCode);
         break;
       }
     }
@@ -18403,15 +16776,15 @@ var LoopNode2 = class _LoopNode extends Node {
     }
     const loopOutput = outputData.getLoop();
     if (loopOutput) {
-      const loopObj = loopOutput.toObject();
-      if (loopObj.data && typeof loopObj.data === "string") {
+      const dataValue = loopOutput.getData();
+      if (dataValue) {
         try {
-          return JSON.parse(loopObj.data);
-        } catch {
-          return loopObj.data;
+          return dataValue.toJavaScript();
+        } catch (error) {
+          console.warn("Failed to convert loop data from protobuf Value:", error);
+          return null;
         }
       }
-      return loopObj;
     }
     return null;
   }
@@ -18677,7 +17050,7 @@ var Step = class _Step {
     this.error = props.error;
     this.log = props.log;
     this.inputsList = props.inputsList;
-    this.input = props.input;
+    this.config = props.config;
     this.output = props.output;
     this.startAt = props.startAt;
     this.endAt = props.endAt;
@@ -18695,299 +17068,102 @@ var Step = class _Step {
       error: this.error,
       log: this.log,
       inputsList: this.inputsList,
-      input: this.input,
+      config: this.config,
       output: this.output,
       startAt: this.startAt,
       endAt: this.endAt
     };
   }
   static getOutput(step) {
-    const getOutputDataCase = () => {
-      if (typeof step.getOutputDataCase === "function") {
-        return step.getOutputDataCase();
-      }
-      const stepObj = step;
-      if (stepObj.blockTrigger)
-        return avs_pb20.Execution.Step.OutputDataCase.BLOCK_TRIGGER;
-      if (stepObj.fixedTimeTrigger)
-        return avs_pb20.Execution.Step.OutputDataCase.FIXED_TIME_TRIGGER;
-      if (stepObj.cronTrigger)
-        return avs_pb20.Execution.Step.OutputDataCase.CRON_TRIGGER;
-      if (stepObj.eventTrigger)
-        return avs_pb20.Execution.Step.OutputDataCase.EVENT_TRIGGER;
-      if (stepObj.manualTrigger)
-        return avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER;
-      if (stepObj.ethTransfer)
-        return avs_pb20.Execution.Step.OutputDataCase.ETH_TRANSFER;
-      if (stepObj.graphql) return avs_pb20.Execution.Step.OutputDataCase.GRAPHQL;
-      if (stepObj.contractRead)
-        return avs_pb20.Execution.Step.OutputDataCase.CONTRACT_READ;
-      if (stepObj.contractWrite)
-        return avs_pb20.Execution.Step.OutputDataCase.CONTRACT_WRITE;
-      if (stepObj.customCode)
-        return avs_pb20.Execution.Step.OutputDataCase.CUSTOM_CODE;
-      if (stepObj.restApi) return avs_pb20.Execution.Step.OutputDataCase.REST_API;
-      if (stepObj.branch) return avs_pb20.Execution.Step.OutputDataCase.BRANCH;
-      if (stepObj.filter) return avs_pb20.Execution.Step.OutputDataCase.FILTER;
-      if (stepObj.loop) return avs_pb20.Execution.Step.OutputDataCase.LOOP;
-      return avs_pb20.Execution.Step.OutputDataCase.OUTPUT_DATA_NOT_SET;
-    };
-    switch (getOutputDataCase()) {
-      case avs_pb20.Execution.Step.OutputDataCase.OUTPUT_DATA_NOT_SET:
-        return void 0;
-      // Trigger outputs
+    const outputData = this.extractOutputData(step);
+    if (!outputData) return null;
+    if (typeof outputData.hasData === "function" && outputData.hasData()) {
+      try {
+        return convertProtobufValueToJs(outputData.getData());
+      } catch (error) {
+        console.warn("Failed to convert protobuf Value to JavaScript:", error);
+        return outputData.getData();
+      }
+    } else if (outputData.data) {
+      return typeof outputData.data.getKindCase === "function" ? convertProtobufValueToJs(outputData.data) : outputData.data;
+    }
+    return null;
+  }
+  static extractOutputData(step) {
+    const outputCase = this.getOutputDataCase(step);
+    switch (outputCase) {
       case avs_pb20.Execution.Step.OutputDataCase.BLOCK_TRIGGER:
-        const blockTrigger = typeof step.getBlockTrigger === "function" ? step.getBlockTrigger()?.toObject() : step.blockTrigger;
-        return { data: blockTrigger };
-      // ✅ Use standard structure
+        return typeof step.getBlockTrigger === "function" ? step.getBlockTrigger() : step.blockTrigger;
       case avs_pb20.Execution.Step.OutputDataCase.FIXED_TIME_TRIGGER:
-        const fixedTimeTrigger = typeof step.getFixedTimeTrigger === "function" ? step.getFixedTimeTrigger()?.toObject() : step.fixedTimeTrigger;
-        return { data: fixedTimeTrigger };
-      // ✅ Use standard structure
+        return typeof step.getFixedTimeTrigger === "function" ? step.getFixedTimeTrigger() : step.fixedTimeTrigger;
       case avs_pb20.Execution.Step.OutputDataCase.CRON_TRIGGER:
-        const cronTrigger = typeof step.getCronTrigger === "function" ? step.getCronTrigger()?.toObject() : step.cronTrigger;
-        return { data: cronTrigger };
-      // ✅ Use standard structure
+        return typeof step.getCronTrigger === "function" ? step.getCronTrigger() : step.cronTrigger;
       case avs_pb20.Execution.Step.OutputDataCase.EVENT_TRIGGER:
-        const eventTrigger = typeof step.getEventTrigger === "function" ? step.getEventTrigger() : step.eventTrigger;
-        if (eventTrigger) {
-          if (typeof eventTrigger.hasData === "function" && eventTrigger.hasData()) {
-            try {
-              const eventData = convertProtobufValueToJs(
-                eventTrigger.getData()
-              );
-              return { data: eventData };
-            } catch (error) {
-              console.warn(
-                "Failed to convert event trigger data from protobuf Value:",
-                error
-              );
-              return { data: eventTrigger.getData() };
-            }
-          } else if (eventTrigger.data) {
-            const eventData = typeof eventTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(eventTrigger.data) : eventTrigger.data;
-            return { data: eventData };
-          }
-          if (typeof eventTrigger.hasEvmLog === "function" && eventTrigger.hasEvmLog()) {
-            return { data: eventTrigger.getEvmLog()?.toObject() };
-          } else if (typeof eventTrigger.hasTransferLog === "function" && eventTrigger.hasTransferLog()) {
-            return { data: eventTrigger.getTransferLog()?.toObject() };
-          } else if (eventTrigger.evmLog) {
-            return { data: eventTrigger.evmLog };
-          } else if (eventTrigger.transferLog) {
-            return { data: eventTrigger.transferLog };
-          }
-        }
-        return { data: null };
-      // ✅ Use standard structure
-      case avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER: {
-        const manualTrigger = typeof step.getManualTrigger === "function" ? step.getManualTrigger() : step.manualTrigger;
-        if (manualTrigger) {
-          if (typeof manualTrigger.hasData === "function" && manualTrigger.hasData()) {
-            try {
-              return convertProtobufValueToJs(manualTrigger.getData());
-            } catch (error) {
-              console.warn(
-                "Failed to convert manual trigger data from protobuf Value:",
-                error
-              );
-              return manualTrigger.getData();
-            }
-          } else if (manualTrigger.data) {
-            return typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
-          }
-        }
-        return null;
-      }
-      // Node outputs - RESTORE MISSING CASES
+        return typeof step.getEventTrigger === "function" ? step.getEventTrigger() : step.eventTrigger;
+      case avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER:
+        return typeof step.getManualTrigger === "function" ? step.getManualTrigger() : step.manualTrigger;
       case avs_pb20.Execution.Step.OutputDataCase.ETH_TRANSFER:
-        return typeof step.getEthTransfer === "function" ? step.getEthTransfer()?.toObject() : step.ethTransfer;
-      case avs_pb20.Execution.Step.OutputDataCase.CUSTOM_CODE: {
-        const customCodeOutput = typeof step.getCustomCode === "function" ? step.getCustomCode() : step.customCode;
-        if (customCodeOutput) {
-          if (typeof customCodeOutput.hasData === "function" && customCodeOutput.hasData()) {
-            try {
-              return convertProtobufValueToJs(customCodeOutput.getData());
-            } catch {
-              return customCodeOutput.getData();
-            }
-          } else if (customCodeOutput.data) {
-            return typeof customCodeOutput.data.getKindCase === "function" ? convertProtobufValueToJs(customCodeOutput.data) : customCodeOutput.data;
-          }
-        }
-        return void 0;
-      }
-      case avs_pb20.Execution.Step.OutputDataCase.REST_API: {
-        const restApiOutput = typeof step.getRestApi === "function" ? step.getRestApi() : step.restApi;
-        if (restApiOutput) {
-          if (typeof restApiOutput.hasData === "function" && restApiOutput.hasData()) {
-            try {
-              return convertProtobufValueToJs(restApiOutput.getData());
-            } catch {
-              return restApiOutput.getData();
-            }
-          } else if (restApiOutput.data) {
-            return typeof restApiOutput.data.getKindCase === "function" ? convertProtobufValueToJs(restApiOutput.data) : restApiOutput.data;
-          }
-        }
-        return void 0;
-      }
+        return typeof step.getEthTransfer === "function" ? step.getEthTransfer() : step.ethTransfer;
+      case avs_pb20.Execution.Step.OutputDataCase.GRAPHQL:
+        return typeof step.getGraphql === "function" ? step.getGraphql() : step.graphql;
+      case avs_pb20.Execution.Step.OutputDataCase.CONTRACT_READ:
+        return typeof step.getContractRead === "function" ? step.getContractRead() : step.contractRead;
+      case avs_pb20.Execution.Step.OutputDataCase.CONTRACT_WRITE:
+        return typeof step.getContractWrite === "function" ? step.getContractWrite() : step.contractWrite;
+      case avs_pb20.Execution.Step.OutputDataCase.CUSTOM_CODE:
+        return typeof step.getCustomCode === "function" ? step.getCustomCode() : step.customCode;
+      case avs_pb20.Execution.Step.OutputDataCase.REST_API:
+        return typeof step.getRestApi === "function" ? step.getRestApi() : step.restApi;
       case avs_pb20.Execution.Step.OutputDataCase.BRANCH:
-        return typeof step.getBranch === "function" ? step.getBranch()?.toObject() : step.branch;
-      case avs_pb20.Execution.Step.OutputDataCase.LOOP: {
-        const loopOutput = typeof step.getLoop === "function" ? step.getLoop() : step.loop;
-        if (loopOutput) {
-          if (typeof loopOutput.getData === "function" && loopOutput.getData()) {
-            try {
-              return JSON.parse(loopOutput.getData());
-            } catch {
-              return loopOutput.getData();
-            }
-          } else if (loopOutput.data) {
-            try {
-              return typeof loopOutput.data === "string" ? JSON.parse(loopOutput.data) : loopOutput.data;
-            } catch {
-              return loopOutput.data;
-            }
-          }
-        }
-        return void 0;
-      }
-      case avs_pb20.Execution.Step.OutputDataCase.GRAPHQL: {
-        const graphqlOutput = typeof step.getGraphql === "function" ? step.getGraphql() : step.graphql;
-        if (graphqlOutput) {
-          try {
-            return typeof graphqlOutput.toObject === "function" ? graphqlOutput.toObject() : graphqlOutput;
-          } catch {
-            return void 0;
-          }
-        }
-        return void 0;
-      }
-      case avs_pb20.Execution.Step.OutputDataCase.CONTRACT_READ: {
-        const contractReadOutput = typeof step.getContractRead === "function" ? step.getContractRead() : step.contractRead;
-        if (contractReadOutput) {
-          if (typeof contractReadOutput.hasData === "function" && contractReadOutput.hasData()) {
-            try {
-              const data = convertProtobufValueToJs(
-                contractReadOutput.getData()
-              );
-              if (Array.isArray(data)) {
-                return data;
-              } else {
-                return [data];
-              }
-            } catch (error) {
-              console.warn(
-                "Failed to convert contract read data from protobuf Value:",
-                error
-              );
-              return contractReadOutput.getData();
-            }
-          } else if (contractReadOutput.data) {
-            const data = typeof contractReadOutput.data.getKindCase === "function" ? convertProtobufValueToJs(contractReadOutput.data) : contractReadOutput.data;
-            if (Array.isArray(data)) {
-              return data;
-            } else {
-              return [data];
-            }
-          }
-          const outputObj = typeof contractReadOutput.toObject === "function" ? contractReadOutput.toObject() : contractReadOutput;
-          if (outputObj && outputObj.resultsList) {
-            return outputObj.resultsList.map((result) => ({
-              methodName: result.methodName,
-              success: result.success,
-              error: result.error,
-              data: result.dataList || []
-            }));
-          }
-          return outputObj;
-        }
-        return void 0;
-      }
-      case avs_pb20.Execution.Step.OutputDataCase.CONTRACT_WRITE: {
-        const contractWriteOutput = typeof step.getContractWrite === "function" ? step.getContractWrite() : step.contractWrite;
-        if (contractWriteOutput) {
-          if (typeof contractWriteOutput.hasData === "function" && contractWriteOutput.hasData()) {
-            try {
-              const data = convertProtobufValueToJs(
-                contractWriteOutput.getData()
-              );
-              if (Array.isArray(data)) {
-                return data;
-              } else {
-                return [data];
-              }
-            } catch (error) {
-              console.warn(
-                "Failed to convert contract write data from protobuf Value:",
-                error
-              );
-              return contractWriteOutput.getData();
-            }
-          } else if (contractWriteOutput.data) {
-            const data = typeof contractWriteOutput.data.getKindCase === "function" ? convertProtobufValueToJs(contractWriteOutput.data) : contractWriteOutput.data;
-            if (Array.isArray(data)) {
-              return data;
-            } else {
-              return [data];
-            }
-          }
-          const outputObj = typeof contractWriteOutput.toObject === "function" ? contractWriteOutput.toObject() : contractWriteOutput;
-          if (outputObj && outputObj.resultsList) {
-            return outputObj.resultsList.map((result) => ({
-              methodName: result.methodName,
-              success: result.success,
-              error: result.error,
-              transaction: result.transaction,
-              events: result.eventsList || [],
-              returnData: result.returnData,
-              inputData: result.inputData
-            }));
-          }
-          return outputObj;
-        }
-        return void 0;
-      }
-      case avs_pb20.Execution.Step.OutputDataCase.FILTER: {
-        const filterOutput = typeof step.getFilter === "function" ? step.getFilter() : step.filter;
-        if (filterOutput) {
-          try {
-            return typeof filterOutput.toObject === "function" ? filterOutput.toObject() : filterOutput;
-          } catch {
-            return void 0;
-          }
-        }
-        return void 0;
-      }
+        return typeof step.getBranch === "function" ? step.getBranch() : step.branch;
+      case avs_pb20.Execution.Step.OutputDataCase.FILTER:
+        return typeof step.getFilter === "function" ? step.getFilter() : step.filter;
+      case avs_pb20.Execution.Step.OutputDataCase.LOOP:
+        return typeof step.getLoop === "function" ? step.getLoop() : step.loop;
       default:
-        console.warn(
-          `Unhandled output data type in Step.getOutput: ${step.getOutputDataCase()}`
-        );
-        return void 0;
+        return null;
     }
   }
+  static getOutputDataCase(step) {
+    if (typeof step.getOutputDataCase === "function") {
+      return step.getOutputDataCase();
+    }
+    const stepObj = step;
+    if (stepObj.blockTrigger)
+      return avs_pb20.Execution.Step.OutputDataCase.BLOCK_TRIGGER;
+    if (stepObj.fixedTimeTrigger)
+      return avs_pb20.Execution.Step.OutputDataCase.FIXED_TIME_TRIGGER;
+    if (stepObj.cronTrigger)
+      return avs_pb20.Execution.Step.OutputDataCase.CRON_TRIGGER;
+    if (stepObj.eventTrigger)
+      return avs_pb20.Execution.Step.OutputDataCase.EVENT_TRIGGER;
+    if (stepObj.manualTrigger)
+      return avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER;
+    if (stepObj.ethTransfer)
+      return avs_pb20.Execution.Step.OutputDataCase.ETH_TRANSFER;
+    if (stepObj.graphql) return avs_pb20.Execution.Step.OutputDataCase.GRAPHQL;
+    if (stepObj.contractRead)
+      return avs_pb20.Execution.Step.OutputDataCase.CONTRACT_READ;
+    if (stepObj.contractWrite)
+      return avs_pb20.Execution.Step.OutputDataCase.CONTRACT_WRITE;
+    if (stepObj.customCode)
+      return avs_pb20.Execution.Step.OutputDataCase.CUSTOM_CODE;
+    if (stepObj.restApi) return avs_pb20.Execution.Step.OutputDataCase.REST_API;
+    if (stepObj.branch) return avs_pb20.Execution.Step.OutputDataCase.BRANCH;
+    if (stepObj.filter) return avs_pb20.Execution.Step.OutputDataCase.FILTER;
+    if (stepObj.loop) return avs_pb20.Execution.Step.OutputDataCase.LOOP;
+    return avs_pb20.Execution.Step.OutputDataCase.OUTPUT_DATA_NOT_SET;
+  }
   static fromResponse(step) {
-    let inputData = void 0;
-    if (typeof step.hasInput === "function" && step.hasInput()) {
-      const inputValue = step.getInput();
-      if (inputValue) {
+    let configData = void 0;
+    if (typeof step.hasConfig === "function" && step.hasConfig()) {
+      const configValue = step.getConfig();
+      if (configValue) {
         try {
-          inputData = convertProtobufValueToJs(inputValue);
+          configData = convertProtobufValueToJs(configValue);
         } catch (error) {
           console.warn("Failed to convert protobuf input value:", error);
-          inputData = inputValue;
-        }
-      }
-    } else if (step.input) {
-      const inputValue = step.input;
-      if (typeof inputValue === "object" && !inputValue.getKindCase) {
-        inputData = inputValue;
-      } else {
-        try {
-          inputData = convertProtobufValueToJs(inputValue);
-        } catch (error) {
-          inputData = inputValue;
+          configData = configValue;
         }
       }
     }
@@ -19008,7 +17184,7 @@ var Step = class _Step {
       error: getError(),
       log: getLog(),
       inputsList: getInputsList(),
-      input: inputData,
+      config: configData,
       output: _Step.getOutput(step),
       startAt: getStartAt(),
       endAt: getEndAt()
@@ -19096,6 +17272,7 @@ import {
   DEFAULT_LIMIT,
   TimeoutPresets
 } from "@avaprotocol/types";
+import * as google_protobuf_struct_pb from "google-protobuf/google/protobuf/struct_pb";
 import {
   TimeoutPresets as TimeoutPresets2
 } from "@avaprotocol/types";
@@ -19628,30 +17805,43 @@ var Client = class extends BaseClient {
     switch (triggerData.type) {
       case TriggerType13.FixedTime: {
         const fixedTimeOutput = new avs_pb22.FixedTimeTrigger.Output();
-        fixedTimeOutput.setTimestamp(triggerData.timestamp);
-        fixedTimeOutput.setTimestampIso(triggerData.timestampIso);
+        const triggerOutputData = {
+          timestamp: triggerData.timestamp,
+          timestampIso: triggerData.timestampIso
+        };
+        const dataValue = new google_protobuf_struct_pb.Value();
+        dataValue.setStructValue(google_protobuf_struct_pb.Struct.fromJavaScript(triggerOutputData));
+        fixedTimeOutput.setData(dataValue);
         request.setFixedTimeTrigger(fixedTimeOutput);
         break;
       }
       case TriggerType13.Cron: {
         const cronOutput = new avs_pb22.CronTrigger.Output();
-        cronOutput.setTimestamp(triggerData.timestamp);
-        cronOutput.setTimestampIso(triggerData.timestampIso);
+        const triggerOutputData = {
+          timestamp: triggerData.timestamp,
+          timestampIso: triggerData.timestampIso
+        };
+        const dataValue = new google_protobuf_struct_pb.Value();
+        dataValue.setStructValue(google_protobuf_struct_pb.Struct.fromJavaScript(triggerOutputData));
+        cronOutput.setData(dataValue);
         request.setCronTrigger(cronOutput);
         break;
       }
       case TriggerType13.Block: {
         const blockData = triggerData;
         const blockOutput = new avs_pb22.BlockTrigger.Output();
-        blockOutput.setBlockNumber(blockData.blockNumber);
-        if (blockData.blockHash) blockOutput.setBlockHash(blockData.blockHash);
-        if (blockData.timestamp) blockOutput.setTimestamp(blockData.timestamp);
-        if (blockData.parentHash)
-          blockOutput.setParentHash(blockData.parentHash);
-        if (blockData.difficulty)
-          blockOutput.setDifficulty(blockData.difficulty);
-        if (blockData.gasLimit) blockOutput.setGasLimit(blockData.gasLimit);
-        if (blockData.gasUsed) blockOutput.setGasUsed(blockData.gasUsed);
+        const triggerOutputData = {
+          blockNumber: blockData.blockNumber,
+          blockHash: blockData.blockHash || "",
+          timestamp: blockData.timestamp || 0,
+          parentHash: blockData.parentHash || "",
+          difficulty: blockData.difficulty || "",
+          gasLimit: blockData.gasLimit || 0,
+          gasUsed: blockData.gasUsed || 0
+        };
+        const dataValue = new google_protobuf_struct_pb.Value();
+        dataValue.setStructValue(google_protobuf_struct_pb.Struct.fromJavaScript(triggerOutputData));
+        blockOutput.setData(dataValue);
         request.setBlockTrigger(blockOutput);
         break;
       }
@@ -19672,18 +17862,6 @@ var Client = class extends BaseClient {
           const protobufValue = convertJSValueToProtobuf(manualData.data);
           manualOutput.setData(protobufValue);
         }
-        if (manualData.headers) {
-          const headersMap = manualOutput.getHeadersMap();
-          Object.entries(manualData.headers).forEach(([key, value]) => {
-            headersMap.set(key, value);
-          });
-        }
-        if (manualData.pathParams) {
-          const pathParamsMap = manualOutput.getPathparamsMap();
-          Object.entries(manualData.pathParams).forEach(([key, value]) => {
-            pathParamsMap.set(key, value);
-          });
-        }
         request.setManualTrigger(manualOutput);
         break;
       }
@@ -19950,23 +18128,14 @@ var Client = class extends BaseClient {
     let metadata = void 0;
     const metadataValue = result.getMetadata();
     if (metadataValue) {
-      if (typeof metadataValue === "string") {
-        try {
-          metadata = JSON.parse(metadataValue);
-        } catch (parseError) {
-          console.warn("Failed to parse metadata as JSON:", parseError);
-          metadata = metadataValue;
-        }
-      } else {
-        try {
-          metadata = convertProtobufValueToJs(metadataValue);
-        } catch (error) {
-          console.warn(
-            "Failed to convert metadata from protobuf Value:",
-            error
-          );
-          metadata = metadataValue;
-        }
+      try {
+        metadata = convertProtobufValueToJs(metadataValue);
+      } catch (error) {
+        console.warn(
+          "Failed to convert metadata from protobuf Value:",
+          error
+        );
+        metadata = metadataValue;
       }
     }
     return {