@sentio/sdk 1.40.5 → 1.41.0-rc.1

package/lib/{core → eth}/eth-plugin.js

@@ -4,15 +4,15 @@ exports.EthPlugin = void 0;
 const runtime_1 = require("@sentio/runtime");
 const protos_1 = require("@sentio/protos");
 const nice_grpc_1 = require("nice-grpc");
-const binds_1 = require("../binds");
-const account_processor_1 = require("./account-processor");
+const binds_1 = require("./binds");
+const account_processor_state_1 = require("./account-processor-state");
 const base_processor_template_1 = require("./base-processor-template");
 class EthPlugin extends runtime_1.Plugin {
     name = 'EthPlugin';
     eventHandlers = [];
     traceHandlers = [];
     blockHandlers = [];
-    configure(config) {
+    async configure(config) {
         // This syntax is to copy values instead of using references
         config.templateInstances = [...base_processor_template_1.TemplateInstanceState.INSTANCE.getValues()];
         for (const processor of binds_1.ProcessorState.INSTANCE.getValues()) {
@@ -72,15 +72,16 @@ class EthPlugin extends runtime_1.Plugin {
                     fetchConfig: eventsHandler.fetchConfig,
                 };
                 for (const filter of eventsHandler.filters) {
-                    if (!filter.topics) {
-                        throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'Topic should not be null');
-                    }
+                    const topics = await filter.getTopicFilter();
+                    // if (!filter.topics) {
+                    //   throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
+                    // }
                     const logFilter = {
                         addressType: undefined,
                         address: contractConfig.contract?.address,
                         topics: [],
                     };
-                    for (const ts of filter.topics) {
+                    for (const ts of topics) {
                         let hashes = [];
                         if (Array.isArray(ts)) {
                             hashes = hashes.concat(ts);
@@ -98,7 +99,7 @@ class EthPlugin extends runtime_1.Plugin {
             config.contractConfigs.push(contractConfig);
         }
         // part 1.b prepare EVM account processors
-        for (const processor of account_processor_1.AccountProcessorState.INSTANCE.getValues()) {
+        for (const processor of account_processor_state_1.AccountProcessorState.INSTANCE.getValues()) {
             const accountConfig = {
                 address: processor.config.address,
                 chainId: processor.getChainId().toString(),
@@ -117,15 +118,20 @@ class EthPlugin extends runtime_1.Plugin {
                     fetchConfig: eventsHandler.fetchConfig,
                 };
                 for (const filter of eventsHandler.filters) {
-                    if (!filter.topics) {
-                        throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'Topic should not be null');
+                    const topics = await filter.getTopicFilter();
+                    // if (!filter.topics) {
+                    //   throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
+                    // }
+                    let address = undefined;
+                    if (filter.address) {
+                        address = filter.address.toString();
                     }
                     const logFilter = {
                         addressType: filter.addressType,
-                        address: filter.address,
+                        address,
                         topics: [],
                     };
-                    for (const ts of filter.topics) {
+                    for (const ts of topics) {
                         let hashes = [];
                         if (Array.isArray(ts)) {
                             hashes = hashes.concat(ts);
@@ -156,7 +162,7 @@ class EthPlugin extends runtime_1.Plugin {
                 throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType);
         }
     }
-    start(request) {
+    async start(request) {
         for (const instance of request.templateInstances) {
             const template = base_processor_template_1.ProcessorTemplateProcessorState.INSTANCE.getValues()[instance.templateId];
             if (!template) {

package/lib/eth/eth-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eth-plugin.js","sourceRoot":"","sources":["../../src/eth/eth-plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { Plugin, PluginManager, errorString, mergeProcessResults, USER_PROCESSOR } from '@sentio/runtime'\nimport {\n  AccountConfig,\n  ContractConfig,\n  Data_EthBlock,\n  Data_EthLog,\n  Data_EthTrace,\n  DataBinding,\n  HandlerType,\n  LogFilter,\n  LogHandlerConfig,\n  ProcessConfigResponse,\n  ProcessResult,\n  StartRequest,\n} from '@sentio/protos'\n\nimport { ServerError, Status } from 'nice-grpc'\nimport { ProcessorState } from './binds'\nimport { AccountProcessorState } from './account-processor-state'\nimport { ProcessorTemplateProcessorState, TemplateInstanceState } from './base-processor-template'\n\nexport class EthPlugin extends Plugin {\n  name: string = 'EthPlugin'\n\n  private eventHandlers: ((event: Data_EthLog) => Promise<ProcessResult>)[] = []\n  private traceHandlers: ((trace: Data_EthTrace) => Promise<ProcessResult>)[] = []\n  private blockHandlers: ((block: Data_EthBlock) => Promise<ProcessResult>)[] = []\n\n  async configure(config: ProcessConfigResponse) {\n    // This syntax is to copy values instead of using references\n    config.templateInstances = [...TemplateInstanceState.INSTANCE.getValues()]\n\n    for (const processor of ProcessorState.INSTANCE.getValues()) {\n      // If server favor incremental update this need to change\n      // Start basic config for contract\n      const chainId = processor.getChainId()\n      // this.processorsByChainId.set(chainId, processor)\n\n      const contractConfig: ContractConfig = {\n        processorType: USER_PROCESSOR,\n        contract: {\n          name: processor.config.name,\n          chainId: chainId.toString(),\n          address: processor.config.address,\n          abi: '',\n        },\n        intervalConfigs: [],\n        logConfigs: [],\n        traceConfigs: [],\n        transactionConfig: [],\n        startBlock: processor.config.startBlock,\n        endBlock: 0n,\n        instructionConfig: undefined,\n        aptosEventConfigs: [],\n        aptosCallConfigs: [],\n      }\n      if (processor.config.endBlock) {\n        contractConfig.endBlock = processor.config.endBlock\n      }\n\n      // Step 1. Prepare all the block handlers\n      for (const blockHandler of processor.blockHandlers) {\n        const handlerId = this.blockHandlers.push(blockHandler.handler) - 1\n        // TODO wrap the block handler into one\n\n        contractConfig.intervalConfigs.push({\n          slot: 0,\n          slotInterval: blockHandler.blockInterval,\n          minutes: 0,\n          minutesInterval: blockHandler.timeIntervalInMinutes,\n          handlerId: handlerId,\n        })\n      }\n\n      // Step 2. Prepare all trace handlers\n      for (const traceHandler of processor.traceHandlers) {\n        const handlerId = this.traceHandlers.push(traceHandler.handler) - 1\n        contractConfig.traceConfigs.push({\n          signature: traceHandler.signature,\n          handlerId: handlerId,\n          fetchConfig: traceHandler.fetchConfig,\n        })\n      }\n\n      // Step 3. Prepare all the event handlers\n      for (const eventsHandler of processor.eventHandlers) {\n        // associate id with filter\n        const handlerId = this.eventHandlers.push(eventsHandler.handler) - 1\n        const logConfig: LogHandlerConfig = {\n          handlerId: handlerId,\n          filters: [],\n          fetchConfig: eventsHandler.fetchConfig,\n        }\n\n        for (const filter of eventsHandler.filters) {\n          const topics = await filter.getTopicFilter()\n\n          // if (!filter.topics) {\n          //   throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')\n          // }\n          const logFilter: LogFilter = {\n            addressType: undefined,\n            address: contractConfig.contract?.address,\n            topics: [],\n          }\n\n          for (const ts of topics) {\n            let hashes: string[] = []\n            if (Array.isArray(ts)) {\n              hashes = hashes.concat(ts)\n            } else if (ts) {\n              hashes.push(ts)\n            }\n            logFilter.topics.push({ hashes: hashes })\n          }\n          logConfig.filters.push(logFilter)\n        }\n        contractConfig.logConfigs.push(logConfig)\n      }\n\n      // Finish up a contract\n      config.contractConfigs.push(contractConfig)\n    }\n\n    // part 1.b prepare EVM account processors\n    for (const processor of AccountProcessorState.INSTANCE.getValues()) {\n      const accountConfig: AccountConfig = {\n        address: processor.config.address,\n        chainId: processor.getChainId().toString(),\n        startBlock: processor.config.startBlock ? BigInt(processor.config.startBlock) : 0n,\n        aptosIntervalConfigs: [],\n        intervalConfigs: [],\n        logConfigs: [],\n      }\n      // TODO add interval\n      for (const eventsHandler of processor.eventHandlers) {\n        // associate id with filter\n        const handlerId = this.eventHandlers.push(eventsHandler.handler) - 1\n        const logConfig: LogHandlerConfig = {\n          handlerId: handlerId,\n          filters: [],\n          fetchConfig: eventsHandler.fetchConfig,\n        }\n\n        for (const filter of eventsHandler.filters) {\n          const topics = await filter.getTopicFilter()\n          // if (!filter.topics) {\n          //   throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')\n          // }\n          let address = undefined\n          if (filter.address) {\n            address = filter.address.toString()\n          }\n          const logFilter: LogFilter = {\n            addressType: filter.addressType,\n            address,\n            topics: [],\n          }\n\n          for (const ts of topics) {\n            let hashes: string[] = []\n            if (Array.isArray(ts)) {\n              hashes = hashes.concat(ts)\n            } else if (ts) {\n              hashes.push(ts)\n            }\n            logFilter.topics.push({ hashes: hashes })\n          }\n          logConfig.filters.push(logFilter)\n        }\n        accountConfig.logConfigs.push(logConfig)\n      }\n\n      config.accountConfigs.push(accountConfig)\n    }\n  }\n\n  supportedHandlers = [HandlerType.ETH_LOG, HandlerType.ETH_BLOCK, HandlerType.ETH_TRACE]\n\n  processBinding(request: DataBinding): Promise<ProcessResult> {\n    // return Promise.resolve(undefined);\n    switch (request.handlerType) {\n      case HandlerType.ETH_LOG:\n        return this.processLog(request)\n      case HandlerType.ETH_TRACE:\n        return this.processTrace(request)\n      case HandlerType.ETH_BLOCK:\n        return this.processBlock(request)\n      default:\n        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)\n    }\n  }\n\n  async start(request: StartRequest) {\n    for (const instance of request.templateInstances) {\n      const template = ProcessorTemplateProcessorState.INSTANCE.getValues()[instance.templateId]\n      if (!template) {\n        throw new ServerError(Status.INVALID_ARGUMENT, 'Invalid template contract:' + instance)\n      }\n      if (!instance.contract) {\n        throw new ServerError(Status.INVALID_ARGUMENT, 'Contract Empty from:' + instance)\n      }\n      template.bind({\n        name: instance.contract.name,\n        address: instance.contract.address,\n        network: Number(instance.contract.chainId),\n        startBlock: instance.startBlock,\n        endBlock: instance.endBlock,\n      })\n    }\n  }\n\n  stateDiff(config: ProcessConfigResponse): boolean {\n    return TemplateInstanceState.INSTANCE.getValues().length !== config.templateInstances.length\n  }\n\n  async processLog(request: DataBinding): Promise<ProcessResult> {\n    if (!request.data?.ethLog?.log) {\n      throw new ServerError(Status.INVALID_ARGUMENT, \"Log can't be null\")\n    }\n    const ethLog = request.data.ethLog\n\n    const promises: Promise<ProcessResult>[] = []\n    for (const handlerId of request.handlerIds) {\n      const handler = this.eventHandlers[handlerId]\n      promises.push(\n        handler(ethLog).catch((e) => {\n          throw new ServerError(\n            Status.INTERNAL,\n            'error processing log: ' + JSON.stringify(ethLog.log) + '\\n' + errorString(e)\n          )\n        })\n      )\n    }\n    return mergeProcessResults(await Promise.all(promises))\n  }\n\n  async processTrace(binding: DataBinding): Promise<ProcessResult> {\n    if (!binding.data?.ethTrace?.trace) {\n      throw new ServerError(Status.INVALID_ARGUMENT, \"Trace can't be null\")\n    }\n    const ethTrace = binding.data.ethTrace\n\n    const promises: Promise<ProcessResult>[] = []\n\n    for (const handlerId of binding.handlerIds) {\n      promises.push(\n        this.traceHandlers[handlerId](ethTrace).catch((e) => {\n          throw new ServerError(\n            Status.INTERNAL,\n            'error processing trace: ' + JSON.stringify(ethTrace.trace) + '\\n' + errorString(e)\n          )\n        })\n      )\n    }\n    return mergeProcessResults(await Promise.all(promises))\n  }\n\n  async processBlock(binding: DataBinding): Promise<ProcessResult> {\n    if (!binding.data?.ethBlock?.block) {\n      throw new ServerError(Status.INVALID_ARGUMENT, \"Block can't be empty\")\n    }\n    const ethBlock = binding.data.ethBlock\n\n    const promises: Promise<ProcessResult>[] = []\n    for (const handlerId of binding.handlerIds) {\n      promises.push(\n        this.blockHandlers[handlerId](ethBlock).catch((e) => {\n          throw new ServerError(\n            Status.INTERNAL,\n            'error processing block: ' + ethBlock.block?.number + '\\n' + errorString(e)\n          )\n        })\n      )\n    }\n    return mergeProcessResults(await Promise.all(promises))\n  }\n}\n\nPluginManager.INSTANCE.register(new EthPlugin())\n"]}

package/lib/{core → eth}/generic-processor.d.ts

@@ -1,6 +1,6 @@
-import { BaseContract } from '@ethersproject/contracts';
-import { BoundContractView, ContractView } from './context';
-import { BindOptions } from './bind-options';
+import { BaseContract } from 'ethers';
+import { BoundContractView, ContractView } from '../core/context';
+import { BindOptions } from '../core/bind-options';
 import { BaseProcessor } from './base-processor';
 export declare class GenericProcessor extends BaseProcessor<BaseContract, BoundContractView<BaseContract, ContractView<BaseContract>>> {
     eventABI: string[];

package/lib/{core → eth}/generic-processor.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericProcessor = void 0;
-const contracts_1 = require("@ethersproject/contracts");
-const context_1 = require("./context");
+const ethers_1 = require("ethers");
+const context_1 = require("../core/context");
 const base_processor_1 = require("./base-processor");
-const runtime_1 = require("@sentio/runtime");
-const binds_1 = require("../binds");
+const provider_1 = require("./provider");
+const binds_1 = require("./binds");
 class GenericProcessor extends base_processor_1.BaseProcessor {
     eventABI;
     constructor(eventABI, options) {
@@ -13,7 +13,7 @@ class GenericProcessor extends base_processor_1.BaseProcessor {
         this.eventABI = eventABI;
     }
     CreateBoundContractView() {
-        const contract = new contracts_1.BaseContract(this.config.address, this.eventABI, (0, runtime_1.getProvider)(this.config.network));
+        const contract = new ethers_1.BaseContract(this.config.address, this.eventABI, (0, provider_1.getProvider)(this.config.network));
         return new context_1.BoundContractView(new context_1.ContractView(contract));
     }
     static bind(eventABI, options) {

package/lib/eth/generic-processor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generic-processor.js","sourceRoot":"","sources":["../../src/eth/generic-processor.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AACrC,6CAAiE;AAEjE,qDAAgD;AAChD,yCAAwC;AACxC,mCAAsC;AAEtC,MAAa,gBAAiB,SAAQ,8BAGrC;IACC,QAAQ,CAAU;IAClB,YAAY,QAAkB,EAAE,OAAoB;QAClD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAES,uBAAuB;QAC/B,MAAM,QAAQ,GAAG,IAAI,qBAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAA,sBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QACvG,OAAO,IAAI,2BAAiB,CAAC,IAAI,sBAAY,CAAe,QAAQ,CAAC,CAAC,CAAA;IACxE,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,QAA2B,EAAE,OAAoB;QAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC5B,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAA;SACtB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,OAAO,CAAC,IAAI,GAAG,SAAS,CAAA;SACzB;QACD,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACzD,IAAA,oBAAY,EAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AA1BD,4CA0BC","sourcesContent":["import { BaseContract } from 'ethers'\nimport { BoundContractView, ContractView } from '../core/context'\nimport { BindOptions } from '../core/bind-options'\nimport { BaseProcessor } from './base-processor'\nimport { getProvider } from './provider'\nimport { addProcessor } from './binds'\n\nexport class GenericProcessor extends BaseProcessor<\n  BaseContract,\n  BoundContractView<BaseContract, ContractView<BaseContract>>\n> {\n  eventABI: string[]\n  constructor(eventABI: string[], options: BindOptions) {\n    super(options)\n    this.eventABI = eventABI\n  }\n\n  protected CreateBoundContractView(): BoundContractView<BaseContract, ContractView<BaseContract>> {\n    const contract = new BaseContract(this.config.address, this.eventABI, getProvider(this.config.network))\n    return new BoundContractView(new ContractView<BaseContract>(contract))\n  }\n\n  public static bind(eventABI: string[] | string, options: BindOptions): GenericProcessor {\n    if (!Array.isArray(eventABI)) {\n      eventABI = [eventABI]\n    }\n    if (!options.name) {\n      options.name = 'Generic'\n    }\n    const processor = new GenericProcessor(eventABI, options)\n    addProcessor(options, processor)\n    return processor\n  }\n}\n"]}

package/lib/eth/index.d.ts

@@ -0,0 +1,6 @@
+export { BaseProcessor } from './base-processor';
+export { GenericProcessor } from './generic-processor';
+export { BaseProcessorTemplate } from './base-processor-template';
+export { getProvider, DummyProvider } from './provider';
+export type { TypedCallTrace, Trace } from './trace';
+export { EthPlugin } from './eth-plugin';

package/lib/eth/index.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthPlugin = exports.DummyProvider = exports.getProvider = exports.BaseProcessorTemplate = exports.GenericProcessor = exports.BaseProcessor = void 0;
+var base_processor_1 = require("./base-processor");
+Object.defineProperty(exports, "BaseProcessor", { enumerable: true, get: function () { return base_processor_1.BaseProcessor; } });
+var generic_processor_1 = require("./generic-processor");
+Object.defineProperty(exports, "GenericProcessor", { enumerable: true, get: function () { return generic_processor_1.GenericProcessor; } });
+var base_processor_template_1 = require("./base-processor-template");
+Object.defineProperty(exports, "BaseProcessorTemplate", { enumerable: true, get: function () { return base_processor_template_1.BaseProcessorTemplate; } });
+var provider_1 = require("./provider");
+Object.defineProperty(exports, "getProvider", { enumerable: true, get: function () { return provider_1.getProvider; } });
+Object.defineProperty(exports, "DummyProvider", { enumerable: true, get: function () { return provider_1.DummyProvider; } });
+var eth_plugin_1 = require("./eth-plugin");
+Object.defineProperty(exports, "EthPlugin", { enumerable: true, get: function () { return eth_plugin_1.EthPlugin; } });
+//# sourceMappingURL=index.js.map

package/lib/eth/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAAvC,+GAAA,aAAa,OAAA;AACtB,yDAAsD;AAA7C,qHAAA,gBAAgB,OAAA;AACzB,qEAAiE;AAAxD,gIAAA,qBAAqB,OAAA;AAC9B,uCAAuD;AAA9C,uGAAA,WAAW,OAAA;AAAE,yGAAA,aAAa,OAAA;AAEnC,2CAAwC;AAA/B,uGAAA,SAAS,OAAA","sourcesContent":["export { BaseProcessor } from './base-processor'\nexport { GenericProcessor } from './generic-processor'\nexport { BaseProcessorTemplate } from './base-processor-template'\nexport { getProvider, DummyProvider } from './provider'\nexport type { TypedCallTrace, Trace } from './trace'\nexport { EthPlugin } from './eth-plugin'\n"]}

package/lib/eth/provider.d.ts

@@ -0,0 +1,4 @@
+import { Provider, JsonRpcProvider } from 'ethers';
+import { Networkish } from 'ethers/providers';
+export declare const DummyProvider: JsonRpcProvider;
+export declare function getProvider(networkish?: Networkish): Provider;

package/lib/eth/provider.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProvider = exports.DummyProvider = void 0;
+const tslib_1 = require("tslib");
+const ethers_1 = require("ethers");
+const p_queue_1 = tslib_1.__importDefault(require("p-queue"));
+const runtime_1 = require("@sentio/runtime");
+exports.DummyProvider = new ethers_1.JsonRpcProvider('', ethers_1.Network.from(1));
+const providers = new Map();
+function getProvider(networkish) {
+    if (!networkish) {
+        networkish = 1;
+    }
+    const network = ethers_1.Network.from(networkish);
+    // TODO check if other key needed
+    const address = runtime_1.Endpoints.INSTANCE.chainServer.get(network.chainId.toString());
+    const key = network.chainId.toString() + '-' + address;
+    let provider = providers.get(key);
+    if (provider) {
+        return provider;
+    }
+    if (address === undefined) {
+        throw Error('Provider not found for chain ' +
+            network.chainId +
+            ', configured chains: ' +
+            [...runtime_1.Endpoints.INSTANCE.chainServer.keys()].join(' '));
+    }
+    provider = new QueuedStaticJsonRpcProvider(address, network, runtime_1.Endpoints.INSTANCE.concurrency);
+    providers.set(network.chainId.toString(), provider);
+    return provider;
+}
+exports.getProvider = getProvider;
+// export function setProvider(config: Record<string, ChainConfig>, concurrency = 4, useChainServer = false) {
+//   Endpoints.INSTANCE.providers = new Map<bigint, Provider>()
+//
+//   for (const chainIdStr in config) {
+//     if (isNaN(Number.parseInt(chainIdStr))) {
+//       continue
+//     }
+//
+//     const chainConfig = config[chainIdStr]
+//     const chainId = BigInt(chainIdStr)
+//
+//     // let providers: StaticJsonRpcProvider[] = []
+//     // for (const http of chainConfig.Https) {
+//     //   providers.push(new StaticJsonRpcProvider(http, chainId))
+//     // }
+//     // random shuffle
+//     // providers = providers.sort(() => Math.random() - 0.5)
+//
+//     // const provider = new FallbackProvider(providers)
+//
+//     let rpcAddress = ''
+//     if (useChainServer && chainConfig.ChainServer) {
+//       rpcAddress = chainConfig.ChainServer
+//     } else {
+//       const idx = Math.floor(Math.random() * chainConfig.Https.length)
+//       rpcAddress = chainConfig.Https[idx]
+//     }
+//
+//     Endpoints.INSTANCE.providers.set(chainId, provider)
+//   }
+// }
+class QueuedStaticJsonRpcProvider extends ethers_1.JsonRpcProvider {
+    executor;
+    constructor(url, network, concurrency) {
+        super(url, ethers_1.Network.from(network));
+        this.executor = new p_queue_1.default({ concurrency: concurrency });
+    }
+    send(method, params) {
+        return this.executor.add(() => super.send(method, params));
+    }
+}
+//# sourceMappingURL=provider.js.map

package/lib/eth/provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":";;;;AAAA,mCAA2D;AAG3D,8DAA4B;AAC5B,6CAA2C;AAE9B,QAAA,aAAa,GAAG,IAAI,wBAAe,CAAC,EAAE,EAAE,gBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAA;AAEpD,SAAgB,WAAW,CAAC,UAAuB;IACjD,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,CAAC,CAAA;KACf;IACD,MAAM,OAAO,GAAG,gBAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACxC,iCAAiC;IAEjC,MAAM,OAAO,GAAG,mBAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9E,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,OAAO,CAAA;IACtD,IAAI,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEjC,IAAI,QAAQ,EAAE;QACZ,OAAO,QAAQ,CAAA;KAChB;IAED,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,KAAK,CACT,+BAA+B;YAC7B,OAAO,CAAC,OAAO;YACf,uBAAuB;YACvB,CAAC,GAAG,mBAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACvD,CAAA;KACF;IACD,QAAQ,GAAG,IAAI,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,mBAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC5F,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAA;IACnD,OAAO,QAAQ,CAAA;AACjB,CAAC;AA1BD,kCA0BC;AAED,8GAA8G;AAC9G,+DAA+D;AAC/D,EAAE;AACF,uCAAuC;AACvC,gDAAgD;AAChD,iBAAiB;AACjB,QAAQ;AACR,EAAE;AACF,6CAA6C;AAC7C,yCAAyC;AACzC,EAAE;AACF,qDAAqD;AACrD,iDAAiD;AACjD,oEAAoE;AACpE,WAAW;AACX,wBAAwB;AACxB,+DAA+D;AAC/D,EAAE;AACF,0DAA0D;AAC1D,EAAE;AACF,0BAA0B;AAC1B,uDAAuD;AACvD,6CAA6C;AAC7C,eAAe;AACf,yEAAyE;AACzE,4CAA4C;AAC5C,QAAQ;AACR,EAAE;AACF,0DAA0D;AAC1D,MAAM;AACN,IAAI;AAEJ,MAAM,2BAA4B,SAAQ,wBAAe;IACvD,QAAQ,CAAQ;IAEhB,YAAY,GAAW,EAAE,OAAmB,EAAE,WAAmB;QAC/D,KAAK,CAAC,GAAG,EAAE,gBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,iBAAM,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,IAAI,CAAC,MAAc,EAAE,MAAkB;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC5D,CAAC;CACF","sourcesContent":["import { Provider, Network, JsonRpcProvider } from 'ethers'\nimport { Networkish } from 'ethers/providers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\nexport function getProvider(networkish?: Networkish): Provider {\n  if (!networkish) {\n    networkish = 1\n  }\n  const network = Network.from(networkish)\n  // TODO check if other key needed\n\n  const address = Endpoints.INSTANCE.chainServer.get(network.chainId.toString())\n  const key = network.chainId.toString() + '-' + address\n  let provider = providers.get(key)\n\n  if (provider) {\n    return provider\n  }\n\n  if (address === undefined) {\n    throw Error(\n      'Provider not found for chain ' +\n        network.chainId +\n        ', configured chains: ' +\n        [...Endpoints.INSTANCE.chainServer.keys()].join(' ')\n    )\n  }\n  provider = new QueuedStaticJsonRpcProvider(address, network, Endpoints.INSTANCE.concurrency)\n  providers.set(network.chainId.toString(), provider)\n  return provider\n}\n\n// export function setProvider(config: Record<string, ChainConfig>, concurrency = 4, useChainServer = false) {\n//   Endpoints.INSTANCE.providers = new Map<bigint, Provider>()\n//\n//   for (const chainIdStr in config) {\n//     if (isNaN(Number.parseInt(chainIdStr))) {\n//       continue\n//     }\n//\n//     const chainConfig = config[chainIdStr]\n//     const chainId = BigInt(chainIdStr)\n//\n//     // let providers: StaticJsonRpcProvider[] = []\n//     // for (const http of chainConfig.Https) {\n//     //   providers.push(new StaticJsonRpcProvider(http, chainId))\n//     // }\n//     // random shuffle\n//     // providers = providers.sort(() => Math.random() - 0.5)\n//\n//     // const provider = new FallbackProvider(providers)\n//\n//     let rpcAddress = ''\n//     if (useChainServer && chainConfig.ChainServer) {\n//       rpcAddress = chainConfig.ChainServer\n//     } else {\n//       const idx = Math.floor(Math.random() * chainConfig.Https.length)\n//       rpcAddress = chainConfig.Https[idx]\n//     }\n//\n//     Endpoints.INSTANCE.providers.set(chainId, provider)\n//   }\n// }\n\nclass QueuedStaticJsonRpcProvider extends JsonRpcProvider {\n  executor: PQueue\n\n  constructor(url: string, network: Networkish, concurrency: number) {\n    super(url, Network.from(network))\n    this.executor = new PQueue({ concurrency: concurrency })\n  }\n\n  send(method: string, params: Array<any>): Promise<any> {\n    return this.executor.add(() => super.send(method, params))\n  }\n}\n"]}

package/lib/{core → eth}/trace.d.ts

@@ -1,5 +1,5 @@
-import { Result } from '@ethersproject/abi';
-export interface TypedCallTrace<TArgsArray extends Array<any> = any, TArgsObject = any> extends Trace {
+import { Result } from 'ethers';
+export interface TypedCallTrace<TArgsArray extends Array<any> = any, TArgsObject = any> {
     args: TArgsArray & TArgsObject;
 }
 export interface Trace {

package/lib/eth/trace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/eth/trace.ts"],"names":[],"mappings":";;AA4CA,yBAAyB;AACzB,cAAc;AACd,0DAA0D;AAC1D,wBAAwB;AACxB,oBAAoB;AACpB,aAAa;AACb,sZAAsZ;AACtZ,wDAAwD;AACxD,gCAAgC;AAChC,OAAO;AACP,qFAAqF;AACrF,2BAA2B;AAC3B,gDAAgD;AAChD,kBAAkB;AAClB,sBAAsB;AACtB,2FAA2F;AAC3F,6BAA6B;AAC7B,kBAAkB;AAClB,IAAI;AAEJ,uBAAuB;AACvB,QAAQ;AACR,oBAAoB;AACpB,gEAAgE;AAChE,2BAA2B;AAC3B,0qLAA0qL;AAC1qL,uBAAuB;AACvB,WAAW;AACX,2FAA2F;AAC3F,gCAAgC;AAChC,oBAAoB;AACpB,mEAAmE;AACnE,4yIAA4yI;AAC5yI,6BAA6B;AAC7B,WAAW;AACX,wBAAwB;AACxB,4BAA4B;AAC5B,iGAAiG;AACjG,mCAAmC;AACnC,yBAAyB;AACzB,QAAQ","sourcesContent":["// https://github.com/openethereum/parity-ethereum/blob/55c90d4016505317034e3e98f699af07f5404b63/rpc/src/v1/types/trace.rs#L482\nimport { Result } from 'ethers'\n\nexport interface TypedCallTrace<TArgsArray extends Array<any> = any, TArgsObject = any> {\n  args: TArgsArray & TArgsObject\n}\n\nexport interface Trace {\n  args?: Result\n  action: TraceAction\n  blockHash: string\n  blockNumber: number\n  result: TraceResult\n  subtraces: number\n  traceAddress: number[]\n  transactionHash: string\n  transactionPosition: number\n  type: string\n  error?: string\n}\n// export type CallType = \"call\" | \"callcode\" |  \"delegatecall\" | \"staticcall\"\n\nexport interface TraceAction {\n  from: string\n  to?: string\n  value: number\n  gas: number\n  input?: string\n  callType?: string\n\n  init?: string\n  address?: string\n  balance?: string\n  refundAddress?: string\n}\n\n// TODO are more field missing for FailedCall, FailedCreate\nexport interface TraceResult {\n  gasUsed: number\n  output?: string\n  address?: string\n  code?: string\n}\n\n// const TRACE: Trace = {\n//   action: {\n//     from: '0xd771111cbfa2bbdafbf9f0e58b49b3f827da31f5',\n//     callType: 'call',\n//     gas: 0x12154,\n//     input:\n//       '0xb1a417f4000000000000000000000000d771111cbfa2bbdafbf9f0e58b49b3f827da31f5000000000000000000000000d771111cbfa2bbdafbf9f0e58b49b3f827da31f500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000131888b5aaf000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000',\n//     to: '0x0baba1ad5be3a5c0a66e7ac838a129bf948f1ea4',\n//     value: 0x131888b5aaf0000,\n//   },\n//   blockHash: '0x5451711bc530a7c04128fedbe149eb359c10eccd44a83909d448c5244c7eea26',\n//   blockNumber: 15533908,\n//   result: { gasUsed: 0x114c1, output: '0x' },\n//   subtraces: 1,\n//   traceAddress: [],\n//   transactionHash: '0x66dce11d6217042ed709a38e507e7762c93b1bde4a0447ae7a243493bbdffc0e',\n//   transactionPosition: 73,\n//   type: 'call',\n// }\n\n// const trac2: Trace =\n//     {\n//       \"action\": {\n//         \"from\": \"0x95ba4cf87d6723ad9c0db21737d862be80e93911\",\n//         \"gas\": 0x630d0b,\n//         \"init\": \"0x608060405234801561001057600080fd5b50604051602080610b2983398101806040528101908080519060200190929190505050808060405180807f6f72672e7a657070656c696e6f732e70726f78792e696d706c656d656e74617481526020017f696f6e000000000000000000000000000000000000000000000000000000000081525060230190506040518091039020600019167f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3600102600019161415156100c657fe5b6100de81610169640100000000026401000000009004565b5060405180807f6f72672e7a657070656c696e6f732e70726f78792e61646d696e000000000000815250601a0190506040518091039020600019167f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b6001026000191614151561014a57fe5b6101623361024e640100000000026401000000009004565b5050610290565b60006101878261027d6401000000000261084b176401000000009004565b1515610221576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603b8152602001807f43616e6e6f742073657420612070726f787920696d706c656d656e746174696f81526020017f6e20746f2061206e6f6e2d636f6e74726163742061646472657373000000000081525060400191505060405180910390fd5b7f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c360010290508181555050565b60007f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b60010290508181555050565b600080823b905060008111915050919050565b61088a8061029f6000396000f30060806040526004361061006d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633659cfe6146100775780634f1ef286146100ba5780635c60da1b146101085780638f2839701461015f578063f851a440146101a2575b6100756101f9565b005b34801561008357600080fd5b506100b8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610213565b005b610106600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001908201803590602001919091929391929390505050610268565b005b34801561011457600080fd5b5061011d610308565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561016b57600080fd5b506101a0600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610360565b005b3480156101ae57600080fd5b506101b761051e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b610201610576565b61021161020c610651565b610682565b565b61021b6106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561025c57610257816106d9565b610265565b6102646101f9565b5b50565b6102706106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102fa576102ac836106d9565b3073ffffffffffffffffffffffffffffffffffffffff163483836040518083838082843782019150509250505060006040518083038185875af19250505015156102f557600080fd5b610303565b6103026101f9565b5b505050565b60006103126106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156103545761034d610651565b905061035d565b61035c6101f9565b5b90565b6103686106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561051257600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610466576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260368152602001807f43616e6e6f74206368616e6765207468652061646d696e206f6620612070726f81526020017f787920746f20746865207a65726f20616464726573730000000000000000000081525060400191505060405180910390fd5b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61048f6106a8565b82604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019250505060405180910390a161050d81610748565b61051b565b61051a6101f9565b5b50565b60006105286106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561056a576105636106a8565b9050610573565b6105726101f9565b5b90565b61057e6106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151515610647576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260328152602001807f43616e6e6f742063616c6c2066616c6c6261636b2066756e6374696f6e20667281526020017f6f6d207468652070726f78792061646d696e000000000000000000000000000081525060400191505060405180910390fd5b61064f610777565b565b6000807f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c36001029050805491505090565b3660008037600080366000845af43d6000803e80600081146106a3573d6000f35b3d6000fd5b6000807f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b6001029050805491505090565b6106e281610779565b7fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b81604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a150565b60007f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b60010290508181555050565b565b60006107848261084b565b151561081e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603b8152602001807f43616e6e6f742073657420612070726f787920696d706c656d656e746174696f81526020017f6e20746f2061206e6f6e2d636f6e74726163742061646472657373000000000081525060400191505060405180910390fd5b7f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c360010290508181555050565b600080823b9050600081119150509190505600a165627a7a72305820a4a547cfc7202c5acaaae74d428e988bc62ad5024eb0165532d3a8f91db4ed2400290000000000000000000000000882477e7895bdc5cea7cb1552ed914ab157fe56\",\n//         \"value\": 0x0\n//       },\n//       \"blockHash\": \"0xb2f6986457f5a24ff088a0beb5567c8c1fe2da02687c78e743507ee7c982b977\",\n//       \"blockNumber\": 6082465,\n//       \"result\": {\n//         \"address\": \"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48\",\n//         \"code\": \"0x60806040526004361061006d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633659cfe6146100775780634f1ef286146100ba5780635c60da1b146101085780638f2839701461015f578063f851a440146101a2575b6100756101f9565b005b34801561008357600080fd5b506100b8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610213565b005b610106600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001908201803590602001919091929391929390505050610268565b005b34801561011457600080fd5b5061011d610308565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561016b57600080fd5b506101a0600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610360565b005b3480156101ae57600080fd5b506101b761051e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b610201610576565b61021161020c610651565b610682565b565b61021b6106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561025c57610257816106d9565b610265565b6102646101f9565b5b50565b6102706106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102fa576102ac836106d9565b3073ffffffffffffffffffffffffffffffffffffffff163483836040518083838082843782019150509250505060006040518083038185875af19250505015156102f557600080fd5b610303565b6103026101f9565b5b505050565b60006103126106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156103545761034d610651565b905061035d565b61035c6101f9565b5b90565b6103686106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561051257600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610466576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260368152602001807f43616e6e6f74206368616e6765207468652061646d696e206f6620612070726f81526020017f787920746f20746865207a65726f20616464726573730000000000000000000081525060400191505060405180910390fd5b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61048f6106a8565b82604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019250505060405180910390a161050d81610748565b61051b565b61051a6101f9565b5b50565b60006105286106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561056a576105636106a8565b9050610573565b6105726101f9565b5b90565b61057e6106a8565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151515610647576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260328152602001807f43616e6e6f742063616c6c2066616c6c6261636b2066756e6374696f6e20667281526020017f6f6d207468652070726f78792061646d696e000000000000000000000000000081525060400191505060405180910390fd5b61064f610777565b565b6000807f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c36001029050805491505090565b3660008037600080366000845af43d6000803e80600081146106a3573d6000f35b3d6000fd5b6000807f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b6001029050805491505090565b6106e281610779565b7fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b81604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a150565b60007f10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b60010290508181555050565b565b60006107848261084b565b151561081e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603b8152602001807f43616e6e6f742073657420612070726f787920696d706c656d656e746174696f81526020017f6e20746f2061206e6f6e2d636f6e74726163742061646472657373000000000081525060400191505060405180910390fd5b7f7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c360010290508181555050565b600080823b9050600081119150509190505600a165627a7a72305820a4a547cfc7202c5acaaae74d428e988bc62ad5024eb0165532d3a8f91db4ed240029\",\n//         \"gasUsed\": 0x74f42\n//       },\n//       \"subtraces\": 0,\n//       \"traceAddress\": [],\n//       \"transactionHash\": \"0xe7e0fe390354509cd08c9a0168536938600ddc552b3f7cb96030ebef62e75895\",\n//       \"transactionPosition\": 22,\n//       \"type\": \"create\"\n//     }\n"]}

package/lib/index.d.ts

@@ -1,6 +1,6 @@
-export { getProvider, setProvider, DummyProvider } from '@sentio/runtime';
 export { transformEtherError, EthersError } from './error';
-export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds';
+export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './eth/binds';
 export * from '@sentio/protos';
 export * from './core';
+export * from './eth';
 export * from './utils/chain';

package/lib/index.js

@@ -1,35 +1,19 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addContractByABI = exports.getContractByABI = exports.addProcessor = exports.getProcessor = exports.EthersError = exports.transformEtherError = exports.DummyProvider = exports.setProvider = exports.getProvider = void 0;
-var runtime_1 = require("@sentio/runtime");
-Object.defineProperty(exports, "getProvider", { enumerable: true, get: function () { return runtime_1.getProvider; } });
-Object.defineProperty(exports, "setProvider", { enumerable: true, get: function () { return runtime_1.setProvider; } });
-Object.defineProperty(exports, "DummyProvider", { enumerable: true, get: function () { return runtime_1.DummyProvider; } });
+exports.addContractByABI = exports.getContractByABI = exports.addProcessor = exports.getProcessor = exports.EthersError = exports.transformEtherError = void 0;
+const tslib_1 = require("tslib");
 var error_1 = require("./error");
 Object.defineProperty(exports, "transformEtherError", { enumerable: true, get: function () { return error_1.transformEtherError; } });
 Object.defineProperty(exports, "EthersError", { enumerable: true, get: function () { return error_1.EthersError; } });
-var binds_1 = require("./binds");
+var binds_1 = require("./eth/binds");
 Object.defineProperty(exports, "getProcessor", { enumerable: true, get: function () { return binds_1.getProcessor; } });
 Object.defineProperty(exports, "addProcessor", { enumerable: true, get: function () { return binds_1.addProcessor; } });
 Object.defineProperty(exports, "getContractByABI", { enumerable: true, get: function () { return binds_1.getContractByABI; } });
 Object.defineProperty(exports, "addContractByABI", { enumerable: true, get: function () { return binds_1.addContractByABI; } });
 // TODO maybe remove this
-__exportStar(require("@sentio/protos"), exports);
-__exportStar(require("./core"), exports);
-__exportStar(require("./utils/chain"), exports);
+tslib_1.__exportStar(require("@sentio/protos"), exports);
+tslib_1.__exportStar(require("./core"), exports);
+tslib_1.__exportStar(require("./eth"), exports);
+tslib_1.__exportStar(require("./utils/chain"), exports);
 // export * from  './api'
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyE;AAAhE,sGAAA,WAAW,OAAA;AAAE,sGAAA,WAAW,OAAA;AAAE,wGAAA,aAAa,OAAA;AAChD,iCAA0D;AAAjD,4GAAA,mBAAmB,OAAA;AAAE,oGAAA,WAAW,OAAA;AAEzC,iCAAwF;AAA/E,qGAAA,YAAY,OAAA;AAAE,qGAAA,YAAY,OAAA;AAAE,yGAAA,gBAAgB,OAAA;AAAE,yGAAA,gBAAgB,OAAA;AAEvE,yBAAyB;AACzB,iDAA8B;AAE9B,yCAAsB;AAEtB,gDAA6B;AAE7B,yBAAyB","sourcesContent":["export { getProvider, setProvider, DummyProvider } from '@sentio/runtime'\nexport { transformEtherError, EthersError } from './error'\n\nexport { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds'\n\n// TODO maybe remove this\nexport * from '@sentio/protos'\n\nexport * from './core'\n\nexport * from './utils/chain'\n\n// export * from  './api'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,iCAA0D;AAAjD,4GAAA,mBAAmB,OAAA;AAAE,oGAAA,WAAW,OAAA;AAEzC,qCAA4F;AAAnF,qGAAA,YAAY,OAAA;AAAE,qGAAA,YAAY,OAAA;AAAE,yGAAA,gBAAgB,OAAA;AAAE,yGAAA,gBAAgB,OAAA;AAEvE,yBAAyB;AACzB,yDAA8B;AAE9B,iDAAsB;AACtB,gDAAqB;AAErB,wDAA6B;AAC7B,yBAAyB","sourcesContent":["export { transformEtherError, EthersError } from './error'\n\nexport { getProcessor, addProcessor, getContractByABI, addContractByABI } from './eth/binds'\n\n// TODO maybe remove this\nexport * from '@sentio/protos'\n\nexport * from './core'\nexport * from './eth'\n\nexport * from './utils/chain'\n// export * from  './api'\n"]}

package/lib/target-ethers-sentio/event-handler.d.ts

@@ -1,3 +1,4 @@
 import { EventDeclaration } from 'typechain';
 export declare function generateEventHandler(event: EventDeclaration, contractName: string, includeArgTypes: boolean): string;
 export declare function generateEventHandlers(events: EventDeclaration[], contractName: string): string;
+export declare function generateEventFilters(events: EventDeclaration[]): string[];

package/lib/target-ethers-sentio/event-handler.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEventHandlers = exports.generateEventHandler = void 0;
+exports.generateEventFilters = exports.generateEventHandlers = exports.generateEventHandler = void 0;
 const typechain_1 = require("typechain");
 const types_1 = require("./types");
+const events_1 = require("@sentio/ethers-v6/dist/codegen/events");
 function generateEventHandler(event, contractName, includeArgTypes) {
     const eventName = includeArgTypes ? (0, typechain_1.getFullSignatureAsSymbolForEvent)(event) : event.name;
     const eventNamePrefix = includeArgTypes ? eventName + '_' : eventName;
@@ -14,10 +15,7 @@ function generateEventHandler(event, contractName, includeArgTypes) {
     fetchConfig?: EthFetchConfig
   ) {
     if (!filter) {
-      // @ts-ignore
-      filter = ${contractName}Processor.filters[
-        // @ts-ignore
-        '${filterName}'](${event.inputs.map(() => 'null').join(',')})
+      filter = templateContract.filters['${filterName}'](${event.inputs.map(() => 'null').join(',')})
     }
     return super.onEvent(handler, filter!, fetchConfig)
   }
@@ -33,4 +31,22 @@ function generateEventHandlers(events, contractName) {
     }
 }
 exports.generateEventHandlers = generateEventHandlers;
+function generateEventFilter(event, includeArgTypes) {
+    const eventName = includeArgTypes ? (0, typechain_1.getFullSignatureAsSymbolForEvent)(event) : event.name;
+    const filterName = (0, types_1.getFullSignatureForEventPatched)(event);
+    return `
+    ${eventName}(${(0, events_1.generateEventInputs)(event.inputs)}) { return templateContract.filters['${filterName}'](${event.inputs
+        .map((i) => i.name)
+        .join(',')}) }
+  `;
+}
+function generateEventFilters(events) {
+    if (events.length === 1) {
+        return [generateEventFilter(events[0], false)];
+    }
+    else {
+        return events.map((e) => generateEventFilter(e, true));
+    }
+}
+exports.generateEventFilters = generateEventFilters;
 //# sourceMappingURL=event-handler.js.map

package/lib/target-ethers-sentio/event-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-handler.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/event-handler.ts"],"names":[],"mappings":";;;AAAA,yCAA8E;AAC9E,mCAAyD;AAEzD,SAAgB,oBAAoB,CAAC,KAAuB,EAAE,YAAoB,EAAE,eAAwB;IAC1G,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,IAAA,4CAAgC,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;IACxF,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;IAErE,MAAM,UAAU,GAAG,IAAA,uCAA+B,EAAC,KAAK,CAAC,CAAA;IACzD,OAAO;WACE,SAAS;uBACG,eAAe,eAAe,YAAY;eAClD,eAAe,iBAAiB,eAAe;;;;;iBAK7C,YAAY;;WAElB,UAAU,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;;;GAIhE,CAAA;AACH,CAAC;AApBD,oDAoBC;AAED,SAAgB,qBAAqB,CAAC,MAA0B,EAAE,YAAoB;IACpF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;KAC5D;SAAM;QACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACjF;AACH,CAAC;AAND,sDAMC"}
+{"version":3,"file":"event-handler.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/event-handler.ts"],"names":[],"mappings":";;;AAAA,yCAAwF;AACxF,mCAAyD;AACzD,kEAA2E;AAE3E,SAAgB,oBAAoB,CAAC,KAAuB,EAAE,YAAoB,EAAE,eAAwB;IAC1G,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,IAAA,4CAAgC,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;IACxF,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;IAErE,MAAM,UAAU,GAAG,IAAA,uCAA+B,EAAC,KAAK,CAAC,CAAA;IACzD,OAAO;WACE,SAAS;uBACG,eAAe,eAAe,YAAY;eAClD,eAAe,iBAAiB,eAAe;;;;2CAInB,UAAU,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;;;GAIhG,CAAA;AACH,CAAC;AAjBD,oDAiBC;AAED,SAAgB,qBAAqB,CAAC,MAA0B,EAAE,YAAoB;IACpF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;KAC5D;SAAM;QACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACjF;AACH,CAAC;AAND,sDAMC;AAED,SAAS,mBAAmB,CAAC,KAAuB,EAAE,eAAwB;IAC5E,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,IAAA,4CAAgC,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;IAExF,MAAM,UAAU,GAAG,IAAA,uCAA+B,EAAC,KAAK,CAAC,CAAA;IACzD,OAAO;MACH,SAAS,IAAI,IAAA,4BAAmB,EAAC,KAAK,CAAC,MAAM,CAAC,wCAAwC,UAAU,MAAM,KAAK,CAAC,MAAM;SACnH,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,IAAI,CAAC,GAAG,CAAC;GACX,CAAA;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAA0B;IAC7D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;KAC/C;SAAM;QACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;KACvD;AACH,CAAC;AAND,oDAMC"}