@keep-network/tbtc-v2 1.0.0-dev.3 → 1.0.0-dev.5

package/contracts/bridge/BridgeGovernance.sol

@@ -417,13 +417,14 @@ contract BridgeGovernance is Ownable {
             uint64 depositTxMaxFee,
             uint32 depositRevealAheadPeriod
         ) = bridge.depositParameters();
+        uint64 newDepositDustThreshold = depositData.newDepositDustThreshold;
+        depositData.finalizeDepositDustThresholdUpdate(governanceDelay());
         bridge.updateDepositParameters(
-            depositData.getNewDepositDustThreshold(),
+            newDepositDustThreshold,
             depositTreasuryFeeDivisor,
             depositTxMaxFee,
             depositRevealAheadPeriod
         );
-        depositData.finalizeDepositDustThresholdUpdate(governanceDelay());
     }
 
     /// @notice Begins the deposit treasury fee divisor amount update process.
@@ -447,14 +448,15 @@ contract BridgeGovernance is Ownable {
             uint64 depositTxMaxFee,
             uint32 depositRevealAheadPeriod
         ) = bridge.depositParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newDepositTreasuryFeeDivisor = depositData
+            .newDepositTreasuryFeeDivisor;
+        depositData.finalizeDepositTreasuryFeeDivisorUpdate(governanceDelay());
         bridge.updateDepositParameters(
             depositDustThreshold,
-            depositData.getNewDepositTreasuryFeeDivisor(),
+            newDepositTreasuryFeeDivisor,
             depositTxMaxFee,
             depositRevealAheadPeriod
         );
-        depositData.finalizeDepositTreasuryFeeDivisorUpdate(governanceDelay());
     }
 
     /// @notice Begins the deposit tx max fee amount update process.
@@ -477,14 +479,14 @@ contract BridgeGovernance is Ownable {
             ,
             uint32 depositRevealAheadPeriod
         ) = bridge.depositParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newDepositTxMaxFee = depositData.newDepositTxMaxFee;
+        depositData.finalizeDepositTxMaxFeeUpdate(governanceDelay());
         bridge.updateDepositParameters(
             depositDustThreshold,
             depositTreasuryFeeDivisor,
-            depositData.getNewDepositTxMaxFee(),
+            newDepositTxMaxFee,
             depositRevealAheadPeriod
         );
-        depositData.finalizeDepositTxMaxFeeUpdate(governanceDelay());
     }
 
     /// @notice Begins the deposit reveal ahead period update process.
@@ -508,14 +510,15 @@ contract BridgeGovernance is Ownable {
             uint64 depositTxMaxFee,
 
         ) = bridge.depositParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newDepositRevealAheadPeriod = depositData
+            .newDepositRevealAheadPeriod;
+        depositData.finalizeDepositRevealAheadPeriodUpdate(governanceDelay());
         bridge.updateDepositParameters(
             depositDustThreshold,
             depositTreasuryFeeDivisor,
             depositTxMaxFee,
-            depositData.getNewDepositRevealAheadPeriod()
+            newDepositRevealAheadPeriod
         );
-        depositData.finalizeDepositRevealAheadPeriodUpdate(governanceDelay());
     }
 
     // --- Redemption
@@ -544,9 +547,11 @@ contract BridgeGovernance is Ownable {
             uint96 redemptionTimeoutSlashingAmount,
             uint32 redemptionTimeoutNotifierRewardMultiplier
         ) = bridge.redemptionParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newRedemptionDustThreshold = redemptionData
+            .newRedemptionDustThreshold;
+        redemptionData.finalizeRedemptionDustThresholdUpdate(governanceDelay());
         bridge.updateRedemptionParameters(
-            redemptionData.getNewRedemptionDustThreshold(),
+            newRedemptionDustThreshold,
             redemptionTreasuryFeeDivisor,
             redemptionTxMaxFee,
             redemptionTxMaxTotalFee,
@@ -554,8 +559,6 @@ contract BridgeGovernance is Ownable {
             redemptionTimeoutSlashingAmount,
             redemptionTimeoutNotifierRewardMultiplier
         );
-
-        redemptionData.finalizeRedemptionDustThresholdUpdate(governanceDelay());
     }
 
     /// @notice Begins the redemption treasury fee divisor amount update process.
