@sentio/sdk 2.42.0-rc.1 → 2.42.0-rc.10

package/src/btc/types.ts

@@ -1,67 +1,64 @@
 import { BaseContext, Labels, normalizeLabels } from '../core/index.js'
 import { RecordMetaData } from '@sentio/protos'
 import { ChainId } from '@sentio/chain'
-import { BigDecimal } from '@sentio/bigdecimal'
 
-type Vin = {
+export type Transaction = {
   txid: string
-  vout: number
-  is_coinbase: boolean
-  scriptsig: string
-  scriptsig_asm: string
-  inner_redeemscript_asm?: string
-  inner_witnessscript_asm?: string
+  hash: string
+  txindex: number
+  blockhash: string
+  blockheight: number
+  blocktime: number
+  size: number
+  vsize: number
+  version: number
+  locktime: number
+  vin: Vin[]
+  vout: Vout[]
+}
+
+export type Vin = {
+  vin_index: number
+  coinbase?: string
+  txid?: string
+  vout?: number
   sequence: number
-  witness: string[]
-  prevout: Vout
-  is_pegin?: boolean
-  issuance?: {
-    asset_id: string
-    is_reissuance: boolean
-    asset_blinding_nonce: string
-    asset_entropy: string
-    contract_hash: string
-    assetamount?: number
-    assetamountcommitment?: string
-    tokenamount?: number
-    tokenamountcommitment?: string
+  witness?: string[]
+  scriptSig: {
+    asm: string
+    hex: string
   }
+  pre_vout?: Vout
+  pre_transaction?: Transaction
 }
 
-type Vout = {
-  scriptpubkey: string
-  scriptpubkey_asm: string
-  scriptpubkey_type: string
-  scriptpubkey_address: string
+export type Vout = {
   value: number
-  valuecommitment?: string
-  asset?: string
-  assetcommitment?: string
-  pegout?: {
-    genesis_hash: string
-    scriptpubkey: string
-    scriptpubkey_asm: string
-    scriptpubkey_address: string
+  n: number
+  scriptPubKey: {
+    asm: string
+    hex: string
+    reqSigs: number
+    type: string
+    address: string
   }
 }
 
-type Status = {
-  confirmed: boolean
-  block_height?: number
-  block_hash?: string
-  block_time?: number
-}
-
-export type Transaction = {
-  txid: string
-  version: number
-  locktime: number
+export type Block = {
+  block_hash: string
+  block_number: number
+  block_timestamp: Date
   size: number
+  stripped_size: number
   weight: number
-  fee: number
-  vin: Vin[]
-  vout: Vout[]
-  status: Status
+  version: number
+  merkle_root: string
+  nonce: number
+  bits: string
+  difficulty: number
+  previous_hash: string
+  next_hash: string
+  transaction_count: number
 }
 
 export class BTCContext extends BaseContext {
@@ -78,7 +75,7 @@ export class BTCContext extends BaseContext {
     return {
       address: this.address,
       contractName: this.name,
-      blockNumber: BigInt(this.tx.status?.block_time ?? 0),
+      blockNumber: BigInt(this.tx.blockheight ?? 0),
       transactionIndex: 0,
       transactionHash: this.tx.txid,
       chainId: this.getChainId(),
@@ -92,33 +89,3 @@ export class BTCContext extends BaseContext {
     return this.chainId as ChainId
   }
 }
-
-export type TransactionFilter = {
-  field:
-    | 'vin.txid'
-    | 'vin.vout'
-    | 'vin.is_coinbase'
-    | 'vin.scriptsig'
-    | 'vin.scriptsig_asm'
-    | 'vout.scriptpubkey'
-    | 'vout.scriptpubkey_asm'
-    | 'vout.scriptpubkey_type'
-    | 'vout.scriptpubkey_address'
-    | 'vout.value'
-    | 'status.block_height'
-    | 'status.block_hash'
-    | 'status.block_time'
-  prefix?: string
-  equals?: Comparable
-  gt?: Comparable
-  gte?: Comparable
-  lt?: Comparable
-  lte?: Comparable
-  ne?: Comparable
-  contains?: string
-  not_contains?: string
-}
-
-type Comparable = number | BigDecimal | bigint | Date
-
-export type TransactionFilters = TransactionFilter | TransactionFilter[]

package/src/fuel/base-processor.ts

@@ -1,19 +1,21 @@
 import { FuelProcessor, FuelProcessorConfig } from './fuel-processor.js'
-import { JsonAbi } from 'fuels'
+import { Contract, JsonAbi } from 'fuels'
 // import { FuelCall } from './context.js'
 import { FuelChainId } from '@sentio/chain'
 import { FuelLog, FuelProcessorState } from './types.js'
 
-export abstract class FuelAbstractProcessor extends FuelProcessor {
-  protected constructor(abi: JsonAbi, config?: FuelProcessorConfig) {
+export abstract class FuelAbstractProcessor<TContract extends Contract> extends FuelProcessor<TContract> {
+  protected constructor(abi: JsonAbi, config?: Omit<FuelProcessorConfig, 'abi'>) {
     if (!config) {
       config = {
         chainId: FuelChainId.FUEL_MAINNET,
         address: '*'
       }
     }
-    config.abi = abi
-    super(config)
+    super({
+      ...config,
+      abi
+    })
     FuelProcessorState.INSTANCE.addValue(this)
   }
 }

package/src/fuel/codegen/codegen.ts

@@ -115,7 +115,7 @@ async function codegenInternal(abisDir: string, outDir: string): Promise<number>
 /* tslint:disable */
 /* eslint-disable */
     
-import { FuelAbstractProcessor, FuelContext, FuelProcessorConfig, TypedCall, FuelFetchConfig, FuelCall, FuelLog} from '@sentio/sdk/fuel'
+import { FuelAbstractProcessor, FuelContractContext, FuelProcessorConfig, TypedCall, FuelFetchConfig, FuelCall, FuelLog} from '@sentio/sdk/fuel'
 import {${abi.commonTypesInUse.join(',')}} from './common.js'
 import {${importedTypes.join(',')}, ${abi.capitalizedName}} from './${abi.capitalizedName}.js'
 
@@ -144,13 +144,9 @@ ${
 }
 }
 
-export class ${name}Processor extends FuelAbstractProcessor {
-  constructor(config?: FuelProcessorConfig) {
-    super(${abi.capitalizedName}.abi, config)
-  }
-  
-  static bind(config: FuelProcessorConfig) {
-    return new ${name}Processor({
+export class ${name}Processor extends FuelAbstractProcessor<${name}> {
+  static bind(config: Omit<FuelProcessorConfig, 'abi'>) {
+    return new ${name}Processor(${abi.capitalizedName}.abi, {
       name: '${name}',
       ...config,
     })
@@ -162,7 +158,9 @@ ${
        abi.functions.map((f) => genOnCallFunction(name, f)).join('\n') */
 }   
 
-${Object.entries(logByTypes).map(genOnLogFunction).join('\n')}
+${Object.entries(logByTypes)
+  .map((e) => genOnLogFunction(name, e))
+  .join('\n')}
 
 }
 `
@@ -200,7 +198,7 @@ function genCallType(f: IFunction) {
 function genOnCallFunction(contractName: string, f: IFunction) {
   const name = upperFirst(f.name)
   return `
-  onCall${name}(handler: (call: ${contractName}.${name}Call, ctx: FuelContext) => void | Promise<void>, config?: FuelFetchConfig) {
+  onCall${name}(handler: (call: ${contractName}.${name}Call, ctx: FuelContractContext<${contractName}>) => void | Promise<void>, config?: FuelFetchConfig) {
     return super.onCall('${f.name}', (call, ctx) => handler(new ${contractName}.${name}Call(call), ctx), config)
   }`
 }
@@ -217,10 +215,10 @@ function collectImportedTypes(types: any[]): string[] {
   return Array.from(ret)
 }
 
-function genOnLogFunction([type, ids]: [string, string[]]) {
+function genOnLogFunction(contractName: string, [type, ids]: [string, string[]]) {
   const name = getTypeName(type)
   return `
-  onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContext) => void | Promise<void>, logIdFilter?: string | string[]) {
+  onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContractContext<${contractName}>) => void | Promise<void>, logIdFilter?: string | string[]) {
     return super.onLog<${type}>(logIdFilter ?? [${ids.map((id) => `"${id}"`).join(', ')}], (log, ctx) => handler(log, ctx))
   }`
 }

package/src/fuel/context.ts

@@ -1,7 +1,7 @@
 import { BaseContext, Labels, normalizeLabels } from '../core/index.js'
 import { ChainId } from '@sentio/chain'
 import { RecordMetaData } from '@sentio/protos'
-import type { CallResult } from 'fuels'
+import type { CallResult, Contract } from 'fuels'
 import { InvocationScopeLike } from 'fuels'
 import { FuelTransaction } from './transaction.js'
 import { FuelLog } from './types.js'
@@ -51,3 +51,15 @@ export class FuelContext extends BaseContext {
     }
   }
 }
+
+export class FuelContractContext<TContract extends Contract> extends FuelContext {
+  constructor(
+    readonly chainId: ChainId,
+    readonly contract: TContract,
+    readonly contractAddress: string,
+    readonly contractName: string,
+    readonly transaction: FuelTransaction | null
+  ) {
+    super(chainId, contractAddress, contractName, transaction)
+  }
+}

package/src/fuel/fuel-processor.ts

@@ -1,5 +1,5 @@
 import { Data_FuelCall, FuelCallFilter, ProcessResult } from '@sentio/protos'
-import { FuelCall, FuelContext } from './context.js'
+import { FuelCall, FuelContext, FuelContractContext } from './context.js'
 import { bn, Contract, Interface, JsonAbi, Provider } from 'fuels'
 import { FuelNetwork, getRpcEndpoint } from './network.js'
 import {
@@ -11,12 +11,13 @@ import {
 import { CallHandler, FuelBaseProcessor, FuelLog, FuelProcessorState } from './types.js'
 import { mergeProcessResults } from '@sentio/runtime'
 
-export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
+export class FuelProcessor<TContract extends Contract> implements FuelBaseProcessor<FuelProcessorConfig> {
   callHandlers: CallHandler<Data_FuelCall>[] = []
 
   private provider: Provider
+  private contract: TContract
 
-  static bind(config: FuelProcessorConfig): FuelProcessor {
+  static bind(config: FuelProcessorConfig): FuelProcessor<any> {
     const processor = new FuelProcessor(config)
     FuelProcessorState.INSTANCE.addValue(processor)
     return processor
@@ -37,10 +38,12 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
       this.latestGasPrice = latestGasPrice?.gasPrice
       return bn(latestGasPrice.gasPrice)
     }
+
+    this.contract = new Contract(this.config.address, this.config.abi!, this.provider) as TContract
   }
 
   public onTransaction(
-    handler: (transaction: FuelTransaction, ctx: FuelContext) => void | Promise<void>,
+    handler: (transaction: FuelTransaction, ctx: FuelContractContext<TContract>) => void | Promise<void>,
     config: FuelFetchConfig = DEFAULT_FUEL_FETCH_CONFIG
   ) {
     const callHandler = {
@@ -52,8 +55,9 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
           : {}
         const tx = await decodeFuelTransactionWithAbi(call.transaction, abiMap, this.provider)
 
-        const ctx = new FuelContext(
+        const ctx = new FuelContractContext(
           this.config.chainId,
+          this.contract,
           this.config.address,
           this.config.name ?? this.config.address,
           tx
@@ -101,7 +105,7 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
     const callHandler = {
       handler: async (call: Data_FuelCall) => {
         try {
-          const contract = new Contract(this.config.address, abi, this.provider)
+          // const contract = new Contract(this.config.address, abi, this.provider)
           const gqlTransaction = call.transaction
           const tx = await decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: abi }, this.provider)
 
@@ -114,7 +118,7 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
           for (const op of tx.operations) {
             for (const call of op.calls || []) {
               if (names.has(call.functionName)) {
-                const fn = contract.functions[call.functionName]
+                const fn = this.contract.functions[call.functionName]
                 const args = Object.values(call.argumentsProvided || {})
                 const scope = fn(...args)
                 const invocationResult = new FuelCall(scope, tx, false, call.argumentsProvided, tx.logs)
@@ -147,7 +151,7 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
 
   public onLog<T>(
     logIdFilter: string | string[],
-    handler: (logs: FuelLog<T>, ctx: FuelContext) => void | Promise<void>
+    handler: (logs: FuelLog<T>, ctx: FuelContractContext<TContract>) => void | Promise<void>
   ) {
     const logIds = new Set(Array.isArray(logIdFilter) ? logIdFilter : [logIdFilter])
 
@@ -164,8 +168,9 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
           const results: ProcessResult[] = []
           const logs = (tx.logs || []).filter((log) => logIds.has(log.logId))
           for (const log of logs) {
-            const ctx = new FuelContext(
+            const ctx = new FuelContractContext(
               this.config.chainId,
+              this.contract,
               this.config.address,
               this.config.name ?? this.config.address,
               tx
@@ -203,5 +208,5 @@ export type FuelProcessorConfig = {
   chainId: FuelNetwork
   startBlock?: bigint
   endBlock?: bigint
-  abi?: JsonAbi
+  abi: JsonAbi
 }