@sentio/sdk 1.40.5-rc.6 → 1.41.0-rc.1

package/lib/core/numberish.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"numberish.test.js","sourceRoot":"","sources":["../../src/core/numberish.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'chai'\nimport { toBigInteger, toMetricValue } from './numberish'\nimport { webcrypto } from 'crypto'\nimport { BigNumber } from 'ethers'\nimport { performance } from 'perf_hooks'\nimport { BigInteger } from '@sentio/protos'\nimport { BigDecimal } from '.'\n\n// TODO add test for type conversion\ndescribe('Numberish tests', () => {\n  const values: bigint[] = [0n, -0n, 3815372408723498172304781320847103784n, 2132n, -18708707n, 123n << 100n]\n\n  test('big integer conversion correctness ', async () => {\n    for (const v of values) {\n      const b = toBigInteger(v)\n      const hex1 = BigIntegerToHex(b)\n      const hex2 = v.toString(16)\n      expect(hex1).equals(hex2)\n    }\n  })\n\n  test('random big integer conversion correctness ', async () => {\n    for (let i = 0; i < 1000; i++) {\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = BigNumber.from(random).toBigInt()\n      const b = toBigInteger(v)\n\n      expect(BigNumber.from(b.data).eq(v)).to.equals(true)\n    }\n  })\n\n  test.skip('random big integer performance', async () => {\n    jest.setTimeout(100000)\n    jest.retryTimes(3)\n\n    let timer1 = 0\n    let timer2 = 0\n    for (let i = 0; i < 1000; i++) {\n      // Use higher value for local debugging\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = BigNumber.from(random).toBigInt()\n\n      let start = performance.now()\n      toBigInteger(v)\n      timer1 += performance.now() - start\n\n      start = performance.now()\n      v.toString(16)\n      timer2 += performance.now() - start\n    }\n\n    console.log(timer1, timer2)\n    expect(timer1).to.lessThan(timer2 * 3)\n  })\n\n  test('metric values', async () => {\n    const longDec = '12.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002'\n    expect(toMetricValue(new BigDecimal(longDec)).bigDecimal == longDec)\n\n    const complexDec = '-7.350918e-428'\n    expect(toMetricValue(new BigDecimal(complexDec)).bigDecimal == complexDec)\n\n    expect(\n      BigIntegerToBigInt(toMetricValue(new BigDecimal('100000')).bigInteger || BigInteger.fromPartial({})) === 100000n\n    )\n  })\n})\n\n// Performance very bad\nfunction BigIntegerToHex(b: BigInteger): string {\n  let res = BigNumber.from(b.data).toBigInt().toString(16)\n  if (b.negative) {\n    res = '-' + res\n  }\n  return res\n}\n\nfunction BigIntegerToBigInt(b: BigInteger): bigint {\n  let res = BigNumber.from(b.data).toBigInt()\n  if (b.negative) {\n    res = -res\n  }\n  return res\n}\n"]}
+{"version":3,"file":"numberish.test.js","sourceRoot":"","sources":["../../src/core/numberish.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'chai'\nimport { toBigInteger, toMetricValue } from './numberish'\nimport { webcrypto } from 'crypto'\nimport { performance } from 'perf_hooks'\nimport { BigInteger } from '@sentio/protos'\nimport { BigDecimal } from '.'\nimport { bytesToBigInt } from '../utils/conversion'\n\n// TODO add test for type conversion\ndescribe('Numberish tests', () => {\n  const values: bigint[] = [0n, -0n, 3815372408723498172304781320847103784n, 2132n, -18708707n, 123n << 100n]\n\n  test('big integer conversion correctness ', async () => {\n    for (const v of values) {\n      const b = toBigInteger(v)\n      const hex1 = BigIntegerToHex(b)\n      const hex2 = v.toString(16)\n      expect(hex1).equals(hex2)\n    }\n  })\n\n  test('random big integer conversion correctness ', async () => {\n    for (let i = 0; i < 1000; i++) {\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = bytesToBigInt(random)\n      const b = toBigInteger(v)\n\n      expect(bytesToBigInt(b.data)).equals(v)\n    }\n  })\n\n  test.skip('random big integer performance', async () => {\n    jest.setTimeout(100000)\n    jest.retryTimes(3)\n\n    let timer1 = 0\n    let timer2 = 0\n    for (let i = 0; i < 1000; i++) {\n      // Use higher value for local debugging\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = bytesToBigInt(random)\n\n      let start = performance.now()\n      toBigInteger(v)\n      timer1 += performance.now() - start\n\n      start = performance.now()\n      v.toString(16)\n      timer2 += performance.now() - start\n    }\n\n    console.log(timer1, timer2)\n    expect(timer1).to.lessThan(timer2 * 3)\n  })\n\n  test('metric values', async () => {\n    const longDec = '12.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002'\n    expect(toMetricValue(new BigDecimal(longDec)).bigDecimal == longDec)\n\n    const complexDec = '-7.350918e-428'\n    expect(toMetricValue(new BigDecimal(complexDec)).bigDecimal == complexDec)\n\n    expect(\n      BigIntegerToBigInt(toMetricValue(new BigDecimal('100000')).bigInteger || BigInteger.fromPartial({})) === 100000n\n    )\n  })\n})\n\n// Performance very bad\nfunction BigIntegerToHex(b: BigInteger): string {\n  let res = bytesToBigInt(b.data).toString(16)\n  if (b.negative) {\n    res = '-' + res\n  }\n  return res\n}\n\nfunction BigIntegerToBigInt(b: BigInteger): bigint {\n  let res = bytesToBigInt(b.data)\n  if (b.negative) {\n    res = -res\n  }\n  return res\n}\n"]}

package/lib/core/sui-plugin.d.ts

@@ -2,7 +2,7 @@ import { Plugin } from '@sentio/runtime';
 import { DataBinding, ProcessConfigResponse, ProcessResult } from '@sentio/protos';
 export declare class SuiPlugin extends Plugin {
     name: string;
-    configure(config: ProcessConfigResponse): void;
+    configure(config: ProcessConfigResponse): Promise<void>;
     supportedHandlers: never[];
     processBinding(request: DataBinding): Promise<ProcessResult>;
 }

package/lib/core/sui-plugin.js

