@sentio/runtime 2.31.0-rc.14 → 2.31.0-rc.15

package/lib/global-config.d.ts

@@ -1,6 +1,4 @@
-export interface ExecutionConfig {
-    sequential: boolean;
-}
+import { ExecutionConfig } from './gen/processor/protos/processor.js';
 export interface GlobalConfig {
     execution: ExecutionConfig;
 }

package/lib/global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../src/global-config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAE9B,UAAU,EAAE,OAAO,CAAA;CACpB;AACD,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,eAAe,CAAA;CAC3B;AAGD,eAAO,MAAM,aAAa,EAAE,YAI3B,CAAA;AAED,wBAAgB,kBAAkB,SAEjC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,GAAG,OAcrC"}
+{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../src/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAErE,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,eAAe,CAAA;CAC3B;AAGD,eAAO,MAAM,aAAa,EAAE,YAI3B,CAAA;AAED,wBAAgB,kBAAkB,SAEjC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,GAAG,OAcrC"}

package/lib/global-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"global-config.js","sourceRoot":"","sources":["../src/global-config.ts"],"names":[],"mappings":"AAQA,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,SAAS,EAAE;QACT,UAAU,EAAE,KAAK;KAClB;CACF,CAAA;AAED,MAAM,UAAU,kBAAkB;IAChC,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAW;IACpC,gDAAgD;IAChD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAEzC,yCAAyC;IACzC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;QAE1B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YACvE,UAAU,CAAC,KAAK,CAAC,CAAA;SAClB;KACF;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAC9B,CAAC"}
+{"version":3,"file":"global-config.js","sourceRoot":"","sources":["../src/global-config.ts"],"names":[],"mappings":"AAMA,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,SAAS,EAAE;QACT,UAAU,EAAE,KAAK;KAClB;CACF,CAAA;AAED,MAAM,UAAU,kBAAkB;IAChC,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAW;IACpC,gDAAgD;IAChD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAEzC,yCAAyC;IACzC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;QAE1B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YACvE,UAAU,CAAC,KAAK,CAAC,CAAA;SAClB;KACF;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAC9B,CAAC"}

package/lib/index.d.ts

@@ -4,5 +4,5 @@ export * from './utils.js';
 export * from './endpoints.js';
 export * from './chain-config.js';
 export * from './service.js';
-export { GLOBAL_CONFIG, type ExecutionConfig, type GlobalConfig } from './global-config.js';
+export { GLOBAL_CONFIG, type GlobalConfig } from './global-config.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA"}

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,aAAa,EAA2C,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAqB,MAAM,oBAAoB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/runtime",
-  "version": "2.31.0-rc.14",
+  "version": "2.31.0-rc.15",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -30,10 +30,10 @@
     "protobufjs": "^7.2.5",
     "utility-types": "^3.10.0",
     "winston": "^3.10.0",
