@sentio/sdk 2.59.5-rc.1 → 2.60.0-rc.2

package/lib/core/handler-register.d.ts

@@ -0,0 +1,18 @@
+import { ChainId } from '@sentio/chain';
+import { ProcessResult } from '@sentio/protos';
+export type HandlerFunction = (...args: any[]) => Promise<ProcessResult>;
+export declare class HandlerRegister {
+    private handlerByChain;
+    private handlers;
+    /**
+     * Register a handler function with chain ID and handle type
+     * @returns handler ID
+     */
+    register(handler: HandlerFunction, chainId: ChainId | string): number;
+    /**
+     * Get handler function by ID
+     */
+    getHandlerById(id: number): HandlerFunction;
+    clear(chainId?: ChainId): void;
+}
+//# sourceMappingURL=handler-register.d.ts.map

package/lib/core/handler-register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler-register.d.ts","sourceRoot":"","sources":["../../src/core/handler-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE9C,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,aAAa,CAAC,CAAA;AAmBxE,qBAAa,eAAe;IAC1B,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,QAAQ,CAAuC;IAEvD;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM;IAmBrE;;OAEG;IACH,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe;IAQ3C,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI;CAiB/B"}

package/lib/core/handler-register.js

@@ -0,0 +1,62 @@
+import { ServerError, Status } from 'nice-grpc';
+import { ChainId } from '@sentio/chain';
+const chainToNumber = new Map();
+const numberToChain = new Map();
+for (const chainId of Object.values(ChainId)) {
+    const num = chainToNumber.size + 1;
+    chainToNumber.set(chainId, num);
+    numberToChain.set(num, chainId);
+}
+const MAX_HANDLER_PER_CHAIN = 1000000; // Maximum handlers per chain
+export class HandlerRegister {
+    handlerByChain = new Map();
+    handlers = new Map();
+    /**
+     * Register a handler function with chain ID and handle type
+     * @returns handler ID
+     */
+    register(handler, chainId) {
+        const chainNum = chainToNumber.get(chainId) || 0;
+        const entries = this.handlerByChain.get(chainNum) || [];
+        const len = entries.length;
+        const id = chainNum * MAX_HANDLER_PER_CHAIN + len + 1; // Use the first 32 bits for chain ID, next bits for index
+        const entry = {
+            id,
+            handler,
+            chainId
+        };
+        entries.push(entry);
+        this.handlerByChain.set(chainNum, entries);
+        this.handlers.set(id, entry);
+        return id;
+    }
+    /**
+     * Get handler function by ID
+     */
+    getHandlerById(id) {
+        const entry = this.handlers.get(id);
+        if (!entry) {
+            throw new ServerError(Status.INTERNAL, `Handler with ID ${id} not found.`);
+        }
+        return entry.handler;
+    }
+    clear(chainId) {
+        if (chainId) {
+            const chainNum = chainToNumber.get(chainId);
+            if (chainNum !== undefined) {
+                const chainHandlers = this.handlerByChain.get(chainNum);
+                if (chainHandlers) {
+                    for (const entry of chainHandlers) {
+                        this.handlers.delete(entry.id);
+                    }
+                }
+                this.handlerByChain.delete(chainNum);
+            }
+        }
+        else {
+            this.handlerByChain.clear();
+            this.handlers.clear();
+        }
+    }
+}
+//# sourceMappingURL=handler-register.js.map

