@sentio/sdk 2.9.0-rc.1 → 2.9.0-rc.2

package/lib/core/index.d.ts

@@ -1,4 +1,5 @@
 export { BigDecimal, scaleDown } from './big-decimal.js';
+export type { PartiallyOptional } from './partial-optional.js';
 export { BaseContext } from './base-context.js';
 export { normalizeLabels } from './normalization.js';
 export { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js';

package/lib/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAe,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC5G,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,cAAc,oBAAoB,CAAA,CAAC,mBAAmB;AACtD,cAAc,mBAAmB,CAAA;AACjC,OAAO,EAAkB,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA","sourcesContent":["export { BigDecimal, scaleDown } from './big-decimal.js'\nexport { BaseContext } from './base-context.js'\nexport { normalizeLabels } from './normalization.js'\nexport { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js'\nexport { Exporter } from './exporter.js'\nexport * from './event-tracker.js' // TODO remove this\nexport * from './event-logger.js'\nexport { type Numberish, toBigInteger, toMetricValue } from './numberish.js'\n\nexport { CorePlugin } from './core-plugin.js'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAe,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC5G,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,cAAc,oBAAoB,CAAA,CAAC,mBAAmB;AACtD,cAAc,mBAAmB,CAAA;AACjC,OAAO,EAAkB,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA","sourcesContent":["export { BigDecimal, scaleDown } from './big-decimal.js'\nexport type { PartiallyOptional } from './partial-optional.js'\nexport { BaseContext } from './base-context.js'\nexport { normalizeLabels } from './normalization.js'\nexport { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js'\nexport { Exporter } from './exporter.js'\nexport * from './event-tracker.js' // TODO remove this\nexport * from './event-logger.js'\nexport { type Numberish, toBigInteger, toMetricValue } from './numberish.js'\n\nexport { CorePlugin } from './core-plugin.js'\n"]}

package/lib/core/partial-optional.d.ts

@@ -0,0 +1 @@
+export type PartiallyOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;

package/lib/core/partial-optional.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=partial-optional.js.map

package/lib/core/partial-optional.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"partial-optional.js","sourceRoot":"","sources":["../../src/core/partial-optional.ts"],"names":[],"mappings":"","sourcesContent":["export type PartiallyOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>\n"]}

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

@@ -6,11 +6,12 @@ import { AccountContext } from './context.js';
 import { PromiseOrVoid } from '../promise-or-void.js';
 import { AddressOrTypeEventFilter, EventsHandler } from './base-processor.js';
 import { LogDescription } from 'ethers';
+import { PartiallyOptional } from '../core/partial-optional.js';
 export declare class AccountProcessor {
     config: AccountBindOptions;
     eventHandlers: EventsHandler[];
-    static bind(config: AccountBindOptions): AccountProcessor;
-    protected constructor(config: AccountBindOptions);
+    static bind(config: PartiallyOptional<AccountBindOptions, 'network'>): AccountProcessor;
+    protected constructor(config: PartiallyOptional<AccountBindOptions, 'network'>);
     getChainId(): number;
     /**
      * Register custom handler function to process erc20 transfer event to this account

package/lib/eth/account-processor.js

@@ -1,11 +1,11 @@
 import { ERC20__factory, ERC721__factory } from './builtin/internal/index.js';
 import { AddressType, EthFetchConfig, ProcessResult } from '@sentio/protos';
-import { Network } from 'ethers/providers';
 import { ERC20Processor } from './builtin/erc20.js';
 import { ERC721Processor } from './builtin/erc721.js';
 import { AccountContext } from './context.js';
 import { AccountProcessorState } from './account-processor-state.js';
 import { formatEthData } from './eth.js';
+import { getNetworkFromCtxOrNetworkish } from './provider.js';
 const ERC20_INTERFACE = ERC20__factory.createInterface();
 const ERC721_INTERFACE = ERC721__factory.createInterface();
 export class AccountProcessor {
@@ -17,16 +17,13 @@ export class AccountProcessor {
         return processor;
     }
     constructor(config) {
-        this.config = config;
-        if (typeof this.config.network === 'string') {
-            const asInt = parseInt(this.config.network);
-            if (Number.isFinite(asInt)) {
-                this.config.network = asInt;
-            }
-        }
+        this.config = {
+            ...config,
+            network: getNetworkFromCtxOrNetworkish(config.network),
+        };
     }
     getChainId() {
-        return Number(Network.from(this.config.network || 1).chainId);
+        return Number(this.config.network.chainId);
     }
     /**
      * Register custom handler function to process erc20 transfer event to this account

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

@@ -1 +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/index.js'\nimport { AddressType, EthFetchConfig, ProcessResult } from '@sentio/protos'\nimport { AccountBindOptions } from './bind-options.js'\n\nimport { Network } from 'ethers/providers'\n\nimport { TransferEvent as ERC20TransferEvent, ERC20Processor } from './builtin/erc20.js'\nimport { TransferEvent as ERC721TransferEvent, ERC721Processor } from './builtin/erc721.js'\n\nimport { AccountContext } from './context.js'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { AddressOrTypeEventFilter, EventsHandler } from './base-processor.js'\nimport { Block, LogDescription } from 'ethers'\nimport { AccountProcessorState } from './account-processor-state.js'\nimport { formatEthData } from './eth.js'\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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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: EthFetchConfig.fromPartial(fetchConfig || {}),\n      handler: async function (data) {\n        const { log, block, transaction, transactionReceipt } = formatEthData(data)\n\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,\n          undefined,\n          transaction,\n          transactionReceipt\n        )\n        const logParam = log as any as { topics: Array<string>; data: string }\n        const parsed = ERC20_INTERFACE.parseLog(logParam)\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"]}
+{"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/index.js'\nimport { AddressType, EthFetchConfig, ProcessResult } from '@sentio/protos'\nimport { AccountBindOptions } from './bind-options.js'\n\nimport { TransferEvent as ERC20TransferEvent, ERC20Processor } from './builtin/erc20.js'\nimport { TransferEvent as ERC721TransferEvent, ERC721Processor } from './builtin/erc721.js'\n\nimport { AccountContext } from './context.js'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { AddressOrTypeEventFilter, EventsHandler } from './base-processor.js'\nimport { Block, LogDescription } from 'ethers'\nimport { AccountProcessorState } from './account-processor-state.js'\nimport { formatEthData } from './eth.js'\nimport { getNetworkFromCtxOrNetworkish } from './provider.js'\nimport { PartiallyOptional } from '../core/partial-optional.js'\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: PartiallyOptional<AccountBindOptions, 'network'>): AccountProcessor {\n    const processor = new AccountProcessor(config)\n    AccountProcessorState.INSTANCE.addValue(processor)\n    return processor\n  }\n\n  protected constructor(config: PartiallyOptional<AccountBindOptions, 'network'>) {\n    this.config = {\n      ...config,\n      network: getNetworkFromCtxOrNetworkish(config.network),\n    }\n  }\n\n  public getChainId(): number {\n    return Number(this.config.network.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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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?: Partial<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: EthFetchConfig.fromPartial(fetchConfig || {}),\n      handler: async function (data) {\n        const { log, block, transaction, transactionReceipt } = formatEthData(data)\n\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,\n          undefined,\n          transaction,\n          transactionReceipt\n        )\n        const logParam = log as any as { topics: Array<string>; data: string }\n        const parsed = ERC20_INTERFACE.parseLog(logParam)\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/eth/base-processor-template.js

@@ -1,7 +1,7 @@
 import { getOptionsSignature } from './bind-options.js';
 import { EthFetchConfig } from '@sentio/protos';
 import { ListStateStorage } from '@sentio/runtime';
-import { Network } from 'ethers/providers';
+import { getNetworkFromCtxOrNetworkish } from './provider.js';
 export class ProcessorTemplateProcessorState extends ListStateStorage {
     static INSTANCE = new ProcessorTemplateProcessorState();
 }
@@ -39,7 +39,7 @@ export class BaseProcessorTemplate {
             contract: {
                 address: options.address,
                 name: options.name || '',
-                chainId: options.network ? Network.from(options.network).chainId.toString() : '1',
+                chainId: getNetworkFromCtxOrNetworkish(options.network).chainId.toString(),
                 abi: '',
             },
             startBlock: 0n,

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

@@ -1 +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 './context.js'\nimport { BaseContract } from 'ethers'\nimport { BaseProcessor } from './base-processor.js'\nimport { BindOptions, getOptionsSignature } from './bind-options.js'\nimport { EthFetchConfig, HandleInterval, TemplateInstance } from '@sentio/protos'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { Trace } from './trace.js'\nimport { ListStateStorage } from '@sentio/runtime'\nimport { BlockParams, Network } from 'ethers/providers'\nimport { DeferredTopicFilter } from 'ethers/contract'\nimport { EthEvent } from './eth.js'\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: BlockParams, 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: EthEvent, 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: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: Partial<EthFetchConfig>\n  ) {\n    this.eventHandlers.push({\n      handler: handler,\n      filter: filter,\n      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),\n    })\n    return this\n  }\n\n  public onBlockInterval(\n    handler: (block: BlockParams, 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: BlockParams, 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: BlockParams, 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    fetchConfig?: Partial<EthFetchConfig>\n  ) {\n    this.traceHandlers.push({ signature, handler, fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}) })\n    return this\n  }\n\n  protected abstract bindInternal(options: BindOptions): BaseProcessor<TContract, TBoundContractView>\n}\n"]}
+{"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 './context.js'\nimport { BaseContract } from 'ethers'\nimport { BaseProcessor } from './base-processor.js'\nimport { BindOptions, getOptionsSignature } from './bind-options.js'\nimport { EthFetchConfig, HandleInterval, TemplateInstance } from '@sentio/protos'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { Trace } from './trace.js'\nimport { ListStateStorage } from '@sentio/runtime'\nimport { BlockParams } from 'ethers/providers'\nimport { DeferredTopicFilter } from 'ethers/contract'\nimport { EthEvent } from './eth.js'\nimport { getNetworkFromCtxOrNetworkish } from './provider.js'\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: BlockParams, 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: EthEvent, 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: getNetworkFromCtxOrNetworkish(options.network).chainId.toString(),\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: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: Partial<EthFetchConfig>\n  ) {\n    this.eventHandlers.push({\n      handler: handler,\n      filter: filter,\n      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),\n    })\n    return this\n  }\n\n  public onBlockInterval(\n    handler: (block: BlockParams, 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: BlockParams, 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: BlockParams, 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    fetchConfig?: Partial<EthFetchConfig>\n  ) {\n    this.traceHandlers.push({ signature, handler, fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}) })\n    return this\n  }\n\n  protected abstract bindInternal(options: BindOptions): BaseProcessor<TContract, TBoundContractView>\n}\n"]}

package/lib/eth/base-processor.d.ts

@@ -1,8 +1,8 @@
 import { BaseContract, DeferredTopicFilter } from 'ethers';
-import { BlockParams } from 'ethers/providers';
+import { BlockParams, Network } from 'ethers/providers';
 import { BoundContractView, ContractContext, ContractView } from './context.js';
 import { AddressType, Data_EthBlock, Data_EthLog, Data_EthTrace, EthFetchConfig, HandleInterval, ProcessResult } from '@sentio/protos';
-import { BindInternalOptions, BindOptions } from './bind-options.js';
+import { BindOptions } from './bind-options.js';
 import { PromiseOrVoid } from '../promise-or-void.js';
 import { Trace } from './trace.js';
 import { EthEvent } from './eth.js';
@@ -25,6 +25,13 @@ export declare class BlockHandlder {
     timeIntervalInMinutes?: HandleInterval;
     handler: (block: Data_EthBlock) => Promise<ProcessResult>;
 }
+declare class BindInternalOptions {
+    address: string;
+    network: Network;
+    name: string;
+    startBlock: bigint;
+    endBlock?: bigint;
+}
 export declare abstract class BaseProcessor<TContract extends BaseContract, TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>> {
     blockHandlers: BlockHandlder[];
     eventHandlers: EventsHandler[];
@@ -40,3 +47,4 @@ export declare abstract class BaseProcessor<TContract extends BaseContract, TBou
     onAllEvents(handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
     onTrace(signature: string, handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, fetchConfig?: Partial<EthFetchConfig>): this;
 }
+export {};

package/lib/eth/base-processor.js

@@ -1,9 +1,9 @@
-import { Network } from 'ethers/providers';
 import { ContractContext } from './context.js';
 import { EthFetchConfig, ProcessResult, } from '@sentio/protos';
 import { ServerError, Status } from 'nice-grpc';
 import { decodeResult, formatEthData } from './eth.js';
 import * as console from 'console';
+import { getNetworkFromCtxOrNetworkish } from './provider.js';
 export class EventsHandler {
     filters;
     handler;
@@ -19,6 +19,13 @@ export class BlockHandlder {
     timeIntervalInMinutes;
     handler;
 }
+class BindInternalOptions {
+    address;
+    network;
+    name;
+    startBlock;
+    endBlock;
+}
 export class BaseProcessor {
     blockHandlers = [];
     eventHandlers = [];
@@ -28,15 +35,9 @@ export class BaseProcessor {
         this.config = {
             address: config.address,
             name: config.name || '',
-            network: config.network ? config.network : 1,
+            network: getNetworkFromCtxOrNetworkish(config.network),
             startBlock: 0n,
         };
-        if (typeof this.config.network === 'string') {
-            const asInt = parseInt(this.config.network);
-            if (Number.isFinite(asInt)) {
-                this.config.network = asInt;
-            }
-        }
         if (config.startBlock) {
             this.config.startBlock = BigInt(config.startBlock);
         }
@@ -45,7 +46,7 @@ export class BaseProcessor {
         }
     }
     getChainId() {
-        return Number(Network.from(this.config.network).chainId);
+        return Number(this.config.network.chainId);
     }
     onEvent(handler, filter, fetchConfig) {
         const chainId = this.getChainId();

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

@@ -1 +1 @@
-{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/eth/base-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContract, DeferredTopicFilter } from 'ethers'\nimport { BlockParams, Network } from 'ethers/providers'\n\nimport { BoundContractView, ContractContext, ContractView } from './context.js'\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 './bind-options.js'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { Trace } from './trace.js'\nimport { ServerError, Status } from 'nice-grpc'\nimport { decodeResult, EthEvent, formatEthData } from './eth.js'\nimport * as console from 'console'\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: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: Partial<EthFetchConfig>\n  ): this {\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: EthFetchConfig.fromPartial(fetchConfig || {}),\n      handler: async function (data: Data_EthLog) {\n        const { log, block, transaction, transactionReceipt } = formatEthData(data)\n        if (!log) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')\n        }\n        const contractView = processor.CreateBoundContractView()\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          block,\n          log,\n          undefined,\n          transaction,\n          transactionReceipt\n        )\n        const logParam = log as any as { topics: Array<string>; data: string }\n\n        const parsed = contractView.rawContract.interface.parseLog(logParam)\n\n        if (parsed) {\n          const event: EthEvent = { ...log, name: parsed.name, args: decodeResult(parsed) }\n          await handler(event, ctx)\n          return ctx.getProcessResult()\n        }\n        return ProcessResult.fromPartial({})\n      },\n    })\n    return this\n  }\n\n  public onBlockInterval(\n    handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    blockInterval = 250,\n    backfillBlockInterval = 1000\n  ): this {\n    return this.onInterval(handler, undefined, {\n      recentInterval: blockInterval,\n      backfillInterval: backfillBlockInterval,\n    })\n  }\n\n  public onTimeInterval(\n    handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeIntervalInMinutes = 60,\n    backfillTimeIntervalInMinutes = 240\n  ): this {\n    return this.onInterval(\n      handler,\n      { recentInterval: timeIntervalInMinutes, backfillInterval: backfillTimeIntervalInMinutes },\n      undefined\n    )\n  }\n\n  public onInterval(\n    handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeInterval: HandleInterval | undefined,\n    blockInterval: HandleInterval | undefined\n  ): this {\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        const { block } = formatEthData(data)\n\n        if (!block) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Block is empty')\n        }\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: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ): this {\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?: Partial<EthFetchConfig>\n  ): this {\n    const chainId = this.getChainId()\n    const contractName = this.config.name\n    const processor = this\n\n    this.traceHandlers.push({\n      signature,\n      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),\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        const { trace, block, transaction, transactionReceipt } = formatEthData(data)\n        if (!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        try {\n          trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData, true)\n        } catch (e) {\n          if (!trace.error) {\n            throw e\n          }\n          console.error('Failed to decode successful trace', e)\n        }\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          block,\n          undefined,\n          trace,\n          transaction,\n          transactionReceipt\n        )\n        await handler(trace, ctx)\n        return ctx.getProcessResult()\n      },\n    })\n    return this\n  }\n}\n"]}
+{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/eth/base-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContract, DeferredTopicFilter } from 'ethers'\nimport { BlockParams, Network } from 'ethers/providers'\n\nimport { BoundContractView, ContractContext, ContractView } from './context.js'\nimport {\n  AddressType,\n  Data_EthBlock,\n  Data_EthLog,\n  Data_EthTrace,\n  EthFetchConfig,\n  HandleInterval,\n  ProcessResult,\n} from '@sentio/protos'\nimport { BindOptions } from './bind-options.js'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { Trace } from './trace.js'\nimport { ServerError, Status } from 'nice-grpc'\nimport { decodeResult, EthEvent, formatEthData } from './eth.js'\nimport * as console from 'console'\nimport { getNetworkFromCtxOrNetworkish } from './provider.js'\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\nclass BindInternalOptions {\n  address: string\n  network: Network\n  name: string\n  startBlock: bigint\n  endBlock?: bigint\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: getNetworkFromCtxOrNetworkish(config.network),\n      startBlock: 0n,\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(this.config.network.chainId)\n  }\n\n  public onEvent(\n    handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: Partial<EthFetchConfig>\n  ): this {\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: EthFetchConfig.fromPartial(fetchConfig || {}),\n      handler: async function (data: Data_EthLog) {\n        const { log, block, transaction, transactionReceipt } = formatEthData(data)\n        if (!log) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')\n        }\n        const contractView = processor.CreateBoundContractView()\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          block,\n          log,\n          undefined,\n          transaction,\n          transactionReceipt\n        )\n        const logParam = log as any as { topics: Array<string>; data: string }\n\n        const parsed = contractView.rawContract.interface.parseLog(logParam)\n\n        if (parsed) {\n          const event: EthEvent = { ...log, name: parsed.name, args: decodeResult(parsed) }\n          await handler(event, ctx)\n          return ctx.getProcessResult()\n        }\n        return ProcessResult.fromPartial({})\n      },\n    })\n    return this\n  }\n\n  public onBlockInterval(\n    handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    blockInterval = 250,\n    backfillBlockInterval = 1000\n  ): this {\n    return this.onInterval(handler, undefined, {\n      recentInterval: blockInterval,\n      backfillInterval: backfillBlockInterval,\n    })\n  }\n\n  public onTimeInterval(\n    handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeIntervalInMinutes = 60,\n    backfillTimeIntervalInMinutes = 240\n  ): this {\n    return this.onInterval(\n      handler,\n      { recentInterval: timeIntervalInMinutes, backfillInterval: backfillTimeIntervalInMinutes },\n      undefined\n    )\n  }\n\n  public onInterval(\n    handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeInterval: HandleInterval | undefined,\n    blockInterval: HandleInterval | undefined\n  ): this {\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        const { block } = formatEthData(data)\n\n        if (!block) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Block is empty')\n        }\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: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ): this {\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?: Partial<EthFetchConfig>\n  ): this {\n    const chainId = this.getChainId()\n    const contractName = this.config.name\n    const processor = this\n\n    this.traceHandlers.push({\n      signature,\n      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),\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        const { trace, block, transaction, transactionReceipt } = formatEthData(data)\n        if (!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        try {\n          trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData, true)\n        } catch (e) {\n          if (!trace.error) {\n            throw e\n          }\n          console.error('Failed to decode successful trace', e)\n        }\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          block,\n          undefined,\n          trace,\n          transaction,\n          transactionReceipt\n        )\n        await handler(trace, ctx)\n        return ctx.getProcessResult()\n      },\n    })\n    return this\n  }\n}\n"]}

package/lib/eth/bind-options.d.ts

@@ -1,4 +1,4 @@
-import { Networkish } from 'ethers/providers';
+import { Networkish, Network } from 'ethers/providers';
 export declare class BindOptions {
     address: string;
     network?: Networkish;
@@ -7,15 +7,8 @@ export declare class BindOptions {
     endBlock?: bigint | number;
 }
 export declare function getOptionsSignature(opts: BindOptions): string;
-export declare class BindInternalOptions {
-    address: string;
-    network: Networkish;
-    name: string;
-    startBlock: bigint;
-    endBlock?: bigint;
-}
 export declare class AccountBindOptions {
     address: string;
-    network?: Networkish;
+    network: Network;
     startBlock?: bigint | number;
 }

package/lib/eth/bind-options.js

@@ -1,4 +1,4 @@
-import { Network } from 'ethers/providers';
+import { getNetworkFromCtxOrNetworkish } from './provider.js';
 export class BindOptions {
     // Contract address
     address;
@@ -12,13 +12,8 @@ export class BindOptions {
 export function getOptionsSignature(opts) {
     const sig = [opts.address];
     if (opts.network) {
-        if (typeof opts.network === 'string') {
-            const asInt = parseInt(opts.network);
-            if (Number.isFinite(asInt)) {
-                opts.network = asInt;
-            }
-        }
-        sig.push(Network.from(opts.network).chainId.toString());
+        const n = getNetworkFromCtxOrNetworkish(opts.network);
+        sig.push(n.chainId.toString());
     }
     if (opts.name) {
         sig.push(opts.name);
@@ -31,13 +26,6 @@ export function getOptionsSignature(opts) {
     }
     return sig.join('_');
 }
-export class BindInternalOptions {
-    address;
-    network;
-    name;
-    startBlock;
-    endBlock;
-}
 export class AccountBindOptions {
     address;
     network;

package/lib/eth/bind-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-options.js","sourceRoot":"","sources":["../../src/eth/bind-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAEtD,MAAM,OAAO,WAAW;IACtB,mBAAmB;IACnB,OAAO,CAAQ;IACf,6CAA6C;IAC7C,OAAO,GAAgB,CAAC,CAAA;IACxB,2CAA2C;IAC3C,IAAI,CAAS;IACb,UAAU,CAAkB;IAC5B,QAAQ,CAAkB;CAC3B;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAiB;IACnD,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1B,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;YACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC1B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;aACrB;SACF;QACD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;KACxD;IACD,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACpB;IACD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;KACnC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACtB,CAAC;AAED,MAAM,OAAO,mBAAmB;IAC9B,OAAO,CAAQ;IACf,OAAO,CAAY;IACnB,IAAI,CAAQ;IACZ,UAAU,CAAQ;IAClB,QAAQ,CAAS;CAClB;AAED,MAAM,OAAO,kBAAkB;IAC7B,OAAO,CAAQ;IACf,OAAO,CAAa;IACpB,UAAU,CAAkB;CAC7B","sourcesContent":["import { Networkish, Network } from 'ethers/providers'\n\nexport class BindOptions {\n  // Contract address\n  address: string\n  // Optional, if not set, then use eth mainnet\n  network?: Networkish = 1\n  // Optional, override default contract name\n  name?: string\n  startBlock?: bigint | number\n  endBlock?: bigint | number\n}\n\nexport function getOptionsSignature(opts: BindOptions): string {\n  const sig = [opts.address]\n  if (opts.network) {\n    if (typeof opts.network === 'string') {\n      const asInt = parseInt(opts.network)\n      if (Number.isFinite(asInt)) {\n        opts.network = asInt\n      }\n    }\n    sig.push(Network.from(opts.network).chainId.toString())\n  }\n  if (opts.name) {\n    sig.push(opts.name)\n  }\n  if (opts.startBlock) {\n    sig.push(opts.startBlock.toString())\n  }\n  if (opts.endBlock) {\n    sig.push(opts.endBlock.toString())\n  }\n  return sig.join('_')\n}\n\nexport class BindInternalOptions {\n  address: string\n  network: Networkish\n  name: string\n  startBlock: bigint\n  endBlock?: bigint\n}\n\nexport class AccountBindOptions {\n  address: string\n  network?: Networkish\n  startBlock?: bigint | number\n}\n"]}
+{"version":3,"file":"bind-options.js","sourceRoot":"","sources":["../../src/eth/bind-options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAA;AAE7D,MAAM,OAAO,WAAW;IACtB,mBAAmB;IACnB,OAAO,CAAQ;IACf,6CAA6C;IAC7C,OAAO,GAAgB,CAAC,CAAA;IACxB,2CAA2C;IAC3C,IAAI,CAAS;IACb,UAAU,CAAkB;IAC5B,QAAQ,CAAkB;CAC3B;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAiB;IACnD,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1B,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,MAAM,CAAC,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACrD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;KAC/B;IACD,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACpB;IACD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;KACnC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACtB,CAAC;AAED,MAAM,OAAO,kBAAkB;IAC7B,OAAO,CAAQ;IACf,OAAO,CAAS;IAChB,UAAU,CAAkB;CAC7B","sourcesContent":["import { Networkish, Network } from 'ethers/providers'\nimport { getNetworkFromCtxOrNetworkish } from './provider.js'\n\nexport class BindOptions {\n  // Contract address\n  address: string\n  // Optional, if not set, then use eth mainnet\n  network?: Networkish = 1\n  // Optional, override default contract name\n  name?: string\n  startBlock?: bigint | number\n  endBlock?: bigint | number\n}\n\nexport function getOptionsSignature(opts: BindOptions): string {\n  const sig = [opts.address]\n  if (opts.network) {\n    const n = getNetworkFromCtxOrNetworkish(opts.network)\n    sig.push(n.chainId.toString())\n  }\n  if (opts.name) {\n    sig.push(opts.name)\n  }\n  if (opts.startBlock) {\n    sig.push(opts.startBlock.toString())\n  }\n  if (opts.endBlock) {\n    sig.push(opts.endBlock.toString())\n  }\n  return sig.join('_')\n}\n\nexport class AccountBindOptions {\n  address: string\n  network: Network\n  startBlock?: bigint | number\n}\n"]}

package/lib/eth/binds.js

@@ -1,13 +1,13 @@
 import { getOptionsSignature } from './bind-options.js';
-import { Network } from 'ethers/providers';
 import { MapStateStorage } from '@sentio/runtime';
+import { getNetworkFromCtxOrNetworkish } from './provider.js';
 export class ProcessorState extends MapStateStorage {
     static INSTANCE = new ProcessorState();
 }
 // from abiName_address_chainId => contract wrapper
 const contracts = new Map();
 function getKey(abiName, address, network) {
-    const chainId = Network.from(network).chainId.toString();
+    const chainId = getNetworkFromCtxOrNetworkish(network).chainId.toString();
     return [abiName, address.toLowerCase(), chainId].join('_');
 }
 // Dedup processor that bind multiple times

package/lib/eth/binds.js.map

@@ -1 +1 @@
-{"version":3,"file":"binds.js","sourceRoot":"","sources":["../../src/eth/binds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAGpE,OAAO,EAAc,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,OAAO,cAAe,SAAQ,eAAwC;IAC1E,MAAM,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAA;;AAGxC,mDAAmD;AACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsC,CAAA;AAE/D,SAAS,MAAM,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACnE,MAAM,OAAO,GAAG,OAAO,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,MAAM,UAAU,YAAY,CAAC,IAAiB;IAC5C,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACrC,OAAO,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAiB,EAAE,SAAkC;IAChF,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;IAErC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;AACvD,CAAC;AAED,MAAM,UAAU,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;AAED,MAAM,UAAU,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","sourcesContent":["import { BindOptions, getOptionsSignature } from './bind-options.js'\nimport { ContractView } from './context.js'\nimport { BaseProcessor } from './base-processor.js'\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"]}
+{"version":3,"file":"binds.js","sourceRoot":"","sources":["../../src/eth/binds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAMpE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAA;AAE7D,MAAM,OAAO,cAAe,SAAQ,eAAwC;IAC1E,MAAM,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAA;;AAGxC,mDAAmD;AACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsC,CAAA;AAE/D,SAAS,MAAM,CAAC,OAAe,EAAE,OAAe,EAAE,OAAmB;IACnE,MAAM,OAAO,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;IACzE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,CAAC;AAED,2CAA2C;AAC3C,MAAM,UAAU,YAAY,CAAC,IAAiB;IAC5C,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACrC,OAAO,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAiB,EAAE,SAAkC;IAChF,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;IAErC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;AACvD,CAAC;AAED,MAAM,UAAU,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;AAED,MAAM,UAAU,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","sourcesContent":["import { BindOptions, getOptionsSignature } from './bind-options.js'\nimport { ContractView } from './context.js'\nimport { BaseProcessor } from './base-processor.js'\nimport { Networkish } from 'ethers/providers'\n\nimport { BaseContract } from 'ethers'\nimport { MapStateStorage } from '@sentio/runtime'\nimport { getNetworkFromCtxOrNetworkish } from './provider.js'\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 = getNetworkFromCtxOrNetworkish(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/eth/provider.js

@@ -13,9 +13,10 @@ export function getNetworkFromCtxOrNetworkish(networkish) {
     }
     if (typeof networkish === 'string') {
         const id = parseInt(networkish);
-        if (!isNaN(id)) {
-            networkish = 1;
+        if (isNaN(id)) {
+            throw Error('Unexpected Network');
         }
+        networkish = id;
     }
     return Network.from(networkish);
 }
@@ -34,7 +35,7 @@ export function getProvider(networkish) {
             ', configured chains: ' +
             [...Endpoints.INSTANCE.chainServer.keys()].join(' '));
     }
-    provider = new QueuedStaticJsonRpcProvider(address, Network.from(network), Endpoints.INSTANCE.concurrency);
+    provider = new QueuedStaticJsonRpcProvider(address, network, Endpoints.INSTANCE.concurrency);
     providers.set(network.chainId.toString(), provider);
     return provider;
 }

package/lib/eth/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Provider, Network, JsonRpcProvider } from 'ethers'\nimport { Networkish } from 'ethers/providers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\nimport { BaseContext } from '../core/index.js'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\nexport function getNetworkFromCtxOrNetworkish(networkish?: BaseContext | Networkish) {\n  if (!networkish) {\n    networkish = 1\n  }\n  if (networkish instanceof BaseContext) {\n    networkish = networkish.getChainId()\n  }\n  if (typeof networkish === 'string') {\n    const id = parseInt(networkish)\n    if (!isNaN(id)) {\n      networkish = 1\n    }\n  }\n  return Network.from(networkish)\n}\n\nexport function getProvider(networkish?: Networkish): Provider {\n  const network = getNetworkFromCtxOrNetworkish(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.from(network), Endpoints.INSTANCE.concurrency)\n  providers.set(network.chainId.toString(), provider)\n  return provider\n}\n\nfunction getTag(prefix: string, value: any): string {\n  return (\n    prefix +\n    ':' +\n    JSON.stringify(value, (k, v) => {\n      if (v == null) {\n        return 'null'\n      }\n      if (typeof v === 'bigint') {\n        return `bigint:${v.toString()}`\n      }\n      if (typeof v === 'string') {\n        return v.toLowerCase()\n      }\n\n      // Sort object keys\n      if (typeof v === 'object' && !Array.isArray(v)) {\n        const keys = Object.keys(v)\n        keys.sort()\n        return keys.reduce((accum, key) => {\n          accum[key] = v[key]\n          return accum\n        }, <any>{})\n      }\n\n      return v\n    })\n  )\n}\n\nclass QueuedStaticJsonRpcProvider extends JsonRpcProvider {\n  executor: PQueue\n  #performCache = new Map<string, Promise<any>>()\n\n  constructor(url: string, network: Network, concurrency: number) {\n    // TODO re-enable match when possible\n    super(url, network, { staticNetwork: network, batchMaxCount: 1 })\n    this.executor = new PQueue({ concurrency: concurrency })\n  }\n\n  async send(method: string, params: Array<any>): Promise<any> {\n    const tag = getTag(method, params)\n    const block = params[params.length - 1]\n    let perform = this.#performCache.get(tag)\n    if (!perform) {\n      perform = this.executor.add(() => super.send(method, params))\n      this.#performCache.set(tag, perform)\n      // For non latest block call, we cache permanently, otherwise we cache for one minute\n      if (block === 'latest') {\n        setTimeout(() => {\n          if (this.#performCache.get(tag) === perform) {\n            this.#performCache.delete(tag)\n          }\n        }, 60 * 1000)\n      }\n    }\n\n    const result = await perform\n    if (!result) {\n      throw Error('Unexpected null response')\n    }\n    return result\n  }\n}\n"]}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Provider, Network, JsonRpcProvider } from 'ethers'\nimport { Networkish } from 'ethers/providers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\nimport { BaseContext } from '../core/index.js'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\nexport function getNetworkFromCtxOrNetworkish(networkish?: BaseContext | Networkish) {\n  if (!networkish) {\n    networkish = 1\n  }\n  if (networkish instanceof BaseContext) {\n    networkish = networkish.getChainId()\n  }\n  if (typeof networkish === 'string') {\n    const id = parseInt(networkish)\n    if (isNaN(id)) {\n      throw Error('Unexpected Network')\n    }\n    networkish = id\n  }\n  return Network.from(networkish)\n}\n\nexport function getProvider(networkish?: Networkish): Provider {\n  const network = getNetworkFromCtxOrNetworkish(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\nfunction getTag(prefix: string, value: any): string {\n  return (\n    prefix +\n    ':' +\n    JSON.stringify(value, (k, v) => {\n      if (v == null) {\n        return 'null'\n      }\n      if (typeof v === 'bigint') {\n        return `bigint:${v.toString()}`\n      }\n      if (typeof v === 'string') {\n        return v.toLowerCase()\n      }\n\n      // Sort object keys\n      if (typeof v === 'object' && !Array.isArray(v)) {\n        const keys = Object.keys(v)\n        keys.sort()\n        return keys.reduce((accum, key) => {\n          accum[key] = v[key]\n          return accum\n        }, <any>{})\n      }\n\n      return v\n    })\n  )\n}\n\nclass QueuedStaticJsonRpcProvider extends JsonRpcProvider {\n  executor: PQueue\n  #performCache = new Map<string, Promise<any>>()\n\n  constructor(url: string, network: Network, concurrency: number) {\n    // TODO re-enable match when possible\n    super(url, network, { staticNetwork: network, batchMaxCount: 1 })\n    this.executor = new PQueue({ concurrency: concurrency })\n  }\n\n  async send(method: string, params: Array<any>): Promise<any> {\n    const tag = getTag(method, params)\n    const block = params[params.length - 1]\n    let perform = this.#performCache.get(tag)\n    if (!perform) {\n      perform = this.executor.add(() => super.send(method, params))\n      this.#performCache.set(tag, perform)\n      // For non latest block call, we cache permanently, otherwise we cache for one minute\n      if (block === 'latest') {\n        setTimeout(() => {\n          if (this.#performCache.get(tag) === perform) {\n            this.#performCache.delete(tag)\n          }\n        }, 60 * 1000)\n      }\n    }\n\n    const result = await perform\n    if (!result) {\n      throw Error('Unexpected null response')\n    }\n    return result\n  }\n}\n"]}

package/lib/eth/provider.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/eth/provider.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.test.js","sourceRoot":"","sources":["../../src/eth/provider.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,CAAC,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAA;QAC9C,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,CAAC,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,GAAG,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC1C,MAAM,CAAC,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { getNetworkFromCtxOrNetworkish } from './provider.js'\nimport { expect } from 'chai'\nimport { AccountContext } from './context.js'\n\ndescribe('provider test', () => {\n  test('network test with string', async () => {\n    const n = getNetworkFromCtxOrNetworkish('321')\n    expect(n.chainId).eq(321n)\n  })\n\n  test('network test with id', async () => {\n    const n = getNetworkFromCtxOrNetworkish(321)\n    expect(n.chainId).eq(321n)\n  })\n\n  test('network test with context', async () => {\n    const ctx = new AccountContext(321, '0x1')\n    const n = getNetworkFromCtxOrNetworkish(ctx)\n    expect(n.chainId).eq(321n)\n  })\n})\n"]}

package/lib/testing/eth-facet.js

@@ -1,5 +1,5 @@
 import { HandlerType } from '@sentio/protos';
-import { Network } from 'ethers/providers';
+import { getNetworkFromCtxOrNetworkish } from '../eth/provider.js';
 export class EthFacet {
     server;
     constructor(server) {
@@ -27,7 +27,7 @@ export class EthFacet {
         }
         const signature = trace.action.input.slice(0, 10);
         for (const contract of this.server.contractConfigs) {
-            if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {
+            if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
                 continue;
             }
             if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -68,7 +68,7 @@ export class EthFacet {
     }
     buildLogBinding(log, network = 1) {
         for (const contract of this.server.contractConfigs) {
-            if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {
+            if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
                 continue;
             }
             if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -126,7 +126,7 @@ export class EthFacet {
     }
     buildAccountLogBinding(address, log, network = 1) {
         for (const account of this.server.accountConfigs) {
-            if (account.chainId !== Network.from(network).chainId.toString()) {
+            if (account.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
                 continue;
             }
             if (address.toLowerCase() !== account.address.toLowerCase()) {
@@ -191,7 +191,7 @@ export class EthFacet {
             handlerIds: [],
         };
         for (const contract of this.server.contractConfigs) {
-            if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {
+            if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
                 continue;
             }
             const longBlockNumber = block.number;

package/lib/testing/eth-facet.js.map

@@ -1 +1 @@
-{"version":3,"file":"eth-facet.js","sourceRoot":"","sources":["../../src/testing/eth-facet.ts"],"names":[],"mappings":"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","sourcesContent":["import { TestProcessorServer } from './test-processor-server.js'\nimport { DataBinding, HandlerType, ProcessBindingResponse } from '@sentio/protos'\nimport { Trace } from '../eth/trace.js'\nimport { BlockParams, LogParams, Network, Networkish } from 'ethers/providers'\nimport { Block } from 'ethers'\n\nexport class EthFacet {\n  server: TestProcessorServer\n\n  constructor(server: TestProcessorServer) {\n    this.server = server\n  }\n\n  testTrace(trace: Trace, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testTraces([trace], network)\n  }\n\n  testTraces(traces: Trace[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const trace of traces) {\n      const binding = this.buildTraceBinding(trace, network)\n      if (!binding) {\n        throw Error('Invalid test trace: ' + JSON.stringify(trace))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildTraceBinding(trace: Trace, network: Networkish = 1): DataBinding | undefined {\n    if (trace.type !== 'call' || !trace.action.input) {\n      throw Error('Invalid test trace: ' + JSON.stringify(trace))\n    }\n    const signature = trace.action.input.slice(0, 10)\n\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.traceConfigs) {\n        if (config.signature == signature) {\n          return {\n            data: {\n              ethTrace: {\n                trace,\n                timestamp: new Date(),\n              },\n            },\n            handlerIds: [config.handlerId],\n            handlerType: HandlerType.ETH_TRACE,\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testLog(log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testLogs([log], network)\n  }\n\n  testLogs(logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildLogBinding(log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildLogBinding(log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n  testAccountLog(address: string, log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testAccountLogs(address, [log], network)\n  }\n\n  testAccountLogs(address: string, logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildAccountLogBinding(address, log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildAccountLogBinding(address: string, log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const account of this.server.accountConfigs) {\n      if (account.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (address.toLowerCase() !== account.address.toLowerCase()) {\n        continue\n      }\n      for (const config of account.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testBlock(\n    block: Partial<BlockParams> & { number: number },\n    network: Networkish = 1\n  ): Promise<ProcessBindingResponse> {\n    return this.testBlocks([block], network)\n  }\n\n  testBlocks(blocks: Partial<BlockParams> & { number: number }[], network: Networkish = 1) {\n    const bindings = []\n    for (const block of blocks) {\n      const binding = this.buildBlockBinding(block, network)\n      if (!binding) {\n        throw Error('Invalid test block: ' + JSON.stringify(block))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildBlockBinding(block: Partial<Block> & { number: number }, network: Networkish = 1): DataBinding {\n    const binding: DataBinding = {\n      data: {\n        ethBlock: { block },\n      },\n      handlerType: HandlerType.ETH_BLOCK,\n      handlerIds: [],\n    }\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      const longBlockNumber = block.number\n      if (longBlockNumber < contract.startBlock) {\n        continue\n      }\n      if (contract.endBlock !== 0n && longBlockNumber >= contract.endBlock) {\n        continue\n      }\n\n      for (const config of contract.intervalConfigs) {\n        binding.handlerIds.push(config.handlerId)\n      }\n    }\n    return binding\n  }\n}\n"]}
+{"version":3,"file":"eth-facet.js","sourceRoot":"","sources":["../../src/testing/eth-facet.ts"],"names":[],"mappings":"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","sourcesContent":["import { TestProcessorServer } from './test-processor-server.js'\nimport { DataBinding, HandlerType, ProcessBindingResponse } from '@sentio/protos'\nimport { Trace } from '../eth/trace.js'\nimport { BlockParams, LogParams, Networkish } from 'ethers/providers'\nimport { Block } from 'ethers'\nimport { getNetworkFromCtxOrNetworkish } from '../eth/provider.js'\n\nexport class EthFacet {\n  server: TestProcessorServer\n\n  constructor(server: TestProcessorServer) {\n    this.server = server\n  }\n\n  testTrace(trace: Trace, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testTraces([trace], network)\n  }\n\n  testTraces(traces: Trace[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const trace of traces) {\n      const binding = this.buildTraceBinding(trace, network)\n      if (!binding) {\n        throw Error('Invalid test trace: ' + JSON.stringify(trace))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildTraceBinding(trace: Trace, network: Networkish = 1): DataBinding | undefined {\n    if (trace.type !== 'call' || !trace.action.input) {\n      throw Error('Invalid test trace: ' + JSON.stringify(trace))\n    }\n    const signature = trace.action.input.slice(0, 10)\n\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.traceConfigs) {\n        if (config.signature == signature) {\n          return {\n            data: {\n              ethTrace: {\n                trace,\n                timestamp: new Date(),\n              },\n            },\n            handlerIds: [config.handlerId],\n            handlerType: HandlerType.ETH_TRACE,\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testLog(log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testLogs([log], network)\n  }\n\n  testLogs(logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildLogBinding(log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildLogBinding(log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n  testAccountLog(address: string, log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testAccountLogs(address, [log], network)\n  }\n\n  testAccountLogs(address: string, logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildAccountLogBinding(address, log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildAccountLogBinding(address: string, log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const account of this.server.accountConfigs) {\n      if (account.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      if (address.toLowerCase() !== account.address.toLowerCase()) {\n        continue\n      }\n      for (const config of account.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testBlock(\n    block: Partial<BlockParams> & { number: number },\n    network: Networkish = 1\n  ): Promise<ProcessBindingResponse> {\n    return this.testBlocks([block], network)\n  }\n\n  testBlocks(blocks: Partial<BlockParams> & { number: number }[], network: Networkish = 1) {\n    const bindings = []\n    for (const block of blocks) {\n      const binding = this.buildBlockBinding(block, network)\n      if (!binding) {\n        throw Error('Invalid test block: ' + JSON.stringify(block))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildBlockBinding(block: Partial<Block> & { number: number }, network: Networkish = 1): DataBinding {\n    const binding: DataBinding = {\n      data: {\n        ethBlock: { block },\n      },\n      handlerType: HandlerType.ETH_BLOCK,\n      handlerIds: [],\n    }\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      const longBlockNumber = block.number\n      if (longBlockNumber < contract.startBlock) {\n        continue\n      }\n      if (contract.endBlock !== 0n && longBlockNumber >= contract.endBlock) {\n        continue\n      }\n\n      for (const config of contract.intervalConfigs) {\n        binding.handlerIds.push(config.handlerId)\n      }\n    }\n    return binding\n  }\n}\n"]}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.9.0-rc.1",
+  "version": "2.9.0-rc.2",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
     "build": "yarn gen && yarn compile",
     "build_all": "yarn lerna run --scope=@sentio/sdk build --include-dependencies",
-    "test": "NODE_OPTIONS=--experimental-vm-modules yarn jest",
+    "test": "NODE_OPTIONS=--experimental-vm-modules yarn jest --runInBand --detectOpenHandles",
     "gen": "yarn gen:eth && yarn gen:aptos && yarn gen:sui && yarn gen:solana",
     "gen:eth": "ts-node-esm src/eth/codegen/run.ts src/eth/abis src/eth/builtin && yarn gen:eth_test",
     "gen:eth_test": "ts-node-esm src/eth/codegen/run.ts src/eth/tests/abis/eth ./src/eth/tests/types",
@@ -23,8 +23,8 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.25",
-    "@sentio/protos": "^2.9.0-rc.1",
-    "@sentio/runtime": "^2.9.0-rc.1",
+    "@sentio/protos": "^2.9.0-rc.2",
+    "@sentio/runtime": "^2.9.0-rc.2",
     "@solana/web3.js": "^1.73.2",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.7.1",
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "c20b39437140f1e2059dcc5b5f54eabadfa9bf58"
+  "gitHead": "f22159ed1eac20a3ceed93e681822d039b47f715"
 }

package/src/core/index.ts

@@ -1,4 +1,5 @@
 export { BigDecimal, scaleDown } from './big-decimal.js'
+export type { PartiallyOptional } from './partial-optional.js'
 export { BaseContext } from './base-context.js'
 export { normalizeLabels } from './normalization.js'
 export { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js'

package/src/core/partial-optional.ts

@@ -0,0 +1 @@
+export type PartiallyOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>

package/src/eth/account-processor.ts

@@ -2,8 +2,6 @@ import { ERC20__factory, ERC721__factory } from './builtin/internal/index.js'
 import { AddressType, EthFetchConfig, ProcessResult } from '@sentio/protos'
 import { AccountBindOptions } from './bind-options.js'
 
-import { Network } from 'ethers/providers'
-
 import { TransferEvent as ERC20TransferEvent, ERC20Processor } from './builtin/erc20.js'
 import { TransferEvent as ERC721TransferEvent, ERC721Processor } from './builtin/erc721.js'
 
@@ -13,6 +11,8 @@ import { AddressOrTypeEventFilter, EventsHandler } from './base-processor.js'
 import { Block, LogDescription } from 'ethers'
 import { AccountProcessorState } from './account-processor-state.js'
 import { formatEthData } from './eth.js'
+import { getNetworkFromCtxOrNetworkish } from './provider.js'
+import { PartiallyOptional } from '../core/partial-optional.js'
 
 const ERC20_INTERFACE = ERC20__factory.createInterface()
 const ERC721_INTERFACE = ERC721__factory.createInterface()
@@ -21,24 +21,21 @@ export class AccountProcessor {
   config: AccountBindOptions
   eventHandlers: EventsHandler[] = []
 
-  static bind(config: AccountBindOptions): AccountProcessor {
+  static bind(config: PartiallyOptional<AccountBindOptions, 'network'>): AccountProcessor {
     const processor = new AccountProcessor(config)
     AccountProcessorState.INSTANCE.addValue(processor)
     return processor
   }
 
-  protected constructor(config: AccountBindOptions) {
-    this.config = config
-    if (typeof this.config.network === 'string') {
-      const asInt = parseInt(this.config.network)
-      if (Number.isFinite(asInt)) {
-        this.config.network = asInt
-      }
+  protected constructor(config: PartiallyOptional<AccountBindOptions, 'network'>) {
+    this.config = {
+      ...config,
+      network: getNetworkFromCtxOrNetworkish(config.network),
     }
   }
 
   public getChainId(): number {
-    return Number(Network.from(this.config.network || 1).chainId)
+    return Number(this.config.network.chainId)
   }
 
   /**

package/src/eth/base-processor-template.ts

@@ -6,9 +6,10 @@ import { EthFetchConfig, HandleInterval, TemplateInstance } from '@sentio/protos
 import { PromiseOrVoid } from '../promise-or-void.js'
 import { Trace } from './trace.js'
 import { ListStateStorage } from '@sentio/runtime'
-import { BlockParams, Network } from 'ethers/providers'
+import { BlockParams } from 'ethers/providers'
 import { DeferredTopicFilter } from 'ethers/contract'
 import { EthEvent } from './eth.js'
+import { getNetworkFromCtxOrNetworkish } from './provider.js'
 
 export class ProcessorTemplateProcessorState extends ListStateStorage<
   BaseProcessorTemplate<BaseContract, BoundContractView<BaseContract, any>>
@@ -71,7 +72,7 @@ export abstract class BaseProcessorTemplate<
       contract: {
         address: options.address,
         name: options.name || '',
-        chainId: options.network ? Network.from(options.network).chainId.toString() : '1',
+        chainId: getNetworkFromCtxOrNetworkish(options.network).chainId.toString(),
         abi: '',
       },
       startBlock: 0n,

package/src/eth/base-processor.ts

@@ -11,12 +11,13 @@ import {
   HandleInterval,
   ProcessResult,
 } from '@sentio/protos'
-import { BindInternalOptions, BindOptions } from './bind-options.js'
+import { BindOptions } from './bind-options.js'
 import { PromiseOrVoid } from '../promise-or-void.js'
 import { Trace } from './trace.js'
 import { ServerError, Status } from 'nice-grpc'
 import { decodeResult, EthEvent, formatEthData } from './eth.js'
 import * as console from 'console'
+import { getNetworkFromCtxOrNetworkish } from './provider.js'
 
 export interface AddressOrTypeEventFilter extends DeferredTopicFilter {
   addressType?: AddressType
@@ -41,6 +42,14 @@ export class BlockHandlder {
   handler: (block: Data_EthBlock) => Promise<ProcessResult>
 }
 
+class BindInternalOptions {
+  address: string
+  network: Network
+  name: string
+  startBlock: bigint
+  endBlock?: bigint
+}
+
 export abstract class BaseProcessor<
   TContract extends BaseContract,
   TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>
@@ -55,15 +64,9 @@ export abstract class BaseProcessor<
     this.config = {
       address: config.address,
       name: config.name || '',
-      network: config.network ? config.network : 1,
+      network: getNetworkFromCtxOrNetworkish(config.network),
       startBlock: 0n,
     }
-    if (typeof this.config.network === 'string') {
-      const asInt = parseInt(this.config.network)
-      if (Number.isFinite(asInt)) {
-        this.config.network = asInt
-      }
-    }
     if (config.startBlock) {
       this.config.startBlock = BigInt(config.startBlock)
     }
@@ -75,7 +78,7 @@ export abstract class BaseProcessor<
   protected abstract CreateBoundContractView(): TBoundContractView
 
   public getChainId(): number {
-    return Number(Network.from(this.config.network).chainId)
+    return Number(this.config.network.chainId)
   }
 
   public onEvent(

package/src/eth/bind-options.ts

@@ -1,4 +1,5 @@
 import { Networkish, Network } from 'ethers/providers'
+import { getNetworkFromCtxOrNetworkish } from './provider.js'
 
 export class BindOptions {
   // Contract address
@@ -14,13 +15,8 @@ export class BindOptions {
 export function getOptionsSignature(opts: BindOptions): string {
   const sig = [opts.address]
   if (opts.network) {
-    if (typeof opts.network === 'string') {
-      const asInt = parseInt(opts.network)
-      if (Number.isFinite(asInt)) {
-        opts.network = asInt
-      }
-    }
-    sig.push(Network.from(opts.network).chainId.toString())
+    const n = getNetworkFromCtxOrNetworkish(opts.network)
+    sig.push(n.chainId.toString())
   }
   if (opts.name) {
     sig.push(opts.name)
@@ -34,16 +30,8 @@ export function getOptionsSignature(opts: BindOptions): string {
   return sig.join('_')
 }
 
-export class BindInternalOptions {
-  address: string
-  network: Networkish
-  name: string
-  startBlock: bigint
-  endBlock?: bigint
-}
-
 export class AccountBindOptions {
   address: string
-  network?: Networkish
+  network: Network
   startBlock?: bigint | number
 }

package/src/eth/binds.ts

@@ -1,10 +1,11 @@
 import { BindOptions, getOptionsSignature } from './bind-options.js'
 import { ContractView } from './context.js'
 import { BaseProcessor } from './base-processor.js'
-import { Networkish, Network } from 'ethers/providers'
+import { Networkish } from 'ethers/providers'
 
 import { BaseContract } from 'ethers'
 import { MapStateStorage } from '@sentio/runtime'
+import { getNetworkFromCtxOrNetworkish } from './provider.js'
 
 export class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
   static INSTANCE = new ProcessorState()
@@ -14,7 +15,7 @@ export class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
 const contracts = new Map<string, ContractView<BaseContract>>()
 
 function getKey(abiName: string, address: string, network: Networkish) {
-  const chainId = Network.from(network).chainId.toString()
+  const chainId = getNetworkFromCtxOrNetworkish(network).chainId.toString()
   return [abiName, address.toLowerCase(), chainId].join('_')
 }
 

package/src/eth/provider.ts

@@ -18,9 +18,10 @@ export function getNetworkFromCtxOrNetworkish(networkish?: BaseContext | Network
   }
   if (typeof networkish === 'string') {
     const id = parseInt(networkish)
-    if (!isNaN(id)) {
-      networkish = 1
+    if (isNaN(id)) {
+      throw Error('Unexpected Network')
     }
+    networkish = id
   }
   return Network.from(networkish)
 }
@@ -45,7 +46,7 @@ export function getProvider(networkish?: Networkish): Provider {
         [...Endpoints.INSTANCE.chainServer.keys()].join(' ')
     )
   }
-  provider = new QueuedStaticJsonRpcProvider(address, Network.from(network), Endpoints.INSTANCE.concurrency)
+  provider = new QueuedStaticJsonRpcProvider(address, network, Endpoints.INSTANCE.concurrency)
   providers.set(network.chainId.toString(), provider)
   return provider
 }

package/src/testing/eth-facet.ts

@@ -1,8 +1,9 @@
 import { TestProcessorServer } from './test-processor-server.js'
 import { DataBinding, HandlerType, ProcessBindingResponse } from '@sentio/protos'
 import { Trace } from '../eth/trace.js'
-import { BlockParams, LogParams, Network, Networkish } from 'ethers/providers'
+import { BlockParams, LogParams, Networkish } from 'ethers/providers'
 import { Block } from 'ethers'
+import { getNetworkFromCtxOrNetworkish } from '../eth/provider.js'
 
 export class EthFacet {
   server: TestProcessorServer
@@ -36,7 +37,7 @@ export class EthFacet {
     const signature = trace.action.input.slice(0, 10)
 
     for (const contract of this.server.contractConfigs) {
-      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {
+      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
         continue
       }
       if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -80,7 +81,7 @@ export class EthFacet {
 
   buildLogBinding(log: LogParams, network: Networkish = 1): DataBinding | undefined {
     for (const contract of this.server.contractConfigs) {
-      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {
+      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
         continue
       }
       if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -141,7 +142,7 @@ export class EthFacet {
 
   buildAccountLogBinding(address: string, log: LogParams, network: Networkish = 1): DataBinding | undefined {
     for (const account of this.server.accountConfigs) {
-      if (account.chainId !== Network.from(network).chainId.toString()) {
+      if (account.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
         continue
       }
       if (address.toLowerCase() !== account.address.toLowerCase()) {
@@ -213,7 +214,7 @@ export class EthFacet {
       handlerIds: [],
     }
     for (const contract of this.server.contractConfigs) {
-      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {
+      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
         continue
       }
       const longBlockNumber = block.number