diff --git a/dist/cli.js b/dist/cli.js index 728f7a1..adc8fea 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -176838,6 +176838,15 @@ function getActiveTokens(config) { const { tokens, disabledTokens } = config; return Object.keys(tokens).filter((t) => !(disabledTokens == null ? void 0 : disabledTokens.includes(t))); } +function getActiveTokenInstances(config) { + const { tokens, disabledTokens } = config; + return Object.entries(tokens).reduce((acc, [token, instances]) => { + if (!(disabledTokens == null ? void 0 : disabledTokens.includes(token))) { + acc[token] = instances; + } + return acc; + }, {}); +} function getInstanceByAddress(config, address) { const { tokens, disabledTokens } = config; for (const [currency, { instanceAddress }] of Object.entries(tokens)) { @@ -177026,7 +177035,7 @@ var __async$9 = (__this, __arguments, generator) => { }); }; const MIN_FEE = 0.1; -const MAX_FEE = 0.6; +const MAX_FEE = 0.9; const MIN_STAKE_BALANCE = parseEther("500"); function calculateScore({ stakeBalance, tornadoServiceFee }) { if (tornadoServiceFee < MIN_FEE) { @@ -177274,13 +177283,13 @@ class BaseEventsService { contract, type = "", deployedBlock = 0, - fetchDataOptions + fetchDataOptions: fetchDataOptions2 }) { this.netId = netId; this.provider = provider; this.graphApi = graphApi; this.subgraphName = subgraphName; - this.fetchDataOptions = fetchDataOptions; + this.fetchDataOptions = fetchDataOptions2; this.contract = contract; this.type = type; this.deployedBlock = deployedBlock; @@ -177478,9 +177487,9 @@ class BaseTornadoService extends BaseEventsService { amount, currency, deployedBlock, - fetchDataOptions + fetchDataOptions: fetchDataOptions2 }) { - super({ netId, provider, graphApi, subgraphName, contract: Tornado, type, deployedBlock, fetchDataOptions }); + super({ netId, provider, graphApi, subgraphName, contract: Tornado, type, deployedBlock, fetchDataOptions: fetchDataOptions2 }); this.amount = amount; this.currency = currency; this.batchTransactionService = new BatchTransactionService({ @@ -177574,9 +177583,9 @@ class BaseEchoService extends BaseEventsService { subgraphName, Echoer, deployedBlock, - fetchDataOptions + fetchDataOptions: fetchDataOptions2 }) { - super({ netId, provider, graphApi, subgraphName, contract: Echoer, deployedBlock, fetchDataOptions }); + super({ netId, provider, graphApi, subgraphName, contract: Echoer, deployedBlock, fetchDataOptions: fetchDataOptions2 }); } getInstanceName() { return `echo_${this.netId}`; @@ -177625,9 +177634,9 @@ class BaseEncryptedNotesService extends BaseEventsService { subgraphName, Router, deployedBlock, - fetchDataOptions + fetchDataOptions: fetchDataOptions2 }) { - super({ netId, provider, graphApi, subgraphName, contract: Router, deployedBlock, fetchDataOptions }); + super({ netId, provider, graphApi, subgraphName, contract: Router, deployedBlock, fetchDataOptions: fetchDataOptions2 }); } getInstanceName() { return `encrypted_notes_${this.netId}`; @@ -177664,9 +177673,9 @@ class BaseGovernanceService extends BaseEventsService { subgraphName, Governance, deployedBlock, - fetchDataOptions + fetchDataOptions: fetchDataOptions2 }) { - super({ netId, provider, graphApi, subgraphName, contract: Governance, deployedBlock, fetchDataOptions }); + super({ netId, provider, graphApi, subgraphName, contract: Governance, deployedBlock, fetchDataOptions: fetchDataOptions2 }); this.batchTransactionService = new BatchTransactionService({ provider, onProgress: this.updateTransactionProgress @@ -177760,6 +177769,26 @@ class BaseGovernanceService extends BaseEventsService { }); } } +function getTovarishNetworks(registryService, relayers) { + return __async$8(this, null, function* () { + yield Promise.all( + relayers.filter((r) => r.tovarishUrl).map((relayer) => __async$8(this, null, function* () { + var _a, _b; + try { + relayer.tovarishNetworks = yield fetchData(relayer.tovarishUrl, __spreadProps(__spreadValues({}, registryService.fetchDataOptions), { + headers: { + "Content-Type": "application/json" + }, + timeout: ((_a = registryService.fetchDataOptions) == null ? void 0 : _a.torPort) ? 1e4 : 3e3, + maxRetry: ((_b = registryService.fetchDataOptions) == null ? void 0 : _b.torPort) ? 2 : 0 + })); + } catch (e) { + relayer.tovarishNetworks = []; + } + })) + ); + }); +} class BaseRegistryService extends BaseEventsService { constructor({ netId, @@ -177770,9 +177799,9 @@ class BaseRegistryService extends BaseEventsService { Aggregator, relayerEnsSubdomains, deployedBlock, - fetchDataOptions + fetchDataOptions: fetchDataOptions2 }) { - super({ netId, provider, graphApi, subgraphName, contract: RelayerRegistry, deployedBlock, fetchDataOptions }); + super({ netId, provider, graphApi, subgraphName, contract: RelayerRegistry, deployedBlock, fetchDataOptions: fetchDataOptions2 }); this.Aggregator = Aggregator; this.relayerEnsSubdomains = relayerEnsSubdomains; this.updateInterval = 86400; @@ -177849,13 +177878,18 @@ class BaseRegistryService extends BaseEventsService { }); const relayerNameHashes = uniqueRegisters.map((r) => namehash(r.ensName)); const [relayersData, timestamp] = yield Promise.all([ - this.Aggregator.relayersData.staticCall(relayerNameHashes, subdomains), + this.Aggregator.relayersData.staticCall(relayerNameHashes, subdomains.concat("tovarish-relayer")), this.provider.getBlock("latest").then((b) => Number(b == null ? void 0 : b.timestamp)) ]); const relayers = relayersData.map(({ owner, balance: stakeBalance, records, isRegistered }, index) => { const { ensName, relayerAddress } = uniqueRegisters[index]; + let tovarishUrl = void 0; const hostnames = records.reduce((acc, record, recordIndex) => { if (record) { + if (recordIndex === records.length - 1) { + tovarishUrl = record; + return acc; + } acc[Number(Object.keys(this.relayerEnsSubdomains)[recordIndex])] = record; } return acc; @@ -177870,10 +177904,12 @@ class BaseRegistryService extends BaseEventsService { isRegistered, owner, stakeBalance: formatEther(stakeBalance), - hostnames + hostnames, + tovarishUrl }; } }).filter((r) => r); + yield getTovarishNetworks(this, relayers); return { timestamp, relayers diff --git a/yarn.lock b/yarn.lock index 2660d0d..c1aadf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -781,9 +781,9 @@ "@openzeppelin/contracts-v3" "npm:@openzeppelin/contracts@3.2.0-rc.0" ethers "^6.4.0" -"@tornado/core@git+https://git.tornado.ws/tornadocontrib/tornado-core.git#f7fdf7db0a813ae2193f9864e212d68dc840c0d7": - version "1.0.14" - resolved "git+https://git.tornado.ws/tornadocontrib/tornado-core.git#f7fdf7db0a813ae2193f9864e212d68dc840c0d7" +"@tornado/core@git+https://git.tornado.ws/tornadocontrib/tornado-core.git#c155649719d121fe50799420750f531eb50589ce": + version "1.0.15" + resolved "git+https://git.tornado.ws/tornadocontrib/tornado-core.git#c155649719d121fe50799420750f531eb50589ce" dependencies: "@metamask/eth-sig-util" "^7.0.3" "@tornado/contracts" "^1.0.1"