@avaprotocol/sdk-js 1.3.4-dev.0 → 1.3.4-dev.2

package/dist/index.d.mts

@@ -97,10 +97,6 @@ declare namespace BlockCondition {
 }
 
 declare class EventCondition extends jspb.Message { 
-    clearMatcherList(): void;
-    getMatcherList(): Array<EventCondition.Matcher>;
-    setMatcherList(value: Array<EventCondition.Matcher>): EventCondition;
-    addMatcher(value?: EventCondition.Matcher, index?: number): EventCondition.Matcher;
     getExpression(): string;
     setExpression(value: string): EventCondition;
 
@@ -116,7 +112,6 @@ declare class EventCondition extends jspb.Message {
 
 declare namespace EventCondition {
     export type AsObject = {
-        matcherList: Array<EventCondition.Matcher.AsObject>,
         expression: string,
     }
 
@@ -1513,6 +1508,7 @@ declare class Edge implements EdgeProps {
     constructor(edge: EdgeProps);
     static fromResponse(edge: TaskEdge): Edge;
     toRequest(): TaskEdge;
+    toJson(): Record<string, any>;
 }
 
 type Environment = "production" | "development" | "staging";
@@ -1782,13 +1778,7 @@ declare class CronTrigger extends Trigger {
     static fromResponse(raw: TaskTrigger): CronTrigger;
 }
 
-interface EventMatcher {
-    type: string;
-    value: string[];
-}
-type EventTriggerDataType = EventCondition.AsObject & {
-    matcher?: EventMatcher[];
-};
+type EventTriggerDataType = Pick<EventCondition.AsObject, "expression">;
 type EventTriggerProps = TriggerProps & {
     data: EventTriggerDataType;
 };

package/dist/index.d.ts

@@ -97,10 +97,6 @@ declare namespace BlockCondition {
 }
 
 declare class EventCondition extends jspb.Message { 
-    clearMatcherList(): void;
-    getMatcherList(): Array<EventCondition.Matcher>;
-    setMatcherList(value: Array<EventCondition.Matcher>): EventCondition;
-    addMatcher(value?: EventCondition.Matcher, index?: number): EventCondition.Matcher;
     getExpression(): string;
     setExpression(value: string): EventCondition;
 
@@ -116,7 +112,6 @@ declare class EventCondition extends jspb.Message {
 
 declare namespace EventCondition {
     export type AsObject = {
-        matcherList: Array<EventCondition.Matcher.AsObject>,
         expression: string,
     }
 
@@ -1513,6 +1508,7 @@ declare class Edge implements EdgeProps {
     constructor(edge: EdgeProps);
     static fromResponse(edge: TaskEdge): Edge;
     toRequest(): TaskEdge;
+    toJson(): Record<string, any>;
 }
 
 type Environment = "production" | "development" | "staging";
@@ -1782,13 +1778,7 @@ declare class CronTrigger extends Trigger {
     static fromResponse(raw: TaskTrigger): CronTrigger;
 }
 
-interface EventMatcher {
-    type: string;
-    value: string[];
-}
-type EventTriggerDataType = EventCondition.AsObject & {
-    matcher?: EventMatcher[];
-};
+type EventTriggerDataType = Pick<EventCondition.AsObject, "expression">;
 type EventTriggerProps = TriggerProps & {
     data: EventTriggerDataType;
 };

package/dist/index.js

@@ -135,7 +135,7 @@ var require_avs_pb = __commonJS({
       proto.aggregator.BlockCondition.displayName = "proto.aggregator.BlockCondition";
     }
     proto.aggregator.EventCondition = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventCondition.repeatedFields_, null);
+      jspb.Message.initialize(this, opt_data, 0, -1, null, null);
     };
     goog.inherits(proto.aggregator.EventCondition, jspb.Message);
     if (goog.DEBUG && !COMPILED) {
@@ -679,19 +679,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.BlockCondition.prototype.setInterval = function(value) {
       return jspb.Message.setProto3IntField(this, 1, value);
     };
-    proto.aggregator.EventCondition.repeatedFields_ = [1];
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.EventCondition.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.EventCondition.toObject(opt_includeInstance, this);
       };
       proto.aggregator.EventCondition.toObject = function(includeInstance, msg) {
         var f, obj = {
-          matcherList: jspb.Message.toObjectList(
-            msg.getMatcherList(),
-            proto.aggregator.EventCondition.Matcher.toObject,
-            includeInstance
-          ),
-          expression: jspb.Message.getFieldWithDefault(msg, 2, "")
+          expression: jspb.Message.getFieldWithDefault(msg, 1, "")
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -712,11 +706,6 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = new proto.aggregator.EventCondition.Matcher();
-            reader.readMessage(value, proto.aggregator.EventCondition.Matcher.deserializeBinaryFromReader);
-            msg.addMatcher(value);
-            break;
-          case 2:
             var value = (
               /** @type {string} */
               reader.readString()
@@ -737,18 +726,10 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.EventCondition.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getMatcherList();
-      if (f.length > 0) {
-        writer.writeRepeatedMessage(
-          1,
-          f,
-          proto.aggregator.EventCondition.Matcher.serializeBinaryToWriter
-        );
-      }
       f = message.getExpression();
       if (f.length > 0) {
         writer.writeString(
-          2,
+          1,
           f
         );
       }
@@ -848,29 +829,14 @@ var require_avs_pb = __commonJS({
     proto.aggregator.EventCondition.Matcher.prototype.clearValueList = function() {
       return this.setValueList([]);
     };
-    proto.aggregator.EventCondition.prototype.getMatcherList = function() {
-      return (
-        /** @type{!Array<!proto.aggregator.EventCondition.Matcher>} */
-        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventCondition.Matcher, 1)
-      );
-    };
-    proto.aggregator.EventCondition.prototype.setMatcherList = function(value) {
-      return jspb.Message.setRepeatedWrapperField(this, 1, value);
-    };
-    proto.aggregator.EventCondition.prototype.addMatcher = function(opt_value, opt_index) {
-      return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.EventCondition.Matcher, opt_index);
-    };
-    proto.aggregator.EventCondition.prototype.clearMatcherList = function() {
-      return this.setMatcherList([]);
-    };
     proto.aggregator.EventCondition.prototype.getExpression = function() {
       return (
         /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
+        jspb.Message.getFieldWithDefault(this, 1, "")
       );
     };
     proto.aggregator.EventCondition.prototype.setExpression = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
+      return jspb.Message.setProto3StringField(this, 1, value);
     };
     proto.aggregator.TaskTrigger.oneofGroups_ = [[2, 3, 4, 5, 6]];
     proto.aggregator.TaskTrigger.TriggerTypeCase = {
@@ -6238,7 +6204,7 @@ var require_avs_pb = __commonJS({
 var require_avs_grpc_pb = __commonJS({
   "../../grpc_codegen/avs_grpc_pb.js"(exports2) {
     "use strict";
-    var grpc2 = require("@grpc/grpc-js");
+    var grpc = require("@grpc/grpc-js");
     var avs_pb20 = require_avs_pb();
     var google_protobuf_wrappers_pb = require("google-protobuf/google/protobuf/wrappers_pb.js");
     var google_protobuf_timestamp_pb = require("google-protobuf/google/protobuf/timestamp_pb.js");
@@ -6588,7 +6554,7 @@ var require_avs_grpc_pb = __commonJS({
         responseDeserialize: deserialize_aggregator_UserTriggerTaskResp
       }
     };
-    exports2.AggregatorClient = grpc2.makeGenericClientConstructor(AggregatorService);
+    exports2.AggregatorClient = grpc.makeGenericClientConstructor(AggregatorService);
   }
 });
 
@@ -6624,7 +6590,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_lodash3 = __toESM(require("lodash"));
-var grpc = __toESM(require("@grpc/grpc-js"));
 var import_grpc_js = require("@grpc/grpc-js");
 
 // src/auth.ts
@@ -6666,6 +6631,13 @@ var Edge = class _Edge {
     edge.setTarget(this.target);
     return edge;
   }
+  toJson() {
+    return {
+      id: this.id,
+      source: this.source,
+      target: this.target
+    };
+  }
 };
 var edge_default = Edge;
 
@@ -6804,43 +6776,17 @@ var EventTrigger = class _EventTrigger extends interface_default {
       throw new Error(`Trigger data is missing for ${this.type}`);
     }
     const condition = new avs_pb5.EventCondition();
-    const expression = this.data.expression;
-    const matcher = this.data.matcher;
-    if (expression && expression != "") {
-      condition.setExpression(expression);
-    }
-    if (matcher && matcher.length >= 1) {
-      console.log("hit here", matcher);
-      condition.setMatcherList(matcher.map((element) => {
-        const m = new avs_pb5.EventCondition.Matcher();
-        m.setType(element["type"]);
-        m.setValueList(element["value"]);
-        return m;
-      }));
-    }
+    condition.setExpression(this.data.expression);
     request.setEvent(condition);
-    console.log("EventTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
     console.log("EventTrigger.fromResponse.obj:", obj);
-    let data = {};
-    if (raw.getEvent().getExpression()) {
-      data.expression = raw.getEvent().getExpression();
-    }
-    if (raw.getEvent().getMatcherList()) {
-      data.matcher = raw.getEvent().getMatcherList().map((item) => {
-        return {
-          type: item.getType(),
-          value: item.getValueList()
-        };
-      });
-    }
     return new _EventTrigger({
       ...obj,
       type: "event" /* Event */,
-      data
+      data: raw.getEvent().toObject()
     });
   }
 };
@@ -7518,7 +7464,7 @@ var BaseClient = class {
     this.endpoint = opts.endpoint;
     this.rpcClient = new import_avs_grpc_pb.AggregatorClient(
       this.endpoint,
-      grpc.credentials.createInsecure()
+      import_grpc_js.credentials.createInsecure()
     );
     this.factoryAddress = opts.factoryAddress;
     this.metadata = new import_grpc_js.Metadata();

package/dist/index.mjs

@@ -135,7 +135,7 @@ var require_avs_pb = __commonJS({
       proto.aggregator.BlockCondition.displayName = "proto.aggregator.BlockCondition";
     }
     proto.aggregator.EventCondition = function(opt_data) {
-      jspb.Message.initialize(this, opt_data, 0, -1, proto.aggregator.EventCondition.repeatedFields_, null);
+      jspb.Message.initialize(this, opt_data, 0, -1, null, null);
     };
     goog.inherits(proto.aggregator.EventCondition, jspb.Message);
     if (goog.DEBUG && !COMPILED) {
@@ -679,19 +679,13 @@ var require_avs_pb = __commonJS({
     proto.aggregator.BlockCondition.prototype.setInterval = function(value) {
       return jspb.Message.setProto3IntField(this, 1, value);
     };
-    proto.aggregator.EventCondition.repeatedFields_ = [1];
     if (jspb.Message.GENERATE_TO_OBJECT) {
       proto.aggregator.EventCondition.prototype.toObject = function(opt_includeInstance) {
         return proto.aggregator.EventCondition.toObject(opt_includeInstance, this);
       };
       proto.aggregator.EventCondition.toObject = function(includeInstance, msg) {
         var f, obj = {
-          matcherList: jspb.Message.toObjectList(
-            msg.getMatcherList(),
-            proto.aggregator.EventCondition.Matcher.toObject,
-            includeInstance
-          ),
-          expression: jspb.Message.getFieldWithDefault(msg, 2, "")
+          expression: jspb.Message.getFieldWithDefault(msg, 1, "")
         };
         if (includeInstance) {
           obj.$jspbMessageInstance = msg;
@@ -712,11 +706,6 @@ var require_avs_pb = __commonJS({
         var field = reader.getFieldNumber();
         switch (field) {
           case 1:
-            var value = new proto.aggregator.EventCondition.Matcher();
-            reader.readMessage(value, proto.aggregator.EventCondition.Matcher.deserializeBinaryFromReader);
-            msg.addMatcher(value);
-            break;
-          case 2:
             var value = (
               /** @type {string} */
               reader.readString()
@@ -737,18 +726,10 @@ var require_avs_pb = __commonJS({
     };
     proto.aggregator.EventCondition.serializeBinaryToWriter = function(message, writer) {
       var f = void 0;
-      f = message.getMatcherList();
-      if (f.length > 0) {
-        writer.writeRepeatedMessage(
-          1,
-          f,
-          proto.aggregator.EventCondition.Matcher.serializeBinaryToWriter
-        );
-      }
       f = message.getExpression();
       if (f.length > 0) {
         writer.writeString(
-          2,
+          1,
           f
         );
       }
@@ -848,29 +829,14 @@ var require_avs_pb = __commonJS({
     proto.aggregator.EventCondition.Matcher.prototype.clearValueList = function() {
       return this.setValueList([]);
     };
-    proto.aggregator.EventCondition.prototype.getMatcherList = function() {
-      return (
-        /** @type{!Array<!proto.aggregator.EventCondition.Matcher>} */
-        jspb.Message.getRepeatedWrapperField(this, proto.aggregator.EventCondition.Matcher, 1)
-      );
-    };
-    proto.aggregator.EventCondition.prototype.setMatcherList = function(value) {
-      return jspb.Message.setRepeatedWrapperField(this, 1, value);
-    };
-    proto.aggregator.EventCondition.prototype.addMatcher = function(opt_value, opt_index) {
-      return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.aggregator.EventCondition.Matcher, opt_index);
-    };
-    proto.aggregator.EventCondition.prototype.clearMatcherList = function() {
-      return this.setMatcherList([]);
-    };
     proto.aggregator.EventCondition.prototype.getExpression = function() {
       return (
         /** @type {string} */
-        jspb.Message.getFieldWithDefault(this, 2, "")
+        jspb.Message.getFieldWithDefault(this, 1, "")
       );
     };
     proto.aggregator.EventCondition.prototype.setExpression = function(value) {
-      return jspb.Message.setProto3StringField(this, 2, value);
+      return jspb.Message.setProto3StringField(this, 1, value);
     };
     proto.aggregator.TaskTrigger.oneofGroups_ = [[2, 3, 4, 5, 6]];
     proto.aggregator.TaskTrigger.TriggerTypeCase = {
@@ -6238,7 +6204,7 @@ var require_avs_pb = __commonJS({
 var require_avs_grpc_pb = __commonJS({
   "../../grpc_codegen/avs_grpc_pb.js"(exports) {
     "use strict";
-    var grpc2 = __require("@grpc/grpc-js");
+    var grpc = __require("@grpc/grpc-js");
     var avs_pb20 = require_avs_pb();
     var google_protobuf_wrappers_pb = __require("google-protobuf/google/protobuf/wrappers_pb.js");
     var google_protobuf_timestamp_pb = __require("google-protobuf/google/protobuf/timestamp_pb.js");
@@ -6588,14 +6554,13 @@ var require_avs_grpc_pb = __commonJS({
         responseDeserialize: deserialize_aggregator_UserTriggerTaskResp
       }
     };
-    exports.AggregatorClient = grpc2.makeGenericClientConstructor(AggregatorService);
+    exports.AggregatorClient = grpc.makeGenericClientConstructor(AggregatorService);
   }
 });
 
 // src/index.ts
 import _3 from "lodash";
-import * as grpc from "@grpc/grpc-js";
-import { Metadata } from "@grpc/grpc-js";
+import { credentials, Metadata } from "@grpc/grpc-js";
 
 // src/auth.ts
 var getKeyRequestMessage = (chainId, address, issuedAt, expiredAt) => {
@@ -6636,6 +6601,13 @@ var Edge = class _Edge {
     edge.setTarget(this.target);
     return edge;
   }
+  toJson() {
+    return {
+      id: this.id,
+      source: this.source,
+      target: this.target
+    };
+  }
 };
 var edge_default = Edge;
 
@@ -6774,43 +6746,17 @@ var EventTrigger = class _EventTrigger extends interface_default {
       throw new Error(`Trigger data is missing for ${this.type}`);
     }
     const condition = new avs_pb5.EventCondition();
-    const expression = this.data.expression;
-    const matcher = this.data.matcher;
-    if (expression && expression != "") {
-      condition.setExpression(expression);
-    }
-    if (matcher && matcher.length >= 1) {
-      console.log("hit here", matcher);
-      condition.setMatcherList(matcher.map((element) => {
-        const m = new avs_pb5.EventCondition.Matcher();
-        m.setType(element["type"]);
-        m.setValueList(element["value"]);
-        return m;
-      }));
-    }
+    condition.setExpression(this.data.expression);
     request.setEvent(condition);
-    console.log("EventTrigger.toRequest.request:", request.toObject());
     return request;
   }
   static fromResponse(raw) {
     const obj = raw.toObject();
     console.log("EventTrigger.fromResponse.obj:", obj);
-    let data = {};
-    if (raw.getEvent().getExpression()) {
-      data.expression = raw.getEvent().getExpression();
-    }
-    if (raw.getEvent().getMatcherList()) {
-      data.matcher = raw.getEvent().getMatcherList().map((item) => {
-        return {
-          type: item.getType(),
-          value: item.getValueList()
-        };
-      });
-    }
     return new _EventTrigger({
       ...obj,
       type: "event" /* Event */,
-      data
+      data: raw.getEvent().toObject()
     });
   }
 };
@@ -7488,7 +7434,7 @@ var BaseClient = class {
     this.endpoint = opts.endpoint;
     this.rpcClient = new import_avs_grpc_pb.AggregatorClient(
       this.endpoint,
-      grpc.credentials.createInsecure()
+      credentials.createInsecure()
     );
     this.factoryAddress = opts.factoryAddress;
     this.metadata = new Metadata();

package/package.json

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