Initial client for Tovarish Relayer

dist/index.d.ts

@@ -15,5 +15,6 @@ export * from './prices';
 export * from './providers';
 export * from './relayerClient';
 export * from './tokens';
+export * from './tovarishClient';
 export * from './utils';
 export * from './websnark';

dist/tornado.umd.js

@@ -72070,6 +72070,204 @@ function getTokenBalances(_0) {
 }
 
 
+/***/ }),
+
+/***/ 96838:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   E: () => (/* binding */ TovarishClient),
+/* harmony export */   o: () => (/* binding */ MAX_TOVARISH_EVENTS)
+/* harmony export */ });
+/* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30031);
+/* harmony import */ var _relayerClient__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(57194);
+/* harmony import */ var _providers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(68434);
+
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __reflectGet = Reflect.get;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+
+
+
+const MAX_TOVARISH_EVENTS = 5e3;
+class TovarishClient extends _relayerClient__WEBPACK_IMPORTED_MODULE_0__/* .RelayerClient */ .OR {
+  constructor({ netId, config, fetchDataOptions }) {
+    super({ netId, config, fetchDataOptions });
+    this.tovarish = true;
+  }
+  askRelayerStatus(_0) {
+    return __async(this, arguments, function* ({
+      hostname,
+      url,
+      relayerAddress
+    }) {
+      const status = yield __superGet(TovarishClient.prototype, this, "askRelayerStatus").call(this, { hostname, url, relayerAddress });
+      if (!status.version.includes("tovarish")) {
+        throw new Error("Not a tovarish relayer!");
+      }
+      return status;
+    });
+  }
+  filterRelayer(relayer) {
+    return __async(this, null, function* () {
+      var _a;
+      const { ensName, relayerAddress, tovarishHost: hostname, tovarishNetworks } = relayer;
+      if (!hostname || !(tovarishNetworks == null ? void 0 : tovarishNetworks.includes(this.netId))) {
+        return;
+      }
+      try {
+        const status = yield this.askRelayerStatus({ hostname, relayerAddress });
+        return {
+          netId: status.netId,
+          url: status.url,
+          hostname,
+          ensName,
+          relayerAddress,
+          rewardAccount: (0,ethers__WEBPACK_IMPORTED_MODULE_2__/* .getAddress */ .b)(status.rewardAccount),
+          instances: (0,_relayerClient__WEBPACK_IMPORTED_MODULE_0__/* .getSupportedInstances */ .XF)(status.instances),
+          stakeBalance: relayer.stakeBalance,
+          gasPrice: (_a = status.gasPrices) == null ? void 0 : _a.fast,
+          ethPrices: status.ethPrices,
+          currentQueue: status.currentQueue,
+          tornadoServiceFee: status.tornadoServiceFee,
+          // Additional fields for tovarish relayer
+          latestBlock: Number(status.latestBlock),
+          version: status.version,
+          events: status.events,
+          syncStats: status.syncStats
+        };
+      } catch (err) {
+        return {
+          hostname,
+          relayerAddress,
+          errorMessage: err.message,
+          hasError: true
+        };
+      }
+    });
+  }
+  getValidRelayers(relayers) {
+    return __async(this, null, function* () {
+      const invalidRelayers = [];
+      const validRelayers = (yield Promise.all(relayers.map((relayer) => this.filterRelayer(relayer)))).filter((r) => {
+        if (!r) {
+          return false;
+        }
+        if (r.hasError) {
+          invalidRelayers.push(r);
+          return false;
+        }
+        return true;
+      });
+      return {
+        validRelayers,
+        invalidRelayers
+      };
+    });
+  }
+  getEvents(_0) {
+    return __async(this, arguments, function* ({
+      type,
+      currency,
+      amount,
+      fromBlock,
+      recent
+    }) {
+      var _a;
+      const url = `${(_a = this.selectedRelayer) == null ? void 0 : _a.url}events`;
+      try {
+        const events = [];
+        let lastSyncBlock = fromBlock;
+        while (true) {
+          let { events: fetchedEvents, lastSyncBlock: currentBlock } = yield (0,_providers__WEBPACK_IMPORTED_MODULE_1__/* .fetchData */ .Fd)(url, __spreadProps(__spreadValues({}, this.fetchDataOptions), {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              type,
+              currency,
+              amount,
+              fromBlock,
+              recent
+            })
+          }));
+          lastSyncBlock = currentBlock;
+          if (!Array.isArray(fetchedEvents) || !fetchedEvents.length) {
+            break;
+          }
+          fetchedEvents = fetchedEvents.sort((a, b) => {
+            if (a.blockNumber === b.blockNumber) {
+              return a.logIndex - b.logIndex;
+            }
+            return a.blockNumber - b.blockNumber;
+          });
+          const [lastEvent] = fetchedEvents.slice(-1);
+          if (fetchedEvents.length < MAX_TOVARISH_EVENTS - 100) {
+            events.push(...fetchedEvents);
+            break;
+          }
+          fetchedEvents = fetchedEvents.filter((e) => e.blockNumber !== lastEvent.blockNumber);
+          fromBlock = Number(lastEvent.blockNumber);
+          events.push(...fetchedEvents);
+        }
+        return {
+          events,
+          lastSyncBlock
+        };
+      } catch (err) {
+        console.log("Error from TovarishClient events endpoint");
+        console.log(err);
+        return {
+          events: [],
+          lastSyncBlock: fromBlock
+        };
+      }
+    });
+  }
+}
+
+
 /***/ }),
 
 /***/ 21278:
