From 986c2617732c0fdf34218989e90f7d58bafbd7ba Mon Sep 17 00:00:00 2001
From: Yulong <allendragon@gmail.com>
Date: Thu, 12 Sep 2024 09:33:17 +0800
Subject: [PATCH] chore(fuel): add missing block number to context (#963)

---
 packages/sdk/src/fuel/asset-processor.ts  |  3 ++-
 packages/sdk/src/fuel/context.ts          | 12 +++++++-----
 packages/sdk/src/fuel/fuel-processor.ts   | 12 ++++++++----
 packages/sdk/src/fuel/global-processor.ts |  3 ++-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/sdk/src/fuel/asset-processor.ts b/packages/sdk/src/fuel/asset-processor.ts
index 3bb7d76db7..125e739a58 100644
--- a/packages/sdk/src/fuel/asset-processor.ts
+++ b/packages/sdk/src/fuel/asset-processor.ts
@@ -78,7 +78,8 @@ export class FuelAssetProcessor implements FuelBaseProcessor<FuelAssetProcessorC
           assetId,
           this.config.name ?? '',
           call.timestamp || new Date(0),
-          tx
+          tx,
+          null
         )
         await handler(transfer, ctx)
         return ctx.stopAndGetResult()
diff --git a/packages/sdk/src/fuel/context.ts b/packages/sdk/src/fuel/context.ts
index 6effe362ea..6c89e3aca0 100644
--- a/packages/sdk/src/fuel/context.ts
+++ b/packages/sdk/src/fuel/context.ts
@@ -3,7 +3,7 @@ import { ChainId } from '@sentio/chain'
 import { RecordMetaData } from '@sentio/protos'
 import type { CallResult, Contract } from 'fuels'
 import { InvocationScopeLike } from 'fuels'
-import { FuelLog, FuelTransaction } from './types.js'
+import { FuelBlock, FuelLog, FuelTransaction } from './types.js'
 
 export class FuelCall {
   constructor(
@@ -24,7 +24,8 @@ export class FuelContext extends BaseContext {
     readonly contractAddress: string,
     readonly contractName: string,
     readonly timestamp: Date,
-    readonly transaction: FuelTransaction | null
+    readonly transaction: FuelTransaction | null,
+    readonly block: FuelBlock | null
   ) {
     super({})
   }
@@ -41,7 +42,7 @@ export class FuelContext extends BaseContext {
     return {
       address: this.contractAddress,
       contractName: this.contractName,
-      blockNumber: BigInt(this.transaction?.blockNumber || 0),
+      blockNumber: BigInt(this.block?.height?.toString() ?? (this.transaction?.blockNumber || 0)),
       transactionIndex: 0,
       transactionHash: this.transaction?.id || '', // TODO
       chainId: this.getChainId(),
@@ -59,9 +60,10 @@ export class FuelContractContext<TContract extends Contract> extends FuelContext
     readonly contractAddress: string,
     readonly contractName: string,
     readonly timestamp: Date,
-    readonly transaction: FuelTransaction | null
+    readonly transaction: FuelTransaction | null,
+    readonly block: FuelBlock | null
   ) {
-    super(chainId, contractAddress, contractName, timestamp, transaction)
+    super(chainId, contractAddress, contractName, timestamp, transaction, block)
   }
 
   get provider() {
diff --git a/packages/sdk/src/fuel/fuel-processor.ts b/packages/sdk/src/fuel/fuel-processor.ts
index c286da2594..4111eb214c 100644
--- a/packages/sdk/src/fuel/fuel-processor.ts
+++ b/packages/sdk/src/fuel/fuel-processor.ts
@@ -67,7 +67,8 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
           this.config.address,
           this.config.name ?? this.config.address,
           call.timestamp || new Date(0),
-          tx
+          tx,
+          null
         )
         await handler(tx, ctx)
         return ctx.stopAndGetResult()
@@ -121,7 +122,8 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
             this.config.address,
             this.config.name ?? this.config.address,
             call.timestamp || new Date(0),
-            tx
+            tx,
+            null
           )
           for (const op of tx.operations) {
             for (const call of op.calls || []) {
@@ -182,7 +184,8 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
               this.config.address,
               this.config.name ?? this.config.address,
               call.timestamp || new Date(0),
-              tx
+              tx,
+              null
             )
             ctx.setLogIndex(log.receiptIndex)
             await handler(log, ctx)
@@ -255,7 +258,8 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
           processor.config.address,
           processor.config.name ?? processor.config.address,
           data.timestamp || new Date(0),
-          null
+          null,
+          block
         )
         await handler(block, ctx)
         return ctx.stopAndGetResult()
diff --git a/packages/sdk/src/fuel/global-processor.ts b/packages/sdk/src/fuel/global-processor.ts
index 4d5f6305c1..77f20757e2 100644
--- a/packages/sdk/src/fuel/global-processor.ts
+++ b/packages/sdk/src/fuel/global-processor.ts
@@ -46,7 +46,8 @@ export class FuelGlobalProcessor implements FuelBaseProcessor<GlobalFuelProcesso
           '*',
           this.config.name ?? '*',
           call.timestamp || new Date(0),
-          tx
+          tx,
+          null
         )
         await handler(tx, ctx)
         return ctx.stopAndGetResult()