@sentio/sdk 2.40.0-rc.16 → 2.40.0-rc.18

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

@@ -181,8 +181,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
             .toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "totalSupply", key);
       }
-      console.debug("missing eth call:", "totalSupply");
       return await this.contract.getFunction("totalSupply()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -213,8 +213,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
           const result = iface.decodeFunctionResult("balanceOf", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "balanceOf", owner, key);
       }
-      console.debug("missing eth call:", "balanceOf", owner);
       return await this.contract.getFunction("balanceOf(address)")(
         owner,
         overrides || {}
@@ -250,8 +250,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
             .toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "getApproved", tokenId, key);
       }
-      console.debug("missing eth call:", "getApproved", tokenId);
       return await this.contract.getFunction("getApproved(uint256)")(
         tokenId,
         overrides || {}
@@ -291,8 +291,14 @@ export class ERC721ContractView extends ContractView<ERC721> {
             .toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log(
+          "missing eth call key:",
+          "isApprovedForAll",
+          owner,
+          operator,
+          key
+        );
       }
-      console.debug("missing eth call:", "isApprovedForAll", owner, operator);
       return await this.contract.getFunction(
         "isApprovedForAll(address,address)"
       )(owner, operator, overrides || {});
@@ -322,8 +328,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
           const result = iface.decodeFunctionResult("name", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "name", key);
       }
-      console.debug("missing eth call:", "name");
       return await this.contract.getFunction("name()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -354,8 +360,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
           const result = iface.decodeFunctionResult("ownerOf", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "ownerOf", tokenId, key);
       }
