@sentio/sdk 2.36.0-rc.9 → 2.36.1-rc.1

package/src/fuel/codegen/codegen.ts

@@ -15,8 +15,9 @@ export async function codegen(abisDir: string, outDir: string) {
 }
 
 function patchImport(contents: string) {
-  return contents
-    .replace(
+  return (
+    contents
+      /* .replace(
       `import { Interface, Contract, ContractFactory } from "fuels";`,
       `import { Contract, } from "@fuel-ts/program";
 import { ContractFactory } from "@fuel-ts/contract";
@@ -29,8 +30,9 @@ import { Interface } from "@fuel-ts/abi-coder";`
 import type { AbstractAddress, BytesLike } from "@fuel-ts/interfaces";
 import type { DeployContractOptions } from "@fuel-ts/contract";
 import type { StorageSlot } from "@fuel-ts/transactions";`
-    )
-    .replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`)
+    )*/
+      .replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`)
+  )
 }
 
 function patchEnumType(contents: string) {
@@ -90,26 +92,68 @@ async function codegenInternal(abisDir: string, outDir: string): Promise<number>
     }
   })
 
+  // for (const file of abiTypeGen.files) {
+  //   const jsonAbi: JsonAbi = JSON.parse(file.contents)
+  //   for (const logType of jsonAbi.loggedTypes) {
+  //     logType.loggedType.name
+  //
+  //   }
+  // }
+
   for (const abi of abiTypeGen.abis) {
     const name = abi.name.endsWith('Abi') ? abi.name.slice(0, -3) : abi.name
     const filePath = path.join(outDir, `${name}Processor.ts`)
     const importedTypes = collectImportedTypes(abi.types)
 
+    const logByTypes: Record<string, string[]> = {}
+
+    for (const logType of abi.rawContents.loggedTypes) {
+      // @ts-ignore - we know that the type is in the abi
+      const t = abi.types.find((t) => t.rawAbiType.typeId == logType.loggedType?.type)
+      // @ts-ignore - we know that the type is in the abi
+      const typeName = t?.attributes?.outputLabel
+      if (typeName) {
+        if (!logByTypes[typeName]) {
+          logByTypes[typeName] = []
+        }
+        logByTypes[typeName].push(logType.logId)
+      }
+    }
+
     const content = `/* Autogenerated file. Do not edit manually. */
 
 /* tslint:disable */
 /* eslint-disable */
     
-import { FuelAbstractProcessor, FuelContext, FuelProcessorConfig, TypedCall, FuelFetchConfig} from '@sentio/sdk/fuel'
+import { FuelAbstractProcessor, FuelContext, FuelProcessorConfig, TypedCall, FuelFetchConfig, FuelCall, FuelLog} from '@sentio/sdk/fuel'
 import {${abi.name}__factory } from './factories/${abi.name}__factory.js'
 import {${abi.commonTypesInUse.join(',')}} from './common.js'
 import {${importedTypes.join(',')}} from './${abi.name}.js'
 
-import type { BigNumberish, BN } from '@fuel-ts/math';
-import type { BytesLike } from '@fuel-ts/interfaces';
+import type { BigNumberish, BN } from 'fuels';
+import type { BytesLike } from 'fuels';
 
 
 namespace ${name} {
+  export abstract class CallWithLogs<T extends Array<any>, R> extends TypedCall<T, R> {
+${Object.entries(logByTypes)
+  .flatMap(([t, ids]) => {
+    const s = ids.map(
+      (id) => `
+    getLog${id}(): Array<${t}>  {
+      return this.logs?.filter(l => l.logId == ${id})?.map(l => l.data) as Array<${t}>
+    }`
+    )
+    s.push(`
+    getLogsOfType${getTypeName(t)}(): Array<${t}> {
+      return this.logs?.filter(l =>[${ids.join(', ')}].includes(l.logId) ).map(l => l.data) as Array<${t}>
+    }`)
+
+    return s
+  })
+  .join('\n')}
+  }
+
 ${abi.functions.map(genCallType).join('\n')}
 }
 
@@ -126,6 +170,9 @@ export class ${name}Processor extends FuelAbstractProcessor {
   }
 
 ${abi.functions.map((f) => genOnCallFunction(name, f)).join('\n')}   
+
+${Object.entries(logByTypes).map(genOnLogFunction).join('\n')}
+
 }
 `
     writeFileSync(filePath, content)
@@ -137,10 +184,24 @@ ${abi.functions.map((f) => genOnCallFunction(name, f)).join('\n')}
 
 function genCallType(f: IFunction) {
   const name = upperFirst(f.name)
+  const argMap: Record<string, string> = {}
+  const argTypes = f.attributes.inputs.split(',').map((t) => t.trim())
+  f.rawAbiFunction.inputs.forEach((input, idx) => {
+    argMap[input.name] = argTypes[idx]
+  })
+
   return `
-  export interface ${name}Call extends TypedCall<[${f.attributes.inputs}], ${f.attributes.output}> {
-      args: [${f.attributes.inputs}]
-      returnValue: ${f.attributes.output}
+  export class ${name}Call extends CallWithLogs<[${argTypes.join(', ')}], ${f.attributes.output}> {
+      declare args: [${argTypes.join(', ')}]
+      declare returnValue: ${f.attributes.output}
+      declare argsObject: {
+          ${Object.entries(argMap)
+            .map(([k, v]) => `${k}: ${v}`)
+            .join(', ')}
+      } 
+      constructor(call: FuelCall) {
+        super(call)
+      }
   }
 `
 }
@@ -148,8 +209,8 @@ 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) {
-      super.onCallMethod('${f.name}', handler, config)
+  onCall${name}(handler: (call: ${contractName}.${name}Call, ctx: FuelContext) => void | Promise<void>, config?: FuelFetchConfig) {
+    return super.onCall('${f.name}', (call, ctx) => handler(new ${contractName}.${name}Call(call), ctx), config)
   }`
 }
 
@@ -164,3 +225,15 @@ function collectImportedTypes(types: any[]): string[] {
 
   return Array.from(ret)
 }
+
+function genOnLogFunction([type, ids]: [string, string[]]) {
+  const name = getTypeName(type)
+  return `
+  onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContext) => void | Promise<void>, logIdFilter?: number | number[]) {
+    return super.onLog<${type}>(logIdFilter ?? [${ids.join(', ')}], (log, ctx) => handler(log, ctx))
+  }`
+}
+
+function getTypeName(type: string) {
+  return upperFirst(type.replace('Output', ''))
+}

package/src/fuel/codegen/utils.ts

@@ -1,6 +1,3 @@
-
-
-
 export function upperFirst(str: string): string {
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
+  return str.charAt(0).toUpperCase() + str.slice(1)
+}

package/src/fuel/context.ts

@@ -1,12 +1,25 @@
 import { BaseContext, Labels, normalizeLabels } from '../core/index.js'
 import { ChainId } from '@sentio/chain'
 import { RecordMetaData } from '@sentio/protos'
-import { InvocationCallResult } from '@fuel-ts/program'
+import type { CallResult } from 'fuels'
+import { InvocationCallResult, InvocationScopeLike } from 'fuels'
 import { FuelTransaction } from './transaction.js'
+import { FuelLog } from './types.js'
 
-export type FuelCall = InvocationCallResult
+export class FuelCall extends InvocationCallResult {
+  constructor(
+    funcScopes: InvocationScopeLike | Array<InvocationScopeLike>,
+    callResult: CallResult,
+    isMultiCall: boolean,
+    readonly args?: Record<string, any>,
+    readonly logs?: FuelLog<unknown>[]
+  ) {
+    super(funcScopes, callResult, isMultiCall)
+  }
+}
 
 export class FuelContext extends BaseContext {
+  private logIndex: number = -1
   constructor(
     readonly chainId: ChainId,
     readonly contractAddress: string,
@@ -20,6 +33,10 @@ export class FuelContext extends BaseContext {
     return this.chainId
   }
 
+  setLogIndex(logIndex: number): void {
+    this.logIndex = logIndex
+  }
+
   protected getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
     return {
       address: this.contractAddress,
@@ -29,7 +46,7 @@ export class FuelContext extends BaseContext {
       transactionHash: this.transaction?.id || '', // TODO
       chainId: this.getChainId(),
       name: name,
-      logIndex: -1,
+      logIndex: this.logIndex,
       labels: normalizeLabels(labels)
     }
   }

package/src/fuel/fuel-plugin.ts

@@ -14,6 +14,8 @@ import { TemplateInstanceState } from '../core/template.js'
 import { FuelAssetProcessor } from './asset-processor.js'
 import { FuelProcessorState } from './types.js'
 import { FuelProcessor } from './fuel-processor.js'
+import { BN } from 'fuels'
+import { FuelGlobalProcessor } from './global-processor.js'
 
 interface Handlers {
   callHandlers: ((trace: Data_FuelCall) => Promise<ProcessResult>)[]
@@ -46,17 +48,31 @@ export class FuelPlugin extends Plugin {
       for (const callHandler of processor.callHandlers) {
         const handlerId = handlers.callHandlers.push(callHandler.handler) - 1
         if (processor instanceof FuelProcessor) {
-          const fetchConfig = {
-            handlerId,
-            filters: callHandler.fetchConfig?.filters || []
+          if (callHandler.logConfig?.logIds?.length) {
+            contractConfig.fuelLogConfigs.push({
+              logIds: callHandler.logConfig.logIds.map((logId) => new BN(logId).toString(10)),
+              handlerId
+            })
+          } else {
+            const fetchConfig = {
+              handlerId,
+              filters: callHandler.fetchConfig?.filters || []
+            }
+            contractConfig.fuelCallConfigs.push(fetchConfig)
           }
-          contractConfig.fuelCallConfigs.push(fetchConfig)
         } else if (processor instanceof FuelAssetProcessor) {
           const assetConfig = callHandler.assetConfig
           contractConfig.assetConfigs.push({
             filters: assetConfig?.filters || [],
             handlerId
           })
+        } else if (processor instanceof FuelGlobalProcessor) {
+          const fetchConfig = {
+            handlerId,
+            filters: []
+          }
+          contractConfig.fuelCallConfigs.push(fetchConfig)
+          contractConfig.contract!.address = '*'
         }
       }
 

package/src/fuel/fuel-processor.ts

@@ -1,9 +1,6 @@
-import { Data_FuelCall, FuelCallFilter } from '@sentio/protos'
+import { Data_FuelCall, FuelCallFilter, ProcessResult } from '@sentio/protos'
 import { FuelCall, FuelContext } from './context.js'
-import { Provider } from '@fuel-ts/account'
-import { Contract, InvocationCallResult } from '@fuel-ts/program'
-import { Interface, JsonAbi } from '@fuel-ts/abi-coder'
-import { bn } from '@fuel-ts/math'
+import { bn, Contract, Interface, JsonAbi, Provider } from 'fuels'
 import { FuelNetwork, getRpcEndpoint } from './network.js'
 import {
   decodeFuelTransactionWithAbi,
@@ -11,7 +8,8 @@ import {
   FuelFetchConfig,
   FuelTransaction
 } from './transaction.js'
-import { CallHandler, FuelBaseProcessor, FuelProcessorState } from './types.js'
+import { CallHandler, FuelBaseProcessor, FuelLog, FuelProcessorState } from './types.js'
+import { mergeProcessResults } from '@sentio/runtime'
 
 export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
   callHandlers: CallHandler<Data_FuelCall>[] = []
@@ -107,7 +105,8 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
               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)
             }
           }
@@ -122,6 +121,44 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
     this.callHandlers.push(callHandler)
     return this
   }
+
+  public onLog<T>(
+    logIdFilter: number | number[],
+    handler: (logs: FuelLog<T>, ctx: FuelContext) => void | Promise<void>
+  ) {
+    const logIds = new Set(Array.isArray(logIdFilter) ? logIdFilter : [logIdFilter])
+
+    const callHandler = {
+      handler: async (call: Data_FuelCall) => {
+        const gqlTransaction = call.transaction
+        const tx = decodeFuelTransactionWithAbi(
+          gqlTransaction,
+          { [this.config.address]: this.config.abi! },
+          this.provider
+        )
+
+        const results: ProcessResult[] = []
+        const logs = (tx.logs || []).filter((log) => logIds.has(log.logId))
+        for (const log of logs) {
+          const ctx = new FuelContext(
+            this.config.chainId,
+            this.config.address,
+            this.config.name ?? this.config.address,
+            tx
+          )
+          ctx.setLogIndex(log.receiptIndex)
+          await handler(log, ctx)
+          results.push(ctx.stopAndGetResult())
+        }
+        return mergeProcessResults(results)
+      },
+      logConfig: {
+        logIds: Array.from(logIds)
+      }
+    }
+    this.callHandlers.push(callHandler)
+    return this
+  }
 }
 
 export type FuelProcessorConfig = {

package/src/fuel/global-processor.ts

@@ -0,0 +1,48 @@
+import { CallHandler, FuelBaseProcessor, FuelProcessorState } from './types.js'
+import { Data_FuelCall } from '@sentio/protos'
+import { Provider } from 'fuels'
+import { getRpcEndpoint } from './network.js'
+import { decodeFuelTransaction, DEFAULT_FUEL_FETCH_CONFIG, FuelFetchConfig, FuelTransaction } from './transaction.js'
+import { FuelContext } from './context.js'
+import { FuelProcessorConfig } from './fuel-processor.js'
+
+type GlobalFuelProcessorConfig = Omit<FuelProcessorConfig, 'address' | 'abi'>
+
+export class FuelGlobalProcessor implements FuelBaseProcessor<GlobalFuelProcessorConfig> {
+  callHandlers: CallHandler<Data_FuelCall>[] = []
+
+  private provider: Provider
+
+  static bind(config: GlobalFuelProcessorConfig): FuelGlobalProcessor {
+    const processor = new FuelGlobalProcessor(config)
+    FuelProcessorState.INSTANCE.addValue(processor)
+    return processor
+  }
+
+  constructor(readonly config: GlobalFuelProcessorConfig) {}
+
+  async configure() {
+    const url = getRpcEndpoint(this.config.chainId)
+    this.provider = await Provider.create(url)
+  }
+
+  public onTransaction(
+    handler: (transaction: FuelTransaction, ctx: FuelContext) => void | Promise<void>,
+    config: FuelFetchConfig = DEFAULT_FUEL_FETCH_CONFIG
+  ) {
+    const callHandler = {
+      handler: async (call: Data_FuelCall) => {
+        const tx = decodeFuelTransaction(call.transaction, this.provider)
+        const ctx = new FuelContext(this.config.chainId, '*', this.config.name ?? '*', tx)
+        await handler(tx, ctx)
+        return ctx.stopAndGetResult()
+      },
+      fetchConfig: {
+        filters: [],
+        ...config
+      }
+    }
+    this.callHandlers.push(callHandler)
+    return this
+  }
+}

package/src/fuel/index.ts

@@ -6,3 +6,4 @@ export * from './transaction.js'
 export * from './base-processor.js'
 export * from './asset-processor.js'
 export * from './types.js'
+export * from './global-processor.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 '@fuel-ts/account/configs'
+import { FUEL_BETA_5_NETWORK_URL, FUEL_NETWORK_URL } from 'fuels'
 
 export type FuelNetwork = FuelChainId
 export const FuelNetwork = <const>{

package/src/fuel/transaction.ts

@@ -1,7 +1,20 @@
-import { AbiMap, assembleTransactionSummary, processGqlReceipt, Provider, TransactionSummary } from '@fuel-ts/account'
-import { TransactionCoder } from '@fuel-ts/transactions'
-import { bn } from '@fuel-ts/math'
-import { arrayify } from '@fuel-ts/utils'
+import {
+  AbiMap,
+  arrayify,
+  assembleTransactionSummary,
+  BaseAssetId,
+  BigNumberCoder,
+  bn,
+  Input,
+  InputType,
+  Interface,
+  processGqlReceipt,
+  Provider,
+  ReceiptType,
+  TransactionCoder,
+  TransactionSummary
+} from 'fuels'
+import { FuelLog } from './types.js'
 
 export type FuelFetchConfig = {
   includeFailed?: boolean
@@ -13,6 +26,17 @@ export const DEFAULT_FUEL_FETCH_CONFIG: FuelFetchConfig = {
 
 export type FuelTransaction = TransactionSummary & {
   blockNumber?: string
+  logs?: FuelLog<any>[]
+  sender?: string
+}
+
+function findSenderFromInputs(inputs: Input[] | undefined): string | undefined {
+  for (const input of inputs || []) {
+    if (input.type == InputType.Coin && input.assetId == BaseAssetId) {
+      return input.owner
+    }
+  }
+  return undefined
 }
 
 export function decodeFuelTransaction(gqlTransaction: any, provider: Provider): FuelTransaction {
@@ -37,7 +61,8 @@ export function decodeFuelTransaction(gqlTransaction: any, provider: Provider):
       maxInputs,
       gasCosts
     }),
-    blockNumber
+    blockNumber,
+    sender: findSenderFromInputs(decodedTransaction.inputs)
   }
 }
 
@@ -56,6 +81,21 @@ export function decodeFuelTransactionWithAbi(gqlTransaction: any, abiMap: AbiMap
   }
   const blockNumber = gqlTransactionStatus?.block?.header?.height
 
+  const abi = Object.values(abiMap)[0]
+
+  const logs = [] as FuelLog<any>[]
+  ;(receipts as any[]).forEach((receipt, idx) => {
+    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, data: decodedLog, receiptIndex: idx })
+    }
+  })
+
   return {
     ...assembleTransactionSummary({
       id: gqlTransaction.id,
@@ -69,6 +109,8 @@ export function decodeFuelTransactionWithAbi(gqlTransaction: any, abiMap: AbiMap
       maxInputs,
       gasCosts
     }),
-    blockNumber
+    blockNumber,
+    logs,
+    sender: findSenderFromInputs(decodedTransaction.inputs)
   }
 }

package/src/fuel/types.ts

@@ -15,4 +15,13 @@ export type CallHandler<T> = {
   handler: (call: T) => Promise<ProcessResult>
   fetchConfig?: Partial<FuelCallHandlerConfig>
   assetConfig?: Partial<FuelAssetHandlerConfig>
+  logConfig?: {
+    logIds: number[]
+  }
+}
+
+export interface FuelLog<T> {
+  logId: number
+  data: T
+  receiptIndex: number
 }

package/src/sui/builtin/0x1.ts

@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-/* Generated modules for account 0x1 */
+/* Generated types for 0x1, original address 0x1 */
 
 import { TypeDescriptor, ANY_TYPE } from "@typemove/move";
 import { MoveCoder, TypedEventInstance } from "@typemove/sui";

package/src/sui/builtin/0x2.ts

@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-/* Generated modules for account 0x2 */
+/* Generated types for 0x2, original address 0x2 */
 
 import { TypeDescriptor, ANY_TYPE } from "@typemove/move";
 import { MoveCoder, TypedEventInstance } from "@typemove/sui";

package/src/sui/builtin/0x3.ts

@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-/* Generated modules for account 0x3 */
+/* Generated types for 0x3, original address 0x3 */
 
 import { TypeDescriptor, ANY_TYPE } from "@typemove/move";
 import { MoveCoder, TypedEventInstance } from "@typemove/sui";

package/src/testing/fuel-facet.ts

@@ -51,6 +51,27 @@ export class FuelFacet {
           res.push(binding)
         }
       }
+
+      for (const logConfig of config.fuelLogConfigs) {
+        const binding = {
+          data: {
+            fuelCall: {
+              transaction,
+              timestamp: new Date()
+            }
+          },
+          handlerIds: [logConfig.handlerId],
+          handlerType: HandlerType.FUEL_CALL
+        }
+
+        const logIds = logConfig.logIds
+        for (const receipt of transaction.receipts || []) {
+          if ((receipt.receiptType == 'LOG' || receipt.receiptType == 'LOG_DATA') && logIds.includes(receipt.rb)) {
+            res.push(binding)
+          }
+        }
+      }
+
       for (const assetConfig of config.assetConfigs) {
         const binding = {
           data: {