@@ -173121,6 +173319,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   GET_WITHDRAWALS: () => (/* reexport safe */ _graphql__WEBPACK_IMPORTED_MODULE_1__.GET_WITHDRAWALS),
 /* harmony export */   Invoice: () => (/* reexport safe */ _deposits__WEBPACK_IMPORTED_MODULE_5__.qO),
 /* harmony export */   MAX_FEE: () => (/* reexport safe */ _relayerClient__WEBPACK_IMPORTED_MODULE_15__.KN),
+/* harmony export */   MAX_TOVARISH_EVENTS: () => (/* reexport safe */ _tovarishClient__WEBPACK_IMPORTED_MODULE_17__.o),
 /* harmony export */   MIN_FEE: () => (/* reexport safe */ _relayerClient__WEBPACK_IMPORTED_MODULE_15__.Ss),
 /* harmony export */   MIN_STAKE_BALANCE: () => (/* reexport safe */ _relayerClient__WEBPACK_IMPORTED_MODULE_15__.pO),
 /* harmony export */   MerkleTreeService: () => (/* reexport safe */ _merkleTree__WEBPACK_IMPORTED_MODULE_8__.s),
@@ -173139,28 +173338,29 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   TornadoRpcSigner: () => (/* reexport safe */ _providers__WEBPACK_IMPORTED_MODULE_14__.Vr),
 /* harmony export */   TornadoVoidSigner: () => (/* reexport safe */ _providers__WEBPACK_IMPORTED_MODULE_14__.Gd),
 /* harmony export */   TornadoWallet: () => (/* reexport safe */ _providers__WEBPACK_IMPORTED_MODULE_14__.nA),
+/* harmony export */   TovarishClient: () => (/* reexport safe */ _tovarishClient__WEBPACK_IMPORTED_MODULE_17__.E),
 /* harmony export */   _META: () => (/* reexport safe */ _graphql__WEBPACK_IMPORTED_MODULE_1__._META),
 /* harmony export */   addNetwork: () => (/* reexport safe */ _networkConfig__WEBPACK_IMPORTED_MODULE_11__.AE),
 /* harmony export */   ajv: () => (/* reexport safe */ _schemas__WEBPACK_IMPORTED_MODULE_2__.SS),
-/* harmony export */   base64ToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.Kp),
+/* harmony export */   base64ToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.Kp),
-/* harmony export */   bigIntReplacer: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.gn),
+/* harmony export */   bigIntReplacer: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.gn),
-/* harmony export */   bnToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.jm),
+/* harmony export */   bnToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.jm),
 /* harmony export */   buffPedersenHash: () => (/* reexport safe */ _pedersen__WEBPACK_IMPORTED_MODULE_12__.UB),
-/* harmony export */   bufferToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.lY),
+/* harmony export */   bufferToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.lY),
-/* harmony export */   bytesToBN: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.Ju),
+/* harmony export */   bytesToBN: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.Ju),
-/* harmony export */   bytesToBase64: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__["if"]),
+/* harmony export */   bytesToBase64: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__["if"]),
-/* harmony export */   bytesToHex: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.My),
+/* harmony export */   bytesToHex: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.My),
 /* harmony export */   calculateScore: () => (/* reexport safe */ _relayerClient__WEBPACK_IMPORTED_MODULE_15__.zy),
-/* harmony export */   calculateSnarkProof: () => (/* reexport safe */ _websnark__WEBPACK_IMPORTED_MODULE_18__.i),
+/* harmony export */   calculateSnarkProof: () => (/* reexport safe */ _websnark__WEBPACK_IMPORTED_MODULE_19__.i),
-/* harmony export */   chunk: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.iv),
+/* harmony export */   chunk: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.iv),
-/* harmony export */   concatBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.Id),
+/* harmony export */   concatBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.Id),
 /* harmony export */   convertETHToTokenAmount: () => (/* reexport safe */ _fees__WEBPACK_IMPORTED_MODULE_7__.N),
 /* harmony export */   createDeposit: () => (/* reexport safe */ _deposits__WEBPACK_IMPORTED_MODULE_5__.Hr),