@@ -583,19 +586,20 @@ contract BridgeGovernance is Ownable {
             uint32 redemptionTimeoutNotifierRewardMultiplier
         ) = bridge.redemptionParameters();
         // slither-disable-next-line reentrancy-no-eth
+        uint64 newRedemptionTreasuryFeeDivisor = redemptionData
+            .newRedemptionTreasuryFeeDivisor;
+        redemptionData.finalizeRedemptionTreasuryFeeDivisorUpdate(
+            governanceDelay()
+        );
         bridge.updateRedemptionParameters(
             redemptionDustThreshold,
-            redemptionData.getNewRedemptionTreasuryFeeDivisor(),
+            newRedemptionTreasuryFeeDivisor,
             redemptionTxMaxFee,
             redemptionTxMaxTotalFee,
             redemptionTimeout,
             redemptionTimeoutSlashingAmount,
             redemptionTimeoutNotifierRewardMultiplier
         );
-
-        redemptionData.finalizeRedemptionTreasuryFeeDivisorUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the redemption tx max fee amount update process.
@@ -621,18 +625,17 @@ contract BridgeGovernance is Ownable {
             uint96 redemptionTimeoutSlashingAmount,
             uint32 redemptionTimeoutNotifierRewardMultiplier
         ) = bridge.redemptionParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newRedemptionTxMaxFee = redemptionData.newRedemptionTxMaxFee;
+        redemptionData.finalizeRedemptionTxMaxFeeUpdate(governanceDelay());
         bridge.updateRedemptionParameters(
             redemptionDustThreshold,
             redemptionTreasuryFeeDivisor,
-            redemptionData.getNewRedemptionTxMaxFee(),
+            newRedemptionTxMaxFee,
             redemptionTxMaxTotalFee,
             redemptionTimeout,
             redemptionTimeoutSlashingAmount,
             redemptionTimeoutNotifierRewardMultiplier
         );
-
-        redemptionData.finalizeRedemptionTxMaxFeeUpdate(governanceDelay());
     }
 
     /// @notice Begins the redemption tx max total fee amount update process.
@@ -659,18 +662,18 @@ contract BridgeGovernance is Ownable {
             uint96 redemptionTimeoutSlashingAmount,
             uint32 redemptionTimeoutNotifierRewardMultiplier
         ) = bridge.redemptionParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newRedemptionTxMaxTotalFee = redemptionData
+            .newRedemptionTxMaxTotalFee;
+        redemptionData.finalizeRedemptionTxMaxTotalFeeUpdate(governanceDelay());
         bridge.updateRedemptionParameters(
             redemptionDustThreshold,
             redemptionTreasuryFeeDivisor,
             redemptionTxMaxFee,
-            redemptionData.getNewRedemptionTxMaxTotalFee(),
+            newRedemptionTxMaxTotalFee,
             redemptionTimeout,
             redemptionTimeoutSlashingAmount,
             redemptionTimeoutNotifierRewardMultiplier
         );
-
-        redemptionData.finalizeRedemptionTxMaxTotalFeeUpdate(governanceDelay());
     }
 
     /// @notice Begins the redemption timeout amount update process.
@@ -696,18 +699,17 @@ contract BridgeGovernance is Ownable {
             uint96 redemptionTimeoutSlashingAmount,
             uint32 redemptionTimeoutNotifierRewardMultiplier
         ) = bridge.redemptionParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newRedemptionTimeout = redemptionData.newRedemptionTimeout;
+        redemptionData.finalizeRedemptionTimeoutUpdate(governanceDelay());
         bridge.updateRedemptionParameters(
             redemptionDustThreshold,
             redemptionTreasuryFeeDivisor,
             redemptionTxMaxFee,
             redemptionTxMaxTotalFee,
-            redemptionData.getNewRedemptionTimeout(),
+            newRedemptionTimeout,
             redemptionTimeoutSlashingAmount,
             redemptionTimeoutNotifierRewardMultiplier
         );
-
-        redemptionData.finalizeRedemptionTimeoutUpdate(governanceDelay());
     }
 
     /// @notice Begins the redemption timeout slashing amount update process.
