@sentio/sdk 2.35.1-rc.1 → 2.36.0-rc.10

package/src/fuel/fuel-processor.ts

@@ -1,15 +1,19 @@
-import { ListStateStorage } from '@sentio/runtime'
-import { Data_FuelCall, FuelCallFilter, FuelCallHandlerConfig, ProcessResult } from '@sentio/protos'
+import { Data_FuelCall, FuelCallFilter } from '@sentio/protos'
 import { FuelCall, FuelContext } from './context.js'
-import { bn, Contract, Interface, InvocationCallResult, JsonAbi, Provider } from 'fuels'
+import { Provider } from '@fuel-ts/account'
+import { Contract } from '@fuel-ts/program'
+import { Interface, JsonAbi } from '@fuel-ts/abi-coder'
+import { bn } from '@fuel-ts/math'
 import { FuelNetwork, getRpcEndpoint } from './network.js'
-import { decodeFuelTransaction, DEFAULT_FUEL_FETCH_CONFIG, FuelFetchConfig, FuelTransaction } from './transaction.js'
-
-export class FuelProcessorState extends ListStateStorage<FuelProcessor> {
-  static INSTANCE = new FuelProcessorState()
-}
-
-export class FuelProcessor {
+import {
+  decodeFuelTransactionWithAbi,
+  DEFAULT_FUEL_FETCH_CONFIG,
+  FuelFetchConfig,
+  FuelTransaction
+} from './transaction.js'
+import { CallHandler, FuelBaseProcessor, FuelProcessorState } from './types.js'
+
+export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
   callHandlers: CallHandler<Data_FuelCall>[] = []
 
   private provider: Provider
@@ -38,9 +42,14 @@ export class FuelProcessor {
               [this.config.address]: this.config.abi
             }
           : {}
-        const tx = decodeFuelTransaction(call.transaction, abiMap, this.provider)
-
-        const ctx = new FuelContext(tx, this.config.chainId)
+        const tx = decodeFuelTransactionWithAbi(call.transaction, abiMap, this.provider)
+
+        const ctx = new FuelContext(
+          this.config.chainId,
+          this.config.address,
+          this.config.name ?? this.config.address,
+          tx
+        )
         await handler(tx, ctx)
         return ctx.stopAndGetResult()
       },
@@ -84,16 +93,22 @@ export class FuelProcessor {
       handler: async (call: Data_FuelCall) => {
         const contract = new Contract(this.config.address, abi, this.provider)
         const gqlTransaction = call.transaction
-        const tx = decodeFuelTransaction(gqlTransaction, { [this.config.address]: abi }, this.provider)
-
-        const ctx = new FuelContext(tx, this.config.chainId)
+        const tx = decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: abi }, this.provider)
+
+        const ctx = new FuelContext(
+          this.config.chainId,
+          this.config.address,
+          this.config.name ?? this.config.address,
+          tx
+        )
         for (const op of tx.operations) {
           for (const call of op.calls || []) {
             if (names.has(call.functionName)) {
               const fn = contract.functions[call.functionName]
               const args = Object.values(call.argumentsProvided || {})
               const scope = fn(...args)
-              const invocationResult = await InvocationCallResult.build(scope, tx, false)
+              const invocationResult = new FuelCall(scope, tx, false, call.argumentsProvided, tx.logs)
+
               await handler(invocationResult, ctx)
             }
           }
@@ -110,11 +125,6 @@ export class FuelProcessor {
   }
 }
 
