@keep-network/tbtc-v2 0.1.1-dev.51 → 0.1.1-dev.54

package/contracts/bridge/MovingFunds.sol

@@ -434,12 +434,20 @@ library MovingFunds {
     /// @notice Notifies about a timed out moving funds process. Terminates
     ///         the wallet and slashes signing group members as a result.
     /// @param walletPubKeyHash 20-byte public key hash of the wallet
+    /// @param walletMembersIDs Identifiers of the wallet signing group members
     /// @dev Requirements:
     ///      - The wallet must be in the MovingFunds state
     ///      - The moving funds timeout must be actually exceeded
+    ///      - The expression `keccak256(abi.encode(walletMembersIDs))` must
+    ///        be exactly the same as the hash stored under `membersIdsHash`
+    ///        for the given `walletID`. Those IDs are not directly stored
+    ///        in the contract for gas efficiency purposes but they can be
+    ///        read from appropriate `DkgResultSubmitted` and `DkgResultApproved`
+    ///        events of the `WalletRegistry` contract
     function notifyMovingFundsTimeout(
         BridgeState.Storage storage self,
-        bytes20 walletPubKeyHash
+        bytes20 walletPubKeyHash,
+        uint32[] calldata walletMembersIDs
     ) external {
         Wallets.Wallet storage wallet = self.registeredWallets[
             walletPubKeyHash
@@ -459,8 +467,13 @@ library MovingFunds {
 
         self.terminateWallet(walletPubKeyHash);
 
-        // TODO: Perform slashing of wallet operators, reward the notifier
-        //       using seized amount, and add unit tests for that.
+        self.ecdsaWalletRegistry.seize(
+            self.movingFundsTimeoutSlashingAmount,
+            self.movingFundsTimeoutNotifierRewardMultiplier,
+            msg.sender,
+            wallet.ecdsaWalletID,
+            walletMembersIDs
+        );
 
         // slither-disable-next-line reentrancy-events
         emit MovingFundsTimedOut(walletPubKeyHash);

package/contracts/bridge/Redemption.sol

@@ -765,29 +765,41 @@ library Redemption {
     ///         with the given wallet, that has timed out. The redemption
     ///         request is identified by the key built as
     ///         `keccak256(walletPubKeyHash | redeemerOutputScript)`.
-    ///         The results of calling this function: the pending redemptions
-    ///         value for the wallet will be decreased by the requested amount
-    ///         (minus treasury fee), the tokens taken from the redeemer on
-    ///         redemption request will be returned to the redeemer, the request
-    ///         will be moved from pending redemptions to timed-out redemptions.
-    ///         If the state of the wallet is `Live` or `MovingFunds`, the
-    ///         wallet operators will be slashed.
-    ///         Additionally, if the state of wallet is `Live`, the wallet will
-    ///         be closed or marked as `MovingFunds` (depending on the presence
-    ///         or absence of the wallet's main UTXO) and the wallet will no
-    ///         longer be marked as the active wallet (if it was marked as such).
+    ///         The results of calling this function:
+    ///         - the pending redemptions value for the wallet will be decreased
+    ///           by the requested amount (minus treasury fee),
+    ///         - the tokens taken from the redeemer on redemption request will
+    ///           be returned to the redeemer,
+    ///         - the request will be moved from pending redemptions to
+    ///           timed-out redemptions,
+    ///         - if the state of the wallet is `Live` or `MovingFunds`, the
+    ///           wallet operators will be slashed and the notifier will be
+    ///           rewarded,
+    ///         - if the state of wallet is `Live`, the wallet will be closed or
+    ///           marked as `MovingFunds` (depending on the presence or absence
+    ///           of the wallet's main UTXO) and the wallet will no longer be
+    ///           marked as the active wallet (if it was marked as such).
     /// @param walletPubKeyHash 20-byte public key hash of the wallet
+    /// @param walletMembersIDs Identifiers of the wallet signing group members
     /// @param redeemerOutputScript  The redeemer's length-prefixed output
     ///        script (P2PKH, P2WPKH, P2SH or P2WSH)
     /// @dev Requirements:
+    ///      - The wallet must be in the Live or MovingFunds or Terminated state
     ///      - The redemption request identified by `walletPubKeyHash` and
     ///        `redeemerOutputScript` must exist
+    ///      - The expression `keccak256(abi.encode(walletMembersIDs))` must
+    ///        be exactly the same as the hash stored under `membersIdsHash`
+    ///        for the given `walletID`. Those IDs are not directly stored
+    ///        in the contract for gas efficiency purposes but they can be
+    ///        read from appropriate `DkgResultSubmitted` and `DkgResultApproved`
+    ///        events of the `WalletRegistry` contract
     ///      - The amount of time defined by `redemptionTimeout` must have
     ///        passed since the redemption was requested (the request must be
-    ///        timed-out).
+    ///        timed-out)
     function notifyRedemptionTimeout(
         BridgeState.Storage storage self,
         bytes20 walletPubKeyHash,
+        uint32[] calldata walletMembersIDs,
         bytes calldata redeemerOutputScript
     ) external {
         uint256 redemptionKey = uint256(
@@ -836,7 +848,17 @@ library Redemption {
         ) {
             // Propagate timeout consequences to the wallet
             self.notifyWalletTimedOutRedemption(walletPubKeyHash);
+
+            // Slash the wallet operators and reward the notifier
+            self.ecdsaWalletRegistry.seize(
+                self.redemptionTimeoutSlashingAmount,
+                self.redemptionTimeoutNotifierRewardMultiplier,
+                msg.sender,
+                wallet.ecdsaWalletID,
+                walletMembersIDs
+            );
         }
+
         // slither-disable-next-line reentrancy-events
         emit RedemptionTimedOut(walletPubKeyHash, redeemerOutputScript);
 

package/contracts/bridge/Wallets.sol

@@ -163,8 +163,9 @@ library Wallets {
 
             require(
                 (activeWalletOldEnough &&
-                    activeWalletBtcBalance >= self.walletMinBtcBalance) ||
-                    activeWalletBtcBalance >= self.walletMaxBtcBalance,
+                    activeWalletBtcBalance >=
+                    self.walletCreationMinBtcBalance) ||
+                    activeWalletBtcBalance >= self.walletCreationMaxBtcBalance,
                 "Wallet creation conditions are not met"
             );
         }
@@ -287,12 +288,11 @@ library Wallets {
         moveFunds(self, walletPubKeyHash);
     }
 
-    /// @notice Handles a notification about a wallet redemption timeout
-    ///         and requests slashing of the wallet operators. Triggers the
-    ///         wallet moving funds process only if the wallet is still in the
-    ///         Live state. That means multiple action timeouts can be reported
-    ///         for the same wallet but only the first report requests the
-    ///         wallet to move their funds.
+    /// @notice Handles a notification about a wallet redemption timeout.
+    ///         Triggers the wallet moving funds process only if the wallet is
+    ///         still in the Live state. That means multiple action timeouts can
+    ///         be reported for the same wallet but only the first report
+    ///         requests the wallet to move their funds.
     /// @param walletPubKeyHash 20-byte public key hash of the wallet
     /// @dev Requirements:
     ///      - The wallet must be in the `Live` or `MovingFunds` state
@@ -313,9 +313,6 @@ library Wallets {
         if (walletState == WalletState.Live) {
             moveFunds(self, walletPubKeyHash);
         }
-
-        // TODO: Perform slashing of wallet operators and transfer some of the
-        //       slashed tokens to the caller of this function.
     }
 
     /// @notice Notifies that the wallet is either old enough or has too few
@@ -356,7 +353,7 @@ library Wallets {
         require(
             walletOldEnough ||
                 getWalletBtcBalance(self, walletPubKeyHash, walletMainUtxo) <
-                self.walletMinBtcBalance,
+                self.walletClosureMinBtcBalance,
             "Wallet needs to be old enough or have too few satoshis"
         );
 

package/export.json

@@ -14326,6 +14326,18 @@
               "name": "movingFundsTimeout",
               "type": "uint32"
             },
+            {
+              "indexed": false,
+              "internalType": "uint96",
+              "name": "movingFundsTimeoutSlashingAmount",
+              "type": "uint96"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint256",
+              "name": "movingFundsTimeoutNotifierRewardMultiplier",
+              "type": "uint256"
+            },
             {
               "indexed": false,
               "internalType": "uint64",
@@ -14400,6 +14412,18 @@
               "internalType": "uint256",
               "name": "redemptionTimeout",
               "type": "uint256"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint96",
+              "name": "redemptionTimeoutSlashingAmount",
+              "type": "uint96"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint256",
+              "name": "redemptionTimeoutNotifierRewardMultiplier",
+              "type": "uint256"
             }
           ],
           "name": "RedemptionParametersUpdated",
@@ -14574,13 +14598,19 @@
             {
               "indexed": false,
               "internalType": "uint64",
-              "name": "walletMinBtcBalance",
+              "name": "walletCreationMinBtcBalance",
+              "type": "uint64"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint64",
+              "name": "walletCreationMaxBtcBalance",
               "type": "uint64"
             },
             {
               "indexed": false,
               "internalType": "uint64",
-              "name": "walletMaxBtcBalance",
+              "name": "walletClosureMinBtcBalance",
               "type": "uint64"
             },
             {
@@ -14931,6 +14961,16 @@
               "name": "movingFundsTimeout",
               "type": "uint32"
             },
+            {
+              "internalType": "uint96",
+              "name": "movingFundsTimeoutSlashingAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "uint256",
+              "name": "movingFundsTimeoutNotifierRewardMultiplier",
+              "type": "uint256"
+            },
             {
               "internalType": "uint64",
               "name": "movingFundsDustThreshold",
@@ -15039,6 +15079,11 @@
               "internalType": "bytes20",
               "name": "walletPubKeyHash",
               "type": "bytes20"
+            },
+            {
+              "internalType": "uint32[]",
+              "name": "walletMembersIDs",
+              "type": "uint32[]"
             }
           ],
           "name": "notifyMovingFundsTimeout",
@@ -15053,6 +15098,11 @@
               "name": "walletPubKeyHash",
               "type": "bytes20"
             },
+            {
+              "internalType": "uint32[]",
+              "name": "walletMembersIDs",
+              "type": "uint32[]"
+            },
             {
               "internalType": "bytes",
               "name": "redeemerOutputScript",
@@ -15146,6 +15196,16 @@
               "internalType": "uint256",
               "name": "redemptionTimeout",
               "type": "uint256"
+            },
+            {
+              "internalType": "uint96",
+              "name": "redemptionTimeoutSlashingAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "uint256",
+              "name": "redemptionTimeoutNotifierRewardMultiplier",
+              "type": "uint256"
             }
           ],
           "stateMutability": "view",
@@ -15995,19 +16055,6 @@
           "stateMutability": "view",
           "type": "function"
         },
-        {
-          "inputs": [
-            {
-              "internalType": "bytes20",
-              "name": "walletPubKeyHash",
-              "type": "bytes20"
-            }
-          ],
-          "name": "unsetWalletMainUtxo",
-          "outputs": [],
-          "stateMutability": "nonpayable",
-          "type": "function"
-        },
         {
           "inputs": [
             {
@@ -16071,6 +16118,16 @@
               "name": "movingFundsTimeout",
               "type": "uint32"
             },
+            {
+              "internalType": "uint96",
+              "name": "movingFundsTimeoutSlashingAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "uint256",
+              "name": "movingFundsTimeoutNotifierRewardMultiplier",
+              "type": "uint256"
+            },
             {
               "internalType": "uint64",
               "name": "movingFundsDustThreshold",
@@ -16103,6 +16160,16 @@
               "internalType": "uint256",
               "name": "redemptionTimeout",
               "type": "uint256"
+            },
+            {
+              "internalType": "uint96",
+              "name": "redemptionTimeoutSlashingAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "uint256",
+              "name": "redemptionTimeoutNotifierRewardMultiplier",
+              "type": "uint256"
             }
           ],
           "name": "updateRedemptionParameters",
@@ -16119,12 +16186,17 @@
             },
             {
               "internalType": "uint64",
-              "name": "walletMinBtcBalance",
+              "name": "walletCreationMinBtcBalance",
+              "type": "uint64"
+            },
+            {
+              "internalType": "uint64",
+              "name": "walletCreationMaxBtcBalance",
               "type": "uint64"
             },
             {
               "internalType": "uint64",
-              "name": "walletMaxBtcBalance",
+              "name": "walletClosureMinBtcBalance",
               "type": "uint64"
             },
             {
@@ -16159,12 +16231,17 @@
             },
             {
               "internalType": "uint64",
-              "name": "walletMinBtcBalance",
+              "name": "walletCreationMinBtcBalance",
+              "type": "uint64"
+            },
+            {
+              "internalType": "uint64",
+              "name": "walletCreationMaxBtcBalance",
               "type": "uint64"
             },
             {
               "internalType": "uint64",
-              "name": "walletMaxBtcBalance",
+              "name": "walletClosureMinBtcBalance",
               "type": "uint64"
             },
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keep-network/tbtc-v2",
-  "version": "0.1.1-dev.51+main.2bbde1a93f2bb8ae73f42ac83ee999962a07cfb8",
+  "version": "0.1.1-dev.54+main.76eaffd21a4cdb7ff99e40f5d66c1c66eda4f730",
   "license": "MIT",
   "files": [
     "artifacts/",