@sentio/sdk 1.19.3 → 1.19.5

package/src/tests/aptos.test.ts

@@ -1,8 +1,6 @@
 import { expect } from 'chai'
-import Long from 'long'
 import { TextEncoder } from 'util'
-import { ProcessTransactionsRequest } from '..'
-import { chain } from '../utils'
+import { HandlerType, ProcessBindingsRequest } from '..'
 
 import { TestProcessorServer } from '../testing'
 
@@ -21,20 +19,57 @@ describe('Test Aptos Example', () => {
   })
 
   test('Check souffl3 transaction dispatch', async () => {
-    const request: ProcessTransactionsRequest = {
-      chainId: chain.APTOS_TESTNET_ID,
-      transactions: [
+    const request: ProcessBindingsRequest = {
+      bindings: [
         {
-          raw: new TextEncoder().encode(JSON.stringify(testData)),
-          programAccountId: '4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',
-          slot: Long.fromNumber(12345),
+          data: {
+            raw: new TextEncoder().encode(JSON.stringify(testData)),
+          },
+          handlerId: 0,
+          handlerType: HandlerType.APT_CALL,
+        },
+      ],
+    }
+    const res = await service.processBindings(request)
+    expect(res.result?.counters).length(1)
+    expect(res.result?.gauges).length(0)
+    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)
+  })
+
+  test('Check souffl3 function call dispatch', async () => {
+    const request: ProcessBindingsRequest = {
+      bindings: [
+        {
+          data: {
+            raw: new TextEncoder().encode(JSON.stringify(testData)),
+          },
+          handlerId: 1,
+          handlerType: HandlerType.APT_CALL,
+        },
+      ],
+    }
+    const res = await service.processBindings(request)
+    expect(res.result?.counters).length(1)
+    expect(res.result?.gauges).length(0)
+    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)
+  })
+
+  test('Check souffl3 event dispatch', async () => {
+    const request: ProcessBindingsRequest = {
+      bindings: [
+        {
+          data: {
+            raw: new TextEncoder().encode(JSON.stringify(testData.events[1])),
+          },
+          handlerId: 0,
+          handlerType: HandlerType.APT_EVENT,
         },
       ],
     }
-    const res = await service.processTransactions(request)
+    const res = await service.processBindings(request)
     expect(res.result?.counters).length(1)
     expect(res.result?.gauges).length(0)
-    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(12345)
+    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)
   })
 })
 
