@sentio/sdk 1.14.4 → 1.15.0

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

@@ -194,6 +194,7 @@ export interface ProcessTracesResponse {
 }
 
 export interface ProcessTransactionsRequest {
+  chainId: string;
   transactions: RawTransaction[];
 }
 
@@ -236,9 +237,9 @@ export interface RawTrace {
 }
 
 export interface RawTransaction {
-  txHash: string;
   raw: Uint8Array;
-  programAccountId: string;
+  programAccountId?: string | undefined;
+  slot?: Long | undefined;
 }
 
 export interface Instruction {
@@ -1627,7 +1628,7 @@ export const ProcessTracesResponse = {
 };
 
 function createBaseProcessTransactionsRequest(): ProcessTransactionsRequest {
-  return { transactions: [] };
+  return { chainId: "", transactions: [] };
 }
 
 export const ProcessTransactionsRequest = {
@@ -1635,8 +1636,11 @@ export const ProcessTransactionsRequest = {
     message: ProcessTransactionsRequest,
     writer: _m0.Writer = _m0.Writer.create()
   ): _m0.Writer {
+    if (message.chainId !== "") {
+      writer.uint32(10).string(message.chainId);
+    }
     for (const v of message.transactions) {
-      RawTransaction.encode(v!, writer.uint32(10).fork()).ldelim();
+      RawTransaction.encode(v!, writer.uint32(18).fork()).ldelim();
     }
     return writer;
   },
@@ -1652,6 +1656,9 @@ export const ProcessTransactionsRequest = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
+          message.chainId = reader.string();
+          break;
+        case 2:
           message.transactions.push(
             RawTransaction.decode(reader, reader.uint32())
           );
@@ -1666,6 +1673,7 @@ export const ProcessTransactionsRequest = {
 
   fromJSON(object: any): ProcessTransactionsRequest {
     return {
+      chainId: isSet(object.chainId) ? String(object.chainId) : "",
       transactions: Array.isArray(object?.transactions)
         ? object.transactions.map((e: any) => RawTransaction.fromJSON(e))
         : [],
@@ -1674,6 +1682,7 @@ export const ProcessTransactionsRequest = {
 
   toJSON(message: ProcessTransactionsRequest): unknown {
     const obj: any = {};
+    message.chainId !== undefined && (obj.chainId = message.chainId);
     if (message.transactions) {
       obj.transactions = message.transactions.map((e) =>
         e ? RawTransaction.toJSON(e) : undefined
@@ -1688,6 +1697,7 @@ export const ProcessTransactionsRequest = {
     object: DeepPartial<ProcessTransactionsRequest>
   ): ProcessTransactionsRequest {
     const message = createBaseProcessTransactionsRequest();
+    message.chainId = object.chainId ?? "";
     message.transactions =
       object.transactions?.map((e) => RawTransaction.fromPartial(e)) || [];
     return message;
@@ -2266,7 +2276,11 @@ export const RawTrace = {
 };
 
 function createBaseRawTransaction(): RawTransaction {
-  return { txHash: "", raw: new Uint8Array(), programAccountId: "" };
+  return {
+    raw: new Uint8Array(),
+    programAccountId: undefined,
+    slot: undefined,
+  };
 }
 
 export const RawTransaction = {
@@ -2274,14 +2288,14 @@ export const RawTransaction = {
     message: RawTransaction,
     writer: _m0.Writer = _m0.Writer.create()
   ): _m0.Writer {
-    if (message.txHash !== "") {
-      writer.uint32(10).string(message.txHash);
-    }
     if (message.raw.length !== 0) {
-      writer.uint32(18).bytes(message.raw);
+      writer.uint32(10).bytes(message.raw);
     }
-    if (message.programAccountId !== "") {
-      writer.uint32(26).string(message.programAccountId);
+    if (message.programAccountId !== undefined) {
+      writer.uint32(18).string(message.programAccountId);
+    }
+    if (message.slot !== undefined) {
+      writer.uint32(24).uint64(message.slot);
     }
     return writer;
   },
@@ -2294,13 +2308,13 @@ export const RawTransaction = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          message.txHash = reader.string();
+          message.raw = reader.bytes();
           break;
         case 2:
-          message.raw = reader.bytes();
+          message.programAccountId = reader.string();
           break;
         case 3:
-          message.programAccountId = reader.string();
+          message.slot = reader.uint64() as Long;
           break;
         default:
           reader.skipType(tag & 7);
@@ -2312,31 +2326,35 @@ export const RawTransaction = {
 
   fromJSON(object: any): RawTransaction {
     return {
-      txHash: isSet(object.txHash) ? String(object.txHash) : "",
       raw: isSet(object.raw) ? bytesFromBase64(object.raw) : new Uint8Array(),
       programAccountId: isSet(object.programAccountId)
         ? String(object.programAccountId)
-        : "",
+        : undefined,
+      slot: isSet(object.slot) ? Long.fromValue(object.slot) : undefined,
     };
   },
 
   toJSON(message: RawTransaction): unknown {
     const obj: any = {};
-    message.txHash !== undefined && (obj.txHash = message.txHash);
     message.raw !== undefined &&
       (obj.raw = base64FromBytes(
         message.raw !== undefined ? message.raw : new Uint8Array()
       ));
     message.programAccountId !== undefined &&
       (obj.programAccountId = message.programAccountId);
+    message.slot !== undefined &&
+      (obj.slot = (message.slot || undefined).toString());
     return obj;
   },
 
   fromPartial(object: DeepPartial<RawTransaction>): RawTransaction {
     const message = createBaseRawTransaction();
-    message.txHash = object.txHash ?? "";
     message.raw = object.raw ?? new Uint8Array();
-    message.programAccountId = object.programAccountId ?? "";
+    message.programAccountId = object.programAccountId ?? undefined;
+    message.slot =
+      object.slot !== undefined && object.slot !== null
+        ? Long.fromValue(object.slot)
+        : undefined;
     return message;
   },
 };

package/src/service.ts

@@ -205,7 +205,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     try {
       this.loader()
     } catch (e) {
-      throw new ServerError(Status.INVALID_ARGUMENT, 'Failed to load processor : ' + e.toString())
+      throw new ServerError(Status.INVALID_ARGUMENT, 'Failed to load processor: ' + errorString(e))
     }
 
     for (const instance of request.templateInstances) {
@@ -227,7 +227,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     try {
       await this.configure()
     } catch (e) {
-      throw new ServerError(Status.INTERNAL, 'Failed to start processor : ' + e.toString())
+      throw new ServerError(Status.INTERNAL, 'Failed to start processor : ' + errorString(e))
     }
     this.started = true
     return {}
@@ -265,7 +265,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         const log: Log = JSON.parse(jsonString)
         const handler = this.eventHandlers[l.handlerId]
         const promise = handler(log).catch((e) => {
-          throw new ServerError(Status.INTERNAL, 'error processing log: ' + jsonString + '\n' + e.toString())
+          throw new ServerError(Status.INTERNAL, 'error processing log: ' + jsonString + '\n' + errorString(e))
         })
 
         promises.push(promise)
@@ -310,7 +310,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       logs: [],
     }
 
-    if (global.PROCESSOR_STATE.suiProcessors) {
+    if (request.chainId.toLowerCase().startsWith('sui') && global.PROCESSOR_STATE.suiProcessors) {
       const processorPromises: Promise<void>[] = []
       for (const txn of request.transactions) {
         processorPromises.push(
@@ -319,14 +319,14 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
               const res = processor.handleTransaction(JSON.parse(new TextDecoder().decode(txn.raw)))
               if (res) {
                 res.gauges.forEach((g) => {
-                  if (g.metadata) {
-                    g.metadata.blockNumber = Long.fromString(txn.programAccountId)
+                  if (g.metadata && txn.slot) {
+                    g.metadata.blockNumber = txn.slot
                   }
                   result.gauges.push(g)
                 })
                 res.counters.forEach((c) => {
-                  if (c.metadata) {
-                    c.metadata.blockNumber = Long.fromString(txn.programAccountId)
+                  if (c.metadata && txn.slot) {
+                    c.metadata.blockNumber = txn.slot
                   }
                   result.counters.push(c)
                 })
@@ -394,7 +394,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
                       result.counters.push(c)
                     })
                   } catch (e) {
-                    console.error('error processing instruction ' + e.toString())
+                    console.error('error processing instruction ' + errorString(e))
                   }
                 } else {
                   console.warn(
@@ -455,7 +455,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
       const promise = this.blockHandlers[handlerId](block).catch((e) => {
-        throw new ServerError(Status.INTERNAL, 'error processing block: ' + block.number + '\n' + e.toString())
+        throw new ServerError(Status.INTERNAL, 'error processing block: ' + block.number + '\n' + errorString(e))
       })
       promises.push(promise)
     }
@@ -496,7 +496,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     const trace: Trace = JSON.parse(jsonString)
 
     return this.traceHandlers[binding.handlerId](trace).catch((e) => {
-      throw new ServerError(Status.INTERNAL, 'error processing trace: ' + jsonString + '\n' + e.toString())
+      throw new ServerError(Status.INTERNAL, 'error processing trace: ' + jsonString + '\n' + errorString(e))
     })
   }
 }
@@ -555,3 +555,7 @@ function recordRuntimeInfo(results: ProcessResult, handlerType: HandlerType) {
     }
   })
 }
+
+function errorString(e: Error): string {
+  return e.stack || e.message
+}

package/src/test/erc20.test.ts

@@ -7,7 +7,7 @@ import { HandlerType } from '..'
 import { TestProcessorServer } from './test-processor-server'
 import { firstCounterValue, firstGaugeValue } from './metric-utils'
 import { BigNumber } from 'ethers'
-import { mockTransferLog } from '../builtin/erc20/test-utils'
+import { mockApprovalLog, mockTransferLog } from '../builtin/erc20/test-utils'
 import { Trace } from '../trace'
 
 describe('Test Basic Examples', () => {
@@ -80,6 +80,20 @@ describe('Test Basic Examples', () => {
     expect(config).deep.equals(config2)
   })
 
+  test('Check log exception', async () => {
+    const logData = mockApprovalLog('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', {
+      owner: '0x0000000000000000000000000000000000000000',
+      spender: '0xB329e39Ebefd16f40d38f07643652cE17Ca5Bac1',
+      value: BigNumber.from('1111'),
+    })
+
+    try {
+      await service.testLog(logData, 56)
+    } catch (e) {
+      expect(e.message.indexOf('sdk/src/test/erc20.ts') != -1).eq(true)
+    }
+  })
+
   const blockData = {
     hash: '0x2b9b7cce1f17f3b7e1f3c2472cc806a07bee3f0baca07d021350950d81d73a42',
     number: 14373295,

package/src/test/erc20.ts

@@ -1,4 +1,5 @@
 import { ERC20Processor, ERC20ProcessorTemplate } from '../builtin/erc20'
+import { BigNumber } from '@ethersproject/bignumber'
 
 export const filter = ERC20Processor.filters.Transfer(
   '0x0000000000000000000000000000000000000000',
@@ -34,7 +35,10 @@ ERC20Processor.bind({ address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', net
   .onBlock(async function (block, ctx) {
     ctx.meter.Gauge('g2').record(20, { k: 'v' })
   })
-
+  .onEventApproval(async function (event, ctx) {
+    BigNumber.from(10 ** 18)
+    // console.log(n)
+  })
 ERC20Processor.bind({ address: 'xxxx', network: 56 })
 
 ERC20Processor.bind({ address: 'yyyy', network: 1 })

package/src/test/sui.test.ts

@@ -20,9 +20,10 @@ describe('Test Sui Example', () => {
 
   test('Check tictactoe transaction dispatch', async () => {
     const request: ProcessTransactionsRequest = {
+      chainId: 'SUI_devnet',
       transactions: [
         {
-          txHash: 'z3HjnnFFKAaszOi0pMSImtGMpRd2r7ljLjAjUoqs3Kw=',
+          // txHash: 'z3HjnnFFKAaszOi0pMSImtGMpRd2r7ljLjAjUoqs3Kw=',
           raw: new TextEncoder().encode(JSON.stringify(testData)),
           programAccountId: '0xb8252513f0b9efaa3e260842c4b84d8ff933522d',
         },