@sentio/runtime 2.60.0-rc.9 → 2.60.1-rc.1

package/src/gen/service/common/protos/common.ts

@@ -348,6 +348,7 @@ export interface User {
   username: string;
   accountStatus: User_AccountStatus;
   tier: Tier;
+  isOrganization: boolean;
 }
 
 export enum User_AccountStatus {
@@ -517,6 +518,12 @@ export interface Project_ProjectMember {
 export interface CommunityProject {
   dashAlias: string;
   curated?: boolean | undefined;
+  chain: { [key: string]: StringList };
+}
+
+export interface CommunityProject_ChainEntry {
+  key: string;
+  value: StringList | undefined;
 }
 
 export interface ProjectInfo {
@@ -2535,6 +2542,7 @@ function createBaseUser(): User {
     username: "",
     accountStatus: 0,
     tier: 0,
+    isOrganization: false,
   };
 }
 
@@ -2588,6 +2596,9 @@ export const User = {
     if (message.tier !== 0) {
       writer.uint32(120).int32(message.tier);
     }
+    if (message.isOrganization !== false) {
+      writer.uint32(128).bool(message.isOrganization);
+    }
     return writer;
   },
 
@@ -2696,6 +2707,13 @@ export const User = {
 
           message.tier = reader.int32() as any;
           continue;
+        case 16:
+          if (tag !== 128) {
+            break;
+          }
+
+          message.isOrganization = reader.bool();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -2721,6 +2739,7 @@ export const User = {
       username: isSet(object.username) ? globalThis.String(object.username) : "",
       accountStatus: isSet(object.accountStatus) ? user_AccountStatusFromJSON(object.accountStatus) : 0,
       tier: isSet(object.tier) ? tierFromJSON(object.tier) : 0,
+      isOrganization: isSet(object.isOrganization) ? globalThis.Boolean(object.isOrganization) : false,
     };
   },
 
@@ -2768,6 +2787,9 @@ export const User = {
     if (message.tier !== 0) {
       obj.tier = tierToJSON(message.tier);
     }
+    if (message.isOrganization !== false) {
+      obj.isOrganization = message.isOrganization;
+    }
     return obj;
   },
 
@@ -2790,6 +2812,7 @@ export const User = {
     message.username = object.username ?? "";
     message.accountStatus = object.accountStatus ?? 0;
     message.tier = object.tier ?? 0;
+    message.isOrganization = object.isOrganization ?? false;
     return message;
   },
 };
@@ -3493,7 +3516,7 @@ export const Project_ProjectMember = {
 };
 
 function createBaseCommunityProject(): CommunityProject {
-  return { dashAlias: "", curated: undefined };
+  return { dashAlias: "", curated: undefined, chain: {} };
 }
 
 export const CommunityProject = {
@@ -3504,6 +3527,9 @@ export const CommunityProject = {
     if (message.curated !== undefined) {
       writer.uint32(16).bool(message.curated);
     }
+    Object.entries(message.chain).forEach(([key, value]) => {
+      CommunityProject_ChainEntry.encode({ key: key as any, value }, writer.uint32(26).fork()).ldelim();
+    });
     return writer;
   },
 
@@ -3528,6 +3554,16 @@ export const CommunityProject = {
 
           message.curated = reader.bool();
           continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          const entry3 = CommunityProject_ChainEntry.decode(reader, reader.uint32());
+          if (entry3.value !== undefined) {
+            message.chain[entry3.key] = entry3.value;
+          }
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -3541,6 +3577,12 @@ export const CommunityProject = {
     return {
       dashAlias: isSet(object.dashAlias) ? globalThis.String(object.dashAlias) : "",
       curated: isSet(object.curated) ? globalThis.Boolean(object.curated) : undefined,
+      chain: isObject(object.chain)
+        ? Object.entries(object.chain).reduce<{ [key: string]: StringList }>((acc, [key, value]) => {
+          acc[key] = StringList.fromJSON(value);
+          return acc;
+        }, {})
+        : {},
     };
   },
 
@@ -3552,6 +3594,15 @@ export const CommunityProject = {
     if (message.curated !== undefined) {
       obj.curated = message.curated;
     }
+    if (message.chain) {
+      const entries = Object.entries(message.chain);
+      if (entries.length > 0) {
+        obj.chain = {};
+        entries.forEach(([k, v]) => {
+          obj.chain[k] = StringList.toJSON(v);
+        });
+      }
+    }
     return obj;
   },
 
@@ -3562,6 +3613,88 @@ export const CommunityProject = {
     const message = createBaseCommunityProject();
     message.dashAlias = object.dashAlias ?? "";
     message.curated = object.curated ?? undefined;
+    message.chain = Object.entries(object.chain ?? {}).reduce<{ [key: string]: StringList }>((acc, [key, value]) => {
+      if (value !== undefined) {
+        acc[key] = StringList.fromPartial(value);
+      }
+      return acc;
+    }, {});
+    return message;
+  },
+};
+
+function createBaseCommunityProject_ChainEntry(): CommunityProject_ChainEntry {
+  return { key: "", value: undefined };
+}
+
+export const CommunityProject_ChainEntry = {
+  encode(message: CommunityProject_ChainEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== undefined) {
+      StringList.encode(message.value, writer.uint32(18).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): CommunityProject_ChainEntry {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseCommunityProject_ChainEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.key = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = StringList.decode(reader, reader.uint32());
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): CommunityProject_ChainEntry {
+    return {
+      key: isSet(object.key) ? globalThis.String(object.key) : "",
+      value: isSet(object.value) ? StringList.fromJSON(object.value) : undefined,
+    };
+  },
+
+  toJSON(message: CommunityProject_ChainEntry): unknown {
+    const obj: any = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== undefined) {
+      obj.value = StringList.toJSON(message.value);
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<CommunityProject_ChainEntry>): CommunityProject_ChainEntry {
+    return CommunityProject_ChainEntry.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<CommunityProject_ChainEntry>): CommunityProject_ChainEntry {
+    const message = createBaseCommunityProject_ChainEntry();
+    message.key = object.key ?? "";
+    message.value = (object.value !== undefined && object.value !== null)
+      ? StringList.fromPartial(object.value)
+      : undefined;
     return message;
   },
 };

package/src/plugin.ts

@@ -62,7 +62,7 @@ export abstract class Plugin {
   shutdownServer() {}
 
   /**
-   * Initialize the plugin, for service v2.
+   * Initialize the plugin, for service v3.
    * @param config
    */
   async init(config: InitResponse): Promise<void> {}

package/src/processor-runner.ts

@@ -15,13 +15,15 @@ import { Session } from 'node:inspector/promises'
 import { ProcessorDefinition } from './gen/processor/protos/processor.js'
 import { ProcessorServiceImpl } from './service.js'
 import { configureEndpoints } from './endpoints.js'
-import { FullProcessorServiceImpl } from './full-service.js'
+import { FullProcessorServiceImpl, FullProcessorServiceV3Impl } from './full-service.js'
 import { setupLogger } from './logger.js'
 
 import { setupOTLP } from './otlp.js'
 import { ActionServer } from './action-server.js'
 import { ServiceManager } from './service-manager.js'
 import path from 'path'
+import { ProcessorV3Definition } from '@sentio/protos'
+import { ProcessorServiceImplV3 } from './service-v3.js'
 
 // const mergedRegistry = Registry.merge([globalRegistry, niceGrpcRegistry])
 
@@ -103,7 +105,10 @@ if (options['start-action-server']) {
   const service = new FullProcessorServiceImpl(baseService)
 
   server.add(ProcessorDefinition, service)
-
+  server.add(
+    ProcessorV3Definition,
+    new FullProcessorServiceV3Impl(new ProcessorServiceImplV3(loader, options, server.shutdown))
+  )
   server.listen('0.0.0.0:' + options.port)
 
   console.log('Processor Server Started at:', options.port)

package/src/{service-v2.ts → service-v3.ts}

@@ -1,14 +1,16 @@
 import {
   ConfigureHandlersRequest,
+  ConfigureHandlersResponse,
   DataBinding,
   DeepPartial,
   Empty,
   HandlerType,
   InitResponse,
   ProcessConfigResponse,
-  ProcessorV2ServiceImplementation,
+  ProcessorV3ServiceImplementation,
   ProcessResult,
   ProcessStreamRequest,
+  ProcessStreamResponse,
   ProcessStreamResponseV2,
   StartRequest
 } from '@sentio/protos'
@@ -27,7 +29,7 @@ import { TemplateInstanceState } from './state.js'
 
 const { process_binding_count, process_binding_time, process_binding_error } = processMetrics
 
-export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation {
+export class ProcessorServiceImplV3 implements ProcessorV3ServiceImplementation {
   readonly enablePartition: boolean
   private readonly loader: () => Promise<any>
   private readonly shutdownHandler?: () => void
@@ -40,6 +42,7 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
   }
 
   async init(request: Empty, context: CallContext): Promise<DeepPartial<InitResponse>> {
+    await this.loader()
     const resp = InitResponse.fromPartial({
       chainIds: []
     })
@@ -50,6 +53,21 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
 
   async *processBindingsStream(requests: AsyncIterable<ProcessStreamRequest>, context: CallContext) {
     const subject = new Subject<DeepPartial<ProcessStreamResponseV2>>()
+    this.handleRequests(requests, subject)
+      .then(() => {
+        subject.complete()
+      })
+      .catch((e) => {
+        console.error(e)
+        subject.error(e)
+      })
+    yield* from(subject).pipe(withAbort(context.signal))
+  }
+
+  protected async handleRequests(
+    requests: AsyncIterable<ProcessStreamRequest>,
+    subject: Subject<DeepPartial<ProcessStreamResponse>>
+  ) {
     let lastBinding: DataBinding | undefined = undefined
     for await (const request of requests) {
       try {
@@ -63,8 +81,8 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
         console.error('unexpect error during handle loop', e)
       }
     }
-    yield* from(subject).pipe(withAbort(context.signal))
   }
+
   private contexts = new Contexts()
 
   async handleRequest(
@@ -85,6 +103,7 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
 
       if (this.enablePartition) {
         try {
+          console.debug('sending partition request', request.binding)
           const partitions = await PluginManager.INSTANCE.partition(request.binding)
           subject.next({
             processId: request.processId,
@@ -126,11 +145,13 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
   ) {
     const context = this.contexts.new(processId, subject)
     const start = Date.now()
+    console.debug('process binding', processId)
     PluginManager.INSTANCE.processBinding(binding, undefined, context)
       .then(async (result) => {
-        // await all pending db requests
+        console.debug(`process binding ${processId} done`)
         await context.awaitPendings()
 
+        console.debug('sending ts data length:', result.timeseriesResult.length)
         for (const ts of result.timeseriesResult) {
           subject.next({
             processId,
@@ -141,6 +162,7 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
         }
 
         if (result.states?.configUpdated) {
+          console.debug('sending tpl updates:')
           subject.next({
             processId,
             tplRequest: {
@@ -149,6 +171,7 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
           })
         }
 
+        console.debug('sending binding result', processId)
         subject.next({
           result: {
             states: result.states,
@@ -167,13 +190,14 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
         const cost = Date.now() - start
         process_binding_time.add(cost)
         this.contexts.delete(processId)
+        console.debug('process binding done', processId)
       })
   }
 
   async configureHandlers(
     request: ConfigureHandlersRequest,
     context: CallContext
-  ): Promise<DeepPartial<ProcessConfigResponse>> {
+  ): Promise<DeepPartial<ConfigureHandlersResponse>> {
     await PluginManager.INSTANCE.start(
       StartRequest.fromPartial({
         templateInstances: request.templateInstances
@@ -182,7 +206,10 @@ export class ProcessorServiceImplV2 implements ProcessorV2ServiceImplementation
 
     const newConfig = ProcessConfigResponse.fromPartial({})
     await PluginManager.INSTANCE.configure(newConfig, request.chainId)
-    return newConfig
+    return {
+      accountConfigs: newConfig.accountConfigs,
+      contractConfigs: newConfig.contractConfigs
+    }
   }
 }