@@ -84,6 +119,7 @@ const testData = {
       },
     },
     {
+      version: '18483034',
       guid: {
         creation_number: '2',
         account_address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',

package/src/tests/erc20.test.ts

@@ -57,7 +57,7 @@ describe('Test Basic Examples', () => {
     expect(firstCounterValue(res.result, 'c1')).equals(1n)
 
     expect(counters?.[0].metadata?.chainId).equals('1')
-    expect(counters?.[0].runtimeInfo?.from).equals(HandlerType.LOG)
+    expect(counters?.[0].runtimeInfo?.from).equals(HandlerType.ETH_LOG)
     expect(res.configUpdated).equals(true)
 
     const logData2 = Object.assign({}, logData)

package/src/tests/logger.test.ts

@@ -41,6 +41,6 @@ describe('Test Error Capture', () => {
     )
     const log = res.result?.logs?.[0]
     expect(log?.message).eq('transferred 0')
-    expect(log?.metadata?.labels['from'].toLowerCase()).eq('0x80009ff8154bd5653c6dda2fa5f5053e5a5c1a91')
+    expect(JSON.parse(log?.attributes || '')['from'].toLowerCase()).eq('0x80009ff8154bd5653c6dda2fa5f5053e5a5c1a91')
   })
 })

package/src/tests/souffl3.ts

@@ -1,7 +1,7 @@
-import { AptosBindOptions, AptosBaseProcessor } from '@sentio/sdk'
+import { aptos } from '@sentio/sdk'
 
-class Souffl3 extends AptosBaseProcessor {
-  static bind(options: AptosBindOptions): Souffl3 {
+class Souffl3 extends aptos.AptosBaseProcessor {
+  static bind(options: aptos.AptosBindOptions): Souffl3 {
     if (options && !options.name) {
       options.name = 'souffl3'
     }
@@ -10,14 +10,32 @@ class Souffl3 extends AptosBaseProcessor {
 }
 
 Souffl3.bind({
-  startBlock: 6604913,
-  address: '4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',
-}).onTransaction((txn, ctx) => {
-  if (txn.events) {
-    for (const event of txn.events) {
-      if (event && event.type === '0x3::token::DepositEvent') {
-        ctx.meter.Counter('deposit_token_count').add(Number(event.data.amount))
+  startVersion: 6604913,
+  address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',
+})
+  .onTransaction((txn, ctx) => {
+    if (txn.events) {
+      for (const event of txn.events) {
+        if (event && event.type === '0x3::token::DepositEvent') {
+          ctx.meter.Counter('deposit_token_count').add(Number(event.data.amount))
+        }
       }
     }
-  }
-})
+  })
+  .onFunctionCall(
+    (call, ctx) => {
+      ctx.meter.Counter('call_num').add(1)
+    },
+    {
+      function: 'SouffleChefCampaign::pull_token_v2',
+      typeArguments: undefined,
+    }
+  )
+  .onEvent(
+    (event, ctx) => {
+      ctx.meter.Counter('evt_num').add(1)
+    },
+    {
+      type: '0x1::coin::DepositEvent',
+    }
+  )

package/src/utils/chain.ts

@@ -91,7 +91,9 @@ export const SUI_DEVNET_ID = 'sui_devnet'
 CHAIN_MAP[SUI_DEVNET_ID] = 'sui-dev'
 
 export const APTOS_TESTNET_ID = 'aptos_testnet'
+export const APTOS_MAINNET_ID = 'aptos_mainnet'
 CHAIN_MAP[APTOS_TESTNET_ID] = 'aptos-test'
+CHAIN_MAP[APTOS_MAINNET_ID] = 'aptos-mainnet'
 
 export function getChainName(chainId: string | number): string {
   if (typeof chainId === 'number') {

package/src/utils/erc20.test.ts

@@ -1,7 +1,4 @@
-import { ProcessorState, DummyProvider } from '@sentio/sdk'
-
-console.log(DummyProvider)
-
+import { ProcessorState } from '@sentio/sdk'
 import { getERC20TokenInfo } from './token'
 import { loadTestProvidersFromEnv } from '../testing/test-provider'
 

package/lib/core/aptos-processor.d.ts

@@ -1,22 +0,0 @@
-import { AptosBindOptions } from './bind-options';
-import { AptosContext } from './context';
-import { ProcessResult } from '..';
-import Long from 'long';
-declare type IndexConfigure = {
-    startSeqNumber: Long;
-    endSeqNumber?: Long;
-};
-export declare class AptosBaseProcessor {
-    transactionHanlder: (transaction: any, ctx: AptosContext) => void;
-    address: string;
-    name: string;
-    config: IndexConfigure;
-    constructor(options: AptosBindOptions);
-    bind(options: AptosBindOptions): void;
-    onTransaction(handler: (transaction: any, ctx: AptosContext) => void): this;
-    handleTransaction(txn: any, slot: Long): ProcessResult | null;
-    isBind(): boolean;
-    startSlot(startSlot: Long | number): this;
-    endBlock(endBlock: Long | number): this;
-}
-export {};

package/lib/core/aptos-processor.js

@@ -1,67 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AptosBaseProcessor = void 0;
-const context_1 = require("./context");
-const long_1 = __importDefault(require("long"));
-class AptosBaseProcessor {
-    transactionHanlder;
-    address;
-    name;
-    config = { startSeqNumber: new long_1.default(0) };
-    constructor(options) {
-        if (options) {
-            this.bind(options);
-        }
-        global.PROCESSOR_STATE.aptosProcessors.push(this);
-    }
-    bind(options) {
-        this.address = options.address;
-        this.name = options.name || this.address;
-        if (options.startBlock) {
-            this.startSlot(options.startBlock);
-        }
-        if (options.endBlock) {
-            this.endBlock(options.endBlock);
-        }
-    }
-    onTransaction(handler) {
-        if (!this.isBind()) {
-            throw new Error("Processor doesn't bind to an address");
-        }
-        this.transactionHanlder = handler;
-        return this;
-    }
-    handleTransaction(txn, slot) {
-        const ctx = new context_1.AptosContext(this.address, slot);
-        if (txn) {
-            this.transactionHanlder(txn, ctx);
-        }
-        return {
-            gauges: ctx.gauges,
-            counters: ctx.counters,
-            logs: ctx.logs,
-        };
-    }
-    isBind() {
-        return this.address !== null;
-    }
-    startSlot(startSlot) {
-        if (typeof startSlot === 'number') {
-            startSlot = long_1.default.fromNumber(startSlot);
-        }
-        this.config.startSeqNumber = startSlot;
-        return this;
-    }
-    endBlock(endBlock) {
-        if (typeof endBlock === 'number') {
-            endBlock = long_1.default.fromNumber(endBlock);
-        }
-        this.config.endSeqNumber = endBlock;
-        return this;
-    }
-}
-exports.AptosBaseProcessor = AptosBaseProcessor;
-//# sourceMappingURL=aptos-processor.js.map

package/lib/core/aptos-processor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"aptos-processor.js","sourceRoot":"","sources":["../../src/core/aptos-processor.ts"],"names":[],"mappings":";;;;;;AACA,uCAAwC;AAExC,gDAAuB;AAOvB,MAAa,kBAAkB;IACtB,kBAAkB,CAA+C;IACxE,OAAO,CAAQ;IACf,IAAI,CAAQ;IACZ,MAAM,GAAmB,EAAE,cAAc,EAAE,IAAI,cAAI,CAAC,CAAC,CAAC,EAAE,CAAA;IAExD,YAAY,OAAyB;QACnC,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACnB;QACD,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,CAAC,OAAyB;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAA;QACxC,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;SACnC;QACD,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;SAChC;IACH,CAAC;IAEM,aAAa,CAAC,OAAsD;QACzE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QAED,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAA;QAEjC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,iBAAiB,CAAC,GAAQ,EAAE,IAAU;QAC3C,MAAM,GAAG,GAAG,IAAI,sBAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAEhD,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAClC;QACD,OAAO;YACL,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,IAAI,EAAE,GAAG,CAAC,IAAI;SACf,CAAA;IACH,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAA;IAC9B,CAAC;IAEM,SAAS,CAAC,SAAwB;QACvC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,SAAS,GAAG,cAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;SACvC;QACD,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,SAAS,CAAA;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,QAAQ,CAAC,QAAuB;QACrC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,QAAQ,GAAG,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;SACrC;QACD,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAA;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAlED,gDAkEC","sourcesContent":["import { AptosBindOptions } from './bind-options'\nimport { AptosContext } from './context'\nimport { ProcessResult } from '..'\nimport Long from 'long'\n\ntype IndexConfigure = {\n  startSeqNumber: Long\n  endSeqNumber?: Long\n}\n\nexport class AptosBaseProcessor {\n  public transactionHanlder: (transaction: any, ctx: AptosContext) => void\n  address: string\n  name: string\n  config: IndexConfigure = { startSeqNumber: new Long(0) }\n\n  constructor(options: AptosBindOptions) {\n    if (options) {\n      this.bind(options)\n    }\n    global.PROCESSOR_STATE.aptosProcessors.push(this)\n  }\n\n  bind(options: AptosBindOptions) {\n    this.address = options.address\n    this.name = options.name || this.address\n    if (options.startBlock) {\n      this.startSlot(options.startBlock)\n    }\n    if (options.endBlock) {\n      this.endBlock(options.endBlock)\n    }\n  }\n\n  public onTransaction(handler: (transaction: any, ctx: AptosContext) => void) {\n    if (!this.isBind()) {\n      throw new Error(\"Processor doesn't bind to an address\")\n    }\n\n    this.transactionHanlder = handler\n\n    return this\n  }\n\n  public handleTransaction(txn: any, slot: Long): ProcessResult | null {\n    const ctx = new AptosContext(this.address, slot)\n\n    if (txn) {\n      this.transactionHanlder(txn, ctx)\n    }\n    return {\n      gauges: ctx.gauges,\n      counters: ctx.counters,\n      logs: ctx.logs,\n    }\n  }\n\n  public isBind() {\n    return this.address !== null\n  }\n\n  public startSlot(startSlot: Long | number) {\n    if (typeof startSlot === 'number') {\n      startSlot = Long.fromNumber(startSlot)\n    }\n    this.config.startSeqNumber = startSlot\n    return this\n  }\n\n  public endBlock(endBlock: Long | number) {\n    if (typeof endBlock === 'number') {\n      endBlock = Long.fromNumber(endBlock)\n    }\n    this.config.endSeqNumber = endBlock\n    return this\n  }\n}\n"]}

package/src/core/aptos-processor.ts

@@ -1,77 +0,0 @@
-import { AptosBindOptions } from './bind-options'
-import { AptosContext } from './context'
-import { ProcessResult } from '..'
-import Long from 'long'
-
-type IndexConfigure = {
-  startSeqNumber: Long
-  endSeqNumber?: Long
-}
-
-export class AptosBaseProcessor {
-  public transactionHanlder: (transaction: any, ctx: AptosContext) => void
-  address: string
-  name: string
-  config: IndexConfigure = { startSeqNumber: new Long(0) }
-
-  constructor(options: AptosBindOptions) {
-    if (options) {
-      this.bind(options)
-    }
-    global.PROCESSOR_STATE.aptosProcessors.push(this)
-  }
-
-  bind(options: AptosBindOptions) {
-    this.address = options.address
-    this.name = options.name || this.address
-    if (options.startBlock) {
-      this.startSlot(options.startBlock)
-    }
-    if (options.endBlock) {
-      this.endBlock(options.endBlock)
-    }
-  }
-
-  public onTransaction(handler: (transaction: any, ctx: AptosContext) => void) {
-    if (!this.isBind()) {
-      throw new Error("Processor doesn't bind to an address")
-    }
-
-    this.transactionHanlder = handler
-
-    return this
-  }
-
-  public handleTransaction(txn: any, slot: Long): ProcessResult | null {
-    const ctx = new AptosContext(this.address, slot)
-
-    if (txn) {
-      this.transactionHanlder(txn, ctx)
-    }
-    return {
-      gauges: ctx.gauges,
-      counters: ctx.counters,
-      logs: ctx.logs,
-    }
-  }
-
-  public isBind() {
-    return this.address !== null
-  }
-
-  public startSlot(startSlot: Long | number) {
-    if (typeof startSlot === 'number') {
-      startSlot = Long.fromNumber(startSlot)
-    }
-    this.config.startSeqNumber = startSlot
-    return this
-  }
-
-  public endBlock(endBlock: Long | number) {
-    if (typeof endBlock === 'number') {
-      endBlock = Long.fromNumber(endBlock)
-    }
-    this.config.endSeqNumber = endBlock
-    return this
-  }
-}