@sentio/sdk 1.20.2 → 1.21.1

package/src/service.ts

@@ -28,6 +28,7 @@ import { Empty } from './gen/google/protobuf/empty'
 import Long from 'long'
 import { TextDecoder } from 'util'
 import { Trace } from './core'
+import { Instruction } from '@project-serum/anchor'
 
 const DEFAULT_MAX_BLOCK = Long.ZERO
 
@@ -65,6 +66,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       config: undefined,
       contractConfigs: this.contractConfigs,
       templateInstances: this.templateInstances,
+      accountConfigs: [],
     }
   }
 
@@ -211,7 +213,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       const contractConfig: ContractConfig = {
         processorType: USER_PROCESSOR,
         contract: {
-          name: aptosProcessor.name,
+          name: aptosProcessor.moduleName,
           chainId: aptosProcessor.getChainId(),
           address: aptosProcessor.config.address,
           abi: '',
@@ -242,8 +244,9 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
           filters: handler.filters.map((filter) => {
             return {
               function: filter.function,
-              typeArguments: filter.typeArguments ?? [],
+              typeArguments: filter.typeArguments || [],
               withTypeArguments: filter.typeArguments ? true : false,
+              includeFailed: filter.includeFailed || false,
             }
           }),
           handlerId,
@@ -464,26 +467,30 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
           new Promise((resolve, _) => {
             for (const processor of global.PROCESSOR_STATE.solanaProcessors) {
               if (processor.address === instruction.programAccountId) {
-                let res: ProcessResult | null
+                let parsedInstruction: Instruction | null = null
                 if (instruction.parsed) {
-                  res = processor.handleInstruction(
-                    JSON.parse(new TextDecoder().decode(instruction.parsed)),
-                    instruction.slot
+                  parsedInstruction = processor.getParsedInstruction(
+                    JSON.parse(new TextDecoder().decode(instruction.parsed))
                   )
                 } else if (instruction.instructionData) {
-                  res = processor.handleInstruction(instruction.instructionData, instruction.slot)
-                } else {
+                  parsedInstruction = processor.getParsedInstruction(instruction.instructionData)
+                }
+                if (parsedInstruction == null) {
                   continue
                 }
-                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))
-                } else {
-                  console.warn(
-                    `Failed to decode the instruction: ${instruction.instructionData} with slot: ${instruction.slot}`
-                  )
+                const insHandler = processor.getInstructionHandler(parsedInstruction)
+                if (insHandler == null) {
+                  continue
                 }
+                const res = processor.handleInstruction(
+                  parsedInstruction,
+                  instruction.accounts,
+                  insHandler,
+                  instruction.slot
+                )
+                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()

package/src/target-ethers-sentio/codegen.ts

@@ -49,18 +49,19 @@ export function codeGenSentioFile(contract: Contract): string {
       .join('\n')}
   }
 
-  export type ${contract.name}Context = Context<${contract.name}, ${contract.name}BoundContractView>
+  export type ${contract.name}Context = ContractContext<${contract.name}, ${contract.name}BoundContractView>
 
   export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${contract.name}, ${
     contract.name
   }BoundContractView> {
     bindInternal(options: BindOptions) {
-      let processor = getProcessor("${contract.name}", options) as ${contract.name}Processor
+      if (!options.name) {
+        options.name = "${contract.name}"
+      }
+      let processor = getProcessor(options) as ${contract.name}Processor
       if (!processor) {
-        const finalOptions = Object.assign({}, options)
-        finalOptions.name = getContractName("${contract.name}", options.name, options.address, options.network)
-        processor = new ${contract.name}Processor(finalOptions)
-        addProcessor("${contract.name}", options, processor)
+        processor = new ${contract.name}Processor(options)
+        addProcessor(options, processor)
       }
       return processor
     }
@@ -103,14 +104,13 @@ export function codeGenSentioFile(contract: Contract): string {
     }
 
     public static bind(options: BindOptions): ${contract.name}Processor {
-      let processor = getProcessor("${contract.name}", options) as ${contract.name}Processor
+       if (!options.name) {
+        options.name = "${contract.name}"
+      }
+      let processor = getProcessor(options) as ${contract.name}Processor
       if (!processor) {
-        // const wrapper = get${contract.name}Contract(options.address, options.network)
-
-        const finalOptions = Object.assign({}, options)
-        finalOptions.name = getContractName("${contract.name}", options.name, options.address, options.network)
-        processor = new ${contract.name}Processor(finalOptions)
-        addProcessor("${contract.name}", options, processor)
+        processor = new ${contract.name}Processor(options)
+        addProcessor(options, processor)
       }
       return processor
     }
@@ -167,10 +167,9 @@ export function codeGenSentioFile(contract: Contract): string {
         'BaseProcessor',
         'BaseProcessorTemplate',
         'BoundContractView',
-        'Context',
+        'ContractContext',
         'ContractView',
         'DummyProvider',
-        'getContractName',
         'TypedCallTrace',
       ],
       './common': ['PromiseOrValue'],

package/src/test-abi-code-gen.ts

@@ -6,6 +6,7 @@ import path from 'path'
 if (process.argv.length > 3) {
   const abisDir = process.argv[2]
   const targetDir = process.argv[3]
+
   codeGenAptosProcessor(path.join(abisDir, 'aptos'), path.join(targetDir, 'aptos'))
   codeGenSolanaProcessor(path.join(abisDir, 'solana'), path.join(targetDir, 'solana'))
 } else {

package/src/testing/metric-utils.ts

@@ -29,7 +29,7 @@ export function firstCounterValue(result: ProcessResult | undefined, name: strin
     return undefined
   }
   for (const counter of result.counters) {
-    if (counter.metadata?.descriptor?.name === name) {
+    if (counter.metadata?.dataDescriptor?.name === name) {
       return MetricValueToNumber(counter.metricValue)
     }
   }
@@ -41,7 +41,7 @@ export function firstGaugeValue(result: ProcessResult | undefined, name: string)
     return undefined
   }
   for (const gauge of result.gauges) {
-    if (gauge.metadata?.descriptor?.name === name) {
+    if (gauge.metadata?.dataDescriptor?.name === name) {
       return MetricValueToNumber(gauge.metricValue)
     }
   }

package/src/tests/aptos.test.ts

@@ -2,7 +2,7 @@ import { expect } from 'chai'
 import { TextEncoder } from 'util'
 import { HandlerType, ProcessBindingsRequest } from '..'
 
-import { TestProcessorServer } from '../testing'
+import { firstCounterValue, firstGaugeValue, TestProcessorServer } from '../testing'
 
 describe('Test Aptos Example', () => {
   const service = new TestProcessorServer(() => {
@@ -15,7 +15,7 @@ describe('Test Aptos Example', () => {
 
   test('check configuration ', async () => {
     const config = await service.getConfig({})
-    expect(config.contractConfigs).length(2)
+    expect(config.contractConfigs).length(4)
   })
 
   test('Check souffl3 transaction dispatch', async () => {
@@ -59,7 +59,7 @@ describe('Test Aptos Example', () => {
       bindings: [
         {
           data: {
-            raw: new TextEncoder().encode(JSON.stringify(testData.events[1])),
+            raw: new TextEncoder().encode(JSON.stringify(testData.events[testData.events.length - 1])),
           },
           handlerId: 0,
           handlerType: HandlerType.APT_EVENT,
@@ -71,6 +71,39 @@ describe('Test Aptos Example', () => {
     expect(res.result?.gauges).length(0)
     expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)
   })
+
+  test('Check token deposit event dispatch', async () => {
+    const request: ProcessBindingsRequest = {
+      bindings: [
+        {
+          data: {
+            raw: new TextEncoder().encode(JSON.stringify(tokenTestData)),
+          },
+          handlerId: 2,
+          handlerType: HandlerType.APT_EVENT,
+        },
+      ],
+    }
+    const res = await service.processBindings(request)
+    expect(firstCounterValue(res.result, 'deposit')).equal(1n)
+    expect(firstGaugeValue(res.result, 'version')).equal(0n)
+  })
+
+  test('Check create poposal event dispatch', async () => {
+    const request: ProcessBindingsRequest = {
+      bindings: [
+        {
+          data: {
+            raw: new TextEncoder().encode(JSON.stringify(createProposalData)),
+          },
+          handlerId: 3,
+          handlerType: HandlerType.APT_EVENT,
+        },
+      ],
+    }
+    const res = await service.processBindings(request)
+    expect(firstGaugeValue(res.result, 'size')).equal(2n)
+  })
 })
 
 const testData = {
@@ -182,7 +215,73 @@ const testData = {
         },
       },
     },
+    {
+      version: '18483034',
+      guid: {
+        creation_number: '7',
+        account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',
+      },
+      sequence_number: '980533',
+      type: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent',
+      data: {
+        receiver: '0x3a80be5daa84f2da7e07b3ec9234da48a5647f757187879c97a1fa03f31f1195',
+      },
+    },
   ],
   timestamp: '1663143945131218',
   type: 'user_transaction',
 }
+
+const tokenTestData = {
+  version: '18483034',
+  guid: {
+    creation_number: '4',
+    account_address: '0x89bc80de59187f707a59ae7a4121718dafe3e6068e0509104ef7e41a56bc97db',
+  },
+  sequence_number: '10',
+  type: '0x3::token::DepositEvent',
+  data: {
+    amount: '1',
+    id: {
+      property_version: '0',
+      token_data_id: {
+        collection: 'Topaz Troopers',
+        creator: '0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac',
+        name: 'Topaz Trooper #11293',
+      },
+    },
+  },
+}
+
+const createProposalData = {
+  version: '1',
+  guid: {
+    creation_number: '5',
+    account_address: '0x1',
+  },
+  sequence_number: '3',
+  type: '0x1::voting::CreateProposalEvent',
+  data: {
+    early_resolution_vote_threshold: {
+      vec: ['9272156337856446330'],
+    },
+    execution_hash: '0x31549239ce8abdc1e9c259178614c3d44d015bd6d48635ddcfbfa4a77e7222b0',
+    expiration_secs: '1665463839',
+    metadata: {
+      data: [
+        {
+          key: 'metadata_hash',
+          value:
+            '0x61633230656566373063616466363939663530353564323463356363353931396463306330656562643463303662653332346336323030313561633361653066',
+        },
+        {
+          key: 'metadata_location',
+          value:
+            '0x68747470733a2f2f676973742e67697468756275736572636f6e74656e742e636f6d2f6d6f76656b6576696e2f30353766623134356234303836366566663863323263393166623964613931392f7261772f626162383566306637343334663030386138373831656563376663616464316163356135353438312f6769737466696c65312e747874',
+        },
+      ],
+    },
+    min_vote_threshold: '100000000000000',
+    proposal_id: '3',
+  },
+}

package/src/tests/erc20.test.ts

@@ -20,11 +20,9 @@ describe('Test Basic Examples', () => {
     const config = await service.getConfig({})
     expect(config.contractConfigs).length(5)
 
-    // check auto rename
     expect(config.contractConfigs?.[2].contract?.name).equals('ERC20')
-    expect(config.contractConfigs?.[3].contract?.name).equals('ERC20_1')
-    // same as above because only differ in parameters
-    expect(config.contractConfigs?.[4].contract?.name).equals('ERC20_1')
+    expect(config.contractConfigs?.[3].contract?.name).equals('ERC20')
+    expect(config.contractConfigs?.[4].contract?.name).equals('ytoken')
   })
 
   test('Check block dispatch', async () => {
@@ -32,6 +30,7 @@ describe('Test Basic Examples', () => {
     expect(res?.counters).length(0)
     expect(res?.gauges).length(1)
     expect(firstGaugeValue(res, 'g1')).equals(10n)
+    expect(res?.gauges[0].metadata?.contractName).equals('x2y2')
 
     const gauge = res?.gauges?.[0]
     expect(gauge?.metadata?.blockNumber?.toString()).equals('14373295')

package/src/tests/erc20.ts

@@ -42,7 +42,7 @@ ERC20Processor.bind({ address: 'xxxx', network: 56 })
 
 ERC20Processor.bind({ address: 'yyyy', network: 1 })
 ERC20Processor.bind({ address: 'yyyy', network: 1 })
-ERC20Processor.bind({ address: 'yyyy', network: 1, startBlock: 21 })
+ERC20Processor.bind({ address: 'yyyy', network: 1, startBlock: 21, name: 'ytoken' })
 
 // const template = Erc20Processor.template
 //   .onTransfer(async function (event, ctx) {

package/src/tests/solana.test.ts

@@ -29,19 +29,22 @@ describe('Test Solana Example', () => {
           instructionData: '33G5T8yXAQWdH8FX7fTy1mBJ6e4dUKfQWbViSrT7qJjpS8UAA3ftEQx9sNzrkaJm56xtENhDsWf',
           slot: Long.fromNumber(12345),
           programAccountId: 'wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb',
+          accounts: ['worm'],
         },
         {
           instructionData: '33G5T8yXAQWdH8FX7fTy1mBJ6e4dUKfQWbViSrT7qJjpS8UAA3ftEQx9sNzrkaJm56xtENhDsWf',
           slot: Long.fromNumber(1),
           programAccountId: 'wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb',
+          accounts: ['worm'],
         },
       ],
     }
     const res = await service.processInstructions(request)
-    expect(res.result?.counters).length(2)
+    expect(res.result?.counters).length(4)
     expect(res.result?.gauges).length(0)
     expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(12345)
     expect(firstCounterValue(res.result, 'total_transfer_amount')).equal(1000000n)
+    expect(firstCounterValue(res.result, 'worm')).equal(1000000n)
     expect(res.result?.counters[0].runtimeInfo?.from).equals(HandlerType.INSTRUCTION)
   })
 
@@ -62,6 +65,7 @@ describe('Test Solana Example', () => {
           slot: Long.fromNumber(0),
           programAccountId: 'wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb',
           parsed: new TextEncoder().encode(JSON.stringify(parsedIns)),
+          accounts: [],
         },
       ],
     }

package/src/tests/souffl3.ts

@@ -1,11 +1,14 @@
 import { SouffleChefCampaign, CandyMachine } from './types/aptos/souffle'
+import { token } from '../builtin/aptos/0x3'
+import { voting } from '../builtin/aptos/0x1'
 
-SouffleChefCampaign.bind()
-  .onEntryPullTokenV2((call, ctx) => {
+SouffleChefCampaign.bind({ startVersion: 3212312 })
+  .onEntryPullTokenV2((call: SouffleChefCampaign.PullTokenV2Payload<any>, ctx) => {
     ctx.meter.Counter('call_num').add(1)
-    ctx.meter.Counter('pulled').add(parseInt(call.arguments[3]))
+    ctx.meter.Counter('pulled').add(call.arguments_typed[3])
   })
-  .onEventBurnEnjoyEvent((evt, ctx) => {
+  .onEventPullTokenEvent((evt, ctx) => {
+    console.log(evt.data_typed.receiver)
     ctx.meter.Counter('burned').add(1)
   })
   .onEvent(
@@ -20,12 +23,24 @@ SouffleChefCampaign.bind()
     if (txn.events) {
       for (const event of txn.events) {
         if (event && event.type === '0x3::token::DepositEvent') {
+          // const typedEvent = this.dec
           ctx.meter.Counter('deposit_token_count').add(Number(event.data.amount))
         }
       }
     }
   })
 
-CandyMachine.bind().onEntryPullToken((call, ctx) => {
-  ctx.meter.Counter('pulled').add(parseInt(call.arguments[3]))
+CandyMachine.bind().onEntryPullToken((call: CandyMachine.PullTokenPayload<any>, ctx) => {
+  ctx.meter.Counter('pulled').add(call.arguments[2])
+})
+
+token.bind().onEventDepositEvent((evt: token.DepositEventInstance, ctx) => {
+  ctx.meter.Gauge('version').record(evt.data_typed.id.property_version)
+  ctx.meter.Counter('deposit').add(evt.data_typed.amount, { token: evt.data_typed.id.token_data_id.name })
+})
+
+voting.bind().onEventCreateProposalEvent((evt, ctx) => {
+  // console.log(evt)
+  evt.data_typed.expiration_secs + evt.data_typed.expiration_secs
+  ctx.meter.Gauge('size').record(evt.data_typed.metadata.data.length)
 })

package/src/tests/sui.test.ts

@@ -10,10 +10,7 @@ describe('Test Sui Example', () => {
   const service = new TestProcessorServer(() => {
     class TicTacToeProcessor extends SuiBaseProcessor {
       static bind(options: SuiBindOptions): TicTacToeProcessor {
-        if (options && !options.name) {
-          options.name = 'TicTacToe'
-        }
-        return new TicTacToeProcessor(options)
+        return new TicTacToeProcessor('TicTacToe', options)
       }
     }