@avaprotocol/sdk-js 2.0.4 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @avaprotocol/sdk-js
 
+## 2.1.0
+
+### Minor Changes
+
+- 2fe0498: Update interface of event trigger to use queries
+
 ## 2.0.4
 
 ### Patch Changes

package/dist/auth.d.ts

@@ -0,0 +1,2 @@
+export declare const getKeyRequestMessage: (chainId: number, address: string, issuedAt: Date, expiredAt: Date) => string;
+//# sourceMappingURL=auth.d.ts.map

package/dist/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,UAAU,IAAI,EAAE,WAAW,IAAI,KAAG,MAUxG,CAAA"}

package/dist/auth.js

@@ -0,0 +1,10 @@
+export const getKeyRequestMessage = (chainId, address, issuedAt, expiredAt) => {
+    return `Please sign the below text for ownership verification.
+
+URI: https://app.avaprotocol.org
+Chain ID: ${chainId}
+Version: 1
+Issued At: ${issuedAt.toISOString()}
+Expire At: ${expiredAt.toISOString()}
+Wallet: ${address}`;
+};

package/dist/config.d.ts

@@ -0,0 +1,9 @@
+import { Environment } from "@avaprotocol/types";
+export declare const DEFAULT_JWT_EXPIRATION: number;
+interface Config {
+    AVS_RPC_URL: string;
+}
+declare const configs: Record<Environment, Config>;
+export declare function getRpcEndpoint(env: Environment): string;
+export { configs };
+//# sourceMappingURL=config.d.ts.map

package/dist/index.js

