@sentio/sdk 2.15.6-rc.1 → 2.15.6-rc.3

package/lib/eth/codegen/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/eth/codegen/file.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Contract,\n  createImportsForUsedIdentifiers,\n  EventDeclaration,\n  getFullSignatureAsSymbolForEvent,\n  getFullSignatureForEvent,\n} from 'typechain'\n\nimport { reservedKeywords } from '@sentio/ethers-v6/dist/codegen/reserved-keywords.js'\nimport { codegenCallTraceTypes, generateCallHandlers } from './functions-handler.js'\nimport { generateEventFilters, generateEventHandlers } from './event-handler.js'\nimport { generateBoundViewFunctions, generateViewFunctions } from './view-function.js'\n\nexport function codeGenIndex(contract: Contract): string {\n  return ` \n  export * from './internal/${contract.name.toLowerCase()}-processor.js'\n  export * from './internal/${contract.name.toLowerCase()}-test-utils.js'\n  export * from './internal/${contract.name}.js'\n  export * from './internal/factories/${contract.name}__factory.js'\n  `\n}\n\nexport function codeGenSentioFile(contract: Contract): string {\n  const source = `\n  ${Object.values(contract.functions).map(codegenCallTraceTypes).join('\\n')}\n\n  const templateContract = ${contract.name}__factory.connect(\"0x0\", DummyProvider)\n\n  export class ${contract.name}ContractView extends ContractView<${contract.name}> {\n    constructor (contract: ${contract.name}) {\n      super(contract);\n    }\n\n    ${Object.values(contract.functions)\n      .filter((f) => !reservedKeywords.has(f[0].name))\n      .map((fs) => generateViewFunctions(fs))\n      .join('\\n')}\n  }\n  \n  export class ${contract.name}BoundContractView extends BoundContractView<${contract.name}, \n    ${contract.name}ContractView> {\n  ${Object.values(contract.functions)\n    .filter((f) => !reservedKeywords.has(f[0].name))\n    .map((fs) => generateBoundViewFunctions(fs))\n    .join('\\n')}\n  }\n\n    export type ${contract.name}Context = ContractContext<${contract.name}, ${contract.name}BoundContractView>\n\n  export class ${contract.name}Processor extends BaseProcessor<${contract.name}, ${contract.name}BoundContractView> {\n    ${Object.values(contract.events)\n      .map((events) => generateEventHandlers(events, contract.name))\n      .join('\\n')}\n\n    ${Object.values(contract.functions)\n      .map((f) => generateCallHandlers(f, contract.name))\n      .join('\\n')}\n\n  public static filters = {\n    ${Object.values(contract.events)\n      .map((events) => generateEventFilters(events))\n      .join(',')}\n  }\n  \n  protected CreateBoundContractView(): ${contract.name}BoundContractView {\n    const view = get${contract.name}Contract(this.config.network, this.config.address)\n    return new ${contract.name}BoundContractView(this.config.address, view)\n  }\n\n  public static bind(options: BindOptions): ${contract.name}Processor {\n     if (!options.name) {\n      options.name = \"${contract.name}\"\n    }\n    let processor = getProcessor(options) as ${contract.name}Processor\n    if (!processor) {\n      processor = new ${contract.name}Processor(options)\n      addProcessor(options, processor)\n    }\n    return processor\n  }\n}\n\nexport class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${contract.name}, ${\n    contract.name\n  }BoundContractView> {\n  bindInternal(options: BindOptions) {\n    if (!options.name) {\n      options.name = \"${contract.name}\"\n    }\n    let processor = getProcessor(options) as ${contract.name}Processor\n    if (!processor) {\n      processor = new ${contract.name}Processor(options)\n      addProcessor(options, processor)\n    }\n    return processor\n  }\n\n  ${Object.values(contract.events)\n    .map((events) => generateEventHandlers(events, contract.name))\n    .join('\\n')}\n  \n  ${Object.values(contract.functions)\n    .map((functions) => {\n      generateCallHandlers(functions, contract.name)\n    })\n    .join('\\n')}\n  }\n\n  export function get${contract.name}Contract(contextOrNetwork: EthContext | EthChainId, address: string): ${\n    contract.name\n  }ContractView {\n    const network = getEthChainId(contextOrNetwork) \n    let contract = getContractByABI(\"${contract.name}\", address, network) as ${contract.name}ContractView\n    if (!contract) {\n      const rawContract = ${contract.name}__factory.connect(address, getProvider(network))\n      contract = new ${contract.name}ContractView(rawContract)\n      addContractByABI(\"${contract.name}\", address, network, contract)\n    }\n    return contract\n  }\n  `\n  const eventsImports = Object.values(contract.events).flatMap((events) => {\n    if (events.length === 1) {\n      return [`${events[0].name}Event`, `${events[0].name}EventFilter`]\n    } else {\n      return events.flatMap((e) => [\n        `${getFullSignatureAsSymbolForEvent(e)}_Event`,\n        `${getFullSignatureAsSymbolForEvent(e)}_EventFilter`,\n      ])\n    }\n  })\n\n  const structImports = Object.values(contract.structs).flatMap((structs) => {\n    return structs.flatMap((s) => {\n      if (!s.structName) {\n        return []\n      }\n      if (s.structName.namespace) {\n        return [s.structName.namespace]\n      } else {\n        return [s.structName.identifier + 'StructOutput', s.structName.identifier + 'Struct']\n      }\n    })\n  })\n  // dedup namespace\n  const uniqueStructImports = [...new Set(structImports)]\n\n  const imports = createImportsForUsedIdentifiers(\n    {\n      ethers: ['BigNumberish', 'Overrides', 'BytesLike'],\n      // 'ethers/providers': ['Networkish'],\n      '@sentio/sdk/eth': [\n        'addContractByABI',\n        'getContractByABI',\n        'addProcessor',\n        'getProcessor',\n        'getProvider',\n        'transformEtherError',\n        'Trace',\n        'BindOptions',\n        'BaseProcessor',\n        'BaseProcessorTemplate',\n        'BoundContractView',\n        'ContractContext',\n        'ContractView',\n        'DummyProvider',\n        'EthChainId',\n        'TypedCallTrace',\n        'getEthChainId',\n        // 'toBlockTag',\n        'EthContext',\n        'EthFetchConfig',\n      ],\n      // '@sentio/sdk/eth': ['BaseContext'],\n      // '@sentio/protos': ['EthFetchConfig'],\n      './common.js': ['PromiseOrValue'],\n      './index.js': [`${contract.name}`, `${contract.name}__factory`],\n      [`./${contract.name}.js`]: eventsImports.concat(uniqueStructImports),\n    },\n    source\n  )\n\n  return imports + source\n}\n\nexport function codeGenTestUtilsFile(contract: Contract): string {\n  const source = `\n  const mockField = {\n    blockHash:\n      \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n    blockNumber: 0,\n    logIndex: 0,\n    removed: false,\n    transactionHash:\n      \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n    transactionIndex: 0,\n  }\n  ${Object.values(contract.events)\n    .map((events) => {\n      if (events.length === 1) {\n        return generateMockEventLogFunction(events[0], contract.name, false)\n      } else {\n        return events.map((e) => generateMockEventLogFunction(e, contract.name, true)).join('\\n')\n      }\n    })\n    .join('\\n')}\n  `\n\n  const possibleImports = {\n    'ethers/providers': ['LogParams'],\n    '@sentio/sdk/eth': ['EthChainId'],\n  } as any\n  possibleImports[`./${contract.name}.js`] = Object.values(contract.events).flatMap((events) => {\n    if (events.length === 1) {\n      return `${events[0].name}EventObject`\n    } else {\n      return events.flatMap((e) => `${getFullSignatureAsSymbolForEvent(e)}_EventObject`)\n    }\n  })\n\n  possibleImports[`./${contract.name.toLowerCase()}-processor.js`] = [`get${contract.name}Contract`]\n\n  const imports = createImportsForUsedIdentifiers(possibleImports, source)\n\n  return imports + source\n}\n\nfunction generateMockEventLogFunction(event: EventDeclaration, contractName: string, includeArgTypes: boolean): string {\n  let eventName = event.name\n  if (includeArgTypes) {\n    eventName = getFullSignatureAsSymbolForEvent(event) + '_'\n  }\n\n  const eventArgs = event.inputs.map((input, i) => `event.${input.name ?? `arg${i.toString()}`}`)\n\n  return `\n    export function mock${eventName}Log(contractAddress: string, event: ${eventName}EventObject): LogParams {\n      const contract = get${contractName}Contract(EthChainId.ETHEREUM, contractAddress)\n      const encodedLog = contract.rawContract.interface.encodeEventLog(\n        '${getFullSignatureForEvent(event)}',\n        [${eventArgs.join(', ')}]\n      )\n      return {\n        ...mockField,\n        index: 0,\n        address: contractAddress,\n        data: encodedLog.data,\n        topics: encodedLog.topics,\n      }\n    }\n  `\n}\n"]}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/eth/codegen/file.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Contract,\n  createImportsForUsedIdentifiers,\n  EventDeclaration,\n  getFullSignatureAsSymbolForEvent,\n  getFullSignatureForEvent,\n} from 'typechain'\n\nimport { reservedKeywords } from '@sentio/ethers-v6/dist/codegen/reserved-keywords.js'\nimport { codegenCallTraceTypes, generateCallHandlers } from './functions-handler.js'\nimport { generateEventFilters, generateEventHandlers } from './event-handler.js'\nimport { generateBoundViewFunctions, generateViewFunctions } from './view-function.js'\n\nexport function codeGenIndex(contract: Contract): string {\n  return ` \n  export * from './internal/${contract.name.toLowerCase()}-processor.js'\n  export * from './internal/${contract.name.toLowerCase()}-test-utils.js'\n  export * from './internal/${contract.name}.js'\n  export * from './internal/factories/${contract.name}__factory.js'\n  `\n}\n\nexport function codeGenSentioFile(contract: Contract): string {\n  const source = `\n  ${Object.values(contract.functions).map(codegenCallTraceTypes).join('\\n')}\n\n  const templateContract = ${contract.name}__factory.connect(\"0x0\", DummyProvider)\n\n  export class ${contract.name}ContractView extends ContractView<${contract.name}> {\n    constructor (contract: ${contract.name}) {\n      super(contract);\n    }\n\n    ${Object.values(contract.functions)\n      .filter((f) => !reservedKeywords.has(f[0].name))\n      .map((fs) => generateViewFunctions(fs))\n      .join('\\n')}\n  }\n  \n  export class ${contract.name}BoundContractView extends BoundContractView<${contract.name}, \n    ${contract.name}ContractView> {\n  ${Object.values(contract.functions)\n    .filter((f) => !reservedKeywords.has(f[0].name))\n    .map((fs) => generateBoundViewFunctions(fs))\n    .join('\\n')}\n  }\n\n    export type ${contract.name}Context = ContractContext<${contract.name}, ${contract.name}BoundContractView>\n\n  export class ${contract.name}Processor extends BaseProcessor<${contract.name}, ${contract.name}BoundContractView> {\n    ${Object.values(contract.events)\n      .map((events) => generateEventHandlers(events, contract.name))\n      .join('\\n')}\n\n    ${Object.values(contract.functions)\n      .map((f) => generateCallHandlers(f, contract.name))\n      .join('\\n')}\n\n  public static filters = {\n    ${Object.values(contract.events)\n      .map((events) => generateEventFilters(events))\n      .join(',')}\n  }\n  \n  protected CreateBoundContractView(): ${contract.name}BoundContractView {\n    const view = get${contract.name}Contract(this.config.network, this.config.address)\n    return new ${contract.name}BoundContractView(this.config.address, view)\n  }\n\n  public static bind(options: BindOptions): ${contract.name}Processor {\n     if (!options.name) {\n      options.name = \"${contract.name}\"\n    }\n    let processor = getProcessor(options) as ${contract.name}Processor\n    if (!processor) {\n      processor = new ${contract.name}Processor(options)\n      addProcessor(options, processor)\n    }\n    return processor\n  }\n}\n\nexport class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${contract.name}, ${\n    contract.name\n  }BoundContractView> {\n  bindInternal(options: BindOptions) {\n    if (!options.name) {\n      options.name = \"${contract.name}\"\n    }\n    let processor = getProcessor(options) as ${contract.name}Processor\n    if (!processor) {\n      processor = new ${contract.name}Processor(options)\n      addProcessor(options, processor)\n    }\n    return processor\n  }\n\n  ${Object.values(contract.events)\n    .map((events) => generateEventHandlers(events, contract.name))\n    .join('\\n')}\n  \n  ${Object.values(contract.functions)\n    .map((functions) => {\n      generateCallHandlers(functions, contract.name)\n    })\n    .join('\\n')}\n  }\n\n  export function get${contract.name}Contract(chainId: EthChainId, address: string): ${contract.name}ContractView {\n    let contract = getContractByABI(\"${contract.name}\", address, chainId) as ${contract.name}ContractView\n    if (!contract) {\n      const rawContract = ${contract.name}__factory.connect(address, getProvider(chainId))\n      contract = new ${contract.name}ContractView(rawContract)\n      addContractByABI(\"${contract.name}\", address, chainId, contract)\n    }\n    return contract\n  }\n  \n  export function get${contract.name}ContractOnContext(context: EthContext, address: string): \n    ${contract.name}BoundContractView {\n    const view = get${contract.name}Contract(context.getChainId(), address)\n    return new ${contract.name}BoundContractView(address, view) \n  }\n  `\n  const eventsImports = Object.values(contract.events).flatMap((events) => {\n    if (events.length === 1) {\n      return [`${events[0].name}Event`, `${events[0].name}EventFilter`]\n    } else {\n      return events.flatMap((e) => [\n        `${getFullSignatureAsSymbolForEvent(e)}_Event`,\n        `${getFullSignatureAsSymbolForEvent(e)}_EventFilter`,\n      ])\n    }\n  })\n\n  const structImports = Object.values(contract.structs).flatMap((structs) => {\n    return structs.flatMap((s) => {\n      if (!s.structName) {\n        return []\n      }\n      if (s.structName.namespace) {\n        return [s.structName.namespace]\n      } else {\n        return [s.structName.identifier + 'StructOutput', s.structName.identifier + 'Struct']\n      }\n    })\n  })\n  // dedup namespace\n  const uniqueStructImports = [...new Set(structImports)]\n\n  const imports = createImportsForUsedIdentifiers(\n    {\n      ethers: ['BigNumberish', 'Overrides', 'BytesLike'],\n      // 'ethers/providers': ['Networkish'],\n      '@sentio/sdk/eth': [\n        'addContractByABI',\n        'getContractByABI',\n        'addProcessor',\n        'getProcessor',\n        'getProvider',\n        'transformEtherError',\n        'Trace',\n        'BindOptions',\n        'BaseProcessor',\n        'BaseProcessorTemplate',\n        'BoundContractView',\n        'ContractContext',\n        'ContractView',\n        'DummyProvider',\n        'EthChainId',\n        'TypedCallTrace',\n        'EthContext',\n        'EthFetchConfig',\n      ],\n      // '@sentio/sdk/eth': ['BaseContext'],\n      // '@sentio/protos': ['EthFetchConfig'],\n      './common.js': ['PromiseOrValue'],\n      './index.js': [`${contract.name}__factory`],\n      [`./${contract.name}.js`]: [`${contract.name}`, ...eventsImports, ...uniqueStructImports],\n    },\n    source\n  )\n\n  return imports + source\n}\n\nexport function codeGenTestUtilsFile(contract: Contract): string {\n  const source = `\n  const mockField = {\n    blockHash:\n      \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n    blockNumber: 0,\n    logIndex: 0,\n    removed: false,\n    transactionHash:\n      \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n    transactionIndex: 0,\n  }\n  ${Object.values(contract.events)\n    .map((events) => {\n      if (events.length === 1) {\n        return generateMockEventLogFunction(events[0], contract.name, false)\n      } else {\n        return events.map((e) => generateMockEventLogFunction(e, contract.name, true)).join('\\n')\n      }\n    })\n    .join('\\n')}\n  `\n\n  const possibleImports = {\n    'ethers/providers': ['LogParams'],\n    '@sentio/sdk/eth': ['EthChainId'],\n  } as any\n  possibleImports[`./${contract.name}.js`] = Object.values(contract.events).flatMap((events) => {\n    if (events.length === 1) {\n      return `${events[0].name}EventObject`\n    } else {\n      return events.flatMap((e) => `${getFullSignatureAsSymbolForEvent(e)}_EventObject`)\n    }\n  })\n\n  possibleImports[`./${contract.name.toLowerCase()}-processor.js`] = [`get${contract.name}Contract`]\n\n  const imports = createImportsForUsedIdentifiers(possibleImports, source)\n\n  return imports + source\n}\n\nfunction generateMockEventLogFunction(event: EventDeclaration, contractName: string, includeArgTypes: boolean): string {\n  let eventName = event.name\n  if (includeArgTypes) {\n    eventName = getFullSignatureAsSymbolForEvent(event) + '_'\n  }\n\n  const eventArgs = event.inputs.map((input, i) => `event.${input.name ?? `arg${i.toString()}`}`)\n\n  return `\n    export function mock${eventName}Log(contractAddress: string, event: ${eventName}EventObject): LogParams {\n      const contract = get${contractName}Contract(EthChainId.ETHEREUM, contractAddress)\n      const encodedLog = contract.rawContract.interface.encodeEventLog(\n        '${getFullSignatureForEvent(event)}',\n        [${eventArgs.join(', ')}]\n      )\n      return {\n        ...mockField,\n        index: 0,\n        address: contractAddress,\n        data: encodedLog.data,\n        topics: encodedLog.topics,\n      }\n    }\n  `\n}\n"]}

package/lib/eth/codegen/view-function.js

@@ -50,12 +50,10 @@ export function generateBoundViewFunction(fn, includeArgTypes) {
   async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
         useStructs: true,
     })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      }