@@ -738,20 +740,20 @@ contract BridgeGovernance is Ownable {
             ,
             uint32 redemptionTimeoutNotifierRewardMultiplier
         ) = bridge.redemptionParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint96 newRedemptionTimeoutSlashingAmount = redemptionData
+            .newRedemptionTimeoutSlashingAmount;
+        redemptionData.finalizeRedemptionTimeoutSlashingAmountUpdate(
+            governanceDelay()
+        );
         bridge.updateRedemptionParameters(
             redemptionDustThreshold,
             redemptionTreasuryFeeDivisor,
             redemptionTxMaxFee,
             redemptionTxMaxTotalFee,
             redemptionTimeout,
-            redemptionData.getNewRedemptionTimeoutSlashingAmount(),
+            newRedemptionTimeoutSlashingAmount,
             redemptionTimeoutNotifierRewardMultiplier
         );
-
-        redemptionData.finalizeRedemptionTimeoutSlashingAmountUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the redemption timeout notifier reward multiplier amount
@@ -784,7 +786,11 @@ contract BridgeGovernance is Ownable {
             uint96 redemptionTimeoutSlashingAmount,
 
         ) = bridge.redemptionParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newRedemptionTimeoutNotifierRewardMultiplier = redemptionData
+            .newRedemptionTimeoutNotifierRewardMultiplier;
+        redemptionData.finalizeRedemptionTimeoutNotifierRewardMultiplierUpdate(
+            governanceDelay()
+        );
         bridge.updateRedemptionParameters(
             redemptionDustThreshold,
             redemptionTreasuryFeeDivisor,
@@ -792,11 +798,7 @@ contract BridgeGovernance is Ownable {
             redemptionTxMaxTotalFee,
             redemptionTimeout,
             redemptionTimeoutSlashingAmount,
-            redemptionData.getNewRedemptionTimeoutNotifierRewardMultiplier()
-        );
-
-        redemptionData.finalizeRedemptionTimeoutNotifierRewardMultiplierUpdate(
-            governanceDelay()
+            newRedemptionTimeoutNotifierRewardMultiplier
         );
     }
 