-      console.debug("missing eth call:", "ownerOf", tokenId);
       return await this.contract.getFunction("ownerOf(uint256)")(
         tokenId,
         overrides || {}
@@ -393,8 +399,13 @@ export class ERC721ContractView extends ContractView<ERC721> {
             .toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log(
+          "missing eth call key:",
+          "supportsInterface",
+          interfaceId,
+          key
+        );
       }
-      console.debug("missing eth call:", "supportsInterface", interfaceId);
       return await this.contract.getFunction("supportsInterface(bytes4)")(
         interfaceId,
         overrides || {}
@@ -427,8 +438,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
           const result = iface.decodeFunctionResult("symbol", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "symbol", key);
       }
-      console.debug("missing eth call:", "symbol");
       return await this.contract.getFunction("symbol()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -459,8 +470,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
           const result = iface.decodeFunctionResult("tokenURI", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "tokenURI", tokenId, key);
       }
-      console.debug("missing eth call:", "tokenURI", tokenId);
       return await this.contract.getFunction("tokenURI(uint256)")(
         tokenId,
         overrides || {}
@@ -498,8 +509,8 @@ export class ERC721ContractView extends ContractView<ERC721> {
             const result = iface.decodeFunctionResult("approve", ret).toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log("missing eth call key:", "approve", to, tokenId, key);
         }
-        console.debug("missing eth call:", "approve", to, tokenId);
         return await this.contract
           .getFunction("approve(address,uint256)")
           .staticCall(to, tokenId, overrides || {});
@@ -539,14 +550,15 @@ export class ERC721ContractView extends ContractView<ERC721> {
               .toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log(
+            "missing eth call key:",
+            "safeTransferFrom",
+            from,
+            to,
+            tokenId,
+            key
+          );
         }
-        console.debug(
-          "missing eth call:",
-          "safeTransferFrom",
-          from,
-          to,
-          tokenId
-        );
         return await this.contract
           .getFunction("safeTransferFrom(address,address,uint256)")
           .staticCall(from, to, tokenId, overrides || {});
@@ -588,15 +600,16 @@ export class ERC721ContractView extends ContractView<ERC721> {
               .toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log(
+            "missing eth call key:",
+            "safeTransferFrom",
+            from,
+            to,
+            tokenId,
+            data,
+            key
+          );
         }
-        console.debug(
-          "missing eth call:",
-          "safeTransferFrom",
-          from,
-          to,
-          tokenId,
-          data
-        );
         return await this.contract
           .getFunction("safeTransferFrom(address,address,uint256,bytes)")
           .staticCall(from, to, tokenId, data, overrides || {});
@@ -634,13 +647,14 @@ export class ERC721ContractView extends ContractView<ERC721> {
               .toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log(
+            "missing eth call key:",
+            "setApprovalForAll",
+            operator,
+            _approved,
+            key
+          );
         }
-        console.debug(
-          "missing eth call:",
-          "setApprovalForAll",
-          operator,
-          _approved
-        );
         return await this.contract
           .getFunction("setApprovalForAll(address,bool)")
           .staticCall(operator, _approved, overrides || {});
@@ -680,8 +694,15 @@ export class ERC721ContractView extends ContractView<ERC721> {
               .toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log(
+            "missing eth call key:",
+            "transferFrom",
+            from,
+            to,
+            tokenId,
+            key
+          );
         }
-        console.debug("missing eth call:", "transferFrom", from, to, tokenId);
         return await this.contract
           .getFunction("transferFrom(address,address,uint256)")
           .staticCall(from, to, tokenId, overrides || {});
@@ -1529,7 +1550,8 @@ export class ERC721Processor extends BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: ApprovalEvent,
-      ctx: ERC721Context
+      ctx: ERC721Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1548,7 +1570,8 @@ export class ERC721Processor extends BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: ApprovalForAllEvent,
-      ctx: ERC721Context
+      ctx: ERC721Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1567,7 +1590,8 @@ export class ERC721Processor extends BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: TransferEvent,
-      ctx: ERC721Context
+      ctx: ERC721Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1886,7 +1910,8 @@ export class ERC721ProcessorTemplate extends BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: ApprovalEvent,
-      ctx: ERC721Context
+      ctx: ERC721Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1905,7 +1930,8 @@ export class ERC721ProcessorTemplate extends BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: ApprovalForAllEvent,
-      ctx: ERC721Context
+      ctx: ERC721Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1924,7 +1950,8 @@ export class ERC721ProcessorTemplate extends BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: TransferEvent,
-      ctx: ERC721Context
+      ctx: ERC721Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {

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

@@ -134,8 +134,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
           const result = iface.decodeFunctionResult("name", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "name", key);
       }
-      console.debug("missing eth call:", "name");
       return await this.contract.getFunction("name()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -167,8 +167,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
             .toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "totalSupply", key);
       }
-      console.debug("missing eth call:", "totalSupply");
       return await this.contract.getFunction("totalSupply()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -198,8 +198,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
           const result = iface.decodeFunctionResult("decimals", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "decimals", key);
       }
-      console.debug("missing eth call:", "decimals");
       return await this.contract.getFunction("decimals()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -230,8 +230,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
           const result = iface.decodeFunctionResult("balanceOf", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "balanceOf", arg0, key);
       }
-      console.debug("missing eth call:", "balanceOf", arg0);
       return await this.contract.getFunction("balanceOf(address)")(
         arg0,
         overrides || {}
@@ -264,8 +264,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
           const result = iface.decodeFunctionResult("symbol", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "symbol", key);
       }
-      console.debug("missing eth call:", "symbol");
       return await this.contract.getFunction("symbol()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -297,8 +297,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
           const result = iface.decodeFunctionResult("allowance", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
+        console.log("missing eth call key:", "allowance", arg0, arg1, key);
       }
-      console.debug("missing eth call:", "allowance", arg0, arg1);
       return await this.contract.getFunction("allowance(address,address)")(
         arg0,
         arg1,
@@ -337,8 +337,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
             const result = iface.decodeFunctionResult("approve", ret).toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log("missing eth call key:", "approve", guy, wad, key);
         }
-        console.debug("missing eth call:", "approve", guy, wad);
         return await this.contract
           .getFunction("approve(address,uint256)")
           .staticCall(guy, wad, overrides || {});
@@ -378,8 +378,15 @@ export class WETH9ContractView extends ContractView<WETH9> {
               .toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log(
+            "missing eth call key:",
+            "transferFrom",
+            src,
+            dst,
+            wad,
+            key
+          );
         }
-        console.debug("missing eth call:", "transferFrom", src, dst, wad);
         return await this.contract
           .getFunction("transferFrom(address,address,uint256)")
           .staticCall(src, dst, wad, overrides || {});
@@ -413,8 +420,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
               .toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log("missing eth call key:", "withdraw", wad, key);
         }
-        console.debug("missing eth call:", "withdraw", wad);
         return await this.contract
           .getFunction("withdraw(uint256)")
           .staticCall(wad, overrides || {});
@@ -449,8 +456,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
               .toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log("missing eth call key:", "transfer", dst, wad, key);
         }
