Skip to content

Commit 1ae8320

Browse files
committed
fix batch id bug
1 parent ff6d878 commit 1ae8320

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/core/FinalityRelayerManager.sol

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ contract FinalityRelayerManager is OwnableUpgradeable, FinalityRelayerManagerSto
5050
disputeGameFactory = _disputeGameFactory;
5151
isDisputeGameFactory = _isDisputeGameFactory;
5252
operatorWhitelistManager = _operatorWhitelistManager;
53+
confirmBatchId = 0;
5354
}
5455

5556
function registerOperator(string calldata nodeUrl) external {
@@ -73,15 +74,13 @@ contract FinalityRelayerManager is OwnableUpgradeable, FinalityRelayerManagerSto
7374
function VerifyFinalitySignature(
7475
FinalityBatch calldata finalityBatch,
7576
IBLSApkRegistry.FinalityNonSignerAndSignature memory finalityNonSignerAndSignature,
76-
uint256 minGas,
77-
uint256 batchId
77+
uint256 minGas
7878
) external {
7979
(
8080
IBLSApkRegistry.StakeTotals memory stakeTotals,
8181
bytes32 signatoryRecordHash
8282
) = blsApkRegistry.checkSignatures(finalityBatch.msgHash, finalityBatch.l2BlockNumber, finalityNonSignerAndSignature);
8383

84-
8584
uint256 reduciblePeriod = reducibleChallengePeriod(finalityNonSignerAndSignature.totalMantaStake, finalityNonSignerAndSignature.totalBtcStake);
8685

8786
// call l2output oracle contacts
@@ -103,7 +102,7 @@ contract FinalityRelayerManager is OwnableUpgradeable, FinalityRelayerManagerSto
103102
);
104103
require(success, "StrategyBase.VerifyFinalitySignature: change finalized periods in dispute game factory seconds fail");
105104
}
106-
emit VerifyFinalitySig(batchId, stakeTotals.totalBtcStaking, stakeTotals.totalMantaStaking, signatoryRecordHash);
105+
emit VerifyFinalitySig(confirmBatchId++, stakeTotals.totalBtcStaking, stakeTotals.totalMantaStaking, signatoryRecordHash);
107106
}
108107

109108
function addOrRemoveOperatorWhitelist(address operator, bool isAdd) external onlyOperatorWhitelistManager {

src/core/FinalityRelayerManagerStorage.sol

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ abstract contract FinalityRelayerManagerStorage is Initializable {
1818

1919
bool public isDisputeGameFactory;
2020

21+
uint256 public confirmBatchId;
2122
}

0 commit comments

Comments
 (0)