@@ -8,7 +8,7 @@ const chain_1 = require("../utils/chain");
 const sui_processor_1 = require("./sui-processor");
 class SuiPlugin extends runtime_1.Plugin {
     name = 'SuiPlugin';
-    configure(config) {
+    async configure(config) {
         for (const suiProcessor of sui_processor_1.SuiProcessorState.INSTANCE.getValues()) {
             const contractConfig = {
                 transactionConfig: [],

package/lib/core/sui-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"sui-plugin.js","sourceRoot":"","sources":["../../src/core/sui-plugin.ts"],"names":[],"mappings":";;;AAAA,6CAAuE;AACvE,2CAA+G;AAE/G,yCAA+C;AAE/C,0CAA0C;AAC1C,mDAAmD;AAEnD,MAAa,SAAU,SAAQ,gBAAM;IACnC,IAAI,GAAW,WAAW,CAAA;IAE1B,SAAS,CAAC,MAA6B;QACrC,KAAK,MAAM,YAAY,IAAI,iCAAiB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACjE,MAAM,cAAc,GAAmB;gBACrC,iBAAiB,EAAE,EAAE;gBACrB,aAAa,EAAE,wBAAc;gBAC7B,QAAQ,EAAE;oBACR,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,iBAAS,CAAC,UAAU;oBAC7B,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,GAAG,EAAE,EAAE;iBACR;gBACD,UAAU,EAAE,EAAE;gBACd,eAAe,EAAE,EAAE;gBACnB,YAAY,EAAE,EAAE;gBAChB,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,cAAc;gBAC9C,QAAQ,EAAE,EAAE;gBACZ,iBAAiB,EAAE,SAAS;gBAC5B,iBAAiB,EAAE,EAAE;gBACrB,gBAAgB,EAAE,EAAE;aACrB,CAAA;YACD,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;SAC5C;IACH,CAAC;IAED,iBAAiB,GAAG,EAAE,CAAA;IAEtB,cAAc,CAAC,OAAoB;QACjC,QAAQ,OAAO,CAAC,WAAW,EAAE;YAC3B,KAAK,oBAAW,CAAC,eAAe,CAAC;YACjC,6CAA6C;YAC7C;gBACE,MAAM,IAAI,uBAAW,CAAC,kBAAM,CAAC,gBAAgB,EAAE,4BAA4B,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;SACrG;IACH,CAAC;CACF;AArCD,8BAqCC;AAED,uBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager, USER_PROCESSOR } from '@sentio/runtime'\nimport { ContractConfig, DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '@sentio/protos'\n\nimport { ServerError, Status } from 'nice-grpc'\n\nimport { CHAIN_IDS } from '../utils/chain'\nimport { SuiProcessorState } from './sui-processor'\n\nexport class SuiPlugin extends Plugin {\n  name: string = 'SuiPlugin'\n\n  configure(config: ProcessConfigResponse): void {\n    for (const suiProcessor of SuiProcessorState.INSTANCE.getValues()) {\n      const contractConfig: ContractConfig = {\n        transactionConfig: [],\n        processorType: USER_PROCESSOR,\n        contract: {\n          name: 'sui contract',\n          chainId: CHAIN_IDS.SUI_DEVNET,\n          address: suiProcessor.address,\n          abi: '',\n        },\n        logConfigs: [],\n        intervalConfigs: [],\n        traceConfigs: [],\n        startBlock: suiProcessor.config.startSeqNumber,\n        endBlock: 0n,\n        instructionConfig: undefined,\n        aptosEventConfigs: [],\n        aptosCallConfigs: [],\n      }\n      config.contractConfigs.push(contractConfig)\n    }\n  }\n\n  supportedHandlers = []\n\n  processBinding(request: DataBinding): Promise<ProcessResult> {\n    switch (request.handlerType) {\n      case HandlerType.SUI_TRANSACTION:\n      // return this.processSolInstruction(request)\n      default:\n        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new SuiPlugin())\n"]}
+{"version":3,"file":"sui-plugin.js","sourceRoot":"","sources":["../../src/core/sui-plugin.ts"],"names":[],"mappings":";;;AAAA,6CAAuE;AACvE,2CAA+G;AAE/G,yCAA+C;AAE/C,0CAA0C;AAC1C,mDAAmD;AAEnD,MAAa,SAAU,SAAQ,gBAAM;IACnC,IAAI,GAAW,WAAW,CAAA;IAE1B,KAAK,CAAC,SAAS,CAAC,MAA6B;QAC3C,KAAK,MAAM,YAAY,IAAI,iCAAiB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACjE,MAAM,cAAc,GAAmB;gBACrC,iBAAiB,EAAE,EAAE;gBACrB,aAAa,EAAE,wBAAc;gBAC7B,QAAQ,EAAE;oBACR,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,iBAAS,CAAC,UAAU;oBAC7B,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,GAAG,EAAE,EAAE;iBACR;gBACD,UAAU,EAAE,EAAE;gBACd,eAAe,EAAE,EAAE;gBACnB,YAAY,EAAE,EAAE;gBAChB,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,cAAc;gBAC9C,QAAQ,EAAE,EAAE;gBACZ,iBAAiB,EAAE,SAAS;gBAC5B,iBAAiB,EAAE,EAAE;gBACrB,gBAAgB,EAAE,EAAE;aACrB,CAAA;YACD,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;SAC5C;IACH,CAAC;IAED,iBAAiB,GAAG,EAAE,CAAA;IAEtB,cAAc,CAAC,OAAoB;QACjC,QAAQ,OAAO,CAAC,WAAW,EAAE;YAC3B,KAAK,oBAAW,CAAC,eAAe,CAAC;YACjC,6CAA6C;YAC7C;gBACE,MAAM,IAAI,uBAAW,CAAC,kBAAM,CAAC,gBAAgB,EAAE,4BAA4B,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;SACrG;IACH,CAAC;CACF;AArCD,8BAqCC;AAED,uBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager, USER_PROCESSOR } from '@sentio/runtime'\nimport { ContractConfig, DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '@sentio/protos'\n\nimport { ServerError, Status } from 'nice-grpc'\n\nimport { CHAIN_IDS } from '../utils/chain'\nimport { SuiProcessorState } from './sui-processor'\n\nexport class SuiPlugin extends Plugin {\n  name: string = 'SuiPlugin'\n\n  async configure(config: ProcessConfigResponse) {\n    for (const suiProcessor of SuiProcessorState.INSTANCE.getValues()) {\n      const contractConfig: ContractConfig = {\n        transactionConfig: [],\n        processorType: USER_PROCESSOR,\n        contract: {\n          name: 'sui contract',\n          chainId: CHAIN_IDS.SUI_DEVNET,\n          address: suiProcessor.address,\n          abi: '',\n        },\n        logConfigs: [],\n        intervalConfigs: [],\n        traceConfigs: [],\n        startBlock: suiProcessor.config.startSeqNumber,\n        endBlock: 0n,\n        instructionConfig: undefined,\n        aptosEventConfigs: [],\n        aptosCallConfigs: [],\n      }\n      config.contractConfigs.push(contractConfig)\n    }\n  }\n\n  supportedHandlers = []\n\n  processBinding(request: DataBinding): Promise<ProcessResult> {\n    switch (request.handlerType) {\n      case HandlerType.SUI_TRANSACTION:\n      // return this.processSolInstruction(request)\n      default:\n        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new SuiPlugin())\n"]}

package/lib/error.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformEtherError = exports.EthersError = void 0;
-const ethers_1 = require("ethers");
+// import { errors } from 'ethers/providers'
 class EthersError extends Error {
     e;
     constructor(message, e) {
@@ -16,7 +16,7 @@ exports.EthersError = EthersError;
 function transformEtherError(e, ctx) {
     let msg = '';
     // @ts-ignore expected error fields
-    if (e.code === ethers_1.errors.CALL_EXCEPTION) {
+    if (e.code === errors.CALL_EXCEPTION) {
         // @ts-ignore expected error fields
         if (e.data === '0x') {
             if (ctx) {

package/lib/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":";;;AAEA,mCAA+B;AAE/B,MAAa,WAAY,SAAQ,KAAK;IACpC,CAAC,CAAO;IAER,YAAY,OAAe,EAAE,CAAQ;QACnC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAA;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;IACrD,CAAC;CACF;AAXD,kCAWC;AAED,SAAgB,mBAAmB,CAAC,CAAQ,EAAE,GAA0C;IACtF,IAAI,GAAG,GAAG,EAAE,CAAA;IACZ,mCAAmC;IACnC,IAAI,CAAC,CAAC,IAAI,KAAK,eAAM,CAAC,cAAc,EAAE;QACpC,mCAAmC;QACnC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE;YACnB,IAAI,GAAG,EAAE;gBACP,GAAG;oBACD,sEAAsE;wBACtE,GAAG,CAAC,OAAO;wBACX,IAAI;wBACJ,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;aACpB;iBAAM;gBACL,GAAG,GAAG,8DAA8D,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;aACzF;SACF;QACD,OAAO,IAAI,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;KAC/B;IAED,IAAI,CAAC,YAAY,WAAW,EAAE;QAC5B,OAAO,CAAC,CAAA;KACT;IAED,qCAAqC;IAErC,GAAG,GAAG,qBAAqB,GAAG,CAAC,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;IACpE,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC;AA3BD,kDA2BC","sourcesContent":["// Transform error in more readable format\nimport { ContractContext } from './core/context'\nimport { errors } from 'ethers'\n\nexport class EthersError extends Error {\n  e: Error\n\n  constructor(message: string, e: Error) {\n    super(message)\n    this.stack = e.stack\n  }\n\n  toString() {\n    return this.message + '\\n' + this.stack?.toString()\n  }\n}\n\nexport function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined): Error {\n  let msg = ''\n  // @ts-ignore expected error fields\n  if (e.code === errors.CALL_EXCEPTION) {\n    // @ts-ignore expected error fields\n    if (e.data === '0x') {\n      if (ctx) {\n        msg =\n          \"jsonrpc eth_call return '0x' (likely contract not existed) at chain \" +\n          ctx.chainId +\n          ': ' +\n          JSON.stringify(e)\n      } else {\n        msg = \"jsonrpc eth_call return '0x' (likely contract not existed): \" + JSON.stringify(e)\n      }\n    }\n    return new EthersError(msg, e)\n  }\n\n  if (e instanceof EthersError) {\n    return e\n  }\n\n  // TODO gracefully handle more errors\n\n  msg = 'ethers call error\\n' + e.message + '\\n' + e.stack?.toString()\n  return new Error(msg)\n}\n"]}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":";;;AAEA,4CAA4C;AAE5C,MAAa,WAAY,SAAQ,KAAK;IACpC,CAAC,CAAO;IAER,YAAY,OAAe,EAAE,CAAQ;QACnC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAA;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;IACrD,CAAC;CACF;AAXD,kCAWC;AAED,SAAgB,mBAAmB,CAAC,CAAQ,EAAE,GAA0C;IACtF,IAAI,GAAG,GAAG,EAAE,CAAA;IACZ,mCAAmC;IACnC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,cAAc,EAAE;QACpC,mCAAmC;QACnC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE;YACnB,IAAI,GAAG,EAAE;gBACP,GAAG;oBACD,sEAAsE;wBACtE,GAAG,CAAC,OAAO;wBACX,IAAI;wBACJ,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;aACpB;iBAAM;gBACL,GAAG,GAAG,8DAA8D,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;aACzF;SACF;QACD,OAAO,IAAI,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;KAC/B;IAED,IAAI,CAAC,YAAY,WAAW,EAAE;QAC5B,OAAO,CAAC,CAAA;KACT;IAED,qCAAqC;IAErC,GAAG,GAAG,qBAAqB,GAAG,CAAC,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;IACpE,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC;AA3BD,kDA2BC","sourcesContent":["// Transform error in more readable format\nimport { ContractContext } from './core/context'\n// import { errors } from 'ethers/providers'\n\nexport class EthersError extends Error {\n  e: Error\n\n  constructor(message: string, e: Error) {\n    super(message)\n    this.stack = e.stack\n  }\n\n  toString() {\n    return this.message + '\\n' + this.stack?.toString()\n  }\n}\n\nexport function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined): Error {\n  let msg = ''\n  // @ts-ignore expected error fields\n  if (e.code === errors.CALL_EXCEPTION) {\n    // @ts-ignore expected error fields\n    if (e.data === '0x') {\n      if (ctx) {\n        msg =\n          \"jsonrpc eth_call return '0x' (likely contract not existed) at chain \" +\n          ctx.chainId +\n          ': ' +\n          JSON.stringify(e)\n      } else {\n        msg = \"jsonrpc eth_call return '0x' (likely contract not existed): \" + JSON.stringify(e)\n      }\n    }\n    return new EthersError(msg, e)\n  }\n\n  if (e instanceof EthersError) {\n    return e\n  }\n\n  // TODO gracefully handle more errors\n\n  msg = 'ethers call error\\n' + e.message + '\\n' + e.stack?.toString()\n  return new Error(msg)\n}\n"]}

package/lib/eth/account-processor-state.d.ts

@@ -0,0 +1,5 @@
+import { ListStateStorage } from '@sentio/runtime';
+import { AccountProcessor } from './account-processor';
+export declare class AccountProcessorState extends ListStateStorage<AccountProcessor> {
+    static INSTANCE: AccountProcessorState;
+}

package/lib/eth/account-processor-state.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccountProcessorState = void 0;
+const runtime_1 = require("@sentio/runtime");
+class AccountProcessorState extends runtime_1.ListStateStorage {
+    static INSTANCE = new AccountProcessorState();
+}
+exports.AccountProcessorState = AccountProcessorState;
+//# sourceMappingURL=account-processor-state.js.map

package/lib/eth/account-processor-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-processor-state.js","sourceRoot":"","sources":["../../src/eth/account-processor-state.ts"],"names":[],"mappings":";;;AAAA,6CAAkD;AAGlD,MAAa,qBAAsB,SAAQ,0BAAkC;IAC3E,MAAM,CAAC,QAAQ,GAAG,IAAI,qBAAqB,EAAE,CAAA;;AAD/C,sDAEC","sourcesContent":["import { ListStateStorage } from '@sentio/runtime'\nimport { AccountProcessor } from './account-processor'\n\nexport class AccountProcessorState extends ListStateStorage<AccountProcessor> {\n  static INSTANCE = new AccountProcessorState()\n}\n"]}

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

@@ -1,15 +1,11 @@
-import { ListStateStorage } from '@sentio/runtime';
 import { EthFetchConfig } from '@sentio/sdk';
-import { AccountBindOptions } from './bind-options';
+import { AccountBindOptions } from '../core/bind-options';
 import { TransferEvent as ERC20TransferEvent } from '../builtin/internal/ERC20';
 import { TransferEvent as ERC721TransferEvent } from '../builtin/internal/ERC721';
-import { AccountContext } from './context';
+import { AccountContext } from '../core/context';
 import { PromiseOrVoid } from '../promise-or-void';
-import { Event } from '@ethersproject/contracts';
 import { AddressOrTypeEventFilter, EventsHandler } from './base-processor';
-export declare class AccountProcessorState extends ListStateStorage<AccountProcessor> {
-    static INSTANCE: AccountProcessorState;
-}
+import { LogDescription } from 'ethers';
 export declare class AccountProcessor {
     config: AccountBindOptions;
     eventHandlers: EventsHandler[];
@@ -61,5 +57,5 @@ export declare class AccountProcessor {
     onERC721Minted(handler: (event: ERC721TransferEvent, ctx: AccountContext) => PromiseOrVoid, collections?: string[], fetchConfig?: EthFetchConfig): this;
     private onERC721;
     private onERC;
-    protected onEvent(handler: (event: Event, ctx: AccountContext) => PromiseOrVoid, filter: AddressOrTypeEventFilter | AddressOrTypeEventFilter[], fetchConfig?: EthFetchConfig): this;
+    protected onEvent(handler: (event: LogDescription, ctx: AccountContext) => PromiseOrVoid, filter: AddressOrTypeEventFilter | AddressOrTypeEventFilter[], fetchConfig?: EthFetchConfig): this;
 }

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

@@ -1,23 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountProcessor = exports.AccountProcessorState = void 0;
-const runtime_1 = require("@sentio/runtime");
+exports.AccountProcessor = void 0;
 const internal_1 = require("../builtin/internal");
 const sdk_1 = require("@sentio/sdk");
-const providers_1 = require("@ethersproject/providers");
-const context_1 = require("./context");
-class AccountProcessorState extends runtime_1.ListStateStorage {
-    static INSTANCE = new AccountProcessorState();
-}
-exports.AccountProcessorState = AccountProcessorState;
-const ERC20_CONTRACT = internal_1.ERC20__factory.connect('', sdk_1.DummyProvider);
-const ERC721_CONTRACT = internal_1.ERC721__factory.connect('', sdk_1.DummyProvider);
+const providers_1 = require("ethers/providers");
+const erc20_processor_1 = require("../builtin/internal/erc20_processor");
+const erc721_processor_1 = require("../builtin/internal/erc721_processor");
+const context_1 = require("../core/context");
+const account_processor_state_1 = require("./account-processor-state");
+const ERC20_INTERFACE = internal_1.ERC20__factory.createInterface();
+const ERC721_INTERFACE = internal_1.ERC721__factory.createInterface();
 class AccountProcessor {
     config;
     eventHandlers = [];
     static bind(config) {
         const processor = new AccountProcessor(config);
-        AccountProcessorState.INSTANCE.addValue(processor);
+        account_processor_state_1.AccountProcessorState.INSTANCE.addValue(processor);
         return processor;
     }
     constructor(config) {
@@ -30,7 +28,7 @@ class AccountProcessor {
         }
     }
     getChainId() {
-        return (0, providers_1.getNetwork)(this.config.network || 1).chainId;
+        return Number(providers_1.Network.from(this.config.network || 1).chainId);
     }
     /**
      * Register custom handler function to process erc20 transfer event to this account
@@ -39,7 +37,7 @@ class AccountProcessor {
      * @param fetchConfig
      */
     onERC20TransferIn(handler, tokensAddresses = [], fetchConfig) {
-        return this.onERC20(handler, tokensAddresses, (address) => ERC20_CONTRACT.filters.Transfer(null, this.config.address), fetchConfig);
+        return this.onERC20(handler, tokensAddresses, (address) => erc721_processor_1.ERC721Processor.filters.Transfer(null, this.config.address), fetchConfig);
     }
     /**
      * Register custom handler function to process erc20 transfer event from this account
@@ -48,7 +46,7 @@ class AccountProcessor {
      * @param fetchConfig
      */
     onERC20TransferOut(handler, tokensAddresses = [], fetchConfig) {
-        return this.onERC20(handler, tokensAddresses, (address) => ERC20_CONTRACT.filters.Transfer(this.config.address), fetchConfig);
+        return this.onERC20(handler, tokensAddresses, (address) => erc20_processor_1.ERC20Processor.filters.Transfer(this.config.address), fetchConfig);
     }
     /**
      * Register custom handler function to process erc20 mint for this account
@@ -57,7 +55,7 @@ class AccountProcessor {
      * @param fetchConfig
      */
     onERC20Minted(handler, tokensAddresses = [], fetchConfig) {
-        return this.onERC20(handler, tokensAddresses, (address) => ERC20_CONTRACT.filters.Transfer('0x0000000000000000000000000000000000000000', this.config.address), fetchConfig);
+        return this.onERC20(handler, tokensAddresses, (address) => erc20_processor_1.ERC20Processor.filters.Transfer('0x0000000000000000000000000000000000000000', this.config.address), fetchConfig);
     }
     onERC20(handler, tokensAddresses = [], defaultFilter, fetchConfig) {
         return this.onERC(handler, tokensAddresses, defaultFilter, sdk_1.AddressType.ERC20, fetchConfig);
@@ -69,7 +67,7 @@ class AccountProcessor {
      * @param fetchConfig
      */
     onERC721TransferIn(handler, collections, fetchConfig) {
-        return this.onERC721(handler, collections, (address) => ERC721_CONTRACT.filters.Transfer(null, this.config.address), fetchConfig);
+        return this.onERC721(handler, collections, (address) => erc721_processor_1.ERC721Processor.filters.Transfer(null, this.config.address), fetchConfig);
     }
     /**
      * Register custom handler function to process ERC721 transfer event from this account
@@ -78,7 +76,7 @@ class AccountProcessor {
      * @param fetchConfig
      */
     onERC721TransferOut(handler, collections, fetchConfig) {
-        return this.onERC721(handler, collections, (address) => ERC721_CONTRACT.filters.Transfer(this.config.address), fetchConfig);
+        return this.onERC721(handler, collections, (address) => erc721_processor_1.ERC721Processor.filters.Transfer(this.config.address), fetchConfig);
     }
     /**
      * Register custom handler function to process ERC721 mint for this account
@@ -87,7 +85,7 @@ class AccountProcessor {
      * @param fetchConfig
      */
     onERC721Minted(handler, collections = [], fetchConfig) {
-        return this.onERC721(handler, collections, (address) => ERC721_CONTRACT.filters.Transfer('0x0000000000000000000000000000000000000000', this.config.address), fetchConfig);
+        return this.onERC721(handler, collections, (address) => erc721_processor_1.ERC721Processor.filters.Transfer('0x0000000000000000000000000000000000000000', this.config.address), fetchConfig);
     }
     onERC721(handler, collections, defaultFilter, fetchConfig) {
         return this.onERC(handler, collections, defaultFilter, sdk_1.AddressType.ERC721, fetchConfig);
@@ -116,20 +114,21 @@ class AccountProcessor {
         else {
             _filters.push(filter);
         }
-        let hasVaildConfig = false;
-        for (const filter of _filters) {
-            if (filter.address) {
-                hasVaildConfig = true;
-                break;
-            }
-            if (filter.topics && filter.topics.length) {
-                hasVaildConfig = true;
-                break;
-            }
-        }
-        if (!hasVaildConfig) {
-            throw Error('no valid config has been found for this account');
-        }
+        // let hasVaildConfig = false
+        // for (const filter of _filters) {
+        //   if (filter.address) {
+        //     hasVaildConfig = true
+        //     break
+        //   }
+        //   if (filter.topics && filter.topics.length) {
+        //     hasVaildConfig = true
+        //     break
+        //   }
+        // }
+        //
+        // if (!hasVaildConfig) {
+        //   throw Error('no valid config has been found for this account')
+        // }
         const config = this.config;
         this.eventHandlers.push({
             filters: _filters,
@@ -137,17 +136,9 @@ class AccountProcessor {
             handler: async function (data) {
                 const log = data.log;
                 const ctx = new context_1.AccountContext(chainId, config.address, data.timestamp, data.block, log, undefined, data.transaction, data.transactionReceipt);
-                const event = log;
-                const parsed = ERC20_CONTRACT.interface.parseLog(log);
+                const parsed = ERC20_INTERFACE.parseLog(log);
                 if (parsed) {
-                    event.args = parsed.args;
-                    event.decode = (data, topics) => {
-                        return ERC20_CONTRACT.interface.decodeEventLog(parsed.eventFragment, data, topics);
-                    };
-                    event.event = parsed.name;
-                    event.eventSignature = parsed.signature;
-                    // TODO fix this bug
-                    await handler(event, ctx);
+                    await handler(parsed, ctx);
                     return ctx.getProcessResult();
                 }
                 return sdk_1.ProcessResult.fromPartial({});

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

@@ -0,0 +1 @@
+{"version":3,"file":"account-processor.js","sourceRoot":"","sources":["../../src/eth/account-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ERC20__factory, ERC721__factory } from '../builtin/internal'\nimport { AddressType, DummyProvider, EthFetchConfig, ProcessResult } from '@sentio/sdk'\nimport { AccountBindOptions } from '../core/bind-options'\n\nimport { Network, LogParams } from 'ethers/providers'\n\nimport { TransferEvent as ERC20TransferEvent } from '../builtin/internal/ERC20'\nimport { TransferEvent as ERC721TransferEvent } from '../builtin/internal/ERC721'\n\nimport { ERC20Processor } from '../builtin/internal/erc20_processor'\nimport { ERC721Processor } from '../builtin/internal/erc721_processor'\n\nimport { AccountContext } from '../core/context'\nimport { PromiseOrVoid } from '../promise-or-void'\nimport { AddressOrTypeEventFilter, EventsHandler } from './base-processor'\nimport { Transaction, Block, TransactionReceipt, LogDescription } from 'ethers'\nimport { AccountProcessorState } from './account-processor-state'\n\nconst ERC20_INTERFACE = ERC20__factory.createInterface()\nconst ERC721_INTERFACE = ERC721__factory.createInterface()\n\nexport class AccountProcessor {\n  config: AccountBindOptions\n  eventHandlers: EventsHandler[] = []\n\n  static bind(config: AccountBindOptions): AccountProcessor {\n    const processor = new AccountProcessor(config)\n    AccountProcessorState.INSTANCE.addValue(processor)\n    return processor\n  }\n\n  protected constructor(config: AccountBindOptions) {\n    this.config = config\n    if (typeof this.config.network === 'string') {\n      const asInt = parseInt(this.config.network)\n      if (Number.isFinite(asInt)) {\n        this.config.network = asInt\n      }\n    }\n  }\n\n  public getChainId(): number {\n    return Number(Network.from(this.config.network || 1).chainId)\n  }\n\n  /**\n   * Register custom handler function to process erc20 transfer event to this account\n   * @param handler custom handler function\n   * @param tokensAddresses all the erc20 token address to watch\n   * @param fetchConfig\n   */\n  onERC20TransferIn(\n    handler: (event: ERC20TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    tokensAddresses: string[] = [],\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC20(\n      handler,\n      tokensAddresses,\n      (address: string) => ERC721Processor.filters.Transfer(null, this.config.address),\n      fetchConfig\n    )\n  }\n\n  /**\n   * Register custom handler function to process erc20 transfer event from this account\n   * @param handler custom handler function\n   * @param tokensAddresses all the erc20 token address to watch\n   * @param fetchConfig\n   */\n  onERC20TransferOut(\n    handler: (event: ERC20TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    tokensAddresses: string[] = [],\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC20(\n      handler,\n      tokensAddresses,\n      (address: string) => ERC20Processor.filters.Transfer(this.config.address),\n      fetchConfig\n    )\n  }\n\n  /**\n   * Register custom handler function to process erc20 mint for this account\n   * @param handler custom handler function\n   * @param tokensAddresses all the erc20 token address to watch\n   * @param fetchConfig\n   */\n  onERC20Minted(\n    handler: (event: ERC20TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    tokensAddresses: string[] = [],\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC20(\n      handler,\n      tokensAddresses,\n      (address: string) =>\n        ERC20Processor.filters.Transfer('0x0000000000000000000000000000000000000000', this.config.address),\n      fetchConfig\n    )\n  }\n\n  private onERC20(\n    handler: (event: ERC20TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    tokensAddresses: string[] = [],\n    defaultFilter: (address: string) => AddressOrTypeEventFilter,\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC(handler, tokensAddresses, defaultFilter, AddressType.ERC20, fetchConfig)\n  }\n\n  /**\n   * Register custom handler function to process ERC721 transfer event to this account\n   * @param handler custom handler function\n   * @param collections all the ERC721 token address to watch, if not provided then watch all ERC721\n   * @param fetchConfig\n   */\n  onERC721TransferIn(\n    handler: (event: ERC721TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    collections: string[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC721(\n      handler,\n      collections,\n      (address: string) => ERC721Processor.filters.Transfer(null, this.config.address),\n      fetchConfig\n    )\n  }\n\n  /**\n   * Register custom handler function to process ERC721 transfer event from this account\n   * @param handler custom handler function\n   * @param collections all the ERC721 token address to watch, if not provided then watch all ERC721\n   * @param fetchConfig\n   */\n  onERC721TransferOut(\n    handler: (event: ERC721TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    collections: string[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC721(\n      handler,\n      collections,\n      (address: string) => ERC721Processor.filters.Transfer(this.config.address),\n      fetchConfig\n    )\n  }\n\n  /**\n   * Register custom handler function to process ERC721 mint for this account\n   * @param handler custom handler function\n   * @param collections all the ERC721 token address to watch, if not provided then watch all ERC721\n   * @param fetchConfig\n   */\n  onERC721Minted(\n    handler: (event: ERC721TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    collections: string[] = [],\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC721(\n      handler,\n      collections,\n      (address: string) =>\n        ERC721Processor.filters.Transfer('0x0000000000000000000000000000000000000000', this.config.address),\n      fetchConfig\n    )\n  }\n\n  private onERC721(\n    handler: (event: ERC721TransferEvent, ctx: AccountContext) => PromiseOrVoid,\n    collections: string[],\n    defaultFilter: (address: string) => AddressOrTypeEventFilter,\n    fetchConfig?: EthFetchConfig\n  ) {\n    return this.onERC(handler, collections, defaultFilter, AddressType.ERC721, fetchConfig)\n  }\n\n  private onERC(\n    handler: (event: any, ctx: AccountContext) => PromiseOrVoid,\n    contractAddresses: string[],\n    defaultFilter: (address: string) => AddressOrTypeEventFilter,\n    addressType: AddressType,\n    fetchConfig?: EthFetchConfig\n  ) {\n    const filters = []\n    for (const token of contractAddresses) {\n      const filter = defaultFilter(this.config.address)\n      filter.address = token\n      filters.push(filter)\n    }\n    if (!filters.length) {\n      const filter = defaultFilter(this.config.address)\n      filter.address = undefined\n      filter.addressType = addressType\n      filters.push(filter)\n    }\n    return this.onEvent(handler, filters, fetchConfig)\n  }\n\n  protected onEvent(\n    handler: (event: LogDescription, ctx: AccountContext) => PromiseOrVoid,\n    filter: AddressOrTypeEventFilter | AddressOrTypeEventFilter[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    const chainId = this.getChainId()\n\n    let _filters: AddressOrTypeEventFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // let hasVaildConfig = false\n    // for (const filter of _filters) {\n    //   if (filter.address) {\n    //     hasVaildConfig = true\n    //     break\n    //   }\n    //   if (filter.topics && filter.topics.length) {\n    //     hasVaildConfig = true\n    //     break\n    //   }\n    // }\n    //\n    // if (!hasVaildConfig) {\n    //   throw Error('no valid config has been found for this account')\n    // }\n\n    const config = this.config\n\n    this.eventHandlers.push({\n      filters: _filters,\n      fetchConfig: fetchConfig || EthFetchConfig.fromPartial({}),\n      handler: async function (data) {\n        const log = data.log as { topics: Array<string>; data: string }\n        const ctx = new AccountContext(\n          chainId,\n          config.address,\n          data.timestamp,\n          data.block as Block,\n          log as any as LogParams,\n          undefined,\n          data.transaction as Transaction,\n          data.transactionReceipt as TransactionReceipt\n        )\n        const parsed = ERC20_INTERFACE.parseLog(log)\n        if (parsed) {\n          await handler(parsed, ctx)\n          return ctx.getProcessResult()\n        }\n        return ProcessResult.fromPartial({})\n      },\n    })\n\n    return this\n  }\n}\n"]}

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

@@ -1,13 +1,12 @@
-import { BoundContractView, ContractContext, ContractView } from './context';
-import { Block } from '@ethersproject/abstract-provider';
-import { BaseContract, EventFilter } from 'ethers';
-import { Event } from '@ethersproject/contracts';
+import { BoundContractView, ContractContext, ContractView } from '../core/context';
+import { BaseContract, Block, LogDescription } from 'ethers';
 import { BaseProcessor } from './base-processor';
-import { BindOptions } from './bind-options';
+import { BindOptions } from '../core/bind-options';
 import { EthFetchConfig, HandleInterval, TemplateInstance } from '@sentio/protos';
 import { PromiseOrVoid } from '../promise-or-void';
 import { Trace } from './trace';
 import { ListStateStorage } from '@sentio/runtime';
+import { DeferredTopicFilter } from 'ethers/contract';
 export declare class ProcessorTemplateProcessorState extends ListStateStorage<BaseProcessorTemplate<BaseContract, BoundContractView<BaseContract, any>>> {
     static INSTANCE: ProcessorTemplateProcessorState;
 }
@@ -28,13 +27,13 @@ export declare abstract class BaseProcessorTemplate<TContract extends BaseContra
         fetchConfig?: EthFetchConfig;
     }[];
     eventHandlers: {
-        handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid;
-        filter: EventFilter | EventFilter[];
+        handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid;
+        filter: DeferredTopicFilter | DeferredTopicFilter[];
         fetchConfig?: EthFetchConfig;
     }[];
     constructor();
     bind(options: BindOptions): BaseProcessor<TContract, TBoundContractView> | undefined;
-    onEvent(handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, filter: EventFilter | EventFilter[], fetchConfig?: EthFetchConfig): this;
+    onEvent(handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, filter: DeferredTopicFilter | DeferredTopicFilter[], fetchConfig?: EthFetchConfig): this;
     onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
     onBlockInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, blockInterval?: number, backfillBlockInterval?: number): this;
     onTimeInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, timeIntervalInMinutes?: number, backfillBlockInterval?: number): this;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseProcessorTemplate = exports.TemplateInstanceState = exports.ProcessorTemplateProcessorState = void 0;
-const bind_options_1 = require("./bind-options");
-const providers_1 = require("@ethersproject/providers");
+const bind_options_1 = require("../core/bind-options");
 const runtime_1 = require("@sentio/runtime");
+const providers_1 = require("ethers/providers");
 class ProcessorTemplateProcessorState extends runtime_1.ListStateStorage {
     static INSTANCE = new ProcessorTemplateProcessorState();
 }
@@ -43,7 +43,7 @@ class BaseProcessorTemplate {
             contract: {
                 address: options.address,
                 name: options.name || '',
-                chainId: options.network ? (0, providers_1.getNetwork)(options.network).chainId.toString() : '1',
+                chainId: options.network ? providers_1.Network.from(options.network).chainId.toString() : '1',
                 abi: '',
             },
             startBlock: 0n,

package/lib/eth/base-processor-template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-processor-template.js","sourceRoot":"","sources":["../../src/eth/base-processor-template.ts"],"names":[],"mappings":"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","sourcesContent":["import { BoundContractView, ContractContext, ContractView } from '../core/context'\nimport { BaseContract, ContractEvent, Block, LogDescription } from 'ethers'\nimport { AddressOrTypeEventFilter, BaseProcessor } from './base-processor'\nimport { BindOptions, getOptionsSignature } from '../core/bind-options'\nimport { EthFetchConfig, HandleInterval, TemplateInstance } from '@sentio/protos'\nimport { PromiseOrVoid } from '../promise-or-void'\nimport { Trace } from './trace'\nimport { ListStateStorage } from '@sentio/runtime'\nimport { EventFilter, LogParams, Network } from 'ethers/providers'\nimport { DeferredTopicFilter } from 'ethers/contract'\n\nexport class ProcessorTemplateProcessorState extends ListStateStorage<\n  BaseProcessorTemplate<BaseContract, BoundContractView<BaseContract, any>>\n> {\n  static INSTANCE = new ProcessorTemplateProcessorState()\n}\n\nexport class TemplateInstanceState extends ListStateStorage<TemplateInstance> {\n  static INSTANCE = new TemplateInstanceState()\n}\n\nexport abstract class BaseProcessorTemplate<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  id: number\n  binds = new Set<string>()\n  blockHandlers: {\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n    blockInterval?: HandleInterval\n    timeIntervalInMinutes?: HandleInterval\n  }[] = []\n  traceHandlers: {\n    signature: string\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n    fetchConfig?: EthFetchConfig\n  }[] = []\n  eventHandlers: {\n    handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n    filter: DeferredTopicFilter | DeferredTopicFilter[]\n    fetchConfig?: EthFetchConfig\n  }[] = []\n\n  constructor() {\n    this.id = ProcessorTemplateProcessorState.INSTANCE.getValues().length\n    ProcessorTemplateProcessorState.INSTANCE.addValue(this)\n  }\n\n  public bind(options: BindOptions) {\n    const sig = getOptionsSignature(options)\n    if (this.binds.has(sig)) {\n      return\n    }\n    this.binds.add(sig)\n\n    const processor = this.bindInternal(options)\n\n    for (const eh of this.eventHandlers) {\n      processor.onEvent(eh.handler, eh.filter, eh.fetchConfig)\n    }\n    for (const th of this.traceHandlers) {\n      processor.onTrace(th.signature, th.handler, th.fetchConfig)\n    }\n    for (const bh of this.blockHandlers) {\n      processor.onInterval(bh.handler, bh.timeIntervalInMinutes, bh.blockInterval)\n    }\n\n    const instance: TemplateInstance = {\n      templateId: this.id,\n      contract: {\n        address: options.address,\n        name: options.name || '',\n        chainId: options.network ? Network.from(options.network).chainId.toString() : '1',\n        abi: '',\n      },\n      startBlock: 0n,\n      endBlock: 0n,\n    }\n    if (options.startBlock) {\n      instance.startBlock = BigInt(options.startBlock)\n    }\n    if (options.endBlock) {\n      instance.endBlock = BigInt(options.endBlock)\n    }\n    TemplateInstanceState.INSTANCE.addValue(instance)\n    return processor\n  }\n\n  public onEvent(\n    handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    this.eventHandlers.push({\n      handler: handler,\n      filter: filter,\n      fetchConfig: fetchConfig,\n    })\n    return this\n  }\n\n  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    return this.onBlockInterval(handler)\n  }\n\n  public onBlockInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    blockInterval = 1000,\n    backfillBlockInterval = 4000\n  ) {\n    return this.onInterval(handler, undefined, {\n      recentInterval: blockInterval,\n      backfillInterval: backfillBlockInterval,\n    })\n  }\n\n  public onTimeInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeIntervalInMinutes = 60,\n    backfillBlockInterval = 240\n  ) {\n    return this.onInterval(\n      handler,\n      { recentInterval: timeIntervalInMinutes, backfillInterval: backfillBlockInterval },\n      undefined\n    )\n  }\n\n  public onInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeInterval: HandleInterval | undefined,\n    blockInterval: HandleInterval | undefined\n  ) {\n    this.blockHandlers.push({ handler, timeIntervalInMinutes: timeInterval, blockInterval: blockInterval })\n    return this\n  }\n\n  public onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ) {\n    this.traceHandlers.push({ signature, handler })\n    return this\n  }\n\n  protected abstract bindInternal(options: BindOptions): BaseProcessor<TContract, TBoundContractView>\n}\n"]}

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

@@ -1,12 +1,12 @@
-import { Block, Log } from '@ethersproject/providers';
-import { BaseContract, Event, EventFilter } from '@ethersproject/contracts';
-import { BoundContractView, ContractContext, ContractView } from './context';
+import { Block, BaseContract, DeferredTopicFilter, LogDescription } from 'ethers';
+import { BoundContractView, ContractContext, ContractView } from '../core/context';
 import { AddressType, Data_EthBlock, Data_EthLog, Data_EthTrace, EthFetchConfig, HandleInterval, ProcessResult } from '@sentio/protos';
-import { BindInternalOptions, BindOptions } from './bind-options';
+import { BindInternalOptions, BindOptions } from '../core/bind-options';
 import { PromiseOrVoid } from '../promise-or-void';
 import { Trace } from './trace';
-export interface AddressOrTypeEventFilter extends EventFilter {
+export interface AddressOrTypeEventFilter extends DeferredTopicFilter {
     addressType?: AddressType;
+    address?: string;
 }
 export declare class EventsHandler {
     filters: AddressOrTypeEventFilter[];
@@ -31,11 +31,11 @@ export declare abstract class BaseProcessor<TContract extends BaseContract, TBou
     constructor(config: BindOptions);
     protected abstract CreateBoundContractView(): TBoundContractView;
     getChainId(): number;
-    onEvent(handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, filter: EventFilter | EventFilter[], fetchConfig?: EthFetchConfig): this;
+    onEvent(handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, filter: DeferredTopicFilter | DeferredTopicFilter[], fetchConfig?: EthFetchConfig): this;
     onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
     onBlockInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, blockInterval?: number, backfillBlockInterval?: number): this;
     onTimeInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, timeIntervalInMinutes?: number, backfillTimeIntervalInMinutes?: number): this;
     onInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, timeInterval: HandleInterval | undefined, blockInterval: HandleInterval | undefined): this;
-    onAllEvents(handler: (event: Log, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
+    onAllEvents(handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
     onTrace(signature: string, handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, fetchConfig?: EthFetchConfig): this;
 }

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseProcessor = exports.BlockHandlder = exports.TraceHandler = exports.EventsHandler = void 0;
-const providers_1 = require("@ethersproject/providers");
-const context_1 = require("./context");
+const providers_1 = require("ethers/providers");
+const context_1 = require("../core/context");
 const protos_1 = require("@sentio/protos");
 const nice_grpc_1 = require("nice-grpc");
 class EventsHandler {
@@ -49,7 +49,7 @@ class BaseProcessor {
         }
     }
     getChainId() {
-        return (0, providers_1.getNetwork)(this.config.network).chainId;
+        return Number(providers_1.Network.from(this.config.network).chainId);
     }
     onEvent(handler, filter, fetchConfig) {
         const chainId = this.getChainId();
@@ -72,18 +72,10 @@ class BaseProcessor {
                 const log = data.log;
                 const contractView = processor.CreateBoundContractView();
                 const ctx = new context_1.ContractContext(contractName, contractView, chainId, data.timestamp, data.block, log, undefined, data.transaction, data.transactionReceipt);
-                // let event: Event = <Event>deepCopy(log);
-                const event = log;
-                const parsed = contractView.rawContract.interface.parseLog(log);
+                const logParam = log;
+                const parsed = contractView.rawContract.interface.parseLog(logParam);
                 if (parsed) {
-                    event.args = parsed.args;
-                    event.decode = (data, topics) => {
-                        return contractView.rawContract.interface.decodeEventLog(parsed.eventFragment, data, topics);
-                    };
-                    event.event = parsed.name;
-                    event.eventSignature = parsed.signature;
-                    // TODO fix this bug
-                    await handler(event, ctx);
+                    await handler(parsed, ctx);
                     return ctx.getProcessResult();
                 }
                 return protos_1.ProcessResult.fromPartial({});
@@ -126,8 +118,11 @@ class BaseProcessor {
     onAllEvents(handler) {
         const _filters = [];
         const tmpContract = this.CreateBoundContractView();
-        for (const key in tmpContract.filters) {
-            _filters.push(tmpContract.filters[key]());
+        for (const fragment of tmpContract.rawContract.interface.fragments) {
+            if (fragment.type === 'event') {
+                const filter = tmpContract.rawContract.filters[fragment.format()];
+                _filters.push(filter());
+            }
         }
         return this.onEvent(function (log, ctx) {
             return handler(log, ctx);
@@ -144,7 +139,7 @@ class BaseProcessor {
                 const contractView = processor.CreateBoundContractView();
                 const contractInterface = contractView.rawContract.interface;
                 const fragment = contractInterface.getFunction(signature);
-                if (!data.trace) {
+                if (!data.trace || !fragment) {
                     throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'trace is null');
                 }
                 const trace = data.trace;
@@ -152,7 +147,7 @@ class BaseProcessor {
                     return protos_1.ProcessResult.fromPartial({});
                 }
                 const traceData = '0x' + trace.action.input.slice(10);
-                trace.args = contractInterface._abiCoder.decode(fragment.inputs, traceData);
+                trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData);
                 const ctx = new context_1.ContractContext(contractName, contractView, chainId, data.timestamp, data.block, undefined, trace, data.transaction, data.transactionReceipt);
                 await handler(trace, ctx);
                 return ctx.getProcessResult();

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

@@ -0,0 +1 @@
+{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/eth/base-processor.ts"],"names":[],"mappings":";;;AAYA,gDAAkE;AAElE,6CAAkF;AAClF,2CAQuB;AAIvB,yCAA+C;AAO/C,MAAa,aAAa;IACxB,OAAO,CAA4B;IACnC,OAAO,CAAgD;IACvD,WAAW,CAAgB;CAC5B;AAJD,sCAIC;AAED,MAAa,YAAY;IACvB,SAAS,CAAQ;IACjB,OAAO,CAAkD;IACzD,WAAW,CAAgB;CAC5B;AAJD,oCAIC;AAED,MAAa,aAAa;IACxB,aAAa,CAAiB;IAC9B,qBAAqB,CAAiB;IACtC,OAAO,CAAkD;CAC1D;AAJD,sCAIC;AAED,MAAsB,aAAa;IAIjC,aAAa,GAAoB,EAAE,CAAA;IACnC,aAAa,GAAoB,EAAE,CAAA;IACnC,aAAa,GAAmB,EAAE,CAAA;IAElC,MAAM,CAAqB;IAE3B,YAAY,MAAmB;QAC7B,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC5C,UAAU,EAAE,EAAE;SACf,CAAA;QACD,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE;YAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAC3C,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAA;aAC5B;SACF;QACD,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;SACnD;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;SAC/C;IACH,CAAC;IAIM,UAAU;QACf,OAAO,MAAM,CAAC,mBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAA;IAC1D,CAAC;IAEM,OAAO,CACZ,OAAsG,EACtG,MAAmD,EACnD,WAA4B;QAE5B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,IAAI,QAAQ,GAA0B,EAAE,CAAA;QAExC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,QAAQ,GAAG,MAAM,CAAA;SAClB;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;SACtB;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,MAAM,SAAS,GAAG,IAAI,CAAA;QACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE,WAAW,IAAI,uBAAc,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1D,OAAO,EAAE,KAAK,WAAW,IAAiB;gBACxC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;oBACb,MAAM,IAAI,uBAAW,CAAC,kBAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;iBAC/D;gBACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAgB,CAAA;gBAEjC,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBAExD,MAAM,GAAG,GAAG,IAAI,yBAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAc,EACnB,GAAG,EACH,SAAS,EACT,IAAI,CAAC,WAA0B,EAC/B,IAAI,CAAC,kBAAwC,CAC9C,CAAA;gBACD,MAAM,QAAQ,GAAG,GAAqD,CAAA;gBAEtE,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBACpE,IAAI,MAAM,EAAE;oBACV,MAAM,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;oBAC1B,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;iBAC9B;gBACD,OAAO,sBAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACtC,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,OAAO,CAAC,OAA6F;QAC1G,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAEM,eAAe,CACpB,OAA6F,EAC7F,aAAa,GAAG,IAAI,EACpB,qBAAqB,GAAG,IAAI;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE;YACzC,cAAc,EAAE,aAAa;YAC7B,gBAAgB,EAAE,qBAAqB;SACxC,CAAC,CAAA;IACJ,CAAC;IAEM,cAAc,CACnB,OAA6F,EAC7F,qBAAqB,GAAG,EAAE,EAC1B,6BAA6B,GAAG,GAAG;QAEnC,OAAO,IAAI,CAAC,UAAU,CACpB,OAAO,EACP,EAAE,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,EAC1F,SAAS,CACV,CAAA;IACH,CAAC;IAEM,UAAU,CACf,OAA6F,EAC7F,YAAwC,EACxC,aAAyC;QAEzC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,MAAM,SAAS,GAAG,IAAI,CAAA;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAErC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,OAAO,EAAE,KAAK,WAAW,IAAmB;gBAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;oBACf,MAAM,IAAI,uBAAW,CAAC,kBAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;iBACjE;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAc,CAAA;gBAEjC,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBAExD,MAAM,GAAG,GAAG,IAAI,yBAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAChC,KAAK,EACL,SAAS,EACT,SAAS,CACV,CAAA;gBACD,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;YACD,qBAAqB,EAAE,YAAY;YACnC,aAAa,EAAE,aAAa;SAC7B,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,WAAW,CAChB,OAAsG;QAEtG,MAAM,QAAQ,GAA0B,EAAE,CAAA;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAElD,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE;YAClE,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC7B,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;gBACjE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;aACxB;SACF;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,EAAE,GAAG;YACpC,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAC1B,CAAC,EAAE,QAAQ,CAAC,CAAA;IACd,CAAC;IAEM,OAAO,CACZ,SAAiB,EACjB,OAA6F,EAC7F,WAA4B;QAE5B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,MAAM,SAAS,GAAG,IAAI,CAAA;QAEtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,SAAS;YACT,WAAW,EAAE,WAAW,IAAI,uBAAc,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1D,OAAO,EAAE,KAAK,WAAW,IAAmB;gBAC1C,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBACxD,MAAM,iBAAiB,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAA;gBAC5D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;gBACzD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE;oBAC5B,MAAM,IAAI,uBAAW,CAAC,kBAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAA;iBAChE;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAc,CAAA;gBACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;oBACvB,OAAO,sBAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;iBACrC;gBACD,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBACrD,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;gBAE/E,MAAM,GAAG,GAAG,IAAI,yBAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAc,EACnB,SAAS,EACT,KAAK,EACL,IAAI,CAAC,WAA0B,EAC/B,IAAI,CAAC,kBAAwC,CAC9C,CAAA;gBACD,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAnND,sCAmNC","sourcesContent":["import {\n  Block,\n  ContractEvent,\n  Log,\n  TransactionReceipt,\n  BytesLike,\n  BaseContract,\n  Transaction,\n  DeferredTopicFilter,\n  LogDescription,\n  EventFragment,\n} from 'ethers'\nimport { EventFilter, LogParams, Network } from 'ethers/providers'\n\nimport { BoundContractView, ContractContext, ContractView } from '../core/context'\nimport {\n  AddressType,\n  Data_EthBlock,\n  Data_EthLog,\n  Data_EthTrace,\n  EthFetchConfig,\n  HandleInterval,\n  ProcessResult,\n} from '@sentio/protos'\nimport { BindInternalOptions, BindOptions } from '../core/bind-options'\nimport { PromiseOrVoid } from '../promise-or-void'\nimport { Trace } from './trace'\nimport { ServerError, Status } from 'nice-grpc'\n\nexport interface AddressOrTypeEventFilter extends DeferredTopicFilter {\n  addressType?: AddressType\n  address?: string\n}\n\nexport class EventsHandler {\n  filters: AddressOrTypeEventFilter[]\n  handler: (event: Data_EthLog) => Promise<ProcessResult>\n  fetchConfig: EthFetchConfig\n}\n\nexport class TraceHandler {\n  signature: string\n  handler: (trace: Data_EthTrace) => Promise<ProcessResult>\n  fetchConfig: EthFetchConfig\n}\n\nexport class BlockHandlder {\n  blockInterval?: HandleInterval\n  timeIntervalInMinutes?: HandleInterval\n  handler: (block: Data_EthBlock) => Promise<ProcessResult>\n}\n\nexport abstract class BaseProcessor<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  blockHandlers: BlockHandlder[] = []\n  eventHandlers: EventsHandler[] = []\n  traceHandlers: TraceHandler[] = []\n\n  config: BindInternalOptions\n\n  constructor(config: BindOptions) {\n    this.config = {\n      address: config.address,\n      name: config.name || '',\n      network: config.network ? config.network : 1,\n      startBlock: 0n,\n    }\n    if (typeof this.config.network === 'string') {\n      const asInt = parseInt(this.config.network)\n      if (Number.isFinite(asInt)) {\n        this.config.network = asInt\n      }\n    }\n    if (config.startBlock) {\n      this.config.startBlock = BigInt(config.startBlock)\n    }\n    if (config.endBlock) {\n      this.config.endBlock = BigInt(config.endBlock)\n    }\n  }\n\n  protected abstract CreateBoundContractView(): TBoundContractView\n\n  public getChainId(): number {\n    return Number(Network.from(this.config.network).chainId)\n  }\n\n  public onEvent(\n    handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    const chainId = this.getChainId()\n    let _filters: DeferredTopicFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    const contractName = this.config.name\n    const processor = this\n    this.eventHandlers.push({\n      filters: _filters,\n      fetchConfig: fetchConfig || EthFetchConfig.fromPartial({}),\n      handler: async function (data: Data_EthLog) {\n        if (!data.log) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')\n        }\n        const log = data.log as LogParams\n\n        const contractView = processor.CreateBoundContractView()\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          data.block as Block,\n          log,\n          undefined,\n          data.transaction as Transaction,\n          data.transactionReceipt as TransactionReceipt\n        )\n        const logParam = log as any as { topics: Array<string>; data: string }\n\n        const parsed = contractView.rawContract.interface.parseLog(logParam)\n        if (parsed) {\n          await handler(parsed, ctx)\n          return ctx.getProcessResult()\n        }\n        return ProcessResult.fromPartial({})\n      },\n    })\n    return this\n  }\n\n  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    return this.onBlockInterval(handler)\n  }\n\n  public onBlockInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    blockInterval = 1000,\n    backfillBlockInterval = 4000\n  ) {\n    return this.onInterval(handler, undefined, {\n      recentInterval: blockInterval,\n      backfillInterval: backfillBlockInterval,\n    })\n  }\n\n  public onTimeInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeIntervalInMinutes = 60,\n    backfillTimeIntervalInMinutes = 240\n  ) {\n    return this.onInterval(\n      handler,\n      { recentInterval: timeIntervalInMinutes, backfillInterval: backfillTimeIntervalInMinutes },\n      undefined\n    )\n  }\n\n  public onInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeInterval: HandleInterval | undefined,\n    blockInterval: HandleInterval | undefined\n  ) {\n    const chainId = this.getChainId()\n    const processor = this\n    const contractName = this.config.name\n\n    this.blockHandlers.push({\n      handler: async function (data: Data_EthBlock) {\n        if (!data.block) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Block is empty')\n        }\n        const block = data.block as Block\n\n        const contractView = processor.CreateBoundContractView()\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          new Date(block.timestamp * 1000),\n          block,\n          undefined,\n          undefined\n        )\n        await handler(block, ctx)\n        return ctx.getProcessResult()\n      },\n      timeIntervalInMinutes: timeInterval,\n      blockInterval: blockInterval,\n    })\n    return this\n  }\n\n  public onAllEvents(\n    handler: (event: LogDescription, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ) {\n    const _filters: DeferredTopicFilter[] = []\n    const tmpContract = this.CreateBoundContractView()\n\n    for (const fragment of tmpContract.rawContract.interface.fragments) {\n      if (fragment.type === 'event') {\n        const filter = tmpContract.rawContract.filters[fragment.format()]\n        _filters.push(filter())\n      }\n    }\n    return this.onEvent(function (log, ctx) {\n      return handler(log, ctx)\n    }, _filters)\n  }\n\n  public onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    fetchConfig?: EthFetchConfig\n  ) {\n    const chainId = this.getChainId()\n    const contractName = this.config.name\n    const processor = this\n\n    this.traceHandlers.push({\n      signature,\n      fetchConfig: fetchConfig || EthFetchConfig.fromPartial({}),\n      handler: async function (data: Data_EthTrace) {\n        const contractView = processor.CreateBoundContractView()\n        const contractInterface = contractView.rawContract.interface\n        const fragment = contractInterface.getFunction(signature)\n        if (!data.trace || !fragment) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'trace is null')\n        }\n        const trace = data.trace as Trace\n        if (!trace.action.input) {\n          return ProcessResult.fromPartial({})\n        }\n        const traceData = '0x' + trace.action.input.slice(10)\n        trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData)\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          data.block as Block,\n          undefined,\n          trace,\n          data.transaction as Transaction,\n          data.transactionReceipt as TransactionReceipt\n        )\n        await handler(trace, ctx)\n        return ctx.getProcessResult()\n      },\n    })\n    return this\n  }\n}\n"]}

package/lib/{binds.d.ts → eth/binds.d.ts}

@@ -1,6 +1,7 @@
-import { BindOptions } from './core/bind-options';
-import { BaseProcessor, ContractView } from './core';
-import { Networkish } from '@ethersproject/networks';
+import { BindOptions } from '../core/bind-options';
+import { ContractView } from '../core';
+import { BaseProcessor } from './base-processor';
+import { Networkish } from 'ethers/providers';
 import { BaseContract } from 'ethers';
 import { MapStateStorage } from '@sentio/runtime';
 export declare class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {

package/lib/{binds.js → eth/binds.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addContractByABI = exports.getContractByABI = exports.addProcessor = exports.getProcessor = exports.ProcessorState = void 0;
-const bind_options_1 = require("./core/bind-options");
-const providers_1 = require("@ethersproject/providers");
+const bind_options_1 = require("../core/bind-options");
+const providers_1 = require("ethers/providers");
 const runtime_1 = require("@sentio/runtime");
 class ProcessorState extends runtime_1.MapStateStorage {
     static INSTANCE = new ProcessorState();
@@ -11,7 +11,7 @@ exports.ProcessorState = ProcessorState;
 // from abiName_address_chainId => contract wrapper
 const contracts = new Map();
 function getKey(abiName, address, network) {
-    const chainId = (0, providers_1.getNetwork)(network).chainId.toString();
+    const chainId = providers_1.Network.from(network).chainId.toString();
     return [abiName, address.toLowerCase(), chainId].join('_');
 }
 // Dedup processor that bind multiple times

package/lib/eth/binds.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"binds.js","sourceRoot":"","sources":["../../src/eth/binds.ts"],"names":[],"mappings":";;;AAAA,uDAAuE;AAGvE,gDAAsD;AAGtD,6CAAiD;AAEjD,MAAa,cAAe,SAAQ,yBAAwC;IAC1E,MAAM,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAA;;AADxC,wCAEC;AAED,mDAAmD;AACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsC,CAAA;AAE/D,SAAS,MAAM,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACnE,MAAM,OAAO,GAAG,mBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;IACxD,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,CAAC;AAED,2CAA2C;AAC3C,SAAgB,YAAY,CAAC,IAAiB;IAC5C,MAAM,GAAG,GAAG,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAA;IACrC,OAAO,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAC9C,CAAC;AAHD,oCAGC;AAED,SAAgB,YAAY,CAAC,IAAiB,EAAE,SAAkC;IAChF,MAAM,GAAG,GAAG,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAA;IAErC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;AACvD,CAAC;AAJD,oCAIC;AAED,SAAgB,gBAAgB,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACpF,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC;AAHD,4CAGC;AAED,SAAgB,gBAAgB,CAC9B,OAAe,EACf,OAAe,EACf,OAAmB,EACnB,QAAoC;IAEpC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;AACrC,CAAC;AARD,4CAQC","sourcesContent":["import { BindOptions, getOptionsSignature } from '../core/bind-options'\nimport { ContractView } from '../core'\nimport { BaseProcessor } from './base-processor'\nimport { Networkish, Network } from 'ethers/providers'\n\nimport { BaseContract } from 'ethers'\nimport { MapStateStorage } from '@sentio/runtime'\n\nexport class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {\n  static INSTANCE = new ProcessorState()\n}\n\n// from abiName_address_chainId => contract wrapper\nconst contracts = new Map<string, ContractView<BaseContract>>()\n\nfunction getKey(abiName: string, address: string, network: Networkish) {\n  const chainId = Network.from(network).chainId.toString()\n  return [abiName, address.toLowerCase(), chainId].join('_')\n}\n\n// Dedup processor that bind multiple times\nexport function getProcessor(opts: BindOptions) {\n  const sig = getOptionsSignature(opts)\n  return ProcessorState.INSTANCE.getValue(sig)\n}\n\nexport function addProcessor(opts: BindOptions, processor: BaseProcessor<any, any>) {\n  const sig = getOptionsSignature(opts)\n\n  ProcessorState.INSTANCE.getOrSetValue(sig, processor)\n}\n\nexport function getContractByABI(abiName: string, address: string, network: Networkish) {\n  const key = getKey(abiName, address, network)\n  return contracts.get(key)\n}\n\nexport function addContractByABI(\n  abiName: string,\n  address: string,\n  network: Networkish,\n  contract: ContractView<BaseContract>\n) {\n  const key = getKey(abiName, address, network)\n  return contracts.set(key, contract)\n}\n"]}

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

@@ -5,10 +5,10 @@ export declare class EthPlugin extends Plugin {
     private eventHandlers;
     private traceHandlers;
     private blockHandlers;
-    configure(config: ProcessConfigResponse): void;
+    configure(config: ProcessConfigResponse): Promise<void>;
     supportedHandlers: HandlerType[];
     processBinding(request: DataBinding): Promise<ProcessResult>;
-    start(request: StartRequest): void;
+    start(request: StartRequest): Promise<void>;
     stateDiff(config: ProcessConfigResponse): boolean;
     processLog(request: DataBinding): Promise<ProcessResult>;
     processTrace(binding: DataBinding): Promise<ProcessResult>;