@keep-network/tbtc-v2 0.1.1-dev.74 → 0.1.1-dev.75

package/contracts/bridge/BridgeState.sol

@@ -91,6 +91,14 @@ library BridgeState {
         // than `redemptionDustThreshold` in order to prevent redemption requests
         // with values lower or equal to `movingFundsDustThreshold`.
         uint64 movingFundsDustThreshold;
+        // Time after which the moving funds timeout can be reset in case the
+        // target wallet commitment cannot be submitted due to a lack of live
+        // wallets in the system. It is counted from the moment when the wallet
+        // was requested to move their funds and switched to the MovingFunds
+        // state or from the moment the timeout was reset the last time.
+        // Value in seconds. This value should be lower than the value
+        // of the `movingFundsTimeout`.
+        uint32 movingFundsTimeoutResetDelay;
         // Time after which the moving funds process can be reported as
         // timed out. It is counted from the moment when the wallet
         // was requested to move their funds and switched to the MovingFunds
@@ -283,6 +291,7 @@ library BridgeState {
     event MovingFundsParametersUpdated(
         uint64 movingFundsTxMaxTotalFee,
         uint64 movingFundsDustThreshold,
+        uint32 movingFundsTimeoutResetDelay,
         uint32 movingFundsTimeout,
         uint96 movingFundsTimeoutSlashingAmount,
         uint256 movingFundsTimeoutNotifierRewardMultiplier,
@@ -471,10 +480,17 @@ library BridgeState {
     ///        funds transaction.
     /// @param _movingFundsDustThreshold New value of the moving funds dust
     ///        threshold. It is the minimal satoshi amount that makes sense to
-    //         be transferred during the moving funds process. Moving funds
-    //         wallets having their BTC balance below that value can begin
-    //         closing immediately as transferring such a low value may not be
-    //         possible due to BTC network fees.
+    ///        be transferred during the moving funds process. Moving funds
+    ///        wallets having their BTC balance below that value can begin
+    ///        closing immediately as transferring such a low value may not be
+    ///        possible due to BTC network fees.
+    /// @param _movingFundsTimeoutResetDelay New value of the moving funds
+    ///        timeout reset delay in seconds. It is the time after which the
+    ///        moving funds timeout can be reset in case the target wallet
+    ///        commitment cannot be submitted due to a lack of live wallets
+    ///        in the system. It is counted from the moment when the wallet
+    ///        was requested to move their funds and switched to the MovingFunds
+    ///        state or from the moment the timeout was reset the last time.
     /// @param _movingFundsTimeout New value of the moving funds timeout in
     ///        seconds. It is the time after which the moving funds process can
     ///        be reported as timed out. It is counted from the moment when the
@@ -510,7 +526,9 @@ library BridgeState {
     ///      - Moving funds transaction max total fee must be greater than zero,
     ///      - Moving funds dust threshold must be greater than zero and lower
     ///        than the redemption dust threshold,
-    ///      - Moving funds timeout must be greater than zero,
+    ///      - Moving funds timeout reset delay must be greater than zero,
+    ///      - Moving funds timeout must be greater than the moving funds
+    ///        timeout reset delay,
     ///      - Moving funds timeout notifier reward multiplier must be in the
     ///        range [0, 100],
     ///      - Moved funds sweep transaction max total fee must be greater than zero,
@@ -521,6 +539,7 @@ library BridgeState {
         Storage storage self,
         uint64 _movingFundsTxMaxTotalFee,
         uint64 _movingFundsDustThreshold,
+        uint32 _movingFundsTimeoutResetDelay,
         uint32 _movingFundsTimeout,
         uint96 _movingFundsTimeoutSlashingAmount,
         uint256 _movingFundsTimeoutNotifierRewardMultiplier,
@@ -541,8 +560,13 @@ library BridgeState {
         );
 
         require(
-            _movingFundsTimeout > 0,
-            "Moving funds timeout must be greater than zero"
+            _movingFundsTimeoutResetDelay > 0,
+            "Moving funds timeout reset delay must be greater than zero"
+        );
+
+        require(
+            _movingFundsTimeout > _movingFundsTimeoutResetDelay,
+            "Moving funds timeout must be greater than its reset delay"
         );
 
         require(
@@ -567,6 +591,7 @@ library BridgeState {
 
         self.movingFundsTxMaxTotalFee = _movingFundsTxMaxTotalFee;
         self.movingFundsDustThreshold = _movingFundsDustThreshold;
+        self.movingFundsTimeoutResetDelay = _movingFundsTimeoutResetDelay;
         self.movingFundsTimeout = _movingFundsTimeout;
         self
             .movingFundsTimeoutSlashingAmount = _movingFundsTimeoutSlashingAmount;
@@ -582,6 +607,7 @@ library BridgeState {
         emit MovingFundsParametersUpdated(
             _movingFundsTxMaxTotalFee,
             _movingFundsDustThreshold,
+            _movingFundsTimeoutResetDelay,
             _movingFundsTimeout,
             _movingFundsTimeoutSlashingAmount,
             _movingFundsTimeoutNotifierRewardMultiplier,

package/contracts/bridge/MovingFunds.sol

@@ -268,7 +268,8 @@ library MovingFunds {
     ///      - The wallet must be in the MovingFunds state,
     ///      - The target wallets commitment must not be already submitted for
     ///        the given moving funds wallet,
-    ///      - Live wallets count must be zero.
+    ///      - Live wallets count must be zero,
+    ///      - The moving funds timeout reset delay must be elapsed.
     function resetMovingFundsTimeout(
         BridgeState.Storage storage self,
         bytes20 walletPubKeyHash
@@ -292,6 +293,14 @@ library MovingFunds {
 
         require(self.liveWalletsCount == 0, "Live wallets count must be zero");
 
+        require(
+            /* solhint-disable-next-line not-rely-on-time */
+            block.timestamp >
+                wallet.movingFundsRequestedAt +
+                    self.movingFundsTimeoutResetDelay,
+            "Moving funds timeout cannot be reset yet"
+        );
+
         /* solhint-disable-next-line not-rely-on-time */
         wallet.movingFundsRequestedAt = uint32(block.timestamp);
 

package/export.json

@@ -15078,6 +15078,11 @@
               "name": "movingFundsDustThreshold",
               "indexed": false
             },
+            {
+              "type": "uint32",
+              "name": "movingFundsTimeoutResetDelay",
+              "indexed": false
+            },
             {
               "type": "uint32",
               "name": "movingFundsTimeout",
@@ -15780,6 +15785,10 @@
               "type": "uint64",
               "name": "movingFundsDustThreshold"
             },
+            {
+              "type": "uint32",
+              "name": "movingFundsTimeoutResetDelay"
+            },
             {
               "type": "uint32",
               "name": "movingFundsTimeout"
@@ -17110,6 +17119,10 @@
               "type": "uint64",
               "name": "movingFundsDustThreshold"
             },
+            {
+              "type": "uint32",
+              "name": "movingFundsTimeoutResetDelay"
+            },
             {
               "type": "uint32",
               "name": "movingFundsTimeout"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keep-network/tbtc-v2",
-  "version": "0.1.1-dev.74+main.b6bc47e2d628da3f7dda68233621f9ba1b79ff50",
+  "version": "0.1.1-dev.75+main.3200921e06b730fa5ec437a73211a9708e3fae9e",
   "license": "MIT",
   "files": [
     "artifacts/",