@@ -86,9 +86,10 @@ var require_avs_pb = __commonJS({
     goog.exportSymbol("proto.aggregator.Error", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.Config", null, global);
-    goog.exportSymbol("proto.aggregator.EventTrigger.Matcher", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.Output", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.Output.OutputTypeCase", null, global);
+    goog.exportSymbol("proto.aggregator.EventTrigger.Query", null, global);
+    goog.exportSymbol("proto.aggregator.EventTrigger.Topics", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.TransferLogOutput", null, global);
     goog.exportSymbol("proto.aggregator.Evm", null, global);
     goog.exportSymbol("proto.aggregator.Evm.Log", null, global);
@@ -267,12 +268,19 @@ var require_avs_pb = __commonJS({
     if (goog.DEBUG && !COMPILED) {
       proto.aggregator.EventTrigger.displayName = "proto.aggregator.EventTrigger";
     }
-    proto.aggregator.EventTrigger.Matcher = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Matcher.repeatedFields_, null);
+    proto.aggregator.EventTrigger.Query = function(opt_data) {
+      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Query.repeatedFields_, null);
     };
-    goog.inherits(proto.aggregator.EventTrigger.Matcher, jspb.Message);
+    goog.inherits(proto.aggregator.EventTrigger.Query, jspb.Message);
     if (goog.DEBUG && !COMPILED) {
-      proto.aggregator.EventTrigger.Matcher.displayName = "proto.aggregator.EventTrigger.Matcher";
+      proto.aggregator.EventTrigger.Query.displayName = "proto.aggregator.EventTrigger.Query";
+    }
+    proto.aggregator.EventTrigger.Topics = function(opt_data) {
+      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Topics.repeatedFields_, null);
+    };
+    goog.inherits(proto.aggregator.EventTrigger.Topics, jspb.Message);
+    if (goog.DEBUG && !COMPILED) {
+      proto.aggregator.EventTrigger.Topics.displayName = "proto.aggregator.EventTrigger.Topics";
     }
     proto.aggregator.EventTrigger.Config = function(opt_data) {
       jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Config.repeatedFields_, null);
@@ -2089,15 +2097,20 @@ var require_avs_pb = __commonJS({
         );
       }
     };
-    proto.aggregator.EventTrigger.Matcher.repeatedFields_ = [2];
+    proto.aggregator.EventTrigger.Query.repeatedFields_ = [1, 2];
     if (jspb.Message.GENERATE_TO_OBJECT) {
-      proto.aggregator.EventTrigger.Matcher.prototype.toObject = function(opt_includeInstance) {
-        return proto.aggregator.EventTrigger.Matcher.toObject(opt_includeInstance, this);
+      proto.aggregator.EventTrigger.Query.prototype.toObject = function(opt_includeInstance) {
+        return proto.aggregator.EventTrigger.Query.toObject(opt_includeInstance, this);
       };
-      proto.aggregator.EventTrigger.Matcher.toObject = function(includeInstance, msg) {
+      proto.aggregator.EventTrigger.Query.toObject = function(includeInstance, msg) {
         var f, obj = {
-          type: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          valueList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? void 0 : f
+          addressesList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? void 0 : f,
+          topicsList: jspb.Message.toObjectList(
+            msg.getTopicsList(),
+            proto.aggregator.EventTrigger.Topics.toObject,
+            includeInstance
+          ),
+          maxEventsPerBlock: jspb.Message.getFieldWithDefault(msg, 3, 0)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -2105,12 +2118,12 @@ var require_avs_pb = __commonJS({
         return obj;
       };
     }
-    proto.aggregator.EventTrigger.Matcher.deserializeBinary = function(bytes) {
+    proto.aggregator.EventTrigger.Query.deserializeBinary = function(bytes) {
       var reader = new jspb.BinaryReader(bytes);
-      var msg = new proto.aggregator.EventTrigger.Matcher();
-      return proto.aggregator.EventTrigger.Matcher.deserializeBinaryFromReader(msg, reader);
+      var msg = new proto.aggregator.EventTrigger.Query();
+      return proto.aggregator.EventTrigger.Query.deserializeBinaryFromReader(msg, reader);
     };
-    proto.aggregator.EventTrigger.Matcher.deserializeBinaryFromReader = function(msg, reader) {
+    proto.aggregator.EventTrigger.Query.deserializeBinaryFromReader = function(msg, reader) {
       while (reader.nextField()) {
         if (reader.isEndGroup()) {
           break;
@@ -2122,14 +2135,19 @@ var require_avs_pb = __commonJS({
               /** @type {string} */
               reader.readString()
             );
-            msg.setType(value);
+            msg.addAddresses(value);
             break;
           case 2:
+            var value = new proto.aggregator.EventTrigger.Topics();
+            reader.readMessage(value, proto.aggregator.EventTrigger.Topics.deserializeBinaryFromReader);
+            msg.addTopics(value);
+            break;
+          case 3:
             var value = (
-              /** @type {string} */
-              reader.readString()
+              /** @type {number} */
+              reader.readUint32()
             );
-            msg.addValue(value);
+            msg.setMaxEventsPerBlock(value);
             break;
           default:
             reader.skipField();
@@ -2138,51 +2156,152 @@ var require_avs_pb = __commonJS({
       }
       return msg;
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.serializeBinary = function() {
+    proto.aggregator.EventTrigger.Query.prototype.serializeBinary = function() {
       var writer = new jspb.BinaryWriter();
-      proto.aggregator.EventTrigger.Matcher.serializeBinaryToWriter(this, writer);
+      proto.aggregator.EventTrigger.Query.serializeBinaryToWriter(this, writer);
       return writer.getResultBuffer();
     };
-    proto.aggregator.EventTrigger.Matcher.serializeBinaryToWriter = function(message, writer) {
+    proto.aggregator.EventTrigger.Query.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getType();
+      f = message.getAddressesList();
       if (f.length > 0) {
-        writer.writeString(
+        writer.writeRepeatedString(
           1,
           f
         );
       }
-      f = message.getValueList();
+      f = message.getTopicsList();
       if (f.length > 0) {
-        writer.writeRepeatedString(
+        writer.writeRepeatedMessage(
           2,
+          f,
+          proto.aggregator.EventTrigger.Topics.serializeBinaryToWriter
+        );
+      }
+      f = /** @type {number} */
+      jspb.Message.getField(message, 3);
+      if (f != null) {
+        writer.writeUint32(
+          3,
           f
         );
       }
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.getType = function() {
+    proto.aggregator.EventTrigger.Query.prototype.getAddressesList = function() {
       return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
+        /** @type {!Array<string>} */
+        jspb.Message.getRepeatedField(this, 1)
       );
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.setType = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
+    proto.aggregator.EventTrigger.Query.prototype.setAddressesList = function(value) {
+      return jspb.Message.setField(this, 1, value || []);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.addAddresses = function(value, opt_index) {
+      return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.clearAddressesList = function() {
+      return this.setAddressesList([]);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.getTopicsList = function() {
+      return (
+        /** @type{!Array<!proto.aggregator.EventTrigger.Topics>} */
+        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventTrigger.Topics, 2)
+      );
+    };
+    proto.aggregator.EventTrigger.Query.prototype.setTopicsList = function(value) {
+      return jspb.Message.setRepeatedWrapperField(this, 2, value);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.addTopics = function(opt_value, opt_index) {
+      return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.aggregator.EventTrigger.Topics, opt_index);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.clearTopicsList = function() {
+      return this.setTopicsList([]);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.getMaxEventsPerBlock = function() {
+      return (
+        /** @type {number} */
+        jspb.Message.getFieldWithDefault(this, 3, 0)
+      );
+    };
+    proto.aggregator.EventTrigger.Query.prototype.setMaxEventsPerBlock = function(value) {
+      return jspb.Message.setField(this, 3, value);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.clearMaxEventsPerBlock = function() {
+      return jspb.Message.setField(this, 3, void 0);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.hasMaxEventsPerBlock = function() {
+      return jspb.Message.getField(this, 3) != null;
+    };
+    proto.aggregator.EventTrigger.Topics.repeatedFields_ = [1];
+    if (jspb.Message.GENERATE_TO_OBJECT) {
+      proto.aggregator.EventTrigger.Topics.prototype.toObject = function(opt_includeInstance) {
+        return proto.aggregator.EventTrigger.Topics.toObject(opt_includeInstance, this);
+      };
+      proto.aggregator.EventTrigger.Topics.toObject = function(includeInstance, msg) {
+        var f, obj = {
+          valuesList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? void 0 : f
+        };
+        if (includeInstance) {
+          obj.$jspbMessageInstance = msg;
+        }
+        return obj;
+      };
+    }
+    proto.aggregator.EventTrigger.Topics.deserializeBinary = function(bytes) {
+      var reader = new jspb.BinaryReader(bytes);
+      var msg = new proto.aggregator.EventTrigger.Topics();
+      return proto.aggregator.EventTrigger.Topics.deserializeBinaryFromReader(msg, reader);
+    };
+    proto.aggregator.EventTrigger.Topics.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.addValues(value);
+            break;
+          default:
+            reader.skipField();
+            break;
+        }
+      }
+      return msg;
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.getValueList = function() {
+    proto.aggregator.EventTrigger.Topics.prototype.serializeBinary = function() {
+      var writer = new jspb.BinaryWriter();
+      proto.aggregator.EventTrigger.Topics.serializeBinaryToWriter(this, writer);
+      return writer.getResultBuffer();
+    };
+    proto.aggregator.EventTrigger.Topics.serializeBinaryToWriter = function(message, writer) {
+      var f = void 0;
+      f = message.getValuesList();
+      if (f.length > 0) {
+        writer.writeRepeatedString(
+          1,
+          f
+        );
+      }
+    };
+    proto.aggregator.EventTrigger.Topics.prototype.getValuesList = function() {
       return (
         /** @type {!Array<string>} */
-        jspb.Message.getRepeatedField(this, 2)
+        jspb.Message.getRepeatedField(this, 1)
       );
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.setValueList = function(value) {
-      return jspb.Message.setField(this, 2, value || []);
+    proto.aggregator.EventTrigger.Topics.prototype.setValuesList = function(value) {
+      return jspb.Message.setField(this, 1, value || []);
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.addValue = function(value, opt_index) {
-      return jspb.Message.addToRepeatedField(this, 2, value, opt_index);
+    proto.aggregator.EventTrigger.Topics.prototype.addValues = function(value, opt_index) {
+      return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.clearValueList = function() {
-      return this.setValueList([]);
+    proto.aggregator.EventTrigger.Topics.prototype.clearValuesList = function() {
+      return this.setValuesList([]);
     };
     proto.aggregator.EventTrigger.Config.repeatedFields_ = [1];
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -2191,12 +2310,11 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.EventTrigger.Config.toObject = function(includeInstance, msg) {
         var f, obj = {
-          matcherList: jspb.Message.toObjectList(
-            msg.getMatcherList(),
-            proto.aggregator.EventTrigger.Matcher.toObject,
+          queriesList: jspb.Message.toObjectList(
+            msg.getQueriesList(),
+            proto.aggregator.EventTrigger.Query.toObject,
             includeInstance
-          ),
-          expression: jspb.Message.getFieldWithDefault(msg, 2, "")
+          )
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -2217,16 +2335,9 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = new proto.aggregator.EventTrigger.Matcher();
-            reader.readMessage(value, proto.aggregator.EventTrigger.Matcher.deserializeBinaryFromReader);
-            msg.addMatcher(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setExpression(value);
+            var value = new proto.aggregator.EventTrigger.Query();
+            reader.readMessage(value, proto.aggregator.EventTrigger.Query.deserializeBinaryFromReader);
+            msg.addQueries(value);
             break;
           default:
             reader.skipField();
@@ -2242,45 +2353,29 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.EventTrigger.Config.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getMatcherList();
+      f = message.getQueriesList();
       if (f.length > 0) {
         writer.writeRepeatedMessage(
           1,
           f,
-          proto.aggregator.EventTrigger.Matcher.serializeBinaryToWriter
-        );
-      }
-      f = message.getExpression();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
+          proto.aggregator.EventTrigger.Query.serializeBinaryToWriter
         );
       }
     };
-    proto.aggregator.EventTrigger.Config.prototype.getMatcherList = function() {
+    proto.aggregator.EventTrigger.Config.prototype.getQueriesList = function() {
       return (
-        /** @type{!Array<!proto.aggregator.EventTrigger.Matcher>} */
-        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventTrigger.Matcher, 1)
+        /** @type{!Array<!proto.aggregator.EventTrigger.Query>} */
+        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventTrigger.Query, 1)
       );
     };
-    proto.aggregator.EventTrigger.Config.prototype.setMatcherList = function(value) {
+    proto.aggregator.EventTrigger.Config.prototype.setQueriesList = function(value) {
       return jspb.Message.setRepeatedWrapperField(this, 1, value);
     };
-    proto.aggregator.EventTrigger.Config.prototype.addMatcher = function(opt_value, opt_index) {
-      return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.EventTrigger.Matcher, opt_index);
-    };
-    proto.aggregator.EventTrigger.Config.prototype.clearMatcherList = function() {
-      return this.setMatcherList([]);
-    };
-    proto.aggregator.EventTrigger.Config.prototype.getExpression = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
+    proto.aggregator.EventTrigger.Config.prototype.addQueries = function(opt_value, opt_index) {
+      return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.EventTrigger.Query, opt_index);
     };
-    proto.aggregator.EventTrigger.Config.prototype.setExpression = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
+    proto.aggregator.EventTrigger.Config.prototype.clearQueriesList = function() {
+      return this.setQueriesList([]);
     };
     proto.aggregator.EventTrigger.Output.oneofGroups_ = [[1, 2]];
     proto.aggregator.EventTrigger.Output.OutputTypeCase = {
@@ -14614,7 +14709,6 @@ var CronTrigger2 = class _CronTrigger extends interface_default {
 var cron_default = CronTrigger2;
 
 // src/models/trigger/event.ts
-var _ = __toESM(require("lodash"));
 var avs_pb4 = __toESM(require_avs_pb());
 var import_types3 = require("@avaprotocol/types");
 var EventTrigger2 = class _EventTrigger extends interface_default {
@@ -14630,45 +14724,66 @@ var EventTrigger2 = class _EventTrigger extends interface_default {
       throw new Error(`Trigger data is missing for ${this.type}`);
     }
     const trigger = new avs_pb4.EventTrigger();
-    const dataConfig = this.data;
     const config = new avs_pb4.EventTrigger.Config();
-    const expression = dataConfig.expression;
-    const matcherList = dataConfig.matcherList;
-    if (_.isUndefined(expression) || _.isNull(expression)) {
-      throw new Error(`Expression is undefined for ${this.type}`);
-    }
-    config.setExpression(expression);
-    if (matcherList && matcherList.length > 0) {
-      const matchers = matcherList.map((element) => {
-        const m = new avs_pb4.EventTrigger.Matcher();
-        m.setType(element.type);
-        m.setValueList(element.valueList || []);
-        return m;
-      });
-      config.setMatcherList(matchers);
-    }
+    const dataConfig = this.data;
+    const queries = dataConfig.queriesList;
+    if (!queries || queries.length === 0) {
+      throw new Error(`Queries array is required for ${this.type}`);
+    }
+    const queryMessages = queries.map((queryData) => {
+      const query = new avs_pb4.EventTrigger.Query();
+      if (queryData.addressesList && queryData.addressesList.length > 0) {
+        query.setAddressesList(queryData.addressesList);
+      }
+      if (queryData.topicsList && queryData.topicsList.length > 0) {
+        const topicsMessages = queryData.topicsList.map((topicData) => {
+          const topics = new avs_pb4.EventTrigger.Topics();
+          if (topicData.valuesList) {
+            topics.setValuesList(topicData.valuesList);
+          }
+          return topics;
+        });
+        query.setTopicsList(topicsMessages);
+      }
+      if (queryData.maxEventsPerBlock !== void 0) {
+        query.setMaxEventsPerBlock(queryData.maxEventsPerBlock);
+      }
+      return query;
+    });
+    config.setQueriesList(queryMessages);
     trigger.setConfig(config);
     request.setEvent(trigger);
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    let data = { expression: "", matcherList: [] };
+    let data = { queriesList: [] };
     if (raw.getEvent() && raw.getEvent().hasConfig()) {
       const config = raw.getEvent().getConfig();
       if (config) {
-        data = {
-          expression: config.getExpression(),
-          matcherList: []
-        };
-        if (config.getMatcherList && config.getMatcherList().length > 0) {
-          data.matcherList = config.getMatcherList().map((item) => {
-            return {
-              type: item.getType(),
-              valueList: item.getValueList() || []
+        const queries = [];
+        if (config.getQueriesList && config.getQueriesList().length > 0) {
+          config.getQueriesList().forEach((query) => {
+            const queryData = {
+              addressesList: [],
+              topicsList: []
             };
+            if (query.getAddressesList && query.getAddressesList().length > 0) {
+              queryData.addressesList = query.getAddressesList();
+            }
+            if (query.getTopicsList && query.getTopicsList().length > 0) {
+              queryData.topicsList = query.getTopicsList().map((topics) => ({
+                valuesList: topics.getValuesList() || []
+              }));
+            }
+            const maxEvents = query.getMaxEventsPerBlock();
+            if (maxEvents && maxEvents > 0) {
+              queryData.maxEventsPerBlock = maxEvents;
+            }
+            queries.push(queryData);
           });
         }
+        data = { queriesList: queries };
       }
     }
     return new _EventTrigger({

package/dist/index.mjs

@@ -86,9 +86,10 @@ var require_avs_pb = __commonJS({
     goog.exportSymbol("proto.aggregator.Error", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.Config", null, global);
-    goog.exportSymbol("proto.aggregator.EventTrigger.Matcher", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.Output", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.Output.OutputTypeCase", null, global);
+    goog.exportSymbol("proto.aggregator.EventTrigger.Query", null, global);
+    goog.exportSymbol("proto.aggregator.EventTrigger.Topics", null, global);
     goog.exportSymbol("proto.aggregator.EventTrigger.TransferLogOutput", null, global);
     goog.exportSymbol("proto.aggregator.Evm", null, global);
     goog.exportSymbol("proto.aggregator.Evm.Log", null, global);
@@ -267,12 +268,19 @@ var require_avs_pb = __commonJS({
     if (goog.DEBUG && !COMPILED) {
       proto.aggregator.EventTrigger.displayName = "proto.aggregator.EventTrigger";
     }
-    proto.aggregator.EventTrigger.Matcher = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Matcher.repeatedFields_, null);
+    proto.aggregator.EventTrigger.Query = function(opt_data) {
+      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Query.repeatedFields_, null);
     };
-    goog.inherits(proto.aggregator.EventTrigger.Matcher, jspb.Message);
+    goog.inherits(proto.aggregator.EventTrigger.Query, jspb.Message);
     if (goog.DEBUG && !COMPILED) {
-      proto.aggregator.EventTrigger.Matcher.displayName = "proto.aggregator.EventTrigger.Matcher";
+      proto.aggregator.EventTrigger.Query.displayName = "proto.aggregator.EventTrigger.Query";
+    }
+    proto.aggregator.EventTrigger.Topics = function(opt_data) {
+      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Topics.repeatedFields_, null);
+    };
+    goog.inherits(proto.aggregator.EventTrigger.Topics, jspb.Message);
+    if (goog.DEBUG && !COMPILED) {
+      proto.aggregator.EventTrigger.Topics.displayName = "proto.aggregator.EventTrigger.Topics";
     }
     proto.aggregator.EventTrigger.Config = function(opt_data) {
       jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventTrigger.Config.repeatedFields_, null);
@@ -2089,15 +2097,20 @@ var require_avs_pb = __commonJS({
         );
       }
     };
-    proto.aggregator.EventTrigger.Matcher.repeatedFields_ = [2];
+    proto.aggregator.EventTrigger.Query.repeatedFields_ = [1, 2];
     if (jspb.Message.GENERATE_TO_OBJECT) {
-      proto.aggregator.EventTrigger.Matcher.prototype.toObject = function(opt_includeInstance) {
-        return proto.aggregator.EventTrigger.Matcher.toObject(opt_includeInstance, this);
+      proto.aggregator.EventTrigger.Query.prototype.toObject = function(opt_includeInstance) {
+        return proto.aggregator.EventTrigger.Query.toObject(opt_includeInstance, this);
       };
-      proto.aggregator.EventTrigger.Matcher.toObject = function(includeInstance, msg) {
+      proto.aggregator.EventTrigger.Query.toObject = function(includeInstance, msg) {
         var f, obj = {
-          type: jspb.Message.getFieldWithDefault(msg, 1, ""),
-          valueList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? void 0 : f
+          addressesList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? void 0 : f,
+          topicsList: jspb.Message.toObjectList(
+            msg.getTopicsList(),
+            proto.aggregator.EventTrigger.Topics.toObject,
+            includeInstance
+          ),
+          maxEventsPerBlock: jspb.Message.getFieldWithDefault(msg, 3, 0)
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -2105,12 +2118,12 @@ var require_avs_pb = __commonJS({
         return obj;
       };
     }
-    proto.aggregator.EventTrigger.Matcher.deserializeBinary = function(bytes) {
+    proto.aggregator.EventTrigger.Query.deserializeBinary = function(bytes) {
       var reader = new jspb.BinaryReader(bytes);
-      var msg = new proto.aggregator.EventTrigger.Matcher();
-      return proto.aggregator.EventTrigger.Matcher.deserializeBinaryFromReader(msg, reader);
+      var msg = new proto.aggregator.EventTrigger.Query();
+      return proto.aggregator.EventTrigger.Query.deserializeBinaryFromReader(msg, reader);
     };
-    proto.aggregator.EventTrigger.Matcher.deserializeBinaryFromReader = function(msg, reader) {
+    proto.aggregator.EventTrigger.Query.deserializeBinaryFromReader = function(msg, reader) {
       while (reader.nextField()) {
         if (reader.isEndGroup()) {
           break;
@@ -2122,14 +2135,19 @@ var require_avs_pb = __commonJS({
               /** @type {string} */
               reader.readString()
             );
-            msg.setType(value);
+            msg.addAddresses(value);
             break;
           case 2:
+            var value = new proto.aggregator.EventTrigger.Topics();
+            reader.readMessage(value, proto.aggregator.EventTrigger.Topics.deserializeBinaryFromReader);
+            msg.addTopics(value);
+            break;
+          case 3:
             var value = (
-              /** @type {string} */
-              reader.readString()
+              /** @type {number} */
+              reader.readUint32()
             );
-            msg.addValue(value);
+            msg.setMaxEventsPerBlock(value);
             break;
           default:
             reader.skipField();
@@ -2138,51 +2156,152 @@ var require_avs_pb = __commonJS({
       }
       return msg;
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.serializeBinary = function() {
+    proto.aggregator.EventTrigger.Query.prototype.serializeBinary = function() {
       var writer = new jspb.BinaryWriter();
-      proto.aggregator.EventTrigger.Matcher.serializeBinaryToWriter(this, writer);
+      proto.aggregator.EventTrigger.Query.serializeBinaryToWriter(this, writer);
       return writer.getResultBuffer();
     };
-    proto.aggregator.EventTrigger.Matcher.serializeBinaryToWriter = function(message, writer) {
+    proto.aggregator.EventTrigger.Query.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getType();
+      f = message.getAddressesList();
       if (f.length > 0) {
-        writer.writeString(
+        writer.writeRepeatedString(
           1,
           f
         );
       }
-      f = message.getValueList();
+      f = message.getTopicsList();
       if (f.length > 0) {
-        writer.writeRepeatedString(
+        writer.writeRepeatedMessage(
           2,
+          f,
+          proto.aggregator.EventTrigger.Topics.serializeBinaryToWriter
+        );
+      }
+      f = /** @type {number} */
+      jspb.Message.getField(message, 3);
+      if (f != null) {
+        writer.writeUint32(
+          3,
           f
         );
       }
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.getType = function() {
+    proto.aggregator.EventTrigger.Query.prototype.getAddressesList = function() {
       return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 1, "")
+        /** @type {!Array<string>} */
+        jspb.Message.getRepeatedField(this, 1)
       );
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.setType = function(value) {
-      return jspb.Message.setProto3StringField(this, 1, value);
+    proto.aggregator.EventTrigger.Query.prototype.setAddressesList = function(value) {
+      return jspb.Message.setField(this, 1, value || []);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.addAddresses = function(value, opt_index) {
+      return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.clearAddressesList = function() {
+      return this.setAddressesList([]);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.getTopicsList = function() {
+      return (
+        /** @type{!Array<!proto.aggregator.EventTrigger.Topics>} */
+        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventTrigger.Topics, 2)
+      );
+    };
+    proto.aggregator.EventTrigger.Query.prototype.setTopicsList = function(value) {
+      return jspb.Message.setRepeatedWrapperField(this, 2, value);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.addTopics = function(opt_value, opt_index) {
+      return jspb.Message.addToRepeatedWrapperField(this, 2, opt_value, proto.aggregator.EventTrigger.Topics, opt_index);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.clearTopicsList = function() {
+      return this.setTopicsList([]);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.getMaxEventsPerBlock = function() {
+      return (
+        /** @type {number} */
+        jspb.Message.getFieldWithDefault(this, 3, 0)
+      );
+    };
+    proto.aggregator.EventTrigger.Query.prototype.setMaxEventsPerBlock = function(value) {
+      return jspb.Message.setField(this, 3, value);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.clearMaxEventsPerBlock = function() {
+      return jspb.Message.setField(this, 3, void 0);
+    };
+    proto.aggregator.EventTrigger.Query.prototype.hasMaxEventsPerBlock = function() {
+      return jspb.Message.getField(this, 3) != null;
+    };
+    proto.aggregator.EventTrigger.Topics.repeatedFields_ = [1];
+    if (jspb.Message.GENERATE_TO_OBJECT) {
+      proto.aggregator.EventTrigger.Topics.prototype.toObject = function(opt_includeInstance) {
+        return proto.aggregator.EventTrigger.Topics.toObject(opt_includeInstance, this);
+      };
+      proto.aggregator.EventTrigger.Topics.toObject = function(includeInstance, msg) {
+        var f, obj = {
+          valuesList: (f = jspb.Message.getRepeatedField(msg, 1)) == null ? void 0 : f
+        };
+        if (includeInstance) {
+          obj.$jspbMessageInstance = msg;
+        }
+        return obj;
+      };
+    }
+    proto.aggregator.EventTrigger.Topics.deserializeBinary = function(bytes) {
+      var reader = new jspb.BinaryReader(bytes);
+      var msg = new proto.aggregator.EventTrigger.Topics();
+      return proto.aggregator.EventTrigger.Topics.deserializeBinaryFromReader(msg, reader);
+    };
+    proto.aggregator.EventTrigger.Topics.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.addValues(value);
+            break;
+          default:
+            reader.skipField();
+            break;
+        }
+      }
+      return msg;
+    };
+    proto.aggregator.EventTrigger.Topics.prototype.serializeBinary = function() {
+      var writer = new jspb.BinaryWriter();
+      proto.aggregator.EventTrigger.Topics.serializeBinaryToWriter(this, writer);
+      return writer.getResultBuffer();
+    };
+    proto.aggregator.EventTrigger.Topics.serializeBinaryToWriter = function(message, writer) {
+      var f = void 0;
+      f = message.getValuesList();
+      if (f.length > 0) {
+        writer.writeRepeatedString(
+          1,
+          f
+        );
+      }
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.getValueList = function() {
+    proto.aggregator.EventTrigger.Topics.prototype.getValuesList = function() {
       return (
         /** @type {!Array<string>} */
-        jspb.Message.getRepeatedField(this, 2)
+        jspb.Message.getRepeatedField(this, 1)
       );
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.setValueList = function(value) {
-      return jspb.Message.setField(this, 2, value || []);
+    proto.aggregator.EventTrigger.Topics.prototype.setValuesList = function(value) {
+      return jspb.Message.setField(this, 1, value || []);
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.addValue = function(value, opt_index) {
-      return jspb.Message.addToRepeatedField(this, 2, value, opt_index);
+    proto.aggregator.EventTrigger.Topics.prototype.addValues = function(value, opt_index) {
+      return jspb.Message.addToRepeatedField(this, 1, value, opt_index);
     };
-    proto.aggregator.EventTrigger.Matcher.prototype.clearValueList = function() {
-      return this.setValueList([]);
+    proto.aggregator.EventTrigger.Topics.prototype.clearValuesList = function() {
+      return this.setValuesList([]);
     };
     proto.aggregator.EventTrigger.Config.repeatedFields_ = [1];
     if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -2191,12 +2310,11 @@ var require_avs_pb = __commonJS({
       };
       proto.aggregator.EventTrigger.Config.toObject = function(includeInstance, msg) {
         var f, obj = {
-          matcherList: jspb.Message.toObjectList(
-            msg.getMatcherList(),
-            proto.aggregator.EventTrigger.Matcher.toObject,
+          queriesList: jspb.Message.toObjectList(
+            msg.getQueriesList(),
+            proto.aggregator.EventTrigger.Query.toObject,
             includeInstance
-          ),
-          expression: jspb.Message.getFieldWithDefault(msg, 2, "")
+          )
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -2217,16 +2335,9 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = new proto.aggregator.EventTrigger.Matcher();
-            reader.readMessage(value, proto.aggregator.EventTrigger.Matcher.deserializeBinaryFromReader);
-            msg.addMatcher(value);
-            break;
-          case 2:
-            var value = (
-              /** @type {string} */
-              reader.readString()
-            );
-            msg.setExpression(value);
+            var value = new proto.aggregator.EventTrigger.Query();
+            reader.readMessage(value, proto.aggregator.EventTrigger.Query.deserializeBinaryFromReader);
+            msg.addQueries(value);
             break;
           default:
             reader.skipField();
@@ -2242,45 +2353,29 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.EventTrigger.Config.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getMatcherList();
+      f = message.getQueriesList();
       if (f.length > 0) {
         writer.writeRepeatedMessage(
           1,
           f,
-          proto.aggregator.EventTrigger.Matcher.serializeBinaryToWriter
-        );
-      }
-      f = message.getExpression();
-      if (f.length > 0) {
-        writer.writeString(
-          2,
-          f
+          proto.aggregator.EventTrigger.Query.serializeBinaryToWriter
         );
       }
     };
-    proto.aggregator.EventTrigger.Config.prototype.getMatcherList = function() {
+    proto.aggregator.EventTrigger.Config.prototype.getQueriesList = function() {
       return (
-        /** @type{!Array<!proto.aggregator.EventTrigger.Matcher>} */
-        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventTrigger.Matcher, 1)
+        /** @type{!Array<!proto.aggregator.EventTrigger.Query>} */
+        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventTrigger.Query, 1)
       );
     };
-    proto.aggregator.EventTrigger.Config.prototype.setMatcherList = function(value) {
+    proto.aggregator.EventTrigger.Config.prototype.setQueriesList = function(value) {
       return jspb.Message.setRepeatedWrapperField(this, 1, value);
     };
-    proto.aggregator.EventTrigger.Config.prototype.addMatcher = function(opt_value, opt_index) {
-      return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.EventTrigger.Matcher, opt_index);
-    };
-    proto.aggregator.EventTrigger.Config.prototype.clearMatcherList = function() {
-      return this.setMatcherList([]);
+    proto.aggregator.EventTrigger.Config.prototype.addQueries = function(opt_value, opt_index) {
+      return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.EventTrigger.Query, opt_index);
     };
-    proto.aggregator.EventTrigger.Config.prototype.getExpression = function() {
-      return (
-        /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
-      );
-    };
-    proto.aggregator.EventTrigger.Config.prototype.setExpression = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
+    proto.aggregator.EventTrigger.Config.prototype.clearQueriesList = function() {
+      return this.setQueriesList([]);
     };
     proto.aggregator.EventTrigger.Output.oneofGroups_ = [[1, 2]];
     proto.aggregator.EventTrigger.Output.OutputTypeCase = {
@@ -14401,7 +14496,7 @@ import { credentials, Metadata } from "@grpc/grpc-js";
 
 // src/models/workflow.ts
 var avs_pb19 = __toESM(require_avs_pb());
-import _4 from "lodash";
+import _3 from "lodash";
 
 // src/models/edge.ts
 var avs_pb = __toESM(require_avs_pb());
@@ -14586,7 +14681,6 @@ var cron_default = CronTrigger2;
 
 // src/models/trigger/event.ts
 var avs_pb4 = __toESM(require_avs_pb());
-import * as _ from "lodash";
 import { TriggerType as TriggerType6 } from "@avaprotocol/types";
 var EventTrigger2 = class _EventTrigger extends interface_default {
   constructor(props) {
@@ -14601,45 +14695,66 @@ var EventTrigger2 = class _EventTrigger extends interface_default {
       throw new Error(`Trigger data is missing for ${this.type}`);
     }
     const trigger = new avs_pb4.EventTrigger();
-    const dataConfig = this.data;
     const config = new avs_pb4.EventTrigger.Config();
-    const expression = dataConfig.expression;
-    const matcherList = dataConfig.matcherList;
-    if (_.isUndefined(expression) || _.isNull(expression)) {
-      throw new Error(`Expression is undefined for ${this.type}`);
-    }
-    config.setExpression(expression);
-    if (matcherList && matcherList.length > 0) {
-      const matchers = matcherList.map((element) => {
-        const m = new avs_pb4.EventTrigger.Matcher();
-        m.setType(element.type);
-        m.setValueList(element.valueList || []);
-        return m;
-      });
-      config.setMatcherList(matchers);
-    }
+    const dataConfig = this.data;
+    const queries = dataConfig.queriesList;
+    if (!queries || queries.length === 0) {
+      throw new Error(`Queries array is required for ${this.type}`);
+    }
+    const queryMessages = queries.map((queryData) => {
+      const query = new avs_pb4.EventTrigger.Query();
+      if (queryData.addressesList && queryData.addressesList.length > 0) {
+        query.setAddressesList(queryData.addressesList);
+      }
+      if (queryData.topicsList && queryData.topicsList.length > 0) {
+        const topicsMessages = queryData.topicsList.map((topicData) => {
+          const topics = new avs_pb4.EventTrigger.Topics();
+          if (topicData.valuesList) {
+            topics.setValuesList(topicData.valuesList);
+          }
+          return topics;
+        });
+        query.setTopicsList(topicsMessages);
+      }
+      if (queryData.maxEventsPerBlock !== void 0) {
+        query.setMaxEventsPerBlock(queryData.maxEventsPerBlock);
+      }
+      return query;
+    });
+    config.setQueriesList(queryMessages);
     trigger.setConfig(config);
     request.setEvent(trigger);
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
-    let data = { expression: "", matcherList: [] };
+    let data = { queriesList: [] };
     if (raw.getEvent() && raw.getEvent().hasConfig()) {
       const config = raw.getEvent().getConfig();
       if (config) {
-        data = {
-          expression: config.getExpression(),
-          matcherList: []
-        };
-        if (config.getMatcherList && config.getMatcherList().length > 0) {
-          data.matcherList = config.getMatcherList().map((item) => {
-            return {
-              type: item.getType(),
-              valueList: item.getValueList() || []
+        const queries = [];
+        if (config.getQueriesList && config.getQueriesList().length > 0) {
+          config.getQueriesList().forEach((query) => {
+            const queryData = {
+              addressesList: [],
+              topicsList: []
             };
+            if (query.getAddressesList && query.getAddressesList().length > 0) {
+              queryData.addressesList = query.getAddressesList();
+            }
+            if (query.getTopicsList && query.getTopicsList().length > 0) {
+              queryData.topicsList = query.getTopicsList().map((topics) => ({
+                valuesList: topics.getValuesList() || []
+              }));
+            }
+            const maxEvents = query.getMaxEventsPerBlock();
+            if (maxEvents && maxEvents > 0) {
+              queryData.maxEventsPerBlock = maxEvents;
+            }
+            queries.push(queryData);
           });
         }
+        data = { queriesList: queries };
       }
     }
     return new _EventTrigger({
@@ -15023,12 +15138,12 @@ var factory_default = TriggerFactory;
 
 // src/models/node/factory.ts
 var avs_pb18 = __toESM(require_avs_pb());
-import _3 from "lodash";
+import _2 from "lodash";
 
 // src/models/node/interface.ts
 var avs_pb8 = __toESM(require_avs_pb());
 import { NodeType as NodeType2, NodeTypeGoConverter } from "@avaprotocol/types";
-import _2 from "lodash";
+import _ from "lodash";
 var Node = class {
   constructor(props) {
     this.id = props.id;
@@ -15040,7 +15155,7 @@ var Node = class {
     const request = new avs_pb8.TaskNode();
     const raw = request.serializeBinary();
     const parsed = avs_pb8.TaskNode.deserializeBinary(raw);
-    if (!_2.isEqual(request, parsed)) {
+    if (!_.isEqual(request, parsed)) {
       throw new Error("Invalid request object");
     }
     return request;
@@ -15524,7 +15639,7 @@ var NodeFactory = class {
     }
   }
   static createNodes(props) {
-    return _3.map(props, (node) => this.create(node));
+    return _2.map(props, (node) => this.create(node));
   }
   static fromResponse(raw) {
     switch (true) {
@@ -15645,11 +15760,11 @@ var Workflow = class _Workflow {
     if (!trigger) {
       throw new Error("Trigger is undefined in fromResponse()");
     }
-    const nodes = _4.map(
+    const nodes = _3.map(
       obj.getNodesList(),
       (node) => factory_default2.fromResponse(node)
     );
-    const edges = _4.map(obj.getEdgesList(), (edge) => edge_default.fromResponse(edge));
+    const edges = _3.map(obj.getEdgesList(), (edge) => edge_default.fromResponse(edge));
     const workflow = new _Workflow({
       id: obj.getId(),
       owner: obj.getOwner(),
@@ -15686,8 +15801,8 @@ var Workflow = class _Workflow {
       expiredAt: obj.getExpiredAt(),
       maxExecution: obj.getMaxExecution(),
       executionCount: obj.getExecutionCount(),
-      nodes: _4.map(obj.getNodesList(), (node) => factory_default2.fromResponse(node)),
-      edges: _4.map(obj.getEdgesList(), (edge) => edge_default.fromResponse(edge)),
+      nodes: _3.map(obj.getNodesList(), (node) => factory_default2.fromResponse(node)),
+      edges: _3.map(obj.getEdgesList(), (edge) => edge_default.fromResponse(edge)),
       completedAt: obj.getCompletedAt(),
       status: convertStatusToString(obj.getStatus()),
       name: obj.getName(),
@@ -15698,8 +15813,8 @@ var Workflow = class _Workflow {
     const request = new avs_pb19.CreateTaskReq();
     request.setSmartWalletAddress(this.smartWalletAddress);
     request.setTrigger(this.trigger.toRequest());
-    _4.map(this.nodes, (node) => request.addNodes(node.toRequest()));
-    _4.map(this.edges, (edge) => request.addEdges(edge.toRequest()));
+    _3.map(this.nodes, (node) => request.addNodes(node.toRequest()));
+    _3.map(this.edges, (edge) => request.addEdges(edge.toRequest()));
     request.setStartAt(this.startAt);
     request.setExpiredAt(this.expiredAt);
     request.setMaxExecution(this.maxExecution);

package/dist/models/secret.d.ts

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

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

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

package/dist/models/trigger/event.js

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

package/dist/utils.d.ts

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

package/package.json

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