-    }
-    return await this.view.${declName}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} overrides || {})
+    return await this.view.${declName}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} {
+      blockTag: this.context.blockNumber,
+      ...overrides
+    })
   }
   `;
 }

package/lib/eth/codegen/view-function.js.map

@@ -1 +1 @@
-{"version":3,"file":"view-function.js","sourceRoot":"","sources":["../../../src/eth/codegen/view-function.ts"],"names":[],"mappings":"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","sourcesContent":["// https://github.com/dethcrypto/TypeChain/blob/015abb28bd22826611051f27e0ec96a00f9a0b61/packages/target-ethers-v5/src/codegen/functions.ts#L54\nimport { FunctionDeclaration } from 'typechain'\nimport { generateInputTypes, generateOutputTypes } from '@sentio/ethers-v6/dist/codegen/types.js'\nimport { getFullSignatureAsSymbolForFunction, getFullSignatureForFunction } from './types.js'\n\nfunction generateReturnTypes(fn: FunctionDeclaration) {\n  // sounds like returnResultObject should be true but we need to set false to make it work\n  return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`\n}\n\nexport function generateViewFunctions(functions: FunctionDeclaration[]): string {\n  if (functions.length === 1) {\n    return generateViewFunction(functions[0], false)\n  }\n  return functions.map((fn) => generateViewFunction(fn, true)).join('\\n')\n}\n\nexport function generateViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {\n  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {\n    return ''\n  }\n  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name\n  const call = 'this.contract.getFunction(\"' + getFullSignatureForFunction(fn) + '\")'\n  // if (overrides) {\n  //   return await ${call}(${\n  //   fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  // } overrides)\n  //     } else {\n  //       return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})\n  //     }\n  return `\n  async ${declName}(${generateInputTypes(fn.inputs, {\n    useStructs: true,\n  })}overrides?: Overrides): ${generateReturnTypes(fn)} {\n    try {    \n       return await ${call}(${\n    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  } overrides || {})\n    } catch (e) {\n      throw transformEtherError(e, undefined)\n    }\n  }\n  `\n}\n\nexport function generateBoundViewFunctions(functions: FunctionDeclaration[]): string {\n  if (functions.length === 1) {\n    return generateBoundViewFunction(functions[0], false)\n  }\n  return functions.map((fn) => generateBoundViewFunction(fn, true)).join('\\n')\n}\n\nexport function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {\n  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {\n    return ''\n  }\n  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name\n\n  return `\n  async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {\n    useStructs: true,\n  })}overrides?: Overrides): ${generateReturnTypes(fn)} {\n    if (!overrides && this.context) {\n      overrides = {\n        blockTag: this.context.blockNumber,\n      }\n    }\n    return await this.view.${declName}(${\n    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  } overrides || {})\n  }\n  `\n}\n"]}
+{"version":3,"file":"view-function.js","sourceRoot":"","sources":["../../../src/eth/codegen/view-function.ts"],"names":[],"mappings":"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","sourcesContent":["// https://github.com/dethcrypto/TypeChain/blob/015abb28bd22826611051f27e0ec96a00f9a0b61/packages/target-ethers-v5/src/codegen/functions.ts#L54\nimport { FunctionDeclaration } from 'typechain'\nimport { generateInputTypes, generateOutputTypes } from '@sentio/ethers-v6/dist/codegen/types.js'\nimport { getFullSignatureAsSymbolForFunction, getFullSignatureForFunction } from './types.js'\n\nfunction generateReturnTypes(fn: FunctionDeclaration) {\n  // sounds like returnResultObject should be true but we need to set false to make it work\n  return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`\n}\n\nexport function generateViewFunctions(functions: FunctionDeclaration[]): string {\n  if (functions.length === 1) {\n    return generateViewFunction(functions[0], false)\n  }\n  return functions.map((fn) => generateViewFunction(fn, true)).join('\\n')\n}\n\nexport function generateViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {\n  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {\n    return ''\n  }\n  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name\n  const call = 'this.contract.getFunction(\"' + getFullSignatureForFunction(fn) + '\")'\n  // if (overrides) {\n  //   return await ${call}(${\n  //   fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  // } overrides)\n  //     } else {\n  //       return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})\n  //     }\n  return `\n  async ${declName}(${generateInputTypes(fn.inputs, {\n    useStructs: true,\n  })}overrides?: Overrides): ${generateReturnTypes(fn)} {\n    try {    \n       return await ${call}(${\n    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  } overrides || {})\n    } catch (e) {\n      throw transformEtherError(e, undefined)\n    }\n  }\n  `\n}\n\nexport function generateBoundViewFunctions(functions: FunctionDeclaration[]): string {\n  if (functions.length === 1) {\n    return generateBoundViewFunction(functions[0], false)\n  }\n  return functions.map((fn) => generateBoundViewFunction(fn, true)).join('\\n')\n}\n\nexport function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {\n  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {\n    return ''\n  }\n  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name\n\n  return `\n  async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {\n    useStructs: true,\n  })}overrides?: Overrides): ${generateReturnTypes(fn)} {\n    return await this.view.${declName}(${\n    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  } {\n      blockTag: this.context.blockNumber,\n      ...overrides\n    })\n  }\n  `\n}\n"]}

package/lib/eth/index.d.ts

@@ -2,7 +2,7 @@ export { BaseProcessor, GlobalProcessor } from './base-processor.js';
 export { GenericProcessor } from './generic-processor.js';
 export { BaseProcessorTemplate } from './base-processor-template.js';
 export { AccountProcessor } from './account-processor.js';
-export { getProvider, DummyProvider, getEthChainId } from './provider.js';
+export { getProvider, DummyProvider } from './provider.js';
 export { EthContext } from './context.js';
 export * from './eth.js';
 export { BindOptions, AccountBindOptions } from './bind-options.js';

package/lib/eth/index.js

@@ -2,7 +2,7 @@ export { BaseProcessor, GlobalProcessor } from './base-processor.js';
 export { GenericProcessor } from './generic-processor.js';
 export { BaseProcessorTemplate } from './base-processor-template.js';
 export { AccountProcessor } from './account-processor.js';
-export { getProvider, DummyProvider, getEthChainId } from './provider.js';
+export { getProvider, DummyProvider } from './provider.js';
 export { EthContext } from './context.js';
 export * from './eth.js';
 export { BindOptions, AccountBindOptions } from './bind-options.js';

package/lib/eth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC3F,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAE9G,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA","sourcesContent":["export { BaseProcessor, GlobalProcessor } from './base-processor.js'\nexport { GenericProcessor } from './generic-processor.js'\nexport { BaseProcessorTemplate } from './base-processor-template.js'\nexport { AccountProcessor } from './account-processor.js'\nexport { getProvider, DummyProvider, getEthChainId } from './provider.js'\nexport { EthContext } from './context.js'\nexport * from './eth.js'\nexport { BindOptions, AccountBindOptions } from './bind-options.js'\nexport { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js'\nexport { AccountContext, ContractContext, GlobalContext, ContractView, BoundContractView } from './context.js'\n\nexport { EthPlugin } from './eth-plugin.js'\n\nexport { EthFetchConfig } from '@sentio/protos'\n\nexport { EthChainId } from '../core/chain.js'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC3F,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAE9G,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA","sourcesContent":["export { BaseProcessor, GlobalProcessor } from './base-processor.js'\nexport { GenericProcessor } from './generic-processor.js'\nexport { BaseProcessorTemplate } from './base-processor-template.js'\nexport { AccountProcessor } from './account-processor.js'\nexport { getProvider, DummyProvider } from './provider.js'\nexport { EthContext } from './context.js'\nexport * from './eth.js'\nexport { BindOptions, AccountBindOptions } from './bind-options.js'\nexport { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js'\nexport { AccountContext, ContractContext, GlobalContext, ContractView, BoundContractView } from './context.js'\n\nexport { EthPlugin } from './eth-plugin.js'\n\nexport { EthFetchConfig } from '@sentio/protos'\n\nexport { EthChainId } from '../core/chain.js'\n"]}

package/lib/eth/provider.d.ts

@@ -1,6 +1,4 @@
 import { JsonRpcProvider, Provider } from 'ethers';
 import { EthChainId } from '../core/chain.js';
-import { EthContext } from './context.js';
 export declare const DummyProvider: JsonRpcProvider;
-export declare function getEthChainId(networkish?: EthContext | EthChainId): EthChainId;
 export declare function getProvider(chainId?: EthChainId): Provider;

package/lib/eth/provider.js

@@ -1,19 +1,18 @@
 import { JsonRpcProvider, Network } from 'ethers';
 import PQueue from 'p-queue';
 import { Endpoints } from '@sentio/runtime';
-import { BaseContext } from '../core/index.js';
 import { EthChainId } from '../core/chain.js';
 export const DummyProvider = new JsonRpcProvider('', Network.from(1));
 const providers = new Map();
-export function getEthChainId(networkish) {
-    if (!networkish) {
-        networkish = EthChainId.ETHEREUM;
-    }
-    if (networkish instanceof BaseContext) {
-        networkish = networkish.getChainId();
-    }
-    return networkish;
-}
+// export function getEthChainId(networkish?: EthContext | EthChainId): EthChainId {
+//   if (!networkish) {
+//     networkish = EthChainId.ETHEREUM
+//   }
+//   if (networkish instanceof BaseContext) {
+//     networkish = networkish.getChainId()
+//   }
+//   return networkish
+// }
 export function getProvider(chainId) {
     // const network = getNetworkFromCtxOrNetworkish(networkish)
     if (!chainId) {

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 { JsonRpcProvider, Network, Provider } from 'ethers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\nimport { BaseContext } from '../core/index.js'\nimport { EthChainId } from '../core/chain.js'\nimport { EthContext } from './context.js'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\nexport function getEthChainId(networkish?: EthContext | EthChainId): EthChainId {\n  if (!networkish) {\n    networkish = EthChainId.ETHEREUM\n  }\n  if (networkish instanceof BaseContext) {\n    networkish = networkish.getChainId()\n  }\n  return networkish\n}\n\nexport function getProvider(chainId?: EthChainId): Provider {\n  // const network = getNetworkFromCtxOrNetworkish(networkish)\n  if (!chainId) {\n    chainId = EthChainId.ETHEREUM\n  }\n  const network = Network.from(parseInt(chainId))\n  // TODO check if other key needed\n\n  const address = Endpoints.INSTANCE.chainServer.get(chainId)\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"]}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcProvider, Network, Provider } from 'ethers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\nimport { EthChainId } from '../core/chain.js'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\n// export function getEthChainId(networkish?: EthContext | EthChainId): EthChainId {\n//   if (!networkish) {\n//     networkish = EthChainId.ETHEREUM\n//   }\n//   if (networkish instanceof BaseContext) {\n//     networkish = networkish.getChainId()\n//   }\n//   return networkish\n// }\n\nexport function getProvider(chainId?: EthChainId): Provider {\n  // const network = getNetworkFromCtxOrNetworkish(networkish)\n  if (!chainId) {\n    chainId = EthChainId.ETHEREUM\n  }\n  const network = Network.from(parseInt(chainId))\n  // TODO check if other key needed\n\n  const address = Endpoints.INSTANCE.chainServer.get(chainId)\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.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.test.js","sourceRoot":"","sources":["../../src/eth/provider.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,iDAAiD;IACjD,mCAAmC;IACnC,+BAA+B;IAC/B,KAAK;IAEL,6CAA6C;IAC7C,iCAAiC;IACjC,+BAA+B;IAC/B,KAAK;IAEL,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,GAAG,GAAG,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACxD,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;QAC5B,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { getEthChainId } from './provider.js'\nimport { expect } from 'chai'\nimport { AccountContext } from './context.js'\nimport { EthChainId } from '../core/chain.js'\n\ndescribe('provider test', () => {\n  // test('network test with string', async () => {\n  //   const n = getEthChainId('321')\n  //   expect(n.chainId).eq(321n)\n  // })\n\n  // test('network test with id', async () => {\n  //   const n = getEthChainId(321)\n  //   expect(n.chainId).eq(321n)\n  // })\n\n  test('network test with context', async () => {\n    const ctx = new AccountContext(EthChainId.KUCOIN, '0x1')\n    const n = getEthChainId(ctx)\n    expect(n).eq(EthChainId.KUCOIN)\n  })\n})\n"]}
+{"version":3,"file":"provider.test.js","sourceRoot":"","sources":["../../src/eth/provider.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,iDAAiD;IACjD,mCAAmC;IACnC,+BAA+B;IAC/B,KAAK;IAEL,6CAA6C;IAC7C,iCAAiC;IACjC,+BAA+B;IAC/B,KAAK;IAEL,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,GAAG,GAAG,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACxD,MAAM,CAAC,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;QAC1B,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { expect } from 'chai'\nimport { AccountContext } from './context.js'\nimport { EthChainId } from '../core/chain.js'\n\ndescribe('provider test', () => {\n  // test('network test with string', async () => {\n  //   const n = getEthChainId('321')\n  //   expect(n.chainId).eq(321n)\n  // })\n\n  // test('network test with id', async () => {\n  //   const n = getEthChainId(321)\n  //   expect(n.chainId).eq(321n)\n  // })\n\n  test('network test with context', async () => {\n    const ctx = new AccountContext(EthChainId.KUCOIN, '0x1')\n    const n = ctx.getChainId()\n    expect(n).eq(EthChainId.KUCOIN)\n  })\n})\n"]}

package/lib/utils/token.js

@@ -2,7 +2,8 @@ import { getERC20Contract } from '../eth/builtin/erc20.js';
 import { getERC20BytesContract } from '../eth/builtin/erc20bytes.js';
 import { scaleDown } from '../core/big-decimal.js';
 import { decodeBytes32String } from 'ethers';
-import { getEthChainId } from '../eth/index.js';
+import { EthChainId } from '../eth/index.js';
+import { BaseContext } from '../core/index.js';
 export const NATIVE_ETH = {
     symbol: 'ETH',
     decimal: 18,
@@ -17,7 +18,13 @@ async function getTokenInfoPromise(symbol, name, decimal) {
     };
 }
 export async function getERC20TokenInfo(contextOrNetworkish, tokenAddress) {
-    const chainId = getEthChainId(contextOrNetworkish);
+    let chainId;
+    if (contextOrNetworkish instanceof BaseContext) {
+        chainId = contextOrNetworkish.getChainId();
+    }
+    else {
+        chainId = contextOrNetworkish || EthChainId.ETHEREUM;
+    }
     const key = chainId + tokenAddress;
     const res = TOKEN_INFOS.get(key);
     if (res) {

package/lib/utils/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAA;AAC5C,OAAO,EAA0B,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAQvE,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,YAAY;CACnB,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAA;AAEzD,KAAK,UAAU,mBAAmB,CAChC,MAAuC,EACvC,IAAqC,EACrC,OAA+B;IAE/B,OAAO;QACL,MAAM,EAAE,MAAM,MAAM;QACpB,IAAI,EAAE,MAAM,IAAI;QAChB,OAAO,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,mBAA4C,EAC5C,YAAoB;IAEpB,MAAM,OAAO,GAAG,aAAa,CAAC,mBAAmB,CAAC,CAAA;IAClD,MAAM,GAAG,GAAG,OAAO,GAAG,YAAY,CAAA;IAClC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,GAAG,EAAE;QACP,OAAO,GAAG,CAAA;KACX;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IAElE,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI;QACF,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;KACvD;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI;QACF,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;KAC3D;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,mBAA4C,EAC5C,YAAoB,EACpB,MAAc;IAEd,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAA;IAC5E,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { getERC20Contract } from '../eth/builtin/erc20.js'\nimport { getERC20BytesContract } from '../eth/builtin/erc20bytes.js'\nimport { BigDecimal, scaleDown } from '../core/big-decimal.js'\nimport { PromiseOrValue } from '../eth/builtin/internal/common.js'\nimport { decodeBytes32String } from 'ethers'\nimport { EthChainId, EthContext, getEthChainId } from '../eth/index.js'\n\nexport interface TokenInfo {\n  symbol: string\n  name: string\n  decimal: number\n}\n\nexport const NATIVE_ETH = {\n  symbol: 'ETH',\n  decimal: 18,\n  name: 'Native ETH',\n}\n\nconst TOKEN_INFOS = new Map<string, Promise<TokenInfo>>()\n\nasync function getTokenInfoPromise(\n  symbol: PromiseOrValue<string> | string,\n  name: PromiseOrValue<string> | string,\n  decimal: PromiseOrValue<bigint>\n): Promise<TokenInfo> {\n  return {\n    symbol: await symbol,\n    name: await name,\n    decimal: Number(await decimal),\n  }\n}\n\nexport async function getERC20TokenInfo(\n  contextOrNetworkish: EthContext | EthChainId,\n  tokenAddress: string\n): Promise<TokenInfo> {\n  const chainId = getEthChainId(contextOrNetworkish)\n  const key = chainId + tokenAddress\n  const res = TOKEN_INFOS.get(key)\n  if (res) {\n    return res\n  }\n  const contract = getERC20Contract(chainId, tokenAddress)\n  const bytesContract = getERC20BytesContract(chainId, tokenAddress)\n\n  let name = ''\n  try {\n    name = await contract.name()\n  } catch (e) {\n    name = decodeBytes32String(await bytesContract.name())\n  }\n\n  let symbol = ''\n  try {\n    symbol = await contract.symbol()\n  } catch (e) {\n    symbol = decodeBytes32String(await bytesContract.symbol())\n  }\n\n  const decimal = await contract.decimals()\n  const info = getTokenInfoPromise(symbol, name, decimal)\n\n  TOKEN_INFOS.set(key, info)\n  return info\n}\n\nexport async function getER20NormalizedAmount(\n  contextOrNetworkish: EthContext | EthChainId,\n  tokenAddress: string,\n  amount: bigint\n): Promise<BigDecimal> {\n  const tokenInfo = await getERC20TokenInfo(contextOrNetworkish, tokenAddress)\n  return scaleDown(amount, tokenInfo.decimal)\n}\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAQ9C,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,YAAY;CACnB,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAA;AAEzD,KAAK,UAAU,mBAAmB,CAChC,MAAuC,EACvC,IAAqC,EACrC,OAA+B;IAE/B,OAAO;QACL,MAAM,EAAE,MAAM,MAAM;QACpB,IAAI,EAAE,MAAM,IAAI;QAChB,OAAO,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,mBAA4C,EAC5C,YAAoB;IAEpB,IAAI,OAAmB,CAAA;IACvB,IAAI,mBAAmB,YAAY,WAAW,EAAE;QAC9C,OAAO,GAAG,mBAAmB,CAAC,UAAU,EAAE,CAAA;KAC3C;SAAM;QACL,OAAO,GAAG,mBAAmB,IAAI,UAAU,CAAC,QAAQ,CAAA;KACrD;IAED,MAAM,GAAG,GAAG,OAAO,GAAG,YAAY,CAAA;IAClC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,GAAG,EAAE;QACP,OAAO,GAAG,CAAA;KACX;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IAElE,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI;QACF,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;KACvD;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI;QACF,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;KAC3D;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,mBAA4C,EAC5C,YAAoB,EACpB,MAAc;IAEd,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAA;IAC5E,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { getERC20Contract } from '../eth/builtin/erc20.js'\nimport { getERC20BytesContract } from '../eth/builtin/erc20bytes.js'\nimport { BigDecimal, scaleDown } from '../core/big-decimal.js'\nimport { PromiseOrValue } from '../eth/builtin/internal/common.js'\nimport { decodeBytes32String } from 'ethers'\nimport { EthChainId, EthContext } from '../eth/index.js'\nimport { BaseContext } from '../core/index.js'\n\nexport interface TokenInfo {\n  symbol: string\n  name: string\n  decimal: number\n}\n\nexport const NATIVE_ETH = {\n  symbol: 'ETH',\n  decimal: 18,\n  name: 'Native ETH',\n}\n\nconst TOKEN_INFOS = new Map<string, Promise<TokenInfo>>()\n\nasync function getTokenInfoPromise(\n  symbol: PromiseOrValue<string> | string,\n  name: PromiseOrValue<string> | string,\n  decimal: PromiseOrValue<bigint>\n): Promise<TokenInfo> {\n  return {\n    symbol: await symbol,\n    name: await name,\n    decimal: Number(await decimal),\n  }\n}\n\nexport async function getERC20TokenInfo(\n  contextOrNetworkish: EthContext | EthChainId,\n  tokenAddress: string\n): Promise<TokenInfo> {\n  let chainId: EthChainId\n  if (contextOrNetworkish instanceof BaseContext) {\n    chainId = contextOrNetworkish.getChainId()\n  } else {\n    chainId = contextOrNetworkish || EthChainId.ETHEREUM\n  }\n\n  const key = chainId + tokenAddress\n  const res = TOKEN_INFOS.get(key)\n  if (res) {\n    return res\n  }\n  const contract = getERC20Contract(chainId, tokenAddress)\n  const bytesContract = getERC20BytesContract(chainId, tokenAddress)\n\n  let name = ''\n  try {\n    name = await contract.name()\n  } catch (e) {\n    name = decodeBytes32String(await bytesContract.name())\n  }\n\n  let symbol = ''\n  try {\n    symbol = await contract.symbol()\n  } catch (e) {\n    symbol = decodeBytes32String(await bytesContract.symbol())\n  }\n\n  const decimal = await contract.decimals()\n  const info = getTokenInfoPromise(symbol, name, decimal)\n\n  TOKEN_INFOS.set(key, info)\n  return info\n}\n\nexport async function getER20NormalizedAmount(\n  contextOrNetworkish: EthContext | EthChainId,\n  tokenAddress: string,\n  amount: bigint\n): Promise<BigDecimal> {\n  const tokenInfo = await getERC20TokenInfo(contextOrNetworkish, tokenAddress)\n  return scaleDown(amount, tokenInfo.decimal)\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/sdk",
-  "version": "2.15.6-rc.1",
+  "version": "2.15.6-rc.3",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -70,8 +70,8 @@
     "typechain": "^8.0.0",
     "typedoc": "^0.24.1",
     "yaml": "^2.2.1",
-    "@sentio/protos": "^2.15.6-rc.1",
-    "@sentio/runtime": "^2.15.6-rc.1"
+    "@sentio/protos": "^2.15.6-rc.3",
+    "@sentio/runtime": "^2.15.6-rc.3"
   },
   "peerDependencies": {
     "tsup": "npm:@sentio/tsup@^6.7.0"

package/src/eth/builtin/internal/eacaggregatorproxy-processor.ts

@@ -18,13 +18,13 @@ import {
   DummyProvider,
   EthChainId,
   TypedCallTrace,
-  getEthChainId,
   EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
 
-import { EACAggregatorProxy, EACAggregatorProxy__factory } from "./index.js";
+import { EACAggregatorProxy__factory } from "./index.js";
 import {
+  EACAggregatorProxy,
   AnswerUpdatedEvent,
   AnswerUpdatedEventFilter,
   NewRoundEvent,
@@ -421,51 +421,41 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
   EACAggregatorProxyContractView
 > {
   async accessController(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.accessController(overrides || {});
+    return await this.view.accessController({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async aggregator(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.aggregator(overrides || {});
+    return await this.view.aggregator({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async decimals(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.decimals(overrides || {});
+    return await this.view.decimals({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async description(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.description(overrides || {});
+    return await this.view.description({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async getAnswer(
     _roundId: BigNumberish,
     overrides?: Overrides
   ): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.getAnswer(_roundId, overrides || {});
+    return await this.view.getAnswer(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async getRoundData(
@@ -480,42 +470,34 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.getRoundData(_roundId, overrides || {});
+    return await this.view.getRoundData(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async getTimestamp(
     _roundId: BigNumberish,
     overrides?: Overrides
   ): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.getTimestamp(_roundId, overrides || {});
+    return await this.view.getTimestamp(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestAnswer(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestAnswer(overrides || {});
+    return await this.view.latestAnswer({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestRound(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestRound(overrides || {});
+    return await this.view.latestRound({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestRoundData(
@@ -529,60 +511,48 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestRoundData(overrides || {});
+    return await this.view.latestRoundData({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestTimestamp(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestTimestamp(overrides || {});
+    return await this.view.latestTimestamp({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async owner(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.owner(overrides || {});
+    return await this.view.owner({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async phaseAggregators(
     arg0: BigNumberish,
     overrides?: Overrides
   ): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.phaseAggregators(arg0, overrides || {});
+    return await this.view.phaseAggregators(arg0, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async phaseId(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.phaseId(overrides || {});
+    return await this.view.phaseId({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async proposedAggregator(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.proposedAggregator(overrides || {});
+    return await this.view.proposedAggregator({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async proposedGetRoundData(
@@ -597,12 +567,10 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.proposedGetRoundData(_roundId, overrides || {});
+    return await this.view.proposedGetRoundData(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async proposedLatestRoundData(
@@ -616,21 +584,17 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.proposedLatestRoundData(overrides || {});
+    return await this.view.proposedLatestRoundData({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async version(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.version(overrides || {});
+    return await this.view.version({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 }
 
@@ -1067,22 +1031,29 @@ export class EACAggregatorProxyProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getEACAggregatorProxyContract(
-  contextOrNetwork: EthContext | EthChainId,
+  chainId: EthChainId,
   address: string
 ): EACAggregatorProxyContractView {
-  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "EACAggregatorProxy",
     address,
-    network
+    chainId
   ) as EACAggregatorProxyContractView;
   if (!contract) {
     const rawContract = EACAggregatorProxy__factory.connect(
       address,
-      getProvider(network)
+      getProvider(chainId)
     );
     contract = new EACAggregatorProxyContractView(rawContract);
-    addContractByABI("EACAggregatorProxy", address, network, contract);
+    addContractByABI("EACAggregatorProxy", address, chainId, contract);
   }
   return contract;
 }
+
+export function getEACAggregatorProxyContractOnContext(
+  context: EthContext,
+  address: string
+): EACAggregatorProxyBoundContractView {
+  const view = getEACAggregatorProxyContract(context.getChainId(), address);
+  return new EACAggregatorProxyBoundContractView(address, view);
+}