@sentio/sdk 2.9.1 → 2.9.2

package/lib/eth/base-processor.js

@@ -1,7 +1,7 @@
 import { ContractContext } from './context.js';
 import { EthFetchConfig, ProcessResult, } from '@sentio/protos';
 import { ServerError, Status } from 'nice-grpc';
-import { decodeResult, formatEthData } from './eth.js';
+import { fixEmptyKey, formatEthData } from './eth.js';
 import * as console from 'console';
 import { getNetworkFromCtxOrNetworkish } from './provider.js';
 export class EventsHandler {
@@ -72,7 +72,7 @@ export class BaseProcessor {
                 const logParam = log;
                 const parsed = contractView.rawContract.interface.parseLog(logParam);
                 if (parsed) {
-                    const event = { ...log, name: parsed.name, args: decodeResult(parsed) };
+                    const event = { ...log, name: parsed.name, args: fixEmptyKey(parsed) };
                     await handler(event, ctx);
                     return ctx.getProcessResult();
                 }

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 { 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"]}
+{"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 { fixEmptyKey, 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: fixEmptyKey(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/eth.d.ts

@@ -1,19 +1,18 @@
-import { BlockTag, LogParams, TransactionReceiptParams } from 'ethers/providers';
-import { Result, LogDescription } from 'ethers';
+import { LogParams, TransactionReceiptParams } from 'ethers/providers';
+import { LogDescription, Result } from 'ethers';
 import { ContractContext } from './context.js';
 import { Trace } from './trace.js';
 export interface EthEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {
     args: TArgsArray & TArgsObject & Result;
     name: string;
 }
-export declare function toBlockTag(a: number | bigint): BlockTag;
 export declare class SimpleEthersError extends Error {
     e: Error;
     constructor(message: string, e: Error);
     toString(): string;
 }
 export declare function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined): Error;
-export declare function decodeResult(result: LogDescription): any;
+export declare function fixEmptyKey(result: LogDescription): Result;
 export declare function formatEthData(data: {
     log?: any;
     block?: any;

package/lib/eth/eth.js

@@ -1,15 +1,7 @@
 import { formatBlock, formatLog, formatTransactionResponse, allowNull, arrayOf, formatHash, formatReceiptLog, object, formatData, } from 'ethers/providers';
+import { Result } from 'ethers';
 import { getAddress } from 'ethers/address';
 import { getBigInt, getNumber, hexlify } from 'ethers/utils';
-export function toBlockTag(a) {
-    if (typeof a === 'number') {
-        return a;
-    }
-    if (a > Number.MAX_SAFE_INTEGER) {
-        return '0x' + a.toString(16);
-    }
-    return Number(a);
-}
 export class SimpleEthersError extends Error {
     e;
     constructor(message, e) {
@@ -46,18 +38,17 @@ export function transformEtherError(e, ctx) {
     msg = 'ethers call error\n' + JSON.stringify(e) + '\n' + e.stack?.toString() + '\n' + checkPage;
     return new Error(msg);
 }
-export function decodeResult(result) {
-    const decoded = [];
+export function fixEmptyKey(result) {
+    const keys = [];
     for (const [i, arg] of result.fragment.inputs.entries()) {
         if (arg.name === '') {
-            decoded['arg' + i] = result.args[i];
+            keys.push('arg' + i);
         }
         else {
-            decoded[arg.name] = result.args[i];
+            keys.push(arg.name);
         }
-        decoded.push(result.args[i]);
     }
-    return decoded;
+    return Result.fromItems(Array.from(result.args.values()), keys);
 }
 const _formatTransactionReceipt = object({
     to: allowNull(getAddress, null),

package/lib/eth/eth.js.map

@@ -1 +1 @@
-{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/eth/eth.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  BlockTag,\n  LogParams,\n  formatBlock,\n  formatLog,\n  TransactionReceiptParams,\n  formatTransactionResponse,\n  allowNull,\n  arrayOf,\n  formatHash,\n  formatReceiptLog,\n  object,\n  formatData,\n} from 'ethers/providers'\nimport { CallExceptionError, Result, LogDescription } from 'ethers'\nimport { ContractContext } from './context.js'\nimport { Trace } from './trace.js'\nimport { getAddress } from 'ethers/address'\nimport { getBigInt, getNumber, hexlify } from 'ethers/utils'\n\nexport interface EthEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {\n  args: TArgsArray & TArgsObject & Result\n  name: string\n}\n\nexport function toBlockTag(a: number | bigint): BlockTag {\n  if (typeof a === 'number') {\n    return a\n  }\n  if (a > Number.MAX_SAFE_INTEGER) {\n    return '0x' + a.toString(16)\n  }\n  return Number(a)\n}\n\nexport class SimpleEthersError extends Error {\n  e: Error\n\n  constructor(message: string, e: Error) {\n    super(message)\n    this.stack = e.stack\n  }\n\n  toString() {\n    return this.message + '\\n' + this.stack?.toString()\n  }\n}\n\nexport function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined): Error {\n  if (e instanceof SimpleEthersError) {\n    return e\n  }\n\n  const checkPage =\n    'Check here for possible cause and fix: https://docs.sentio.xyz/best-practices/handling-errors#ethers-error'\n\n  let msg = ''\n  const err = e as CallExceptionError\n  if (err.code === 'CALL_EXCEPTION') {\n    if (err.data === '0x') {\n      if (ctx) {\n        msg =\n          \"jsonrpc eth_call return '0x' (likely contract not existed) at chain \" +\n          ctx.chainId +\n          ': ' +\n          JSON.stringify(e)\n      } else {\n        msg = \"jsonrpc eth_call return '0x' (likely contract not existed): \" + JSON.stringify(err)\n      }\n      msg += '\\n' + checkPage\n      return new SimpleEthersError(msg, err)\n    }\n  }\n\n  msg = 'ethers call error\\n' + JSON.stringify(e) + '\\n' + e.stack?.toString() + '\\n' + checkPage\n  return new Error(msg)\n}\n\nexport function decodeResult(result: LogDescription): any {\n  const decoded = [] as any\n  for (const [i, arg] of result.fragment.inputs.entries()) {\n    if (arg.name === '') {\n      decoded['arg' + i] = result.args[i]\n    } else {\n      decoded[arg.name] = result.args[i]\n    }\n    decoded.push(result.args[i])\n  }\n  return decoded\n}\n\nconst _formatTransactionReceipt = object(\n  {\n    to: allowNull(getAddress, null),\n    from: allowNull(getAddress, null),\n    contractAddress: allowNull(getAddress, null),\n    // should be allowNull(hash), but broken-EIP-658 support is handled in receipt\n    index: getNumber,\n    root: allowNull(hexlify),\n    gasUsed: getBigInt,\n    logsBloom: allowNull(formatData),\n    blockHash: formatHash,\n    hash: formatHash,\n    logs: allowNull(arrayOf(formatReceiptLog)), // Only thing that different\n    blockNumber: getNumber,\n    //confirmations: allowNull(getNumber, null),\n    cumulativeGasUsed: getBigInt,\n    effectiveGasPrice: allowNull(getBigInt),\n    status: allowNull(getNumber),\n    type: allowNull(getNumber, 0),\n  },\n  {\n    effectiveGasPrice: ['gasPrice'],\n    hash: ['transactionHash'],\n    index: ['transactionIndex'],\n  }\n)\n\nfunction formatTransactionReceipt(value: any): TransactionReceiptParams {\n  return _formatTransactionReceipt(value)\n}\n\nexport function formatEthData(data: {\n  log?: any\n  block?: any\n  trace?: any\n  transaction?: any\n  transactionReceipt?: any\n}) {\n  const log = data.log ? formatLog(data.log) : undefined\n  if (data.block && !data.block.transactions) {\n    data.block.transactions = []\n  }\n  const block = data.block ? formatBlock(data.block) : undefined\n  const trace = data.trace ? (data.trace as Trace) : undefined\n  const transaction = data.transaction ? formatTransactionResponse(data.transaction) : undefined\n  const transactionReceipt = data.transactionReceipt ? formatTransactionReceipt(data.transactionReceipt) : undefined\n  return {\n    log,\n    block,\n    trace,\n    transaction,\n    transactionReceipt,\n  }\n}\n"]}
+{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/eth/eth.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  LogParams,\n  formatBlock,\n  formatLog,\n  TransactionReceiptParams,\n  formatTransactionResponse,\n  allowNull,\n  arrayOf,\n  formatHash,\n  formatReceiptLog,\n  object,\n  formatData,\n} from 'ethers/providers'\nimport { CallExceptionError, LogDescription, Result } from 'ethers'\nimport { ContractContext } from './context.js'\nimport { Trace } from './trace.js'\nimport { getAddress } from 'ethers/address'\nimport { getBigInt, getNumber, hexlify } from 'ethers/utils'\n\nexport interface EthEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {\n  args: TArgsArray & TArgsObject & Result\n  name: string\n}\n\nexport class SimpleEthersError extends Error {\n  e: Error\n\n  constructor(message: string, e: Error) {\n    super(message)\n    this.stack = e.stack\n  }\n\n  toString() {\n    return this.message + '\\n' + this.stack?.toString()\n  }\n}\n\nexport function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined): Error {\n  if (e instanceof SimpleEthersError) {\n    return e\n  }\n\n  const checkPage =\n    'Check here for possible cause and fix: https://docs.sentio.xyz/best-practices/handling-errors#ethers-error'\n\n  let msg = ''\n  const err = e as CallExceptionError\n  if (err.code === 'CALL_EXCEPTION') {\n    if (err.data === '0x') {\n      if (ctx) {\n        msg =\n          \"jsonrpc eth_call return '0x' (likely contract not existed) at chain \" +\n          ctx.chainId +\n          ': ' +\n          JSON.stringify(e)\n      } else {\n        msg = \"jsonrpc eth_call return '0x' (likely contract not existed): \" + JSON.stringify(err)\n      }\n      msg += '\\n' + checkPage\n      return new SimpleEthersError(msg, err)\n    }\n  }\n\n  msg = 'ethers call error\\n' + JSON.stringify(e) + '\\n' + e.stack?.toString() + '\\n' + checkPage\n  return new Error(msg)\n}\n\nexport function fixEmptyKey(result: LogDescription): Result {\n  const keys = []\n\n  for (const [i, arg] of result.fragment.inputs.entries()) {\n    if (arg.name === '') {\n      keys.push('arg' + i)\n    } else {\n      keys.push(arg.name)\n    }\n  }\n  return Result.fromItems(Array.from(result.args.values()), keys)\n}\n\nconst _formatTransactionReceipt = object(\n  {\n    to: allowNull(getAddress, null),\n    from: allowNull(getAddress, null),\n    contractAddress: allowNull(getAddress, null),\n    // should be allowNull(hash), but broken-EIP-658 support is handled in receipt\n    index: getNumber,\n    root: allowNull(hexlify),\n    gasUsed: getBigInt,\n    logsBloom: allowNull(formatData),\n    blockHash: formatHash,\n    hash: formatHash,\n    logs: allowNull(arrayOf(formatReceiptLog)), // Only thing that different\n    blockNumber: getNumber,\n    //confirmations: allowNull(getNumber, null),\n    cumulativeGasUsed: getBigInt,\n    effectiveGasPrice: allowNull(getBigInt),\n    status: allowNull(getNumber),\n    type: allowNull(getNumber, 0),\n  },\n  {\n    effectiveGasPrice: ['gasPrice'],\n    hash: ['transactionHash'],\n    index: ['transactionIndex'],\n  }\n)\n\nfunction formatTransactionReceipt(value: any): TransactionReceiptParams {\n  return _formatTransactionReceipt(value)\n}\n\nexport function formatEthData(data: {\n  log?: any\n  block?: any\n  trace?: any\n  transaction?: any\n  transactionReceipt?: any\n}) {\n  const log = data.log ? formatLog(data.log) : undefined\n  if (data.block && !data.block.transactions) {\n    data.block.transactions = []\n  }\n  const block = data.block ? formatBlock(data.block) : undefined\n  const trace = data.trace ? (data.trace as Trace) : undefined\n  const transaction = data.transaction ? formatTransactionResponse(data.transaction) : undefined\n  const transactionReceipt = data.transactionReceipt ? formatTransactionReceipt(data.transactionReceipt) : undefined\n  return {\n    log,\n    block,\n    trace,\n    transaction,\n    transactionReceipt,\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"eth.test.js","sourceRoot":"","sources":["../../src/eth/eth.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,GAAG,GAAG;YACV;gBACE,SAAS,EAAE,KAAK;gBAChB,MAAM,EAAE;oBACN;wBACE,OAAO,EAAE,IAAI;wBACb,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,EAAE;wBACR,IAAI,EAAE,SAAS;qBAChB;oBACD;wBACE,OAAO,EAAE,KAAK;wBACd,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;qBAChB;iBACF;gBACD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO;aACd;SACF,CAAA;QAED,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC,0BAA0B,EAAE;YAClE,4CAA4C;YAC5C,KAAK;SACN,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACzC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEd,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;QAEjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAE7B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAA;QACtE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { assert, expect } from 'chai'\nimport { Interface } from 'ethers'\n\nimport { decodeResult } from './index.js'\n\ndescribe('eth test', () => {\n  test('event encoding', async () => {\n    const abi = [\n      {\n        anonymous: false,\n        inputs: [\n          {\n            indexed: true,\n            internalType: 'address',\n            name: '',\n            type: 'address',\n          },\n          {\n            indexed: false,\n            internalType: 'uint256',\n            name: 'amount',\n            type: 'uint256',\n          },\n        ],\n        name: 'Harvest',\n        type: 'event',\n      },\n    ]\n\n    const iface = new Interface(abi)\n    const encodedLog = iface.encodeEventLog('Harvest(address,uint256)', [\n      '0x634316eA0EE79c701c6F67C53A4C54cBAfd2316d',\n      1111n,\n    ])\n\n    const parsed = iface.parseLog(encodedLog)\n    assert(parsed)\n\n    const args = decodeResult(parsed)\n\n    expect(args.length).equals(2)\n\n    expect(args.arg0).equals('0x634316eA0EE79c701c6F67C53A4C54cBAfd2316d')\n    expect(args.amount).equals(1111n)\n  })\n})\n"]}
+{"version":3,"file":"eth.test.js","sourceRoot":"","sources":["../../src/eth/eth.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,GAAG,GAAG;YACV;gBACE,SAAS,EAAE,KAAK;gBAChB,MAAM,EAAE;oBACN;wBACE,OAAO,EAAE,IAAI;wBACb,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,EAAE;wBACR,IAAI,EAAE,SAAS;qBAChB;oBACD;wBACE,OAAO,EAAE,KAAK;wBACd,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;qBAChB;iBACF;gBACD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO;aACd;SACF,CAAA;QAED,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC,0BAA0B,EAAE;YAClE,4CAA4C;YAC5C,KAAK;SACN,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACzC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEd,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;QAEhC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,4CAA4C;YAClD,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;QAEF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAA;QAC9E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAA;QAEtE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACvC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { assert, expect } from 'chai'\nimport { Interface } from 'ethers'\n\nimport { fixEmptyKey } from './index.js'\n\ndescribe('eth test', () => {\n  test('event encoding', async () => {\n    const abi = [\n      {\n        anonymous: false,\n        inputs: [\n          {\n            indexed: true,\n            internalType: 'address',\n            name: '',\n            type: 'address',\n          },\n          {\n            indexed: false,\n            internalType: 'uint256',\n            name: 'amount',\n            type: 'uint256',\n          },\n        ],\n        name: 'Harvest',\n        type: 'event',\n      },\n    ]\n\n    const iface = new Interface(abi)\n    const encodedLog = iface.encodeEventLog('Harvest(address,uint256)', [\n      '0x634316eA0EE79c701c6F67C53A4C54cBAfd2316d',\n      1111n,\n    ])\n\n    const parsed = iface.parseLog(encodedLog)\n    assert(parsed)\n\n    const args = fixEmptyKey(parsed)\n\n    expect(args.toArray().length).equals(2)\n\n    const object = args.toObject()\n    expect(object).eqls({\n      arg0: '0x634316eA0EE79c701c6F67C53A4C54cBAfd2316d',\n      amount: 1111n,\n    })\n\n    expect(args.toArray()[0]).equals('0x634316eA0EE79c701c6F67C53A4C54cBAfd2316d')\n    expect(args.arg0).equals('0x634316eA0EE79c701c6F67C53A4C54cBAfd2316d')\n\n    expect(args.toArray()[1]).equals(1111n)\n    expect(args.amount).equals(1111n)\n  })\n})\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -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.1",
-    "@sentio/runtime": "^2.9.1",
+    "@sentio/protos": "^2.9.2",
+    "@sentio/runtime": "^2.9.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": "47cac5dabe0a011b4ce74b70f3d82998ab9c2690"
+  "gitHead": "ed79ea7e23e256d4318bfccdb454f7be0ae11eb9"
 }

package/src/eth/base-processor.ts

@@ -15,7 +15,7 @@ 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 { fixEmptyKey, EthEvent, formatEthData } from './eth.js'
 import * as console from 'console'
 import { getNetworkFromCtxOrNetworkish } from './provider.js'
 
@@ -123,7 +123,7 @@ export abstract class BaseProcessor<
         const parsed = contractView.rawContract.interface.parseLog(logParam)
 
         if (parsed) {
-          const event: EthEvent = { ...log, name: parsed.name, args: decodeResult(parsed) }
+          const event: EthEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
           await handler(event, ctx)
           return ctx.getProcessResult()
         }

package/src/eth/eth.ts

@@ -1,5 +1,4 @@
 import {
-  BlockTag,
   LogParams,
   formatBlock,
   formatLog,
@@ -12,7 +11,7 @@ import {
   object,
   formatData,
 } from 'ethers/providers'
-import { CallExceptionError, Result, LogDescription } from 'ethers'
+import { CallExceptionError, LogDescription, Result } from 'ethers'
 import { ContractContext } from './context.js'
 import { Trace } from './trace.js'
 import { getAddress } from 'ethers/address'
@@ -23,16 +22,6 @@ export interface EthEvent<TArgsArray extends Array<any> = any, TArgsObject = any
   name: string
 }
 
-export function toBlockTag(a: number | bigint): BlockTag {
-  if (typeof a === 'number') {
-    return a
-  }
-  if (a > Number.MAX_SAFE_INTEGER) {
-    return '0x' + a.toString(16)
-  }
-  return Number(a)
-}
-
 export class SimpleEthersError extends Error {
   e: Error
 
@@ -76,17 +65,17 @@ export function transformEtherError(e: Error, ctx: ContractContext<any, any> | u
   return new Error(msg)
 }
 
-export function decodeResult(result: LogDescription): any {
-  const decoded = [] as any
+export function fixEmptyKey(result: LogDescription): Result {
+  const keys = []
+
   for (const [i, arg] of result.fragment.inputs.entries()) {
     if (arg.name === '') {
-      decoded['arg' + i] = result.args[i]
+      keys.push('arg' + i)
     } else {
-      decoded[arg.name] = result.args[i]
+      keys.push(arg.name)
     }
-    decoded.push(result.args[i])
   }
-  return decoded
+  return Result.fromItems(Array.from(result.args.values()), keys)
 }
 
 const _formatTransactionReceipt = object(