-    "@sentio/protos": "2.31.0-rc.14"
+    "@sentio/protos": "2.31.0-rc.15"
   },
   "peerDependencies": {
-    "@sentio/sdk": "^2.31.0-rc.14"
+    "@sentio/sdk": "^2.31.0-rc.15"
   },
   "devDependencies": {
     "@types/command-line-args": "^5.2.0",

package/src/full-service.ts

@@ -10,13 +10,14 @@ import {
   ProcessConfigRequest,
   ProcessorServiceImplementation,
   StartRequest,
-  ProcessResult,
+  ProcessResult
 } from './gen/processor/protos/processor.js'
 
 import { Empty } from '@sentio/protos'
 import fs from 'fs-extra'
 import path from 'path'
 import os from 'os'
+import { GLOBAL_CONFIG } from './global-config.js'
 
 function locatePackageJson(pkgId: string) {
   const m = require.resolve(pkgId)
@@ -46,6 +47,8 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
 
   async getConfig(request: ProcessConfigRequest, context: CallContext) {
     const config = await this.instance.getConfig(request, context)
+    config.executionConfig = GLOBAL_CONFIG.execution
+
     if (config.contractConfigs) {
       for (const contract of config.contractConfigs) {
         // @ts-ignore old fields
@@ -72,6 +75,8 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
   }
 
   async processBindings(request: ProcessBindingsRequest, options: CallContext) {
+    request.bindings = request.bindings.sort(dataCompare)
+
     for (const binding of request.bindings) {
       this.adjustDataBinding(binding)
     }
@@ -129,3 +134,32 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
     }
   }
 }
+
+// TODO push the logic into sdk
+function dataCompare(a: DataBinding, b: DataBinding): number {
+  const timeA = getTimestamp(a) || new Date(0)
+  const timeB = getTimestamp(b) || new Date(0)
+  const timeCmp = timeA.getTime() - timeB.getTime()
+  if (timeCmp !== 0) {
+    return timeCmp
+  }
+  return getSecondary(a) - getSecondary(b)
+}
+
+function getTimestamp(d: DataBinding): Date | undefined {
+  return (
+    d.data?.ethLog?.timestamp ||
+    d.data?.ethTransaction?.timestamp ||
+    d.data?.ethBlock?.block?.timestamp ||
+    d.data?.ethTrace?.timestamp
+  )
+}
+
+function getSecondary(d: DataBinding) {
+  return (
+    d.data?.ethLog?.log?.logIndex ||
+    d.data?.ethTransaction?.transaction?.transactionIndex ||
+    d.data?.ethBlock?.block?.number ||
+    d.data?.ethTrace?.trace?.transactionPosition
+  )
+}

package/src/gen/processor/protos/processor.ts

@@ -342,11 +342,16 @@ export interface ProjectConfig {
   version: string;
 }
 
+export interface ExecutionConfig {
+  sequential: boolean;
+}
+
 export interface ProcessConfigRequest {
 }
 
 export interface ProcessConfigResponse {
   config: ProjectConfig | undefined;
+  executionConfig: ExecutionConfig | undefined;
   contractConfigs: ContractConfig[];
   templateInstances: TemplateInstance[];
   accountConfigs: AccountConfig[];
@@ -925,6 +930,57 @@ export const ProjectConfig = {
   },
 };
 
+function createBaseExecutionConfig(): ExecutionConfig {
+  return { sequential: false };
+}
+
+export const ExecutionConfig = {
+  encode(message: ExecutionConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.sequential === true) {
+      writer.uint32(8).bool(message.sequential);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ExecutionConfig {
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseExecutionConfig();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          message.sequential = reader.bool();
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ExecutionConfig {
+    return { sequential: isSet(object.sequential) ? Boolean(object.sequential) : false };
+  },
+
+  toJSON(message: ExecutionConfig): unknown {
+    const obj: any = {};
+    message.sequential !== undefined && (obj.sequential = message.sequential);
+    return obj;
+  },
+
+  create(base?: DeepPartial<ExecutionConfig>): ExecutionConfig {
+    return ExecutionConfig.fromPartial(base ?? {});
+  },
+
+  fromPartial(object: DeepPartial<ExecutionConfig>): ExecutionConfig {
+    const message = createBaseExecutionConfig();
+    message.sequential = object.sequential ?? false;
+    return message;
+  },
+};
+
 function createBaseProcessConfigRequest(): ProcessConfigRequest {
   return {};
 }
@@ -971,6 +1027,7 @@ export const ProcessConfigRequest = {
 function createBaseProcessConfigResponse(): ProcessConfigResponse {
   return {
     config: undefined,
+    executionConfig: undefined,
     contractConfigs: [],
     templateInstances: [],
     accountConfigs: [],
@@ -986,6 +1043,9 @@ export const ProcessConfigResponse = {
     if (message.config !== undefined) {
       ProjectConfig.encode(message.config, writer.uint32(10).fork()).ldelim();
     }
+    if (message.executionConfig !== undefined) {
+      ExecutionConfig.encode(message.executionConfig, writer.uint32(74).fork()).ldelim();
+    }
     for (const v of message.contractConfigs) {
       ContractConfig.encode(v!, writer.uint32(18).fork()).ldelim();
     }
@@ -1020,6 +1080,9 @@ export const ProcessConfigResponse = {
         case 1:
           message.config = ProjectConfig.decode(reader, reader.uint32());
           break;
+        case 9:
+          message.executionConfig = ExecutionConfig.decode(reader, reader.uint32());
+          break;
         case 2:
           message.contractConfigs.push(ContractConfig.decode(reader, reader.uint32()));
           break;
@@ -1052,6 +1115,7 @@ export const ProcessConfigResponse = {
   fromJSON(object: any): ProcessConfigResponse {
     return {
       config: isSet(object.config) ? ProjectConfig.fromJSON(object.config) : undefined,
+      executionConfig: isSet(object.executionConfig) ? ExecutionConfig.fromJSON(object.executionConfig) : undefined,
       contractConfigs: Array.isArray(object?.contractConfigs)
         ? object.contractConfigs.map((e: any) => ContractConfig.fromJSON(e))
         : [],
@@ -1079,6 +1143,8 @@ export const ProcessConfigResponse = {
   toJSON(message: ProcessConfigResponse): unknown {
     const obj: any = {};
     message.config !== undefined && (obj.config = message.config ? ProjectConfig.toJSON(message.config) : undefined);
+    message.executionConfig !== undefined &&
+      (obj.executionConfig = message.executionConfig ? ExecutionConfig.toJSON(message.executionConfig) : undefined);
     if (message.contractConfigs) {
       obj.contractConfigs = message.contractConfigs.map((e) => e ? ContractConfig.toJSON(e) : undefined);
     } else {
@@ -1126,6 +1192,9 @@ export const ProcessConfigResponse = {
     message.config = (object.config !== undefined && object.config !== null)
       ? ProjectConfig.fromPartial(object.config)
       : undefined;
+    message.executionConfig = (object.executionConfig !== undefined && object.executionConfig !== null)
+      ? ExecutionConfig.fromPartial(object.executionConfig)
+      : undefined;
     message.contractConfigs = object.contractConfigs?.map((e) => ContractConfig.fromPartial(e)) || [];
     message.templateInstances = object.templateInstances?.map((e) => TemplateInstance.fromPartial(e)) || [];
     message.accountConfigs = object.accountConfigs?.map((e) => AccountConfig.fromPartial(e)) || [];

package/src/global-config.ts

@@ -1,7 +1,5 @@
-export interface ExecutionConfig {
-  // Whether to execute transactions sequentially, by default it's false
-  sequential: boolean
-}
+import { ExecutionConfig } from './gen/processor/protos/processor.js'
+
 export interface GlobalConfig {
   execution: ExecutionConfig
 }

package/src/index.ts

@@ -4,4 +4,4 @@ export * from './utils.js'
 export * from './endpoints.js'
 export * from './chain-config.js'
 export * from './service.js'
-export { GLOBAL_CONFIG, type ExecutionConfig, type GlobalConfig } from './global-config.js'
+export { GLOBAL_CONFIG, type GlobalConfig } from './global-config.js'