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

package/lib/{chunk-K6CPN5YU.js → chunk-FYV7R6QO.js}

@@ -49600,7 +49600,7 @@ var Plugin = class {
   async processBinding(request, preparedData) {
     return ProcessResult.create();
   }
-  async preprocessBinding(request) {
+  async preprocessBinding(request, preprocessStore) {
     return PreprocessResult.create();
   }
 };
@@ -49642,13 +49642,13 @@ var _PluginManager = class {
       return plugin.processBinding(request, preparedData);
     });
   }
-  preprocessBinding(request, dbContext) {
+  preprocessBinding(request, preprocessStore, dbContext) {
     const plugin = this.typesToPlugin.get(request.handlerType);
     if (!plugin) {
       throw new Error(`No plugin for ${request.handlerType}`);
     }
     return this.dbContextLocalStorage.run(dbContext, () => {
-      return plugin.preprocessBinding(request);
+      return plugin.preprocessBinding(request, preprocessStore);
     });
   }
 };
@@ -59531,7 +59531,7 @@ function makeEthCallKey(param) {
     throw new Error("null context for eth call");
   }
   const { chainId, address, blockTag } = param.context;
-  return `${chainId}|${address}|${blockTag}|${param.calldata}`;
+  return `${chainId}|${address}|${blockTag}|${param.calldata}`.toLowerCase();
 }
 
 // src/endpoints.ts