package/lib/core/handler-register.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler-register.js","sourceRoot":"","sources":["../../src/core/handler-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAWvC,MAAM,aAAa,GAAwB,IAAI,GAAG,EAAE,CAAA;AACpD,MAAM,aAAa,GAAwB,IAAI,GAAG,EAAE,CAAA;AAEpD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,CAAA;IAClC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC/B,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AACjC,CAAC;AAED,MAAM,qBAAqB,GAAG,OAAO,CAAA,CAAC,6BAA6B;AAEnE,MAAM,OAAO,eAAe;IAClB,cAAc,GAAgC,IAAI,GAAG,EAAE,CAAA;IACvD,QAAQ,GAA8B,IAAI,GAAG,EAAE,CAAA;IAEvD;;;OAGG;IACH,QAAQ,CAAC,OAAwB,EAAE,OAAyB;QAC1D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;QAEvD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAA;QAC1B,MAAM,EAAE,GAAG,QAAQ,GAAG,qBAAqB,GAAG,GAAG,GAAG,CAAC,CAAA,CAAC,0DAA0D;QAEhH,MAAM,KAAK,GAAiB;YAC1B,EAAE;YACF,OAAO;YACP,OAAO;SACR,CAAA;QACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACnB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC1C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAE5B,OAAO,EAAE,CAAA;IACX,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,EAAU;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;QAC5E,CAAC;QACD,OAAO,KAAK,CAAC,OAAO,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAiB;QACrB,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;gBACvD,IAAI,aAAa,EAAE,CAAC;oBAClB,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;wBAClC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;oBAChC,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YACtC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;YAC3B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;QACvB,CAAC;IACH,CAAC;CACF"}

package/lib/cosmos/cosmos-plugin.d.ts

@@ -1,17 +1,15 @@
 import { Plugin } from '@sentio/runtime';
-import { Data_CosmosCall, DataBinding, HandlerType, ProcessConfigResponse, ProcessResult, StartRequest } from '@sentio/protos';
-interface Handlers {
-    callHandlers: ((trace: Data_CosmosCall) => Promise<ProcessResult>)[];
-}
+import { DataBinding, HandlerType, InitResponse, ProcessConfigResponse, ProcessResult, StartRequest } from '@sentio/protos';
+import { HandlerRegister } from '../core/handler-register.js';
 export declare class CosmosPlugin extends Plugin {
     name: string;
-    handlers: Handlers;
-    configure(config: ProcessConfigResponse): Promise<void>;
+    handlerRegister: HandlerRegister;
+    init(config: InitResponse): Promise<void>;
+    configure(config: ProcessConfigResponse, forChainId?: string): Promise<void>;
     supportedHandlers: HandlerType[];
     processBinding(request: DataBinding): Promise<ProcessResult>;
     start(request: StartRequest): Promise<void>;
     stateDiff(config: ProcessConfigResponse): boolean;
     processTransaction(binding: DataBinding): Promise<ProcessResult>;
 }
-export {};
 //# sourceMappingURL=cosmos-plugin.d.ts.map