-        console.debug("missing eth call:", "transfer", dst, wad);
         return await this.contract
           .getFunction("transfer(address,uint256)")
           .staticCall(dst, wad, overrides || {});
@@ -481,8 +488,8 @@ export class WETH9ContractView extends ContractView<WETH9> {
             const result = iface.decodeFunctionResult("deposit", ret).toArray();
             return result.length == 1 ? result[0] : result;
           }
+          console.log("missing eth call key:", "deposit", key);
         }
-        console.debug("missing eth call:", "deposit");
         return await this.contract
           .getFunction("deposit()")
           .staticCall(overrides || {});
@@ -1078,7 +1085,8 @@ export class WETH9Processor extends BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: ApprovalEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1097,7 +1105,8 @@ export class WETH9Processor extends BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: TransferEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1116,7 +1125,8 @@ export class WETH9Processor extends BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: DepositEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1131,7 +1141,8 @@ export class WETH9Processor extends BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: WithdrawalEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1390,7 +1401,8 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: ApprovalEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1409,7 +1421,8 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: TransferEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1428,7 +1441,8 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: DepositEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
@@ -1443,7 +1457,8 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler?: (
       event: WithdrawalEvent,
-      ctx: WETH9Context
+      ctx: WETH9Context,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
   ): this {
     if (!filter) {

package/src/eth/codegen/event-handler.ts

@@ -12,7 +12,7 @@ export function generateEventHandler(event: EventDeclaration, contractName: stri
     handler: (event: ${eventNamePrefix}Event, ctx: ${contractName}Context) => void,
     filter?: ${eventNamePrefix}EventFilter | ${eventNamePrefix}EventFilter[],
     fetchConfig?: Partial<EthFetchConfig>,
-    preprocessHandler?: (event: ${eventNamePrefix}Event, ctx: ${contractName}Context) => Promise<PreprocessResult>
+    preprocessHandler?: (event: ${eventNamePrefix}Event, ctx: ${contractName}Context, preprocessStore: {[k: string]: any}) => Promise<PreprocessResult>
   ): this {
     if (!filter) {
       filter = templateContract.filters['${filterName}'](${event.inputs.map(() => 'null').join(',')})

package/src/eth/codegen/function-calls.ts

@@ -58,10 +58,10 @@ export function generateViewFunction(view: boolean, fn: FunctionDeclaration, inc
           const result = iface.decodeFunctionResult("${fn.name}", ret).toArray()
           return result.length == 1? result[0]: result
         }
+        console.log("missing eth call key:", "${fn.name}", ${
+          fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
+        }key)
       }
-      console.debug("missing eth call:", "${fn.name}", ${
-        fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-      })
       return await ${func}${call}(${
         fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
       } overrides || {})

package/src/eth/eth-plugin.ts

@@ -35,10 +35,13 @@ interface Handlers {
 }
 
 interface PreprocessHandlers {
-  eventHandlers: ((event: Data_EthLog) => Promise<PreprocessResult>)[]
-  traceHandlers: ((trace: Data_EthTrace) => Promise<PreprocessResult>)[]
-  blockHandlers: ((block: Data_EthBlock) => Promise<PreprocessResult>)[]
-  transactionHandlers: ((txn: Data_EthTransaction) => Promise<PreprocessResult>)[]
+  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>)[]
 }
 
 export class EthPlugin extends Plugin {
@@ -278,16 +281,16 @@ export class EthPlugin extends Plugin {
     }
   }
 
-  preprocessBinding(request: DataBinding): Promise<PreprocessResult> {
+  preprocessBinding(request: DataBinding, preprocessStore: { [k: string]: any }): Promise<PreprocessResult> {
     switch (request.handlerType) {
       case HandlerType.ETH_LOG:
-        return this.preprocessLog(request)
+        return this.preprocessLog(request, preprocessStore)
       case HandlerType.ETH_TRACE:
-        return this.preprocessTrace(request)
+        return this.preprocessTrace(request, preprocessStore)
       case HandlerType.ETH_BLOCK:
-        return this.preprocessBlock(request)
+        return this.preprocessBlock(request, preprocessStore)
       case HandlerType.ETH_TRANSACTION:
-        return this.preprocessTransaction(request)
+        return this.preprocessTransaction(request, preprocessStore)
       default:
         throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
     }
@@ -326,7 +329,7 @@ export class EthPlugin extends Plugin {
     return TemplateInstanceState.INSTANCE.getValues().length !== config.templateInstances.length
   }
 
-  async preprocessLog(request: DataBinding): Promise<PreprocessResult> {
+  async preprocessLog(request: DataBinding, preprocessStore: { [k: string]: any }): Promise<PreprocessResult> {
     if (!request.data?.ethLog?.log) {
       throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null")
     }
@@ -335,7 +338,7 @@ export class EthPlugin extends Plugin {
     const promises: Promise<PreprocessResult>[] = []
     for (const handlerId of request.handlerIds) {
       const handler = this.preprocessHandlers.eventHandlers[handlerId]
-      const promise = handler(ethLog).catch((e) => {
+      const promise = handler(ethLog, preprocessStore).catch((e) => {
         throw new ServerError(
           Status.INTERNAL,
           'error processing log: ' + JSON.stringify(ethLog.log) + '\n' + errorString(e)
@@ -346,7 +349,7 @@ export class EthPlugin extends Plugin {
     return mergePreprocessResults(await Promise.all(promises))
   }
 
-  async preprocessTrace(binding: DataBinding): Promise<PreprocessResult> {
+  async preprocessTrace(binding: DataBinding, preprocessStore: { [k: string]: any }): Promise<PreprocessResult> {
     if (!binding.data?.ethTrace?.trace) {
       throw new ServerError(Status.INVALID_ARGUMENT, "Trace can't be null")
     }
@@ -355,7 +358,7 @@ export class EthPlugin extends Plugin {
     const promises: Promise<PreprocessResult>[] = []
 
     for (const handlerId of binding.handlerIds) {
-      const promise = this.preprocessHandlers.traceHandlers[handlerId](ethTrace).catch((e) => {
+      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)
@@ -366,7 +369,7 @@ export class EthPlugin extends Plugin {
     return mergePreprocessResults(await Promise.all(promises))
   }
 
-  async preprocessBlock(binding: DataBinding): Promise<PreprocessResult> {
+  async preprocessBlock(binding: DataBinding, preprocessStore: { [k: string]: any }): Promise<PreprocessResult> {
     if (!binding.data?.ethBlock?.block) {
       throw new ServerError(Status.INVALID_ARGUMENT, "Block can't be empty")
     }
@@ -374,7 +377,7 @@ export class EthPlugin extends Plugin {
 
     const promises: Promise<PreprocessResult>[] = []
     for (const handlerId of binding.handlerIds) {
-      const promise = this.preprocessHandlers.blockHandlers[handlerId](ethBlock).catch((e) => {
+      const promise = this.preprocessHandlers.blockHandlers[handlerId](ethBlock, preprocessStore).catch((e) => {
         throw new ServerError(
           Status.INTERNAL,
           'error processing block: ' + ethBlock.block?.number + '\n' + errorString(e)
@@ -385,7 +388,7 @@ export class EthPlugin extends Plugin {
     return mergePreprocessResults(await Promise.all(promises))
   }
 
-  async preprocessTransaction(binding: DataBinding): Promise<PreprocessResult> {
+  async preprocessTransaction(binding: DataBinding, preprocessStore: { [k: string]: any }): Promise<PreprocessResult> {
     if (!binding.data?.ethTransaction?.transaction) {
       throw new ServerError(Status.INVALID_ARGUMENT, "transaction can't be null")
     }
@@ -394,12 +397,14 @@ export class EthPlugin extends Plugin {
     const promises: Promise<PreprocessResult>[] = []
 
     for (const handlerId of binding.handlerIds) {
-      const promise = this.preprocessHandlers.transactionHandlers[handlerId](ethTransaction).catch((e) => {
-        throw new ServerError(
-          Status.INTERNAL,
-          'error processing transaction: ' + JSON.stringify(ethTransaction.transaction) + '\n' + errorString(e)
-        )
-      })
+      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))