@sentio/sdk 2.3.2 → 2.3.3-rc.1

package/lib/eth/base-processor.js

@@ -140,7 +140,7 @@ export class BaseProcessor {
                     return ProcessResult.fromPartial({});
                 }
                 const traceData = '0x' + trace.action.input.slice(10);
-                trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData);
+                trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData, true);
                 const ctx = new ContractContext(contractName, contractView, chainId, data.timestamp, data.block, undefined, trace, data.transaction, data.transactionReceipt);
                 await handler(trace, ctx);
                 return ctx.getProcessResult();

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

@@ -1 +1 @@
-{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/eth/base-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionReceipt, BaseContract, Transaction, DeferredTopicFilter } from 'ethers'\nimport { LogParams, BlockParams, Network } from 'ethers/providers'\n\nimport { BoundContractView, ContractContext, ContractView } from './context.js'\nimport {\n  AddressType,\n  Data_EthBlock,\n  Data_EthLog,\n  Data_EthTrace,\n  EthFetchConfig,\n  HandleInterval,\n  ProcessResult,\n} from '@sentio/protos'\nimport { BindInternalOptions, BindOptions } from './bind-options.js'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { Trace } from './trace.js'\nimport { ServerError, Status } from 'nice-grpc'\nimport { decodeResult, EthEvent } from './eth.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\nexport abstract class BaseProcessor<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  blockHandlers: BlockHandlder[] = []\n  eventHandlers: EventsHandler[] = []\n  traceHandlers: TraceHandler[] = []\n\n  config: BindInternalOptions\n\n  constructor(config: BindOptions) {\n    this.config = {\n      address: config.address,\n      name: config.name || '',\n      network: config.network ? config.network : 1,\n      startBlock: 0n,\n    }\n    if (typeof this.config.network === 'string') {\n      const asInt = parseInt(this.config.network)\n      if (Number.isFinite(asInt)) {\n        this.config.network = asInt\n      }\n    }\n    if (config.startBlock) {\n      this.config.startBlock = BigInt(config.startBlock)\n    }\n    if (config.endBlock) {\n      this.config.endBlock = BigInt(config.endBlock)\n    }\n  }\n\n  protected abstract CreateBoundContractView(): TBoundContractView\n\n  public getChainId(): number {\n    return Number(Network.from(this.config.network).chainId)\n  }\n\n  public onEvent(\n    handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    const chainId = this.getChainId()\n    let _filters: DeferredTopicFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    const contractName = this.config.name\n    const processor = this\n    this.eventHandlers.push({\n      filters: _filters,\n      fetchConfig: fetchConfig || EthFetchConfig.fromPartial({}),\n      handler: async function (data: Data_EthLog) {\n        if (!data.log) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')\n        }\n        const log = data.log as LogParams\n\n        const contractView = processor.CreateBoundContractView()\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          data.block as BlockParams,\n          log,\n          undefined,\n          data.transaction as Transaction,\n          data.transactionReceipt as TransactionReceipt\n        )\n        const logParam = log as any as { topics: Array<string>; data: string }\n\n        const parsed = contractView.rawContract.interface.parseLog(logParam)\n\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  ) {\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  ) {\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  ) {\n    const chainId = this.getChainId()\n    const processor = this\n    const contractName = this.config.name\n\n    this.blockHandlers.push({\n      handler: async function (data: Data_EthBlock) {\n        if (!data.block) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Block is empty')\n        }\n        const block = data.block as BlockParams\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(handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    const _filters: DeferredTopicFilter[] = []\n    const tmpContract = this.CreateBoundContractView()\n\n    for (const fragment of tmpContract.rawContract.interface.fragments) {\n      if (fragment.type === 'event') {\n        const filter = tmpContract.rawContract.filters[fragment.format()]\n        _filters.push(filter())\n      }\n    }\n    return this.onEvent(function (log, ctx) {\n      return handler(log, ctx)\n    }, _filters)\n  }\n\n  public onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    fetchConfig?: EthFetchConfig\n  ) {\n    const chainId = this.getChainId()\n    const contractName = this.config.name\n    const processor = this\n\n    this.traceHandlers.push({\n      signature,\n      fetchConfig: fetchConfig || EthFetchConfig.fromPartial({}),\n      handler: async function (data: Data_EthTrace) {\n        const contractView = processor.CreateBoundContractView()\n        const contractInterface = contractView.rawContract.interface\n        const fragment = contractInterface.getFunction(signature)\n        if (!data.trace || !fragment) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'trace is null')\n        }\n        const trace = data.trace as Trace\n        if (!trace.action.input) {\n          return ProcessResult.fromPartial({})\n        }\n        const traceData = '0x' + trace.action.input.slice(10)\n        trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData)\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          data.block as BlockParams,\n          undefined,\n          trace,\n          data.transaction as Transaction,\n          data.transactionReceipt as TransactionReceipt\n        )\n        await handler(trace, ctx)\n        return ctx.getProcessResult()\n      },\n    })\n    return this\n  }\n}\n"]}
+{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/eth/base-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionReceipt, BaseContract, Transaction, DeferredTopicFilter } from 'ethers'\nimport { LogParams, BlockParams, Network } from 'ethers/providers'\n\nimport { BoundContractView, ContractContext, ContractView } from './context.js'\nimport {\n  AddressType,\n  Data_EthBlock,\n  Data_EthLog,\n  Data_EthTrace,\n  EthFetchConfig,\n  HandleInterval,\n  ProcessResult,\n} from '@sentio/protos'\nimport { BindInternalOptions, BindOptions } from './bind-options.js'\nimport { PromiseOrVoid } from '../promise-or-void.js'\nimport { Trace } from './trace.js'\nimport { ServerError, Status } from 'nice-grpc'\nimport { decodeResult, EthEvent } from './eth.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\nexport abstract class BaseProcessor<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  blockHandlers: BlockHandlder[] = []\n  eventHandlers: EventsHandler[] = []\n  traceHandlers: TraceHandler[] = []\n\n  config: BindInternalOptions\n\n  constructor(config: BindOptions) {\n    this.config = {\n      address: config.address,\n      name: config.name || '',\n      network: config.network ? config.network : 1,\n      startBlock: 0n,\n    }\n    if (typeof this.config.network === 'string') {\n      const asInt = parseInt(this.config.network)\n      if (Number.isFinite(asInt)) {\n        this.config.network = asInt\n      }\n    }\n    if (config.startBlock) {\n      this.config.startBlock = BigInt(config.startBlock)\n    }\n    if (config.endBlock) {\n      this.config.endBlock = BigInt(config.endBlock)\n    }\n  }\n\n  protected abstract CreateBoundContractView(): TBoundContractView\n\n  public getChainId(): number {\n    return Number(Network.from(this.config.network).chainId)\n  }\n\n  public onEvent(\n    handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: DeferredTopicFilter | DeferredTopicFilter[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    const chainId = this.getChainId()\n    let _filters: DeferredTopicFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    const contractName = this.config.name\n    const processor = this\n    this.eventHandlers.push({\n      filters: _filters,\n      fetchConfig: fetchConfig || EthFetchConfig.fromPartial({}),\n      handler: async function (data: Data_EthLog) {\n        if (!data.log) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')\n        }\n        const log = data.log as LogParams\n\n        const contractView = processor.CreateBoundContractView()\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          data.block as BlockParams,\n          log,\n          undefined,\n          data.transaction as Transaction,\n          data.transactionReceipt as TransactionReceipt\n        )\n        const logParam = log as any as { topics: Array<string>; data: string }\n\n        const parsed = contractView.rawContract.interface.parseLog(logParam)\n\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  ) {\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  ) {\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  ) {\n    const chainId = this.getChainId()\n    const processor = this\n    const contractName = this.config.name\n\n    this.blockHandlers.push({\n      handler: async function (data: Data_EthBlock) {\n        if (!data.block) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'Block is empty')\n        }\n        const block = data.block as BlockParams\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(handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    const _filters: DeferredTopicFilter[] = []\n    const tmpContract = this.CreateBoundContractView()\n\n    for (const fragment of tmpContract.rawContract.interface.fragments) {\n      if (fragment.type === 'event') {\n        const filter = tmpContract.rawContract.filters[fragment.format()]\n        _filters.push(filter())\n      }\n    }\n    return this.onEvent(function (log, ctx) {\n      return handler(log, ctx)\n    }, _filters)\n  }\n\n  public onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    fetchConfig?: EthFetchConfig\n  ) {\n    const chainId = this.getChainId()\n    const contractName = this.config.name\n    const processor = this\n\n    this.traceHandlers.push({\n      signature,\n      fetchConfig: fetchConfig || EthFetchConfig.fromPartial({}),\n      handler: async function (data: Data_EthTrace) {\n        const contractView = processor.CreateBoundContractView()\n        const contractInterface = contractView.rawContract.interface\n        const fragment = contractInterface.getFunction(signature)\n        if (!data.trace || !fragment) {\n          throw new ServerError(Status.INVALID_ARGUMENT, 'trace is null')\n        }\n        const trace = data.trace as Trace\n        if (!trace.action.input) {\n          return ProcessResult.fromPartial({})\n        }\n        const traceData = '0x' + trace.action.input.slice(10)\n        trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData, true)\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          data.timestamp,\n          data.block as BlockParams,\n          undefined,\n          trace,\n          data.transaction as Transaction,\n          data.transactionReceipt as TransactionReceipt\n        )\n        await handler(trace, ctx)\n        return ctx.getProcessResult()\n      },\n    })\n    return this\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.3.2",
+  "version": "2.3.3-rc.1",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -19,9 +19,9 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.25",
-    "@sentio/protos": "^2.3.2",
-    "@sentio/runtime": "^2.3.2",
-    "@sentio/sdk": "^2.3.2",
+    "@sentio/protos": "^2.3.3-rc.1",
+    "@sentio/runtime": "^2.3.3-rc.1",
+    "@sentio/sdk": "^2.3.3-rc.1",
     "@solana/web3.js": "^1.47.3",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:@sentio/aptos@^1.6.0",
@@ -78,5 +78,5 @@
   "typedoc": {
     "entryPoint": "./src/index.ts"
   },
-  "gitHead": "a38617576f8c6a1990eafde5d971c3642358eefe"
+  "gitHead": "3e58d88fd8d5fd0812de0fe524aafb691834b5bc"
 }

package/src/eth/base-processor.ts

@@ -228,7 +228,7 @@ export abstract class BaseProcessor<
           return ProcessResult.fromPartial({})
         }
         const traceData = '0x' + trace.action.input.slice(10)
-        trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData)
+        trace.args = contractInterface.getAbiCoder().decode(fragment.inputs, traceData, true)
 
         const ctx = new ContractContext<TContract, TBoundContractView>(
           contractName,