@@ -830,9 +832,13 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newMovingFundsTxMaxTotalFee = movingFundsData
+            .newMovingFundsTxMaxTotalFee;
+        movingFundsData.finalizeMovingFundsTxMaxTotalFeeUpdate(
+            governanceDelay()
+        );
         bridge.updateMovingFundsParameters(
-            movingFundsData.getNewMovingFundsTxMaxTotalFee(),
+            newMovingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
             movingFundsTimeoutResetDelay,
             movingFundsTimeout,
@@ -844,9 +850,6 @@ contract BridgeGovernance is Ownable {
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovingFundsTxMaxTotalFeeUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the moving funds dust threshold update process.
@@ -877,10 +880,14 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newMovingFundsDustThreshold = movingFundsData
+            .newMovingFundsDustThreshold;
+        movingFundsData.finalizeMovingFundsDustThresholdUpdate(
+            governanceDelay()
+        );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
-            movingFundsData.getNewMovingFundsDustThreshold(),
+            newMovingFundsDustThreshold,
             movingFundsTimeoutResetDelay,
             movingFundsTimeout,
             movingFundsTimeoutSlashingAmount,
@@ -891,9 +898,6 @@ contract BridgeGovernance is Ownable {
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovingFundsDustThresholdUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the moving funds timeout reset delay update process.
@@ -925,11 +929,15 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newMovingFundsTimeoutResetDelay = movingFundsData
+            .newMovingFundsTimeoutResetDelay;
+        movingFundsData.finalizeMovingFundsTimeoutResetDelayUpdate(
+            governanceDelay()
+        );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
-            movingFundsData.getNewMovingFundsTimeoutResetDelay(),
+            newMovingFundsTimeoutResetDelay,
             movingFundsTimeout,
             movingFundsTimeoutSlashingAmount,
             movingFundsTimeoutNotifierRewardMultiplier,
@@ -939,9 +947,6 @@ contract BridgeGovernance is Ownable {
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovingFundsTimeoutResetDelayUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the moving funds timeout update process.
@@ -971,12 +976,13 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newMovingFundsTimeout = movingFundsData.newMovingFundsTimeout;
+        movingFundsData.finalizeMovingFundsTimeoutUpdate(governanceDelay());
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
             movingFundsTimeoutResetDelay,
-            movingFundsData.getNewMovingFundsTimeout(),
+            newMovingFundsTimeout,
             movingFundsTimeoutSlashingAmount,
             movingFundsTimeoutNotifierRewardMultiplier,
             movingFundsCommitmentGasOffset,
@@ -985,7 +991,6 @@ contract BridgeGovernance is Ownable {
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovingFundsTimeoutUpdate(governanceDelay());
     }
 
     /// @notice Begins the moving funds timeout slashing amount update process.
@@ -1020,13 +1025,17 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint96 newMovingFundsTimeoutSlashingAmount = movingFundsData
+            .newMovingFundsTimeoutSlashingAmount;
+        movingFundsData.finalizeMovingFundsTimeoutSlashingAmountUpdate(
+            governanceDelay()
+        );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
             movingFundsTimeoutResetDelay,
             movingFundsTimeout,
-            movingFundsData.getNewMovingFundsTimeoutSlashingAmount(),
+            newMovingFundsTimeoutSlashingAmount,
             movingFundsTimeoutNotifierRewardMultiplier,
             movingFundsCommitmentGasOffset,
             movedFundsSweepTxMaxTotalFee,
@@ -1034,9 +1043,6 @@ contract BridgeGovernance is Ownable {
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovingFundsTimeoutSlashingAmountUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the moving funds timeout notifier reward multiplier update
@@ -1073,24 +1079,25 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newMovingFundsTimeoutNotifierRewardMultiplier = movingFundsData
+            .newMovingFundsTimeoutNotifierRewardMultiplier;
+        movingFundsData
+            .finalizeMovingFundsTimeoutNotifierRewardMultiplierUpdate(
+                governanceDelay()
+            );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
             movingFundsTimeoutResetDelay,
             movingFundsTimeout,
             movingFundsTimeoutSlashingAmount,
-            movingFundsData.getNewMovingFundsTimeoutNotifierRewardMultiplier(),
+            newMovingFundsTimeoutNotifierRewardMultiplier,
             movingFundsCommitmentGasOffset,
             movedFundsSweepTxMaxTotalFee,
             movedFundsSweepTimeout,
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData
-            .finalizeMovingFundsTimeoutNotifierRewardMultiplierUpdate(
-                governanceDelay()
-            );
     }
 
     /// @notice Begins the moving funds commitment gas offset update process.
@@ -1122,7 +1129,11 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint16 newMovingFundsCommitmentGasOffset = movingFundsData
+            .newMovingFundsCommitmentGasOffset;
+        movingFundsData.finalizeMovingFundsCommitmentGasOffsetUpdate(
+            governanceDelay()
+        );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
@@ -1130,15 +1141,12 @@ contract BridgeGovernance is Ownable {
             movingFundsTimeout,
             movingFundsTimeoutSlashingAmount,
             movingFundsTimeoutNotifierRewardMultiplier,
-            movingFundsData.getNewMovingFundsCommitmentGasOffset(),
+            newMovingFundsCommitmentGasOffset,
             movedFundsSweepTxMaxTotalFee,
             movedFundsSweepTimeout,
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovingFundsCommitmentGasOffsetUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the moved funds sweep tx max total fee update process.
@@ -1170,7 +1178,11 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newMovedFundsSweepTxMaxTotalFee = movingFundsData
+            .newMovedFundsSweepTxMaxTotalFee;
+        movingFundsData.finalizeMovedFundsSweepTxMaxTotalFeeUpdate(
+            governanceDelay()
+        );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
@@ -1179,14 +1191,11 @@ contract BridgeGovernance is Ownable {
             movingFundsTimeoutSlashingAmount,
             movingFundsTimeoutNotifierRewardMultiplier,
             movingFundsCommitmentGasOffset,
-            movingFundsData.getNewMovedFundsSweepTxMaxTotalFee(),
+            newMovedFundsSweepTxMaxTotalFee,
             movedFundsSweepTimeout,
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovedFundsSweepTxMaxTotalFeeUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the moved funds sweep timeout update process.
@@ -1217,7 +1226,9 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newMovedFundsSweepTimeout = movingFundsData
+            .newMovedFundsSweepTimeout;
+        movingFundsData.finalizeMovedFundsSweepTimeoutUpdate(governanceDelay());
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
@@ -1227,11 +1238,10 @@ contract BridgeGovernance is Ownable {
             movingFundsTimeoutNotifierRewardMultiplier,
             movingFundsCommitmentGasOffset,
             movedFundsSweepTxMaxTotalFee,
-            movingFundsData.getNewMovedFundsSweepTimeout(),
+            newMovedFundsSweepTimeout,
             movedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovedFundsSweepTimeoutUpdate(governanceDelay());
     }
 
     /// @notice Begins the moved funds sweep timeout slashing amount update process.
@@ -1267,7 +1277,11 @@ contract BridgeGovernance is Ownable {
             ,
             uint32 movedFundsSweepTimeoutNotifierRewardMultiplier
         ) = bridge.movingFundsParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint96 newMovedFundsSweepTimeoutSlashingAmount = movingFundsData
+            .newMovedFundsSweepTimeoutSlashingAmount;
+        movingFundsData.finalizeMovedFundsSweepTimeoutSlashingAmountUpdate(
+            governanceDelay()
+        );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
@@ -1278,12 +1292,9 @@ contract BridgeGovernance is Ownable {
             movingFundsCommitmentGasOffset,
             movedFundsSweepTxMaxTotalFee,
             movedFundsSweepTimeout,
-            movingFundsData.getNewMovedFundsSweepTimeoutSlashingAmount(),
+            newMovedFundsSweepTimeoutSlashingAmount,
             movedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData.finalizeMovedFundsSweepTimeoutSlashingAmountUpdate(
-            governanceDelay()
-        );
     }
 
     /// @notice Begins the moved funds sweep timeout notifier reward multiplier
@@ -1321,6 +1332,12 @@ contract BridgeGovernance is Ownable {
             uint96 movedFundsSweepTimeoutSlashingAmount,
 
         ) = bridge.movingFundsParameters();
+        uint32 newMovedFundsSweepTimeoutNotifierRewardMultiplier = movingFundsData
+                .newMovedFundsSweepTimeoutNotifierRewardMultiplier;
+        movingFundsData
+            .finalizeMovedFundsSweepTimeoutNotifierRewardMultiplierUpdate(
+                governanceDelay()
+            );
         bridge.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsDustThreshold,
@@ -1332,13 +1349,8 @@ contract BridgeGovernance is Ownable {
             movedFundsSweepTxMaxTotalFee,
             movedFundsSweepTimeout,
             movedFundsSweepTimeoutSlashingAmount,
-            movingFundsData
-                .getNewMovedFundsSweepTimeoutNotifierRewardMultiplier()
+            newMovedFundsSweepTimeoutNotifierRewardMultiplier
         );
-        movingFundsData
-            .finalizeMovedFundsSweepTimeoutNotifierRewardMultiplierUpdate(
-                governanceDelay()
-            );
     }
 
     // --- Wallet creation
@@ -1366,9 +1378,10 @@ contract BridgeGovernance is Ownable {
             uint64 walletMaxBtcTransfer,
             uint32 walletClosingPeriod
         ) = bridge.walletParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newWalletCreationPeriod = walletData.newWalletCreationPeriod;
+        walletData.finalizeWalletCreationPeriodUpdate(governanceDelay());
         bridge.updateWalletParameters(
-            walletData.getNewWalletCreationPeriod(),
+            newWalletCreationPeriod,
             walletCreationMinBtcBalance,
             walletCreationMaxBtcBalance,
             walletClosureMinBtcBalance,
@@ -1376,7 +1389,6 @@ contract BridgeGovernance is Ownable {
             walletMaxBtcTransfer,
             walletClosingPeriod
         );
-        walletData.finalizeWalletCreationPeriodUpdate(governanceDelay());
     }
 
     /// @notice Begins the wallet creation min btc balance update process.
@@ -1403,17 +1415,18 @@ contract BridgeGovernance is Ownable {
             uint64 walletMaxBtcTransfer,
             uint32 walletClosingPeriod
         ) = bridge.walletParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newWalletCreationMinBtcBalance = walletData
+            .newWalletCreationMinBtcBalance;
+        walletData.finalizeWalletCreationMinBtcBalanceUpdate(governanceDelay());
         bridge.updateWalletParameters(
             walletCreationPeriod,
-            walletData.getNewWalletCreationMinBtcBalance(),
+            newWalletCreationMinBtcBalance,
             walletCreationMaxBtcBalance,
             walletClosureMinBtcBalance,
             walletMaxAge,
             walletMaxBtcTransfer,
             walletClosingPeriod
         );
-        walletData.finalizeWalletCreationMinBtcBalanceUpdate(governanceDelay());
     }
 
     /// @notice Begins the wallet creation max btc balance update process.
@@ -1441,17 +1454,18 @@ contract BridgeGovernance is Ownable {
             uint64 walletMaxBtcTransfer,
             uint32 walletClosingPeriod
         ) = bridge.walletParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newWalletCreationMaxBtcBalance = walletData
+            .newWalletCreationMaxBtcBalance;
+        walletData.finalizeWalletCreationMaxBtcBalanceUpdate(governanceDelay());
         bridge.updateWalletParameters(
             walletCreationPeriod,
             walletCreationMinBtcBalance,
-            walletData.getNewWalletCreationMaxBtcBalance(),
+            newWalletCreationMaxBtcBalance,
             walletClosureMinBtcBalance,
             walletMaxAge,
             walletMaxBtcTransfer,
             walletClosingPeriod
         );
-        walletData.finalizeWalletCreationMaxBtcBalanceUpdate(governanceDelay());
     }
 
     /// @notice Begins the wallet closure min btc balance update process.
@@ -1478,17 +1492,18 @@ contract BridgeGovernance is Ownable {
             uint64 walletMaxBtcTransfer,
             uint32 walletClosingPeriod
         ) = bridge.walletParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newWalletClosureMinBtcBalance = walletData
+            .newWalletClosureMinBtcBalance;
+        walletData.finalizeWalletClosureMinBtcBalanceUpdate(governanceDelay());
         bridge.updateWalletParameters(
             walletCreationPeriod,
             walletCreationMinBtcBalance,
             walletCreationMaxBtcBalance,
-            walletData.getNewWalletClosureMinBtcBalance(),
+            newWalletClosureMinBtcBalance,
             walletMaxAge,
             walletMaxBtcTransfer,
             walletClosingPeriod
         );
-        walletData.finalizeWalletClosureMinBtcBalanceUpdate(governanceDelay());
     }
 
     /// @notice Begins the wallet max age update process.
@@ -1514,17 +1529,17 @@ contract BridgeGovernance is Ownable {
             uint64 walletMaxBtcTransfer,
             uint32 walletClosingPeriod
         ) = bridge.walletParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newWalletMaxAge = walletData.newWalletMaxAge;
+        walletData.finalizeWalletMaxAgeUpdate(governanceDelay());
         bridge.updateWalletParameters(
             walletCreationPeriod,
             walletCreationMinBtcBalance,
             walletCreationMaxBtcBalance,
             walletClosureMinBtcBalance,
-            walletData.getNewWalletMaxAge(),
+            newWalletMaxAge,
             walletMaxBtcTransfer,
             walletClosingPeriod
         );
-        walletData.finalizeWalletMaxAgeUpdate(governanceDelay());
     }
 
     /// @notice Begins the wallet max btc transfer amount update process.
@@ -1550,17 +1565,17 @@ contract BridgeGovernance is Ownable {
             ,
             uint32 walletClosingPeriod
         ) = bridge.walletParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint64 newWalletMaxBtcTransfer = walletData.newWalletMaxBtcTransfer;
+        walletData.finalizeWalletMaxBtcTransferUpdate(governanceDelay());
         bridge.updateWalletParameters(
             walletCreationPeriod,
             walletCreationMinBtcBalance,
             walletCreationMaxBtcBalance,
             walletClosureMinBtcBalance,
             walletMaxAge,
-            walletData.getNewWalletMaxBtcTransfer(),
+            newWalletMaxBtcTransfer,
             walletClosingPeriod
         );
-        walletData.finalizeWalletMaxBtcTransferUpdate(governanceDelay());
     }
 
     /// @notice Begins the wallet closing period update process.