-/* harmony export */   crypto: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.Et),
+/* harmony export */   crypto: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.Et),
 /* harmony export */   customConfig: () => (/* reexport safe */ _networkConfig__WEBPACK_IMPORTED_MODULE_11__.cX),
 /* harmony export */   defaultConfig: () => (/* reexport safe */ _networkConfig__WEBPACK_IMPORTED_MODULE_11__.sb),
 /* harmony export */   defaultUserAgent: () => (/* reexport safe */ _providers__WEBPACK_IMPORTED_MODULE_14__.mJ),
-/* harmony export */   digest: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.br),
+/* harmony export */   digest: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.br),
 /* harmony export */   enabledChains: () => (/* reexport safe */ _networkConfig__WEBPACK_IMPORTED_MODULE_11__.Af),
 /* harmony export */   factories: () => (/* reexport safe */ _typechain__WEBPACK_IMPORTED_MODULE_3__.XB),
 /* harmony export */   fetch: () => (/* reexport safe */ _providers__WEBPACK_IMPORTED_MODULE_14__.hd),
@@ -173194,12 +173394,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getTokenBalances: () => (/* reexport safe */ _tokens__WEBPACK_IMPORTED_MODULE_16__.H),
 /* harmony export */   getWeightRandom: () => (/* reexport safe */ _relayerClient__WEBPACK_IMPORTED_MODULE_15__.c$),
 /* harmony export */   getWithdrawals: () => (/* reexport safe */ _graphql__WEBPACK_IMPORTED_MODULE_1__.getWithdrawals),
-/* harmony export */   hexToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.aT),
+/* harmony export */   hexToBytes: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.aT),
-/* harmony export */   initGroth16: () => (/* reexport safe */ _websnark__WEBPACK_IMPORTED_MODULE_18__.O),
+/* harmony export */   initGroth16: () => (/* reexport safe */ _websnark__WEBPACK_IMPORTED_MODULE_19__.O),
-/* harmony export */   isNode: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.Ll),
+/* harmony export */   isNode: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.Ll),
 /* harmony export */   jobsSchema: () => (/* reexport safe */ _schemas__WEBPACK_IMPORTED_MODULE_2__.Us),
-/* harmony export */   leBuff2Int: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.ae),
+/* harmony export */   leBuff2Int: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.ae),
-/* harmony export */   leInt2Buff: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.EI),
+/* harmony export */   leInt2Buff: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.EI),
 /* harmony export */   mimc: () => (/* reexport safe */ _mimc__WEBPACK_IMPORTED_MODULE_9__.f),
 /* harmony export */   multicall: () => (/* reexport safe */ _multicall__WEBPACK_IMPORTED_MODULE_10__.C),
 /* harmony export */   packEncryptedMessage: () => (/* reexport safe */ _encryptedNotes__WEBPACK_IMPORTED_MODULE_6__.Fr),
@@ -173207,13 +173407,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   pickWeightedRandomRelayer: () => (/* reexport safe */ _relayerClient__WEBPACK_IMPORTED_MODULE_15__.sN),
 /* harmony export */   populateTransaction: () => (/* reexport safe */ _providers__WEBPACK_IMPORTED_MODULE_14__.zr),
 /* harmony export */   queryGraph: () => (/* reexport safe */ _graphql__WEBPACK_IMPORTED_MODULE_1__.queryGraph),
-/* harmony export */   rBigInt: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.ib),
+/* harmony export */   rBigInt: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.ib),
-/* harmony export */   sleep: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.yy),
+/* harmony export */   sleep: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.yy),
-/* harmony export */   substring: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.uU),
+/* harmony export */   substring: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.uU),
-/* harmony export */   toFixedHex: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.$W),
+/* harmony export */   toFixedHex: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.$W),
-/* harmony export */   toFixedLength: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.sY),
+/* harmony export */   toFixedLength: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.sY),
 /* harmony export */   unpackEncryptedMessage: () => (/* reexport safe */ _encryptedNotes__WEBPACK_IMPORTED_MODULE_6__.ol),
-/* harmony export */   validateUrl: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_17__.wv)
+/* harmony export */   validateUrl: () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_18__.wv)
 /* harmony export */ });
 /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94513);
 /* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
@@ -173235,8 +173435,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _providers__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(68434);
 /* harmony import */ var _relayerClient__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(57194);
 /* harmony import */ var _tokens__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(7393);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(67418);
+/* harmony import */ var _tovarishClient__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(96838);
-/* harmony import */ var _websnark__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(26746);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(67418);
+/* harmony import */ var _websnark__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(26746);
+
 
 
 

src/index.ts

@@ -15,5 +15,6 @@ export * from './prices';
 export * from './providers';
 export * from './relayerClient';
 export * from './tokens';
+export * from './tovarishClient';
 export * from './utils';
 export * from './websnark';