package/lib/cosmos/cosmos-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos-plugin.d.ts","sourceRoot":"","sources":["../../src/cosmos/cosmos-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmD,MAAM,EAAiC,MAAM,iBAAiB,CAAA;AACxH,OAAO,EAEL,eAAe,EACf,WAAW,EACX,WAAW,EACX,qBAAqB,EACrB,aAAa,EACb,YAAY,EACb,MAAM,gBAAgB,CAAA;AAKvB,UAAU,QAAQ;IAChB,YAAY,EAAE,CAAC,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,CAAA;CACrE;AAED,qBAAa,YAAa,SAAQ,MAAM;IACtC,IAAI,EAAE,MAAM,CAAiB;IAC7B,QAAQ,EAAE,QAAQ,CAEjB;IAEK,SAAS,CAAC,MAAM,EAAE,qBAAqB;IAmC7C,iBAAiB,gBAA4B;IAE7C,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAStD,KAAK,CAAC,OAAO,EAAE,YAAY;IAEjC,SAAS,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO;IAI3C,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;CAsBvE"}
+{"version":3,"file":"cosmos-plugin.d.ts","sourceRoot":"","sources":["../../src/cosmos/cosmos-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmD,MAAM,EAAiC,MAAM,iBAAiB,CAAA;AACxH,OAAO,EAEL,WAAW,EACX,WAAW,EACX,YAAY,EACZ,qBAAqB,EACrB,aAAa,EACb,YAAY,EACb,MAAM,gBAAgB,CAAA;AAGvB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAG7D,qBAAa,YAAa,SAAQ,MAAM;IACtC,IAAI,EAAE,MAAM,CAAiB;IAC7B,eAAe,kBAAwB;IAEjC,IAAI,CAAC,MAAM,EAAE,YAAY;IAOzB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,UAAU,CAAC,EAAE,MAAM;IAmClE,iBAAiB,gBAA4B;IAE7C,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAStD,KAAK,CAAC,OAAO,EAAE,YAAY;IAEjC,SAAS,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO;IAI3C,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;CAwBvE"}

package/lib/cosmos/cosmos-plugin.js

@@ -2,17 +2,24 @@ import { errorString, GLOBAL_CONFIG, mergeProcessResults, Plugin, PluginManager,
 import { ContractConfig, HandlerType } from '@sentio/protos';
 import { ServerError, Status } from 'nice-grpc';
 import { TemplateInstanceState } from '../core/template.js';
+import { HandlerRegister } from '../core/handler-register.js';
 import { CosmosProcessorState } from './types.js';
 export class CosmosPlugin extends Plugin {
     name = 'CosmosPlugin';
-    handlers = {
-        callHandlers: []
-    };
-    async configure(config) {
-        const handlers = {
-            callHandlers: []
-        };
+    handlerRegister = new HandlerRegister();
+    async init(config) {
+        for (const aptosProcessor of CosmosProcessorState.INSTANCE.getValues()) {
+            const chainId = aptosProcessor.config.chainId;
+            config.chainIds.push(chainId);
+        }
+    }
+    async configure(config, forChainId) {
+        this.handlerRegister.clear(forChainId);
         for (const processor of CosmosProcessorState.INSTANCE.getValues()) {
+            const chainId = processor.config.chainId;
+            if (forChainId !== undefined && forChainId !== chainId.toString()) {
+                continue;
+            }
             const contractConfig = ContractConfig.fromPartial({
                 processorType: USER_PROCESSOR,
                 contract: {
@@ -25,7 +32,7 @@ export class CosmosPlugin extends Plugin {
                 endBlock: processor.config.endBlock
             });
             for (const callHandler of processor.callHandlers) {
-                const handlerId = handlers.callHandlers.push(callHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(callHandler.handler, chainId);
                 contractConfig.cosmosLogConfigs.push({
                     handlerId,
                     handlerName: callHandler.handlerName,
@@ -35,7 +42,6 @@ export class CosmosPlugin extends Plugin {
             // Finish up a contract
             config.contractConfigs.push(contractConfig);
         }
-        this.handlers = handlers;
     }
     supportedHandlers = [HandlerType.COSMOS_CALL];
     processBinding(request) {
@@ -57,7 +63,9 @@ export class CosmosPlugin extends Plugin {
         const call = binding.data.cosmosCall;
         const promises = [];
         for (const handlerId of binding.handlerIds) {
-            const promise = this.handlers.callHandlers[handlerId](call).catch((e) => {
+            const promise = this.handlerRegister
+                .getHandlerById(handlerId)(call)
+                .catch((e) => {
                 throw new ServerError(Status.INTERNAL, 'error processing transaction: ' + JSON.stringify(call.transaction) + '\n' + errorString(e));
             });
             if (GLOBAL_CONFIG.execution.sequential) {

package/lib/cosmos/cosmos-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos-plugin.js","sourceRoot":"","sources":["../../src/cosmos/cosmos-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cosmos-plugin.js","sourceRoot":"","sources":["../../src/cosmos/cosmos-plugin.ts"],"names":[],"mappings":"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"}

package/lib/eth/eth-plugin.d.ts

@@ -1,56 +1,21 @@
 import { Plugin } from '@sentio/runtime';
 import { PartitionHandlerManager } from '../core/index.js';
-import { Data_EthBlock, Data_EthLog, Data_EthTrace, Data_EthTransaction, DataBinding, HandlerType, PreparedData, PreprocessResult, ProcessConfigResponse, ProcessResult, ProcessStreamResponse_Partitions, StartRequest } from '@sentio/protos';
-interface Handlers {
-    eventHandlers: ((event: Data_EthLog, preparedData?: PreparedData) => Promise<ProcessResult>)[];
-    traceHandlers: ((trace: Data_EthTrace, preparedData?: PreparedData) => Promise<ProcessResult>)[];
-    blockHandlers: ((block: Data_EthBlock, preparedData?: PreparedData) => Promise<ProcessResult>)[];
-    transactionHandlers: ((trace: Data_EthTransaction, preparedData?: PreparedData) => Promise<ProcessResult>)[];
-}
-interface PreprocessHandlers {
-    eventHandlers: ((event: Data_EthLog, preprocessStore: {
-        [k: string]: any;
-    }) => Promise<PreprocessResult>)[];
-    traceHandlers: ((trace: Data_EthTrace, preprocessStore: {
-        [k: string]: any;
-    }) => Promise<PreprocessResult>)[];
-    blockHandlers: ((block: Data_EthBlock, preprocessStore: {
-        [k: string]: any;
-    }) => Promise<PreprocessResult>)[];
-    transactionHandlers: ((txn: Data_EthTransaction, preprocessStore: {
-        [k: string]: any;
-    }) => Promise<PreprocessResult>)[];
-}
+import { DataBinding, HandlerType, InitResponse, PreparedData, ProcessConfigResponse, ProcessResult, ProcessStreamResponse_Partitions, StartRequest } from '@sentio/protos';
+import { HandlerRegister } from '../core/handler-register.js';
 export declare class EthPlugin extends Plugin {
     name: string;
-    handlers: Handlers;
-    preprocessHandlers: PreprocessHandlers;
+    handlerRegister: HandlerRegister;
     partitionManager: PartitionHandlerManager;
-    configure(config: ProcessConfigResponse): Promise<void>;
+    init(config: InitResponse): Promise<void>;
+    configure(config: ProcessConfigResponse, forChainId?: string): Promise<void>;
     supportedHandlers: HandlerType[];
     processBinding(request: DataBinding, preparedData: PreparedData | undefined): Promise<ProcessResult>;
-    preprocessBinding(request: DataBinding, preprocessStore: {
-        [k: string]: any;
-    }): Promise<PreprocessResult>;
     partition(request: DataBinding): Promise<ProcessStreamResponse_Partitions>;
     start(request: StartRequest): Promise<void>;
     stateDiff(config: ProcessConfigResponse): boolean;
-    preprocessLog(request: DataBinding, preprocessStore: {
-        [k: string]: any;
-    }): Promise<PreprocessResult>;
-    preprocessTrace(binding: DataBinding, preprocessStore: {
-        [k: string]: any;
-    }): Promise<PreprocessResult>;
-    preprocessBlock(binding: DataBinding, preprocessStore: {
-        [k: string]: any;
-    }): Promise<PreprocessResult>;
-    preprocessTransaction(binding: DataBinding, preprocessStore: {
-        [k: string]: any;
-    }): Promise<PreprocessResult>;
     processLog(request: DataBinding, preparedData: PreparedData | undefined): Promise<ProcessResult>;
     processTrace(binding: DataBinding, preparedData: PreparedData | undefined): Promise<ProcessResult>;
     processBlock(binding: DataBinding, preparedData: PreparedData | undefined): Promise<ProcessResult>;
     processTransaction(binding: DataBinding, preparedData: PreparedData | undefined): Promise<ProcessResult>;
 }
-export {};
 //# sourceMappingURL=eth-plugin.d.ts.map

package/lib/eth/eth-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eth-plugin.d.ts","sourceRoot":"","sources":["../../src/eth/eth-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eth-plugin.d.ts","sourceRoot":"","sources":["../../src/eth/eth-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,MAAM,EAGP,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAGL,WAAW,EACX,WAAW,EACX,YAAY,EAGZ,YAAY,EAEZ,qBAAqB,EACrB,aAAa,EACb,gCAAgC,EAChC,YAAY,EACb,MAAM,gBAAgB,CAAA;AAYvB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAE7D,qBAAa,SAAU,SAAQ,MAAM;IACnC,IAAI,EAAE,MAAM,CAAc;IAC1B,eAAe,kBAAwB;IAEvC,gBAAgB,0BAAgC;IAE1C,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,UAAU,CAAC,EAAE,MAAM;IA6NlE,iBAAiB,gBAAmG;IAEpH,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;IAgB9F,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,gCAAgC,CAAC;IAwC1E,KAAK,CAAC,OAAO,EAAE,YAAY;IA6BjC,SAAS,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO;IAI3C,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;IAwBhG,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;IA0BlG,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;IAyBlG,kBAAkB,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;CAwB/G"}

package/lib/eth/eth-plugin.js

@@ -5,45 +5,35 @@ import { ServerError, Status } from 'nice-grpc';
 import { EthProcessorState } from './binds.js';
 import { AccountProcessorState } from './account-processor-state.js';
 import { ProcessorTemplateProcessorState } from './base-processor-template.js';
-import { defaultPreprocessHandler, GlobalProcessorState } from './base-processor.js';
+import { GlobalProcessorState } from './base-processor.js';
 import { validateAndNormalizeAddress } from './eth.js';
 import { EthChainId } from '@sentio/chain';
 import { EthContext } from './context.js';
 import { TemplateInstanceState } from '../core/template.js';
 import { timeOrBlockToBlockNumber } from '@sentio/sdk/utils';
+import { HandlerRegister } from '../core/handler-register.js';
 export class EthPlugin extends Plugin {
     name = 'EthPlugin';
-    handlers = {
-        blockHandlers: [],
-        eventHandlers: [],
-        traceHandlers: [],
-        transactionHandlers: []
-    };
-    preprocessHandlers = {
-        blockHandlers: [],
-        eventHandlers: [],
-        traceHandlers: [],
-        transactionHandlers: []
-    };
+    handlerRegister = new HandlerRegister();
     partitionManager = new PartitionHandlerManager();
-    async configure(config) {
-        const handlers = {
-            blockHandlers: [],
-            eventHandlers: [],
-            traceHandlers: [],
-            transactionHandlers: []
-        };
-        const preprocessHandlers = {
-            blockHandlers: [],
-            eventHandlers: [],
-            traceHandlers: [],
-            transactionHandlers: []
-        };
+    async init(config) {
+        for (const state of [EthProcessorState.INSTANCE, GlobalProcessorState.INSTANCE, AccountProcessorState.INSTANCE]) {
+            for (const processor of state.getValues()) {
+                const chainId = processor.getChainId();
+                config.chainIds.push(chainId);
+            }
+        }
+    }
+    async configure(config, forChainId) {
+        this.handlerRegister.clear(forChainId);
         for (const processor of EthProcessorState.INSTANCE.getValues()) {
             // If server favor incremental update this need to change
             // Start basic config for contract
             const chainId = processor.getChainId();
             // this.processorsByChainId.set(chainId, processor)
+            if (forChainId !== undefined && forChainId !== chainId.toString()) {
+                continue;
+            }
             const provider = getProvider(chainId);
             const startBlock = await timeOrBlockToBlockNumber(provider, processor.config.start);
             const endBlock = processor.config.end ? await timeOrBlockToBlockNumber(provider, processor.config.end) : undefined;
@@ -60,8 +50,7 @@ export class EthPlugin extends Plugin {
             });
             // Step 1. Prepare all the block handlers
             for (const blockHandler of processor.blockHandlers) {
-                preprocessHandlers.blockHandlers.push(blockHandler.preprocessHandler ?? defaultPreprocessHandler);
-                const handlerId = handlers.blockHandlers.push(blockHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(blockHandler.handler, chainId);
                 this.partitionManager.registerPartitionHandler(HandlerType.ETH_BLOCK, handlerId, blockHandler.partitionHandler);
                 // TODO wrap the block handler into one
                 contractConfig.intervalConfigs.push({
@@ -76,8 +65,7 @@ export class EthPlugin extends Plugin {
             }
             // Step 2. Prepare all trace handlers
             for (const traceHandler of processor.traceHandlers) {
-                preprocessHandlers.traceHandlers.push(traceHandler.preprocessHandler ?? defaultPreprocessHandler);
-                const handlerId = handlers.traceHandlers.push(traceHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(traceHandler.handler, chainId);
                 this.partitionManager.registerPartitionHandler(HandlerType.ETH_TRACE, handlerId, traceHandler.partitionHandler);
                 for (const signature of traceHandler.signatures) {
                     contractConfig.traceConfigs.push({
@@ -91,8 +79,7 @@ export class EthPlugin extends Plugin {
             // Step 3. Prepare all the event handlers
             for (const eventsHandler of processor.eventHandlers) {
                 // associate id with filter
-                preprocessHandlers.eventHandlers.push(eventsHandler.preprocessHandler ?? defaultPreprocessHandler);
-                const handlerId = handlers.eventHandlers.push(eventsHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(eventsHandler.handler, chainId);
                 this.partitionManager.registerPartitionHandler(HandlerType.ETH_LOG, handlerId, eventsHandler.partitionHandler);
                 const logConfig = {
                     handlerId: handlerId,
@@ -129,6 +116,9 @@ export class EthPlugin extends Plugin {
         }
         for (const processor of GlobalProcessorState.INSTANCE.getValues()) {
             const chainId = processor.getChainId();
+            if (forChainId !== undefined && forChainId !== chainId.toString()) {
+                continue;
+            }
             const provider = getProvider(chainId);
             const startBlock = await timeOrBlockToBlockNumber(provider, processor.config.start);
             const endBlock = processor.config.end ? await timeOrBlockToBlockNumber(provider, processor.config.end) : undefined;
@@ -144,8 +134,7 @@ export class EthPlugin extends Plugin {
                 endBlock
             });
             for (const blockHandler of processor.blockHandlers) {
-                preprocessHandlers.blockHandlers.push(blockHandler.preprocessHandler ?? defaultPreprocessHandler);
-                const handlerId = handlers.blockHandlers.push(blockHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(blockHandler.handler, chainId);
                 contractConfig.intervalConfigs.push({
                     slot: 0,
                     slotInterval: blockHandler.blockInterval,
@@ -157,8 +146,7 @@ export class EthPlugin extends Plugin {
                 });
             }
             for (const transactionHandler of processor.transactionHandler) {
-                preprocessHandlers.transactionHandlers.push(transactionHandler.preprocessHandler ?? defaultPreprocessHandler);
-                const handlerId = handlers.transactionHandlers.push(transactionHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(transactionHandler.handler, chainId);
                 this.partitionManager.registerPartitionHandler(HandlerType.ETH_TRANSACTION, handlerId, transactionHandler.partitionHandler);
                 contractConfig.transactionConfig.push({
                     handlerId: handlerId,
@@ -167,8 +155,7 @@ export class EthPlugin extends Plugin {
                 });
             }
             for (const traceHandler of processor.traceHandlers) {
-                preprocessHandlers.traceHandlers.push(traceHandler.preprocessHandler ?? defaultPreprocessHandler);
-                const handlerId = handlers.traceHandlers.push(traceHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(traceHandler.handler, chainId);
                 for (const signature of traceHandler.signatures) {
                     contractConfig.traceConfigs.push({
                         signature: signature,
@@ -182,6 +169,9 @@ export class EthPlugin extends Plugin {
         }
         // part 1.b prepare EVM account processors
         for (const processor of AccountProcessorState.INSTANCE.getValues()) {
+            if (forChainId !== undefined && forChainId !== processor.getChainId().toString()) {
+                continue;
+            }
             const accountConfig = AccountConfig.fromPartial({
                 address: validateAndNormalizeAddress(processor.config.address),
                 chainId: processor.getChainId().toString(),
@@ -190,8 +180,7 @@ export class EthPlugin extends Plugin {
             // TODO add interval
             for (const eventsHandler of processor.eventHandlers) {
                 // associate id with filter
-                preprocessHandlers.eventHandlers.push(eventsHandler.preprocessHandler ?? defaultPreprocessHandler);
-                const handlerId = handlers.eventHandlers.push(eventsHandler.handler) - 1;
+                const handlerId = this.handlerRegister.register(eventsHandler.handler, processor.getChainId());
                 const logConfig = {
                     handlerId: handlerId,
                     handlerName: eventsHandler.handlerName,
@@ -228,8 +217,8 @@ export class EthPlugin extends Plugin {
             }
             config.accountConfigs.push(accountConfig);
         }
-        this.handlers = handlers;
-        this.preprocessHandlers = preprocessHandlers;
+        // this.handlers = handlers
+        // this.preprocessHandlers = preprocessHandlers
     }
     supportedHandlers = [HandlerType.ETH_LOG, HandlerType.ETH_BLOCK, HandlerType.ETH_TRACE, HandlerType.ETH_TRANSACTION];
     processBinding(request, preparedData) {
@@ -247,20 +236,6 @@ export class EthPlugin extends Plugin {
                 throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType);
         }
     }
-    preprocessBinding(request, preprocessStore) {
-        switch (request.handlerType) {
-            case HandlerType.ETH_LOG:
-                return this.preprocessLog(request, preprocessStore);
-            case HandlerType.ETH_TRACE:
-                return this.preprocessTrace(request, preprocessStore);
-            case HandlerType.ETH_BLOCK:
-                return this.preprocessBlock(request, preprocessStore);
-            case HandlerType.ETH_TRANSACTION:
-                return this.preprocessTransaction(request, preprocessStore);
-            default:
-                throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType);
-        }
-    }
     async partition(request) {
         let data;
         switch (request.handlerType) {
@@ -322,63 +297,6 @@ export class EthPlugin extends Plugin {
     stateDiff(config) {
         return TemplateInstanceState.INSTANCE.getValues().length !== config.templateInstances.length;
     }
-    async preprocessLog(request, preprocessStore) {
-        if (!request.data?.ethLog?.log) {
-            throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null");
-        }
-        const ethLog = request.data.ethLog;
-        const promises = [];
-        for (const handlerId of request.handlerIds) {
-            const handler = this.preprocessHandlers.eventHandlers[handlerId];
-            const promise = handler(ethLog, preprocessStore).catch((e) => {
-                throw new ServerError(Status.INTERNAL, 'error processing log: ' + JSON.stringify(ethLog.log) + '\n' + errorString(e));
-            });
-            promises.push(promise);
-        }
-        return mergePreprocessResults(await Promise.all(promises));
-    }
-    async preprocessTrace(binding, preprocessStore) {
-        if (!binding.data?.ethTrace?.trace) {
-            throw new ServerError(Status.INVALID_ARGUMENT, "Trace can't be null");
-        }
-        const ethTrace = binding.data.ethTrace;
-        const promises = [];
-        for (const handlerId of binding.handlerIds) {
-            const promise = this.preprocessHandlers.traceHandlers[handlerId](ethTrace, preprocessStore).catch((e) => {
-                throw new ServerError(Status.INTERNAL, 'error processing trace: ' + JSON.stringify(ethTrace.trace) + '\n' + errorString(e));
-            });
-            promises.push(promise);
-        }
-        return mergePreprocessResults(await Promise.all(promises));
-    }
-    async preprocessBlock(binding, preprocessStore) {
-        if (!binding.data?.ethBlock?.block) {
-            throw new ServerError(Status.INVALID_ARGUMENT, "Block can't be empty");
-        }
-        const ethBlock = binding.data.ethBlock;
-        const promises = [];
-        for (const handlerId of binding.handlerIds) {
-            const promise = this.preprocessHandlers.blockHandlers[handlerId](ethBlock, preprocessStore).catch((e) => {
-                throw new ServerError(Status.INTERNAL, 'error processing block: ' + ethBlock.block?.number + '\n' + errorString(e));
-            });
-            promises.push(promise);
-        }
-        return mergePreprocessResults(await Promise.all(promises));
-    }
-    async preprocessTransaction(binding, preprocessStore) {
-        if (!binding.data?.ethTransaction?.transaction) {
-            throw new ServerError(Status.INVALID_ARGUMENT, "transaction can't be null");
-        }
-        const ethTransaction = binding.data.ethTransaction;
-        const promises = [];
-        for (const handlerId of binding.handlerIds) {
-            const promise = this.preprocessHandlers.transactionHandlers[handlerId](ethTransaction, preprocessStore).catch((e) => {
-                throw new ServerError(Status.INTERNAL, 'error processing transaction: ' + JSON.stringify(ethTransaction.transaction) + '\n' + errorString(e));
-            });
-            promises.push(promise);
-        }
-        return mergePreprocessResults(await Promise.all(promises));
-    }
     async processLog(request, preparedData) {
         if (!request.data?.ethLog?.log) {
             throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null");
@@ -386,7 +304,7 @@ export class EthPlugin extends Plugin {
         const ethLog = request.data.ethLog;
         const promises = [];
         for (const handlerId of request.handlerIds) {
-            const handler = this.handlers.eventHandlers[handlerId];
+            const handler = this.handlerRegister.getHandlerById(handlerId);
             const promise = handler(ethLog, preparedData).catch((e) => {
                 console.error('error processing log: ', e);
                 throw new ServerError(Status.INTERNAL, 'error processing log: ' + JSON.stringify(ethLog.log) + '\n' + errorString(e));
@@ -405,7 +323,9 @@ export class EthPlugin extends Plugin {
         const ethTrace = binding.data.ethTrace;
         const promises = [];
         for (const handlerId of binding.handlerIds) {
-            const promise = this.handlers.traceHandlers[handlerId](ethTrace, preparedData).catch((e) => {
+            const promise = this.handlerRegister
+                .getHandlerById(handlerId)(ethTrace, preparedData)
+                .catch((e) => {
                 console.error('error processing trace: ', e);
                 throw new ServerError(Status.INTERNAL, 'error processing trace: ' + JSON.stringify(ethTrace.trace) + '\n' + errorString(e));
             });
@@ -423,7 +343,9 @@ export class EthPlugin extends Plugin {
         const ethBlock = binding.data.ethBlock;
         const promises = [];
         for (const handlerId of binding.handlerIds) {
-            const promise = this.handlers.blockHandlers[handlerId](ethBlock, preparedData).catch((e) => {
+            const promise = this.handlerRegister
+                .getHandlerById(handlerId)(ethBlock, preparedData)
+                .catch((e) => {
                 console.error('error processing block: ', e);
                 throw new ServerError(Status.INTERNAL, 'error processing block: ' + ethBlock.block?.number + '\n' + errorString(e));
             });
@@ -441,7 +363,9 @@ export class EthPlugin extends Plugin {
         const ethTransaction = binding.data.ethTransaction;
         const promises = [];
         for (const handlerId of binding.handlerIds) {
-            const promise = this.handlers.transactionHandlers[handlerId](ethTransaction, preparedData).catch((e) => {
+            const promise = this.handlerRegister
+                .getHandlerById(handlerId)(ethTransaction, preparedData)
+                .catch((e) => {
                 throw new ServerError(Status.INTERNAL, 'error processing transaction: ' + JSON.stringify(ethTransaction.transaction) + '\n' + errorString(e));
             });
             if (GLOBAL_CONFIG.execution.sequential) {