@@ -1586,7 +1601,8 @@ contract BridgeGovernance is Ownable {
             uint64 walletMaxBtcTransfer,
 
         ) = bridge.walletParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint32 newWalletClosingPeriod = walletData.newWalletClosingPeriod;
+        walletData.finalizeWalletClosingPeriodUpdate(governanceDelay());
         bridge.updateWalletParameters(
             walletCreationPeriod,
             walletCreationMinBtcBalance,
@@ -1594,9 +1610,8 @@ contract BridgeGovernance is Ownable {
             walletClosureMinBtcBalance,
             walletMaxAge,
             walletMaxBtcTransfer,
-            walletData.getNewWalletClosingPeriod()
+            newWalletClosingPeriod
         );
-        walletData.finalizeWalletClosingPeriodUpdate(governanceDelay());
     }
 
     // --- Fraud
@@ -1622,14 +1637,15 @@ contract BridgeGovernance is Ownable {
             uint96 fraudSlashingAmount,
             uint32 fraudNotifierRewardMultiplier
         ) = bridge.fraudParameters();
-        // slither-disable-next-line reentrancy-no-eth
+        uint96 newFraudChallengeDepositAmount = fraudData
+            .newFraudChallengeDepositAmount;
+        fraudData.finalizeFraudChallengeDepositAmountUpdate(governanceDelay());
         bridge.updateFraudParameters(
-            fraudData.getNewFraudChallengeDepositAmount(),
+            newFraudChallengeDepositAmount,
             fraudChallengeDefeatTimeout,
             fraudSlashingAmount,
             fraudNotifierRewardMultiplier
         );
