@sentio/sdk 1.27.7 → 1.27.9

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

@@ -150,6 +150,7 @@ export interface ProcessConfigResponse {
 export interface ContractConfig {
   contract: ContractInfo | undefined;
   blockConfigs: BlockHandlerConfig[];
+  intervalConfigs: OnIntervalConfig[];
   logConfigs: LogHandlerConfig[];
   traceConfigs: TraceHandlerConfig[];
   aptosEventConfigs: AptosEventHandlerConfig[];
@@ -230,8 +231,8 @@ export interface AccountConfig {
   chainId: string;
   address: string;
   startBlock: Long;
-  onIntervalConfigs: OnIntervalConfig[];
-  onAptosIntervalConfigs: AptosOnIntervalConfig[];
+  intervalConfigs: OnIntervalConfig[];
+  aptosIntervalConfigs: AptosOnIntervalConfig[];
 }
 
 export interface OnIntervalConfig {
@@ -759,6 +760,7 @@ function createBaseContractConfig(): ContractConfig {
   return {
     contract: undefined,
     blockConfigs: [],
+    intervalConfigs: [],
     logConfigs: [],
     traceConfigs: [],
     aptosEventConfigs: [],
@@ -781,6 +783,9 @@ export const ContractConfig = {
     for (const v of message.blockConfigs) {
       BlockHandlerConfig.encode(v!, writer.uint32(58).fork()).ldelim();
     }
+    for (const v of message.intervalConfigs) {
+      OnIntervalConfig.encode(v!, writer.uint32(90).fork()).ldelim();
+    }
     for (const v of message.logConfigs) {
       LogHandlerConfig.encode(v!, writer.uint32(26).fork()).ldelim();
     }
@@ -826,6 +831,11 @@ export const ContractConfig = {
             BlockHandlerConfig.decode(reader, reader.uint32())
           );
           break;
+        case 11:
+          message.intervalConfigs.push(
+            OnIntervalConfig.decode(reader, reader.uint32())
+          );
+          break;
         case 3:
           message.logConfigs.push(
             LogHandlerConfig.decode(reader, reader.uint32())
@@ -877,6 +887,9 @@ export const ContractConfig = {
       blockConfigs: Array.isArray(object?.blockConfigs)
         ? object.blockConfigs.map((e: any) => BlockHandlerConfig.fromJSON(e))
         : [],
+      intervalConfigs: Array.isArray(object?.intervalConfigs)
+        ? object.intervalConfigs.map((e: any) => OnIntervalConfig.fromJSON(e))
+        : [],
       logConfigs: Array.isArray(object?.logConfigs)
         ? object.logConfigs.map((e: any) => LogHandlerConfig.fromJSON(e))
         : [],
@@ -921,6 +934,13 @@ export const ContractConfig = {
     } else {
       obj.blockConfigs = [];
     }
+    if (message.intervalConfigs) {
+      obj.intervalConfigs = message.intervalConfigs.map((e) =>
+        e ? OnIntervalConfig.toJSON(e) : undefined
+      );
+    } else {
+      obj.intervalConfigs = [];
+    }
     if (message.logConfigs) {
       obj.logConfigs = message.logConfigs.map((e) =>
         e ? LogHandlerConfig.toJSON(e) : undefined
@@ -970,6 +990,8 @@ export const ContractConfig = {
         : undefined;
     message.blockConfigs =
       object.blockConfigs?.map((e) => BlockHandlerConfig.fromPartial(e)) || [];
+    message.intervalConfigs =
+      object.intervalConfigs?.map((e) => OnIntervalConfig.fromPartial(e)) || [];
     message.logConfigs =
       object.logConfigs?.map((e) => LogHandlerConfig.fromPartial(e)) || [];
     message.traceConfigs =
@@ -1427,8 +1449,8 @@ function createBaseAccountConfig(): AccountConfig {
     chainId: "",
     address: "",
     startBlock: Long.UZERO,
-    onIntervalConfigs: [],
-    onAptosIntervalConfigs: [],
+    intervalConfigs: [],
+    aptosIntervalConfigs: [],
   };
 }
 
@@ -1446,10 +1468,10 @@ export const AccountConfig = {
     if (!message.startBlock.isZero()) {
       writer.uint32(24).uint64(message.startBlock);
     }
-    for (const v of message.onIntervalConfigs) {
+    for (const v of message.intervalConfigs) {
       OnIntervalConfig.encode(v!, writer.uint32(34).fork()).ldelim();
     }
-    for (const v of message.onAptosIntervalConfigs) {
+    for (const v of message.aptosIntervalConfigs) {
       AptosOnIntervalConfig.encode(v!, writer.uint32(42).fork()).ldelim();
     }
     return writer;
@@ -1472,12 +1494,12 @@ export const AccountConfig = {
           message.startBlock = reader.uint64() as Long;
           break;
         case 4:
-          message.onIntervalConfigs.push(
+          message.intervalConfigs.push(
             OnIntervalConfig.decode(reader, reader.uint32())
           );
           break;
         case 5:
-          message.onAptosIntervalConfigs.push(
+          message.aptosIntervalConfigs.push(
             AptosOnIntervalConfig.decode(reader, reader.uint32())
           );
           break;
@@ -1496,11 +1518,11 @@ export const AccountConfig = {
       startBlock: isSet(object.startBlock)
         ? Long.fromValue(object.startBlock)
         : Long.UZERO,
-      onIntervalConfigs: Array.isArray(object?.onIntervalConfigs)
-        ? object.onIntervalConfigs.map((e: any) => OnIntervalConfig.fromJSON(e))
+      intervalConfigs: Array.isArray(object?.intervalConfigs)
+        ? object.intervalConfigs.map((e: any) => OnIntervalConfig.fromJSON(e))
         : [],
-      onAptosIntervalConfigs: Array.isArray(object?.onAptosIntervalConfigs)
-        ? object.onAptosIntervalConfigs.map((e: any) =>
+      aptosIntervalConfigs: Array.isArray(object?.aptosIntervalConfigs)
+        ? object.aptosIntervalConfigs.map((e: any) =>
             AptosOnIntervalConfig.fromJSON(e)
           )
         : [],
@@ -1513,19 +1535,19 @@ export const AccountConfig = {
     message.address !== undefined && (obj.address = message.address);
     message.startBlock !== undefined &&
       (obj.startBlock = (message.startBlock || Long.UZERO).toString());
-    if (message.onIntervalConfigs) {
-      obj.onIntervalConfigs = message.onIntervalConfigs.map((e) =>
+    if (message.intervalConfigs) {
+      obj.intervalConfigs = message.intervalConfigs.map((e) =>
         e ? OnIntervalConfig.toJSON(e) : undefined
       );
     } else {
-      obj.onIntervalConfigs = [];
+      obj.intervalConfigs = [];
     }
-    if (message.onAptosIntervalConfigs) {
-      obj.onAptosIntervalConfigs = message.onAptosIntervalConfigs.map((e) =>
+    if (message.aptosIntervalConfigs) {
+      obj.aptosIntervalConfigs = message.aptosIntervalConfigs.map((e) =>
         e ? AptosOnIntervalConfig.toJSON(e) : undefined
       );
     } else {
-      obj.onAptosIntervalConfigs = [];
+      obj.aptosIntervalConfigs = [];
     }
     return obj;
   },
@@ -1538,11 +1560,10 @@ export const AccountConfig = {
       object.startBlock !== undefined && object.startBlock !== null
         ? Long.fromValue(object.startBlock)
         : Long.UZERO;
-    message.onIntervalConfigs =
-      object.onIntervalConfigs?.map((e) => OnIntervalConfig.fromPartial(e)) ||
-      [];
-    message.onAptosIntervalConfigs =
-      object.onAptosIntervalConfigs?.map((e) =>
+    message.intervalConfigs =
+      object.intervalConfigs?.map((e) => OnIntervalConfig.fromPartial(e)) || [];
+    message.aptosIntervalConfigs =
+      object.aptosIntervalConfigs?.map((e) =>
         AptosOnIntervalConfig.fromPartial(e)
       ) || [];
     return message;

package/src/service.ts

@@ -141,6 +141,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
           abi: '',
         },
         blockConfigs: [],
+        intervalConfigs: [],
         logConfigs: [],
         traceConfigs: [],
         startBlock: processor.config.startBlock,
@@ -155,10 +156,12 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
 
       // Step 1. Prepare all the block handlers
       for (const blockHandler of processor.blockHandlers) {
-        const handlerId = this.blockHandlers.push(blockHandler) - 1
+        const handlerId = this.blockHandlers.push(blockHandler.handler) - 1
         // TODO wrap the block handler into one
 
-        contractConfig.blockConfigs.push({
+        contractConfig.intervalConfigs.push({
+          slot: blockHandler.blockInterval || 1,
+          minutes: blockHandler.timeIntervalInMinutes || 0,
           handlerId: handlerId,
         })
       }
@@ -220,6 +223,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         blockConfigs: [],
         logConfigs: [],
         traceConfigs: [],
+        intervalConfigs: [],
         startBlock: solanaProcessor.config.startSlot,
         endBlock: DEFAULT_MAX_BLOCK,
         instructionConfig: {
@@ -245,6 +249,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         },
         blockConfigs: [],
         logConfigs: [],
+        intervalConfigs: [],
         traceConfigs: [],
         startBlock: suiProcessor.config.startSeqNumber,
         endBlock: DEFAULT_MAX_BLOCK,
@@ -266,6 +271,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
           abi: '',
         },
         blockConfigs: [],
+        intervalConfigs: [],
         logConfigs: [],
         traceConfigs: [],
         startBlock: Long.fromString(aptosProcessor.config.startVersion.toString()),
@@ -313,12 +319,12 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         address: aptosProcessor.config.address,
         chainId: aptosProcessor.getChainId(),
         startBlock: Long.fromValue(aptosProcessor.config.startVersion.toString()),
-        onAptosIntervalConfigs: [],
-        onIntervalConfigs: [],
+        aptosIntervalConfigs: [],
+        intervalConfigs: [],
       }
       for (const handler of aptosProcessor.resourcesHandlers) {
         const handlerId = this.aptosResourceHandlers.push(handler.handler) - 1
-        accountConfig.onAptosIntervalConfigs.push({
+        accountConfig.aptosIntervalConfigs.push({
           intervalConfig: {
             handlerId: handlerId,
             minutes: handler.timeIntervalInMinutes || 0,

package/src/testing/test-processor-server.ts

@@ -231,7 +231,7 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
         continue
       }
 
-      for (const config of contract.blockConfigs) {
+      for (const config of contract.intervalConfigs) {
         binding.handlerIds.push(config.handlerId)
       }
     }

package/templates/evm/src/processor.ts

@@ -9,7 +9,7 @@ const rewardPerBlock = new Gauge('reward_per_block', {
 })
 const tokenCounter = new Counter('token')
 
-X2y2Processor.bind({ address: '0xB329e39Ebefd16f40d38f07643652cE17Ca5Bac1' }).onBlock(async (_, ctx) => {
+X2y2Processor.bind({ address: '0xB329e39Ebefd16f40d38f07643652cE17Ca5Bac1' }).onBlockInterval(async (_, ctx) => {
   const phase = (await ctx.contract.currentPhase()).toString()
   const reward = token.scaleDown(await ctx.contract.rewardPerBlockForStaking(), 18)
   rewardPerBlock.record(ctx, reward, { phase })