@@ -78468,7 +78468,7 @@ var ProcessorServiceImpl = class {
     return {};
   }
   async processBindings(request, options) {
-    const preparedData = await this.preprocessBindings(request.bindings, void 0, options);
+    const preparedData = await this.preprocessBindings(request.bindings, {}, void 0, options);
     const promises = [];
     for (const binding of request.bindings) {
       const promise2 = this.processBinding(binding, preparedData);
@@ -78488,11 +78488,11 @@ var ProcessorServiceImpl = class {
       result
     };
   }
-  async preprocessBindings(bindings, dbContext, options) {
+  async preprocessBindings(bindings, preprocessStore, dbContext, options) {
     console.debug(`preprocessBindings start, bindings: ${bindings.length}`);
     const promises = [];
     for (const binding of bindings) {
-      promises.push(this.preprocessBinding(binding, dbContext, options));
+      promises.push(this.preprocessBinding(binding, preprocessStore, dbContext, options));
     }
     let preprocessResults;
     try {
@@ -78500,10 +78500,6 @@ var ProcessorServiceImpl = class {
     } catch (e) {
       throw e;
     }
-    console.debug(
-      "ethCallParams: ",
-      preprocessResults.map((r) => r.ethCallParams)
-    );
     const groupedRequests = /* @__PURE__ */ new Map();
     const providers2 = /* @__PURE__ */ new Map();
     for (const result of preprocessResults) {
@@ -78523,14 +78519,17 @@ var ProcessorServiceImpl = class {
     const callPromises = [];
     for (const params of groupedRequests.values()) {
       const { chainId, address, blockTag } = params[0].context;
-      console.log(`chain: ${chainId}, address: ${address}, blockTag: ${blockTag}, totalCalls: ${params.length}`);
       for (const param of params) {
         callPromises.push(
           providers2.get(chainId).call({
             to: address,
             data: param.calldata,
             blockTag
-          }).then((result) => [makeEthCallKey(param), result])
+          }).then((result) => {
+            const ret = [makeEthCallKey(param), result];
+            console.log(`got eth call result, key: ${ret[0]}, result: ${result}`);
+            return ret;
+          })
         );
       }
     }
@@ -78545,7 +78544,7 @@ var ProcessorServiceImpl = class {
       ethCallResults: results
     };
   }
-  async preprocessBinding(request, dbContext, options) {
+  async preprocessBinding(request, preprocessStore, dbContext, options) {
     if (!this.started) {
       throw new import_nice_grpc.ServerError(import_nice_grpc.Status.UNAVAILABLE, "Service Not started.");
     }
@@ -78561,7 +78560,7 @@ var ProcessorServiceImpl = class {
         ]
       );
     }
-    return await PluginManager.INSTANCE.preprocessBinding(request, dbContext);
+    return await PluginManager.INSTANCE.preprocessBinding(request, preprocessStore, dbContext);
   }
   async processBinding(request, preparedData, options) {
     if (!this.started) {
@@ -78589,6 +78588,7 @@ var ProcessorServiceImpl = class {
     }
     const subject = new import_rxjs.Subject();
     this.handleRequests(requests, subject).then(() => {
+      console.log("clearing prepared data");
       this.preparedData = { ethCallResults: {} };
       subject.complete();
     }).catch((e) => {
@@ -78599,14 +78599,14 @@ var ProcessorServiceImpl = class {
   }
   async handlePreprocessRequests(requests, subject) {
     const contexts = new Contexts();
+    const preprocessStore = {};
     for await (const request of requests) {
       try {
-        console.debug("received request:", request);
         if (request.bindings) {
           const bindings = request.bindings.bindings;
           const dbContext = contexts.new(request.processId, subject);
           const start = Date.now();
-          this.preprocessBindings(bindings, dbContext).then((preparedData) => {
+          this.preprocessBindings(bindings, preprocessStore, dbContext, void 0).then((preparedData) => {
             this.preparedData = {
               ethCallResults: {
                 ...this.preparedData?.ethCallResults,

package/lib/index.d.ts

@@ -41,7 +41,9 @@ declare abstract class Plugin {
      */
     stateDiff(config: ProcessConfigResponse): boolean;
     processBinding(request: DataBinding, preparedData: PreparedData | undefined): Promise<ProcessResult>;
-    preprocessBinding(request: DataBinding): Promise<PreprocessResult>;
+    preprocessBinding(request: DataBinding, preprocessStore: {
+        [k: string]: any;
+    }): Promise<PreprocessResult>;
 }
 declare class PluginManager {
     static INSTANCE: PluginManager;
@@ -56,7 +58,9 @@ declare class PluginManager {
      */
     stateDiff(config: ProcessConfigResponse): boolean;
     processBinding(request: DataBinding, preparedData: PreparedData | undefined, dbContext?: StoreContext): Promise<ProcessResult>;
-    preprocessBinding(request: DataBinding, dbContext?: StoreContext): Promise<PreprocessResult>;
+    preprocessBinding(request: DataBinding, preprocessStore: {
+        [k: string]: any;
+    }, dbContext?: StoreContext): Promise<PreprocessResult>;
 }
 
 declare class State {
@@ -113,8 +117,12 @@ declare class ProcessorServiceImpl implements ProcessorServiceImplementation {
     start(request: StartRequest, context: CallContext): Promise<Empty>;
     stop(request: Empty, context: CallContext): Promise<Empty>;
     processBindings(request: ProcessBindingsRequest, options?: CallContext): Promise<ProcessBindingResponse>;
-    preprocessBindings(bindings: DataBinding[], dbContext?: StoreContext, options?: CallContext): Promise<PreparedData>;
-    preprocessBinding(request: DataBinding, dbContext?: StoreContext, options?: CallContext): Promise<PreprocessResult>;
+    preprocessBindings(bindings: DataBinding[], preprocessStore: {
+        [k: string]: any;
+    }, dbContext?: StoreContext, options?: CallContext): Promise<PreparedData>;
+    preprocessBinding(request: DataBinding, preprocessStore: {
+        [k: string]: any;
+    }, dbContext?: StoreContext, options?: CallContext): Promise<PreprocessResult>;
     processBinding(request: DataBinding, preparedData: PreparedData | undefined, options?: CallContext): Promise<ProcessResult>;
     processBindingsStream(requests: AsyncIterable<ProcessStreamRequest>, context: CallContext): AsyncGenerator<{
         processId?: number | undefined;

package/lib/index.js

@@ -12,7 +12,7 @@ import {
   makeEthCallKey,
   mergeProcessResults,
   timeoutError
-} from "./chunk-K6CPN5YU.js";
+} from "./chunk-FYV7R6QO.js";
 
 // src/state.ts
 var _State = class {

package/lib/processor-runner.js

@@ -40,7 +40,7 @@ import {
   require_minimal,
   require_src,
   trace
-} from "./chunk-K6CPN5YU.js";
+} from "./chunk-FYV7R6QO.js";
 
 // ../../node_modules/.pnpm/universalify@2.0.1/node_modules/universalify/index.js
 var require_universalify = __commonJS({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/runtime",
-  "version": "2.40.0-rc.16",
+  "version": "2.40.0-rc.18",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/plugin.ts

@@ -28,7 +28,7 @@ export abstract class Plugin {
     return ProcessResult.create()
   }
 
-  async preprocessBinding(request: DataBinding): Promise<PreprocessResult> {
+  async preprocessBinding(request: DataBinding, preprocessStore: { [k: string]: any }): Promise<PreprocessResult> {
     return PreprocessResult.create()
   }
 }
@@ -84,13 +84,17 @@ export class PluginManager {
     })
   }
 
-  preprocessBinding(request: DataBinding, dbContext?: StoreContext): Promise<PreprocessResult> {
+  preprocessBinding(
+    request: DataBinding,
+    preprocessStore: { [k: string]: any },
+    dbContext?: StoreContext
+  ): Promise<PreprocessResult> {
     const plugin = this.typesToPlugin.get(request.handlerType)
     if (!plugin) {
       throw new Error(`No plugin for ${request.handlerType}`)
     }
     return this.dbContextLocalStorage.run(dbContext, () => {
-      return plugin.preprocessBinding(request)
+      return plugin.preprocessBinding(request, preprocessStore)
     })
   }
 }

package/src/service.ts

@@ -128,7 +128,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
   }
 
   async processBindings(request: ProcessBindingsRequest, options?: CallContext): Promise<ProcessBindingResponse> {
-    const preparedData = await this.preprocessBindings(request.bindings, undefined, options)
+    const preparedData = await this.preprocessBindings(request.bindings, {}, undefined, options)
 
     const promises = []
     for (const binding of request.bindings) {
@@ -159,13 +159,14 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
 
   async preprocessBindings(
     bindings: DataBinding[],
+    preprocessStore: { [k: string]: any },
     dbContext?: StoreContext,
     options?: CallContext
   ): Promise<PreparedData> {
     console.debug(`preprocessBindings start, bindings: ${bindings.length}`)
     const promises = []
     for (const binding of bindings) {
-      promises.push(this.preprocessBinding(binding, dbContext, options))
+      promises.push(this.preprocessBinding(binding, preprocessStore, dbContext, options))
     }
     let preprocessResults: PreprocessResult[]
     try {
@@ -173,10 +174,6 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     } catch (e) {
       throw e
     }
-    console.debug(
-      'ethCallParams: ',
-      preprocessResults.map((r) => r.ethCallParams)
-    )
     const groupedRequests = new Map<string, EthCallParam[]>()
     const providers = new Map<string, Provider>()
     for (const result of preprocessResults) {
@@ -197,7 +194,6 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     const callPromises = []
     for (const params of groupedRequests.values()) {
       const { chainId, address, blockTag } = params[0].context!
-      console.log(`chain: ${chainId}, address: ${address}, blockTag: ${blockTag}, totalCalls: ${params.length}`)
       // TODO multicall
       for (const param of params) {
         callPromises.push(
@@ -208,7 +204,11 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
               data: param.calldata,
               blockTag
             })
-            .then((result) => [makeEthCallKey(param), result])
+            .then((result) => {
+              const ret = [makeEthCallKey(param), result]
+              console.log(`got eth call result, key: ${ret[0]}, result: ${result}`)
+              return ret
+            })
         )
       }
     }
@@ -226,6 +226,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
 
   async preprocessBinding(
     request: DataBinding,
+    preprocessStore: { [k: string]: any },
     dbContext?: StoreContext,
     options?: CallContext
   ): Promise<PreprocessResult> {
@@ -244,7 +245,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         ]
       )
     }
-    return await PluginManager.INSTANCE.preprocessBinding(request, dbContext)
+    return await PluginManager.INSTANCE.preprocessBinding(request, preprocessStore, dbContext)
   }
 
   async processBinding(
@@ -280,6 +281,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     const subject = new Subject<DeepPartial<ProcessStreamResponse>>()
     this.handleRequests(requests, subject)
       .then(() => {
+        console.log('clearing prepared data')
         this.preparedData = { ethCallResults: {} }
         subject.complete()
       })
@@ -295,15 +297,15 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     subject: Subject<DeepPartial<PreprocessStreamResponse>>
   ) {
     const contexts = new Contexts()
+    const preprocessStore: { [k: string]: any } = {}
 
     for await (const request of requests) {
       try {
-        console.debug('received request:', request)
         if (request.bindings) {
           const bindings = request.bindings.bindings
           const dbContext = contexts.new(request.processId, subject)
           const start = Date.now()
-          this.preprocessBindings(bindings, dbContext)
+          this.preprocessBindings(bindings, preprocessStore, dbContext, undefined)
             .then((preparedData) => {
               // TODO maybe not proper to pass data in this way
               this.preparedData = {

package/src/utils.ts

@@ -34,5 +34,5 @@ export function makeEthCallKey(param: EthCallParam) {
     throw new Error('null context for eth call')
   }
   const { chainId, address, blockTag } = param.context
-  return `${chainId}|${address}|${blockTag}|${param.calldata}`
+  return `${chainId}|${address}|${blockTag}|${param.calldata}`.toLowerCase()
 }