@sentio/sdk 1.30.3 → 1.31.1

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

@@ -37,6 +37,45 @@ export function aggregationTypeToJSON(object: AggregationType): string {
   }
 }
 
+export enum AddressType {
+  ERC20 = 0,
+  ERC721 = 1,
+  ERC1155 = 2,
+  UNRECOGNIZED = -1,
+}
+
+export function addressTypeFromJSON(object: any): AddressType {
+  switch (object) {
+    case 0:
+    case "ERC20":
+      return AddressType.ERC20;
+    case 1:
+    case "ERC721":
+      return AddressType.ERC721;
+    case 2:
+    case "ERC1155":
+      return AddressType.ERC1155;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return AddressType.UNRECOGNIZED;
+  }
+}
+
+export function addressTypeToJSON(object: AddressType): string {
+  switch (object) {
+    case AddressType.ERC20:
+      return "ERC20";
+    case AddressType.ERC721:
+      return "ERC721";
+    case AddressType.ERC1155:
+      return "ERC1155";
+    case AddressType.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 export enum HandlerType {
   UNKNOWN = 0,
   ETH_LOG = 1,
@@ -262,7 +301,7 @@ export interface MetricConfig {
 }
 
 export interface AggregationConfig {
-  intervalInMinutes: number;
+  intervalInMinutes: number[];
   types: AggregationType[];
   discardOrigin: boolean;
 }
@@ -273,6 +312,7 @@ export interface AccountConfig {
   startBlock: Long;
   intervalConfigs: OnIntervalConfig[];
   aptosIntervalConfigs: AptosOnIntervalConfig[];
+  logConfigs: LogHandlerConfig[];
 }
 
 export interface OnIntervalConfig {
@@ -320,6 +360,8 @@ export interface LogHandlerConfig {
 
 export interface LogFilter {
   topics: Topic[];
+  address: string | undefined;
+  addressType: AddressType | undefined;
 }
 
 export interface InstructionHandlerConfig {
@@ -1510,7 +1552,7 @@ export const MetricConfig = {
 };
 
 function createBaseAggregationConfig(): AggregationConfig {
-  return { intervalInMinutes: 0, types: [], discardOrigin: false };
+  return { intervalInMinutes: [], types: [], discardOrigin: false };
 }
 
 export const AggregationConfig = {
@@ -1518,9 +1560,11 @@ export const AggregationConfig = {
     message: AggregationConfig,
     writer: _m0.Writer = _m0.Writer.create()
   ): _m0.Writer {
-    if (message.intervalInMinutes !== 0) {
-      writer.uint32(8).int32(message.intervalInMinutes);
+    writer.uint32(10).fork();
+    for (const v of message.intervalInMinutes) {
+      writer.int32(v);
     }
+    writer.ldelim();
     writer.uint32(18).fork();
     for (const v of message.types) {
       writer.int32(v);
@@ -1540,7 +1584,14 @@ export const AggregationConfig = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          message.intervalInMinutes = reader.int32();
+          if ((tag & 7) === 2) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.intervalInMinutes.push(reader.int32());
+            }
+          } else {
+            message.intervalInMinutes.push(reader.int32());
+          }
           break;
         case 2:
           if ((tag & 7) === 2) {
@@ -1565,9 +1616,9 @@ export const AggregationConfig = {
 
   fromJSON(object: any): AggregationConfig {
     return {
-      intervalInMinutes: isSet(object.intervalInMinutes)
-        ? Number(object.intervalInMinutes)
-        : 0,
+      intervalInMinutes: Array.isArray(object?.intervalInMinutes)
+        ? object.intervalInMinutes.map((e: any) => Number(e))
+        : [],
       types: Array.isArray(object?.types)
         ? object.types.map((e: any) => aggregationTypeFromJSON(e))
         : [],
@@ -1579,8 +1630,13 @@ export const AggregationConfig = {
 
   toJSON(message: AggregationConfig): unknown {
     const obj: any = {};
-    message.intervalInMinutes !== undefined &&
-      (obj.intervalInMinutes = Math.round(message.intervalInMinutes));
+    if (message.intervalInMinutes) {
+      obj.intervalInMinutes = message.intervalInMinutes.map((e) =>
+        Math.round(e)
+      );
+    } else {
+      obj.intervalInMinutes = [];
+    }
     if (message.types) {
       obj.types = message.types.map((e) => aggregationTypeToJSON(e));
     } else {
@@ -1593,7 +1649,7 @@ export const AggregationConfig = {
 
   fromPartial(object: DeepPartial<AggregationConfig>): AggregationConfig {
     const message = createBaseAggregationConfig();
-    message.intervalInMinutes = object.intervalInMinutes ?? 0;
+    message.intervalInMinutes = object.intervalInMinutes?.map((e) => e) || [];
     message.types = object.types?.map((e) => e) || [];
     message.discardOrigin = object.discardOrigin ?? false;
     return message;
@@ -1607,6 +1663,7 @@ function createBaseAccountConfig(): AccountConfig {
     startBlock: Long.UZERO,
     intervalConfigs: [],
     aptosIntervalConfigs: [],
+    logConfigs: [],
   };
 }
 
@@ -1630,6 +1687,9 @@ export const AccountConfig = {
     for (const v of message.aptosIntervalConfigs) {
       AptosOnIntervalConfig.encode(v!, writer.uint32(42).fork()).ldelim();
     }
+    for (const v of message.logConfigs) {
+      LogHandlerConfig.encode(v!, writer.uint32(50).fork()).ldelim();
+    }
     return writer;
   },
 
@@ -1659,6 +1719,11 @@ export const AccountConfig = {
             AptosOnIntervalConfig.decode(reader, reader.uint32())
           );
           break;
+        case 6:
+          message.logConfigs.push(
+            LogHandlerConfig.decode(reader, reader.uint32())
+          );
+          break;
         default:
           reader.skipType(tag & 7);
           break;
@@ -1682,6 +1747,9 @@ export const AccountConfig = {
             AptosOnIntervalConfig.fromJSON(e)
           )
         : [],
+      logConfigs: Array.isArray(object?.logConfigs)
+        ? object.logConfigs.map((e: any) => LogHandlerConfig.fromJSON(e))
+        : [],
     };
   },
 
@@ -1705,6 +1773,13 @@ export const AccountConfig = {
     } else {
       obj.aptosIntervalConfigs = [];
     }
+    if (message.logConfigs) {
+      obj.logConfigs = message.logConfigs.map((e) =>
+        e ? LogHandlerConfig.toJSON(e) : undefined
+      );
+    } else {
+      obj.logConfigs = [];
+    }
     return obj;
   },
 
@@ -1722,6 +1797,8 @@ export const AccountConfig = {
       object.aptosIntervalConfigs?.map((e) =>
         AptosOnIntervalConfig.fromPartial(e)
       ) || [];
+    message.logConfigs =
+      object.logConfigs?.map((e) => LogHandlerConfig.fromPartial(e)) || [];
     return message;
   },
 };
@@ -2313,7 +2390,7 @@ export const LogHandlerConfig = {
 };
 
 function createBaseLogFilter(): LogFilter {
-  return { topics: [] };
+  return { topics: [], address: undefined, addressType: undefined };
 }
 
 export const LogFilter = {
@@ -2324,6 +2401,12 @@ export const LogFilter = {
     for (const v of message.topics) {
       Topic.encode(v!, writer.uint32(10).fork()).ldelim();
     }
+    if (message.address !== undefined) {
+      writer.uint32(18).string(message.address);
+    }
+    if (message.addressType !== undefined) {
+      writer.uint32(24).int32(message.addressType);
+    }
     return writer;
   },
 
@@ -2337,6 +2420,12 @@ export const LogFilter = {
         case 1:
           message.topics.push(Topic.decode(reader, reader.uint32()));
           break;
+        case 2:
+          message.address = reader.string();
+          break;
+        case 3:
+          message.addressType = reader.int32() as any;
+          break;
         default:
           reader.skipType(tag & 7);
           break;
@@ -2350,6 +2439,10 @@ export const LogFilter = {
       topics: Array.isArray(object?.topics)
         ? object.topics.map((e: any) => Topic.fromJSON(e))
         : [],
+      address: isSet(object.address) ? String(object.address) : undefined,
+      addressType: isSet(object.addressType)
+        ? addressTypeFromJSON(object.addressType)
+        : undefined,
     };
   },
 
@@ -2360,12 +2453,20 @@ export const LogFilter = {
     } else {
       obj.topics = [];
     }
+    message.address !== undefined && (obj.address = message.address);
+    message.addressType !== undefined &&
+      (obj.addressType =
+        message.addressType !== undefined
+          ? addressTypeToJSON(message.addressType)
+          : undefined);
     return obj;
   },
 
   fromPartial(object: DeepPartial<LogFilter>): LogFilter {
     const message = createBaseLogFilter();
     message.topics = object.topics?.map((e) => Topic.fromPartial(e)) || [];
+    message.address = object.address ?? undefined;
+    message.addressType = object.addressType ?? undefined;
     return message;
   },
 };

package/src/service.ts

@@ -41,6 +41,7 @@ import {
   AptosProcessorState,
   MoveResourcesWithVersionPayload,
 } from './aptos/aptos-processor'
+import { AccountProcessorState } from './core/account-processor'
 ;(BigInt.prototype as any).toJSON = function () {
   return this.toString()
 }
@@ -131,7 +132,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       })
     }
 
-    // Part 1, prepare EVM processors
+    // Part 1.a, prepare EVM processors
     for (const processor of global.PROCESSOR_STATE.processors) {
       // If server favor incremental update this need to change
       // Start basic config for contract
@@ -195,6 +196,8 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
             throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
           }
           const logFilter: LogFilter = {
+            addressType: undefined,
+            address: contractConfig.contract?.address,
             topics: [],
           }
 
@@ -216,6 +219,52 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       this.contractConfigs.push(contractConfig)
     }
 
+    // part 1.b prepare EVM account processors
+    for (const processor of AccountProcessorState.INSTANCE.getValues()) {
+      const accountConfig: AccountConfig = {
+        address: processor.config.address,
+        chainId: processor.getChainId().toString(),
+        startBlock: processor.config.startBlock ? Long.fromValue(processor.config.startBlock) : Long.ZERO,
+        aptosIntervalConfigs: [],
+        intervalConfigs: [],
+        logConfigs: [],
+      }
+      // TODO add interval
+      for (const eventsHandler of processor.eventHandlers) {
+        // associate id with filter
+        const handlerId = this.eventHandlers.push(eventsHandler.handler) - 1
+        const logConfig: LogHandlerConfig = {
+          handlerId: handlerId,
+          filters: [],
+        }
+
+        for (const filter of eventsHandler.filters) {
+          if (!filter.topics) {
+            throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
+          }
+          const logFilter: LogFilter = {
+            addressType: filter.addressType,
+            address: filter.address,
+            topics: [],
+          }
+
+          for (const ts of filter.topics) {
+            let hashes: string[] = []
+            if (Array.isArray(ts)) {
+              hashes = hashes.concat(ts)
+            } else if (ts) {
+              hashes.push(ts)
+            }
+            logFilter.topics.push({ hashes: hashes })
+          }
+          logConfig.filters.push(logFilter)
+        }
+        accountConfig.logConfigs.push(logConfig)
+      }
+
+      this.accountConfigs.push(accountConfig)
+    }
+
     // Part 2, prepare solana constractors
     for (const solanaProcessor of global.PROCESSOR_STATE.solanaProcessors) {
       const contractConfig: ContractConfig = {
@@ -327,6 +376,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         startBlock: Long.fromValue(aptosProcessor.config.startVersion.toString()),
         aptosIntervalConfigs: [],
         intervalConfigs: [],
+        logConfigs: [],
       }
       for (const handler of aptosProcessor.resourcesHandlers) {
         const handlerId = this.aptosResourceHandlers.push(handler.handler) - 1
@@ -418,6 +468,8 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         return this.processAptosEvent(request)
       case HandlerType.APT_RESOURCE:
         return this.processAptosResource(request)
+      case HandlerType.ETH_LOG:
+        return this.processLog(request)
       default:
         throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
     }
@@ -430,24 +482,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
 
     const promises: Promise<ProcessResult>[] = []
     for (const l of request.bindings) {
-      if (!l.data) {
-        throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null")
-      }
-      // const jsonString = Buffer.from(l.log.raw.buffer).toString("utf-8")
-      // const jsonString = String.fromCharCode.apply(null, l.log.raw)
-
-      try {
-        const jsonString = Utf8ArrayToStr(l.data.raw)
-        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' + errorString(e))
-        })
-
-        promises.push(promise)
-      } catch (e) {
-        throw new ServerError(Status.INTERNAL, 'error parse log: ' + l)
-      }
+      promises.push(this.processLog(l))
     }
 
     const result = mergeProcessResults(await Promise.all(promises))
@@ -468,6 +503,23 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     }
   }
 
+  async processLog(l: DataBinding): Promise<ProcessResult> {
+    if (!l.data) {
+      throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null")
+    }
+
+    try {
+      const jsonString = Utf8ArrayToStr(l.data.raw)
+      const log: Log = JSON.parse(jsonString)
+      const handler = this.eventHandlers[l.handlerId]
+      return handler(log).catch((e) => {
+        throw new ServerError(Status.INTERNAL, 'error processing log: ' + jsonString + '\n' + errorString(e))
+      })
+    } catch (e) {
+      throw new ServerError(Status.INTERNAL, 'error parse log: ' + l)
+    }
+  }
+
   async processTransactions(
     request: ProcessTransactionsRequest,
     context: CallContext
@@ -501,31 +553,6 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       await Promise.all(processorPromises)
     }
 
-    // if (request.chainId.toLowerCase().startsWith('apt') && global.PROCESSOR_STATE.aptosProcessors) {
-    //   const processorPromises: Promise<void>[] = []
-    //   for (const txn of request.transactions) {
-    //     processorPromises.push(
-    //       new Promise((resolve, _) => {
-    //         for (const processor of global.PROCESSOR_STATE.aptosProcessors) {
-    //           if (processor.address === txn.programAccountId!) {
-    //             const res = processor.handleTransaction(
-    //               JSON.parse(new TextDecoder().decode(txn.raw)),
-    //               txn.slot ?? Long.fromNumber(0)
-    //             )
-    //             if (res) {
-    //               res.gauges.forEach((g) => result.gauges.push(g))
-    //               res.counters.forEach((c) => result.counters.push(c))
-    //               res.logs.forEach((l) => result.logs.push(l))
-    //             }
-    //           }
-    //         }
-    //         resolve()
-    //       })
-    //     )
-    //   }
-    //   await Promise.all(processorPromises)
-    // }
-
     recordRuntimeInfo(result, HandlerType.TRANSACTION)
     return {
       result,

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

@@ -1,4 +1,5 @@
 import {
+  AccountConfig,
   BlockBinding,
   ContractConfig,
   DataBinding,
@@ -25,6 +26,7 @@ import { ProcessorState } from '../state/processor-state'
 import { ProcessorServiceImpl } from '../service'
 import { Trace } from '../core/trace'
 import { setProvider } from '../provider'
+import { account } from '../builtin/aptos/0x1'
 
 export const TEST_CONTEXT: CallContext = <CallContext>{}
 
@@ -37,7 +39,8 @@ export function cleanTest() {
 
 export class TestProcessorServer implements ProcessorServiceImplementation {
   service: ProcessorServiceImpl
-  contractConfig: ContractConfig[]
+  contractConfigs: ContractConfig[]
+  accountConfigs: AccountConfig[]
 
   constructor(loader: () => void, httpEndpoints: Record<string, string> = {}) {
     cleanTest()
@@ -58,7 +61,9 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
 
   async start(request: StartRequest = { templateInstances: [] }, context = TEST_CONTEXT): Promise<Empty> {
     const res = await this.service.start(request, context)
-    this.contractConfig = (await this.getConfig({})).contractConfigs
+    const config = await this.getConfig({})
+    this.contractConfigs = config.contractConfigs
+    this.accountConfigs = config.accountConfigs
     return res
   }
 
@@ -114,7 +119,7 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
     }
     const signature = trace.action.input.slice(0, 10)
 
-    for (const contract of this.contractConfig) {
+    for (const contract of this.contractConfigs) {
       if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {
         continue
       }
@@ -155,7 +160,7 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
   }
 
   buildLogBinding(log: Log, network: Networkish = 1): DataBinding | undefined {
-    for (const contract of this.contractConfig) {
+    for (const contract of this.contractConfigs) {
       if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {
         continue
       }
@@ -197,6 +202,67 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
     }
     return undefined
   }
+  testAccountLog(address: string, log: Log, network: Networkish = 1): Promise<ProcessBindingResponse> {
+    return this.testAccountLogs(address, [log], network)
+  }
+
+  testAccountLogs(address: string, logs: Log[], network: Networkish = 1): Promise<ProcessBindingResponse> {
+    const bindings = []
+    for (const log of logs) {
+      const binding = this.buildAccountLogBinding(address, log, network)
+      if (!binding) {
+        throw Error('Invalid test log: ' + JSON.stringify(log))
+      }
+      bindings.push(binding)
+    }
+    return this.processLogs({
+      bindings: bindings,
+    })
+  }
+
+  buildAccountLogBinding(address: string, log: Log, network: Networkish = 1): DataBinding | undefined {
+    for (const account of this.accountConfigs) {
+      if (account.chainId !== getNetwork(network).chainId.toString()) {
+        continue
+      }
+      if (address.toLowerCase() !== account.address.toLowerCase()) {
+        continue
+      }
+      for (const config of account.logConfigs) {
+        for (const filter of config.filters) {
+          // if (filter.topics.length != log.topics.length) {
+          //   continue
+          // }
+
+          let match = true
+          for (const topicIdx in filter.topics) {
+            const logTopic = log.topics[topicIdx]
+            const possibleTopic = filter.topics[topicIdx].hashes
+            if (possibleTopic.length === 0) {
+              // match all
+              continue
+            }
+            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {
+              // find one
+              continue
+            }
+            match = false
+            break
+          }
+          if (match) {
+            return {
+              data: {
+                raw: toBytes(log),
+              },
+              handlerId: config.handlerId,
+              handlerType: HandlerType.ETH_LOG,
+            }
+          }
+        }
+      }
+    }
+    return undefined
+  }
 
   testBlock(block: Partial<Block> & { number: number }, network: Networkish = 1): Promise<ProcessBindingResponse> {
     return this.testBlocks([block], network)
@@ -223,7 +289,7 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
       },
       handlerIds: [],
     }
-    for (const contract of this.contractConfig) {
+    for (const contract of this.contractConfigs) {
       if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {
         continue
       }