-        fraudData.finalizeFraudChallengeDepositAmountUpdate(governanceDelay());
     }
 
     /// @notice Begins the fraud challenge defeat timeout update process.
@@ -1653,13 +1669,15 @@ contract BridgeGovernance is Ownable {
             uint96 fraudSlashingAmount,
             uint32 fraudNotifierRewardMultiplier
         ) = bridge.fraudParameters();
+        uint32 newFraudChallengeDefeatTimeout = fraudData
+            .newFraudChallengeDefeatTimeout;
+        fraudData.finalizeFraudChallengeDefeatTimeoutUpdate(governanceDelay());
         bridge.updateFraudParameters(
             fraudChallengeDepositAmount,
-            fraudData.getNewFraudChallengeDefeatTimeout(),
+            newFraudChallengeDefeatTimeout,
             fraudSlashingAmount,
             fraudNotifierRewardMultiplier
         );
-        fraudData.finalizeFraudChallengeDefeatTimeoutUpdate(governanceDelay());
     }
 
     /// @notice Begins the fraud slashing amount update process.
@@ -1682,13 +1700,14 @@ contract BridgeGovernance is Ownable {
             ,
             uint32 fraudNotifierRewardMultiplier
         ) = bridge.fraudParameters();
+        uint96 newFraudSlashingAmount = fraudData.newFraudSlashingAmount;
+        fraudData.finalizeFraudSlashingAmountUpdate(governanceDelay());
         bridge.updateFraudParameters(
             fraudChallengeDepositAmount,
             fraudChallengeDefeatTimeout,
-            fraudData.getNewFraudSlashingAmount(),
+            newFraudSlashingAmount,
             fraudNotifierRewardMultiplier
         );
-        fraudData.finalizeFraudSlashingAmountUpdate(governanceDelay());
     }
 
     /// @notice Begins the fraud notifier reward multiplier update process.
@@ -1713,14 +1732,16 @@ contract BridgeGovernance is Ownable {
             uint96 fraudSlashingAmount,
 
         ) = bridge.fraudParameters();
+        uint32 newFraudNotifierRewardMultiplier = fraudData
+            .newFraudNotifierRewardMultiplier;
+        fraudData.finalizeFraudNotifierRewardMultiplierUpdate(
+            governanceDelay()
+        );
         bridge.updateFraudParameters(
             fraudChallengeDepositAmount,
             fraudChallengeDefeatTimeout,
             fraudSlashingAmount,
-            fraudData.getNewFraudNotifierRewardMultiplier()
-        );
-        fraudData.finalizeFraudNotifierRewardMultiplierUpdate(
-            governanceDelay()
+            newFraudNotifierRewardMultiplier
         );
     }