@sentio/sdk 2.8.0 → 2.9.0-rc.2

package/lib/testing/eth-facet.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"eth-facet.js","sourceRoot":"","sources":["../../src/testing/eth-facet.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,WAAW,EAA0B,MAAM,gBAAgB,CAAA;AAEjF,OAAO,EAA0B,OAAO,EAAc,MAAM,kBAAkB,CAAA;AAG9E,MAAM,OAAO,QAAQ;IACnB,MAAM,CAAqB;IAE3B,YAAY,MAA2B;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,SAAS,CAAC,KAAY,EAAE,UAAsB,CAAC;QAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;IAED,UAAU,CAAC,MAAe,EAAE,UAAsB,CAAC;QACjD,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YACtD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,KAAK,CAAC,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;aAC5D;YACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACvB;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACjC,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,iBAAiB,CAAC,KAAY,EAAE,UAAsB,CAAC;QACrD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;YAChD,MAAM,KAAK,CAAC,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;SAC5D;QACD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAEjD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAClD,IAAI,QAAQ,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;gBAC3E,SAAQ;aACT;YACD,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE;gBAC/E,SAAQ;aACT;YACD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE;gBAC1C,IAAI,MAAM,CAAC,SAAS,IAAI,SAAS,EAAE;oBACjC,OAAO;wBACL,IAAI,EAAE;4BACJ,QAAQ,EAAE;gCACR,KAAK;gCACL,SAAS,EAAE,IAAI,IAAI,EAAE;6BACtB;yBACF;wBACD,UAAU,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC;wBAC9B,WAAW,EAAE,WAAW,CAAC,SAAS;qBACnC,CAAA;iBACF;aACF;SACF;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,CAAC,GAAc,EAAE,UAAsB,CAAC;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;IACtC,CAAC;IAED,QAAQ,CAAC,IAAiB,EAAE,UAAsB,CAAC;QACjD,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAClD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;aACxD;YACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACvB;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACjC,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,eAAe,CAAC,GAAc,EAAE,UAAsB,CAAC;QACrD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAClD,IAAI,QAAQ,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;gBAC3E,SAAQ;aACT;YACD,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE;gBAC1E,SAAQ;aACT;YACD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE;gBACxC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;oBACnC,mDAAmD;oBACnD,aAAa;oBACb,IAAI;oBAEJ,IAAI,KAAK,GAAG,IAAI,CAAA;oBAChB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE;wBACpC,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;wBACrC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;wBACpD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;4BAC9B,YAAY;4BACZ,SAAQ;yBACT;wBACD,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC,EAAE;4BACzE,WAAW;4BACX,SAAQ;yBACT;wBACD,KAAK,GAAG,KAAK,CAAA;wBACb,MAAK;qBACN;oBACD,IAAI,KAAK,EAAE;wBACT,OAAO;4BACL,IAAI,EAAE;gCACJ,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE;6BACvC;4BACD,UAAU,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC;4BAC9B,WAAW,EAAE,WAAW,CAAC,OAAO;yBACjC,CAAA;qBACF;iBACF;aACF;SACF;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,cAAc,CAAC,OAAe,EAAE,GAAc,EAAE,UAAsB,CAAC;QACrE,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,eAAe,CAAC,OAAe,EAAE,IAAiB,EAAE,UAAsB,CAAC;QACzE,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;YAClE,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;aACxD;YACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACvB;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACjC,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,sBAAsB,CAAC,OAAe,EAAE,GAAc,EAAE,UAAsB,CAAC;QAC7E,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;YAChD,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;gBAChE,SAAQ;aACT;YACD,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE;gBAC3D,SAAQ;aACT;YACD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE;gBACvC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;oBACnC,mDAAmD;oBACnD,aAAa;oBACb,IAAI;oBAEJ,IAAI,KAAK,GAAG,IAAI,CAAA;oBAChB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE;wBACpC,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;wBACrC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;wBACpD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;4BAC9B,YAAY;4BACZ,SAAQ;yBACT;wBACD,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC,EAAE;4BACzE,WAAW;4BACX,SAAQ;yBACT;wBACD,KAAK,GAAG,KAAK,CAAA;wBACb,MAAK;qBACN;oBACD,IAAI,KAAK,EAAE;wBACT,OAAO;4BACL,IAAI,EAAE;gCACJ,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE;6BACvC;4BACD,UAAU,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC;4BAC9B,WAAW,EAAE,WAAW,CAAC,OAAO;yBACjC,CAAA;qBACF;iBACF;aACF;SACF;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,SAAS,CACP,KAAgD,EAChD,UAAsB,CAAC;QAEvB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;IAED,UAAU,CAAC,MAAmD,EAAE,UAAsB,CAAC;QACrF,MAAM,QAAQ,GAAG,EAAE,CAAA;QACnB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YACtD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,KAAK,CAAC,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;aAC5D;YACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACvB;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACjC,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,iBAAiB,CAAC,KAA0C,EAAE,UAAsB,CAAC;QACnF,MAAM,OAAO,GAAgB;YAC3B,IAAI,EAAE;gBACJ,QAAQ,EAAE,EAAE,KAAK,EAAE;aACpB;YACD,WAAW,EAAE,WAAW,CAAC,SAAS;YAClC,UAAU,EAAE,EAAE;SACf,CAAA;QACD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAClD,IAAI,QAAQ,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;gBAC3E,SAAQ;aACT;YACD,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAA;YACpC,IAAI,eAAe,GAAG,QAAQ,CAAC,UAAU,EAAE;gBACzC,SAAQ;aACT;YACD,IAAI,QAAQ,CAAC,QAAQ,KAAK,EAAE,IAAI,eAAe,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACpE,SAAQ;aACT;YAED,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,eAAe,EAAE;gBAC7C,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;aAC1C;SACF;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF","sourcesContent":["import { TestProcessorServer } from './test-processor-server.js'\nimport { DataBinding, HandlerType, ProcessBindingResponse } from '@sentio/protos'\nimport { Trace } from '../eth/trace.js'\nimport { BlockParams, LogParams, Network, Networkish } from 'ethers/providers'\nimport { Block } from 'ethers'\n\nexport class EthFacet {\n  server: TestProcessorServer\n\n  constructor(server: TestProcessorServer) {\n    this.server = server\n  }\n\n  testTrace(trace: Trace, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testTraces([trace], network)\n  }\n\n  testTraces(traces: Trace[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const trace of traces) {\n      const binding = this.buildTraceBinding(trace, network)\n      if (!binding) {\n        throw Error('Invalid test trace: ' + JSON.stringify(trace))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildTraceBinding(trace: Trace, network: Networkish = 1): DataBinding | undefined {\n    if (trace.type !== 'call' || !trace.action.input) {\n      throw Error('Invalid test trace: ' + JSON.stringify(trace))\n    }\n    const signature = trace.action.input.slice(0, 10)\n\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.traceConfigs) {\n        if (config.signature == signature) {\n          return {\n            data: {\n              ethTrace: {\n                trace,\n                timestamp: new Date(),\n              },\n            },\n            handlerIds: [config.handlerId],\n            handlerType: HandlerType.ETH_TRACE,\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testLog(log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testLogs([log], network)\n  }\n\n  testLogs(logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildLogBinding(log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildLogBinding(log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n  testAccountLog(address: string, log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testAccountLogs(address, [log], network)\n  }\n\n  testAccountLogs(address: string, logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildAccountLogBinding(address, log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildAccountLogBinding(address: string, log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const account of this.server.accountConfigs) {\n      if (account.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (address.toLowerCase() !== account.address.toLowerCase()) {\n        continue\n      }\n      for (const config of account.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testBlock(\n    block: Partial<BlockParams> & { number: number },\n    network: Networkish = 1\n  ): Promise<ProcessBindingResponse> {\n    return this.testBlocks([block], network)\n  }\n\n  testBlocks(blocks: Partial<BlockParams> & { number: number }[], network: Networkish = 1) {\n    const bindings = []\n    for (const block of blocks) {\n      const binding = this.buildBlockBinding(block, network)\n      if (!binding) {\n        throw Error('Invalid test block: ' + JSON.stringify(block))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildBlockBinding(block: Partial<Block> & { number: number }, network: Networkish = 1): DataBinding {\n    const binding: DataBinding = {\n      data: {\n        ethBlock: { block },\n      },\n      handlerType: HandlerType.ETH_BLOCK,\n      handlerIds: [],\n    }\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      const longBlockNumber = block.number\n      if (longBlockNumber < contract.startBlock) {\n        continue\n      }\n      if (contract.endBlock !== 0n && longBlockNumber >= contract.endBlock) {\n        continue\n      }\n\n      for (const config of contract.intervalConfigs) {\n        binding.handlerIds.push(config.handlerId)\n      }\n    }\n    return binding\n  }\n}\n"]}
+{"version":3,"file":"eth-facet.js","sourceRoot":"","sources":["../../src/testing/eth-facet.ts"],"names":[],"mappings":"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","sourcesContent":["import { TestProcessorServer } from './test-processor-server.js'\nimport { DataBinding, HandlerType, ProcessBindingResponse } from '@sentio/protos'\nimport { Trace } from '../eth/trace.js'\nimport { BlockParams, LogParams, Networkish } from 'ethers/providers'\nimport { Block } from 'ethers'\nimport { getNetworkFromCtxOrNetworkish } from '../eth/provider.js'\n\nexport class EthFacet {\n  server: TestProcessorServer\n\n  constructor(server: TestProcessorServer) {\n    this.server = server\n  }\n\n  testTrace(trace: Trace, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testTraces([trace], network)\n  }\n\n  testTraces(traces: Trace[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const trace of traces) {\n      const binding = this.buildTraceBinding(trace, network)\n      if (!binding) {\n        throw Error('Invalid test trace: ' + JSON.stringify(trace))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildTraceBinding(trace: Trace, network: Networkish = 1): DataBinding | undefined {\n    if (trace.type !== 'call' || !trace.action.input) {\n      throw Error('Invalid test trace: ' + JSON.stringify(trace))\n    }\n    const signature = trace.action.input.slice(0, 10)\n\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.traceConfigs) {\n        if (config.signature == signature) {\n          return {\n            data: {\n              ethTrace: {\n                trace,\n                timestamp: new Date(),\n              },\n            },\n            handlerIds: [config.handlerId],\n            handlerType: HandlerType.ETH_TRACE,\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testLog(log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testLogs([log], network)\n  }\n\n  testLogs(logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildLogBinding(log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildLogBinding(log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n  testAccountLog(address: string, log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testAccountLogs(address, [log], network)\n  }\n\n  testAccountLogs(address: string, logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildAccountLogBinding(address, log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildAccountLogBinding(address: string, log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const account of this.server.accountConfigs) {\n      if (account.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      if (address.toLowerCase() !== account.address.toLowerCase()) {\n        continue\n      }\n      for (const config of account.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testBlock(\n    block: Partial<BlockParams> & { number: number },\n    network: Networkish = 1\n  ): Promise<ProcessBindingResponse> {\n    return this.testBlocks([block], network)\n  }\n\n  testBlocks(blocks: Partial<BlockParams> & { number: number }[], network: Networkish = 1) {\n    const bindings = []\n    for (const block of blocks) {\n      const binding = this.buildBlockBinding(block, network)\n      if (!binding) {\n        throw Error('Invalid test block: ' + JSON.stringify(block))\n      }\n      bindings.push(binding)\n    }\n    return this.server.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildBlockBinding(block: Partial<Block> & { number: number }, network: Networkish = 1): DataBinding {\n    const binding: DataBinding = {\n      data: {\n        ethBlock: { block },\n      },\n      handlerType: HandlerType.ETH_BLOCK,\n      handlerIds: [],\n    }\n    for (const contract of this.server.contractConfigs) {\n      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {\n        continue\n      }\n      const longBlockNumber = block.number\n      if (longBlockNumber < contract.startBlock) {\n        continue\n      }\n      if (contract.endBlock !== 0n && longBlockNumber >= contract.endBlock) {\n        continue\n      }\n\n      for (const config of contract.intervalConfigs) {\n        binding.handlerIds.push(config.handlerId)\n      }\n    }\n    return binding\n  }\n}\n"]}

