fix execute index bug of slaver chain

zkLinkProtocol · Dec 2, 2023 · f282ab6 · f282ab6
1 parent 7dbfdf4
commit f282ab6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/contracts/zklink.cairo b/src/contracts/zklink.cairo
@@ -890,14 +890,15 @@ mod Zklink {
                 if i.into() == nBlocks {
                     break;
                 }
+                let _executedBlockIdx = _totalBlocksExecuted + i.into() + 1;
                 let _blockExecuteData: @ExecuteBlockInfo = _blocksData[i];
                 assert(
                     *_blockExecuteData
                         .storedBlock
                         .preCommittedBlockNumber == latestExecutedBlockNumber,
                     'd2'
                 );
-                self.executeOneBlock(_blockExecuteData);
+                self.executeOneBlock(_blockExecuteData, _executedBlockIdx);
                 priorityRequestsExecuted += *_blockExecuteData.storedBlock.priorityOperations;
                 latestExecutedBlockNumber = *_blockExecuteData.storedBlock.blockNumber;
                 i += 1;
@@ -1520,12 +1521,14 @@ mod Zklink {
         // Executes one block
         // 1. Processes all pending operations (Send Exits, Complete priority requests)
         // 2. Finalizes block on Ethereum
-        fn executeOneBlock(ref self: ContractState, _blockExecuteData: @ExecuteBlockInfo) {
+        fn executeOneBlock(
+            ref self: ContractState, _blockExecuteData: @ExecuteBlockInfo, _executedBlockIdx: u64
+        ) {
             // Ensure block was committed
             assert(
                 hashStoredBlockInfo(*_blockExecuteData.storedBlock) == self
                     .storedBlockHashes
-                    .read(*_blockExecuteData.storedBlock.blockNumber),
+                    .read(_executedBlockIdx),
                 'm0'
             );