-export type CallHandler<T> = {
-  handler: (call: T) => Promise<ProcessResult>
-  fetchConfig: Partial<FuelCallHandlerConfig>
-}
-
 export type FuelProcessorConfig = {
   address: string
   name?: string

package/src/fuel/index.ts

@@ -3,4 +3,6 @@ export * from './context.js'
 export * from './fuel-processor.js'
 export * from './network.js'
 export * from './transaction.js'
-export * from './base-processor.js'
+export * from './base-processor.js'
+export * from './asset-processor.js'
+export * from './types.js'

package/src/fuel/network.ts

@@ -1,5 +1,5 @@
 import { FuelChainId } from '@sentio/chain'
-import { FUEL_BETA_5_NETWORK_URL, FUEL_NETWORK_URL } from 'fuels'
+import { FUEL_BETA_5_NETWORK_URL, FUEL_NETWORK_URL } from '@fuel-ts/account/configs'
 
 export type FuelNetwork = FuelChainId
 export const FuelNetwork = <const>{

package/src/fuel/transaction.ts

@@ -1,13 +1,9 @@
-import {
-  AbiMap,
-  arrayify,
-  assembleTransactionSummary,
-  bn,
-  processGqlReceipt,
-  Provider,
-  TransactionCoder,
-  TransactionSummary
-} from 'fuels'
+import { AbiMap, assembleTransactionSummary, processGqlReceipt, Provider, TransactionSummary } from '@fuel-ts/account'
+import { ReceiptType, TransactionCoder } from '@fuel-ts/transactions'
+import { bn } from '@fuel-ts/math'
+import { arrayify } from '@fuel-ts/utils'
+import { Interface, BigNumberCoder } from '@fuel-ts/abi-coder'
+import { FuelLog } from './types.js'
 
 export type FuelFetchConfig = {
   includeFailed?: boolean
@@ -17,27 +13,81 @@ export const DEFAULT_FUEL_FETCH_CONFIG: FuelFetchConfig = {
   includeFailed: false
 }
 
-export type FuelTransaction = TransactionSummary
+export type FuelTransaction = TransactionSummary & {
+  blockNumber?: string
+  logs?: FuelLog[]
+}
+
+export function decodeFuelTransaction(gqlTransaction: any, provider: Provider): FuelTransaction {
+  const rawPayload = arrayify(gqlTransaction.rawPayload)
+
+  const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0)
+  const { gasCosts, maxInputs, gasPerByte, gasPriceFactor } = provider.getChain().consensusParameters
+  const blockNumber = gqlTransaction.status?.block?.header?.height
+  const gqlTransactionStatus = {
+    type: gqlTransaction.status?.__typename,
+    ...gqlTransaction.status
+  }
+  return {
+    ...assembleTransactionSummary({
+      id: gqlTransaction.id,
+      receipts: [],
+      transaction: decodedTransaction,
+      transactionBytes: rawPayload,
+      gqlTransactionStatus,
+      gasPerByte: bn(gasPerByte),
+      gasPriceFactor: bn(gasPriceFactor),
+      maxInputs,
+      gasCosts
+    }),
+    blockNumber
+  }
+}
 
-export function decodeFuelTransaction(gqlTransaction: any, abiMap: AbiMap, provider: Provider): FuelTransaction {
+export function decodeFuelTransactionWithAbi(gqlTransaction: any, abiMap: AbiMap, provider: Provider): FuelTransaction {
   const rawPayload = arrayify(gqlTransaction.rawPayload)
 
   const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0)
 
   const receipts = gqlTransaction.receipts?.map(processGqlReceipt) || []
 
-  const { gasPerByte, gasPriceFactor, maxInputs, gasCosts } = provider.getChain().consensusParameters
-
-  return assembleTransactionSummary({
-    id: gqlTransaction.id,
-    receipts,
-    transaction: decodedTransaction,
-    transactionBytes: rawPayload,
-    gqlTransactionStatus: gqlTransaction.status,
-    gasPerByte: bn(gasPerByte),
-    gasPriceFactor: bn(gasPriceFactor),
-    abiMap,
-    maxInputs,
-    gasCosts
-  })
+  const { gasCosts, maxInputs, gasPerByte, gasPriceFactor } = provider.getChain().consensusParameters
+
+  const gqlTransactionStatus = {
+    type: gqlTransaction.status?.__typename,
+    ...gqlTransaction.status
+  }
+  const blockNumber = gqlTransactionStatus?.block?.header?.height
+
+  const abi = Object.values(abiMap)[0]
+
+  const logs: FuelLog[] = []
+  for (const receipt of receipts) {
+    if (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log) {
+      const interfaceToUse = new Interface(abi)
+
+      const data = receipt.type === ReceiptType.Log ? new BigNumberCoder('u64').encode(receipt.val0) : receipt.data
+
+      const logId = receipt.val1.toNumber()
+      const [decodedLog] = interfaceToUse.decodeLog(data, logId)
+      logs.push({ logId, decodedLog })
+    }
+  }
+
+  return {
+    ...assembleTransactionSummary({
+      id: gqlTransaction.id,
+      receipts,
+      transaction: decodedTransaction,
+      transactionBytes: rawPayload,
+      gqlTransactionStatus,
+      gasPerByte: bn(gasPerByte),
+      gasPriceFactor: bn(gasPriceFactor),
+      abiMap,
+      maxInputs,
+      gasCosts
+    }),
+    blockNumber,
+    logs
+  }
 }

package/src/fuel/types.ts

@@ -0,0 +1,23 @@
+import { ListStateStorage } from '@sentio/runtime'
+import { Data_FuelCall, FuelAssetHandlerConfig, FuelCallHandlerConfig, ProcessResult } from '@sentio/protos'
+
+export interface FuelBaseProcessor<T> {
+  configure(): Promise<void>
+  config: T
+  callHandlers: CallHandler<Data_FuelCall>[]
+}
+
+export class FuelProcessorState extends ListStateStorage<FuelBaseProcessor<any>> {
+  static INSTANCE = new FuelProcessorState()
+}
+
+export type CallHandler<T> = {
+  handler: (call: T) => Promise<ProcessResult>
+  fetchConfig?: Partial<FuelCallHandlerConfig>
+  assetConfig?: Partial<FuelAssetHandlerConfig>
+}
+
+export interface FuelLog {
+  logId: number
+  decodedLog: any
+}

package/src/testing/fuel-facet.ts

@@ -51,6 +51,20 @@ export class FuelFacet {
           res.push(binding)
         }
       }
+      for (const assetConfig of config.assetConfigs) {
+        const binding = {
+          data: {
+            fuelCall: {
+              transaction,
+              timestamp: new Date()
+            }
+          },
+          handlerIds: [assetConfig.handlerId],
+          handlerType: HandlerType.FUEL_CALL
+        }
+
+        res.push(binding)
+      }
     }
 
     return res