package/lib/utils/price.d.ts

@@ -133,12 +133,12 @@ export declare function getPriceClient(address?: string): import("nice-grpc").Ra
                 create(base?: {
                     limit?: number | undefined;
                     offset?: number | undefined;
-                    queryString?: string | undefined;
+                    searchQuery?: string | undefined;
                 } | undefined): import("@sentio/protos/price").ListCoinsRequest;
                 fromPartial(object: {
                     limit?: number | undefined;
                     offset?: number | undefined;
-                    queryString?: string | undefined;
+                    searchQuery?: string | undefined;
                 }): import("@sentio/protos/price").ListCoinsRequest;
             };
             readonly requestStream: false;

package/package.json

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

package/src/aptos/aptos-plugin.ts

@@ -80,14 +80,11 @@ export class AptosPlugin extends Plugin {
     }
 
     for (const aptosProcessor of AptosAccountProcessorState.INSTANCE.getValues()) {
-      const accountConfig: AccountConfig = {
+      const accountConfig = AccountConfig.fromPartial({
         address: aptosProcessor.config.address,
         chainId: aptosProcessor.getChainId(),
         startBlock: aptosProcessor.config.startVersion,
-        aptosIntervalConfigs: [],
-        intervalConfigs: [],
-        logConfigs: [],
-      }
+      })
       for (const handler of aptosProcessor.resourcesHandlers) {
         const handlerId = this.aptosResourceHandlers.push(handler.handler) - 1
         accountConfig.aptosIntervalConfigs.push({

package/src/core/chain.ts

@@ -131,3 +131,57 @@ export function getChainType(chainId?: string | number): string {
   }
   return 'EVM'
 }
+
+export function getChainScanUrl(
+  chainId?: string | number,
+  hash?: string,
+  subtype?: 'block' | 'address' | 'transaction'
+): string | undefined {
+  const chainName = getChainName(chainId)
+  if (chainName === 'Ethereum') {
+    if (subtype === 'block') {
+      return `https://etherscan.io/block/${hash}`
+    } else if (subtype === 'address') {
+      return `https://etherscan.io/address/${hash}`
+    } else {
+      return `https://etherscan.io/tx/${hash}`
+    }
+  }
+  if (chainName === 'Polygon') {
+    if (subtype === 'block') {
+      return `https://polygonscan.com/block/${hash}`
+    } else if (subtype === 'address') {
+      return `https://polygonscan.com/address/${hash}`
+    } else {
+      return `https://polygonscan.com/tx/${hash}`
+    }
+  }
+  if (chainName.startsWith('Aptos ')) {
+    if (subtype === 'block') {
+      return `https://explorer.aptos.io/block/${hash}`
+    } else if (subtype === 'address') {
+      return `https://explorer.aptos.io/account/${hash}`
+    } else {
+      return `https://explorer.aptos.io/txn/${hash}`
+    }
+  }
+  if (chainName.startsWith('Solana ')) {
+    if (subtype === 'block') {
+      return `https://explorer.solana.com/block/${hash}`
+    } else if (subtype === 'address') {
+      return `https://explorer.solana.com/address/${hash}`
+    } else {
+      return `https://explorer.solana.io/tx/${hash}`
+    }
+  }
+  if (chainName.startsWith('Sui ')) {
+    if (subtype === 'block') {
+      return `https://explorer.sui.io/block/${hash}`
+    } else if (subtype === 'address') {
+      return `https://explorer.sui.io/address/${hash}`
+    } else {
+      return `https://explorer.sui.io/transaction/${hash}`
+    }
+  }
+  return undefined
+}

package/src/core/event-logger.ts

@@ -3,7 +3,7 @@ import { EventTrackingResult, LogLevel } from '@sentio/protos'
 import { normalizeAttribute } from './normalization.js'
 
 export interface Attribute<T> {
-  [key: string]: Exclude<T | number | bigint | string | LogLevel | Attribute<T> | undefined, Promise<any>>
+  [key: string]: Exclude<T | number | bigint | string | boolean | LogLevel | Attribute<T> | undefined, Promise<any>>
 }
 
 export interface Event<T> extends Attribute<T> {

package/src/core/index.ts

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

package/src/core/partial-optional.ts

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

package/src/eth/account-processor.ts

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

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

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

package/src/eth/base-processor.ts

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

package/src/eth/bind-options.ts

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

package/src/eth/binds.ts

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

package/src/eth/eth-plugin.ts

@@ -114,14 +114,11 @@ export class EthPlugin extends Plugin {
 
     // part 1.b prepare EVM account processors
     for (const processor of AccountProcessorState.INSTANCE.getValues()) {
-      const accountConfig: AccountConfig = {
+      const accountConfig = AccountConfig.fromPartial({
         address: processor.config.address,
         chainId: processor.getChainId().toString(),
         startBlock: processor.config.startBlock ? BigInt(processor.config.startBlock) : 0n,
-        aptosIntervalConfigs: [],
-        intervalConfigs: [],
-        logConfigs: [],
-      }
+      })
       // TODO add interval
       for (const eventsHandler of processor.eventHandlers) {
         // associate id with filter

package/src/eth/provider.ts

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

package/src/sui/context.ts

@@ -48,3 +48,36 @@ export class SuiContext extends BaseContext {
     }
   }
 }
+
+export class SuiObjectContext extends BaseContext {
+  address: string
+  network: SuiNetwork
+  slot: bigint
+  timestamp: Date
+
+  constructor(network: SuiNetwork, address: string, slot: bigint, timestamp: Date) {
+    super()
+    this.address = address
+    this.network = network
+    this.slot = slot
+    this.timestamp = timestamp
+  }
+
+  getChainId(): string {
+    return getChainId(this.network)
+  }
+
+  getMetaData(name: string, labels: Labels): RecordMetaData {
+    return {
+      address: this.address,
+      contractName: 'objects',
+      blockNumber: this.slot,
+      transactionIndex: 0,
+      transactionHash: '',
+      logIndex: 0,
+      chainId: this.getChainId(),
+      name: name,
+      labels: normalizeLabels(labels),
+    }
+  }
+}

package/src/sui/sui-plugin.ts

@@ -1,8 +1,10 @@
 import { errorString, mergeProcessResults, Plugin, PluginManager, USER_PROCESSOR } from '@sentio/runtime'
 import {
+  AccountConfig,
   ContractConfig,
   Data_SuiCall,
   Data_SuiEvent,
+  Data_SuiObject,
   DataBinding,
   HandlerType,
   MoveCallHandlerConfig,
@@ -13,7 +15,7 @@ import {
 
 import { ServerError, Status } from 'nice-grpc'
 
-import { SuiProcessorState } from './sui-processor.js'
+import { SuiAccountProcessorState, SuiProcessorState } from './sui-processor.js'
 import { getChainId } from './network.js'
 
 export class SuiPlugin extends Plugin {
@@ -21,6 +23,7 @@ export class SuiPlugin extends Plugin {
 
   private suiEventHandlers: ((event: Data_SuiEvent) => Promise<ProcessResult>)[] = []
   private suiCallHandlers: ((func: Data_SuiCall) => Promise<ProcessResult>)[] = []
+  private suiObjectHandlers: ((object: Data_SuiObject) => Promise<ProcessResult>)[] = []
 
   async configure(config: ProcessConfigResponse) {
     for (const suiProcessor of SuiProcessorState.INSTANCE.getValues()) {
@@ -67,6 +70,27 @@ export class SuiPlugin extends Plugin {
       }
       config.contractConfigs.push(contractConfig)
     }
+
+    for (const processor of SuiAccountProcessorState.INSTANCE.getValues()) {
+      const accountConfig = AccountConfig.fromPartial({
+        address: processor.config.address,
+        chainId: processor.getChainId(),
+        startBlock: BigInt(processor.config.startTimestamp), // TODO maybe use another field
+      })
+      for (const handler of processor.objectHandlers) {
+        const handlerId = this.suiObjectHandlers.push(handler.handler) - 1
+        accountConfig.suiIntervalConfigs.push({
+          intervalConfig: {
+            handlerId: handlerId,
+            minutes: 0,
+            minutesInterval: handler.timeIntervalInMinutes,
+            slot: 0,
+            slotInterval: handler.versionInterval,
+          },
+        })
+      }
+      config.accountConfigs.push(accountConfig)
+    }
   }
 
   supportedHandlers = [HandlerType.SUI_EVENT, HandlerType.SUI_CALL]
@@ -107,12 +131,34 @@ export class SuiPlugin extends Plugin {
     return mergeProcessResults(await Promise.all(promises))
   }
 
+  async processSuiObject(binding: DataBinding): Promise<ProcessResult> {
+    if (!binding.data?.suiObject) {
+      throw new ServerError(Status.INVALID_ARGUMENT, "Object can't be empty")
+    }
+    const object = binding.data.suiObject
+
+    const promises: Promise<ProcessResult>[] = []
+    for (const handlerId of binding.handlerIds) {
+      promises.push(
+        this.suiObjectHandlers[handlerId](object).catch((e) => {
+          throw new ServerError(
+            Status.INTERNAL,
+            'error processing object: ' + JSON.stringify(object) + '\n' + errorString(e)
+          )
+        })
+      )
+    }
+    return mergeProcessResults(await Promise.all(promises))
+  }
+
   processBinding(request: DataBinding): Promise<ProcessResult> {
     switch (request.handlerType) {
       case HandlerType.SUI_EVENT:
         return this.processSuiEvent(request)
       case HandlerType.SUI_CALL:
         return this.processSuiFunctionCall(request)
+      case HandlerType.SUI_OBJECT:
+        return this.processSuiObject(request)
       default:
         throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
     }