@keep-network/tbtc-v2 0.1.1-dev.91 → 0.1.1-dev.94

package/contracts/bridge/MovingFunds.sol

@@ -280,7 +280,7 @@ library MovingFunds {
 
         require(
             wallet.state == Wallets.WalletState.MovingFunds,
-            "ECDSA wallet must be in MovingFunds state"
+            "Wallet must be in MovingFunds state"
         );
 
         // If the moving funds wallet already submitted their target wallets
@@ -554,7 +554,7 @@ library MovingFunds {
 
         require(
             wallet.state == Wallets.WalletState.MovingFunds,
-            "ECDSA wallet must be in MovingFunds state"
+            "Wallet must be in MovingFunds state"
         );
 
         require(
@@ -564,8 +564,6 @@ library MovingFunds {
             "Moving funds has not timed out yet"
         );
 
-        self.terminateWallet(walletPubKeyHash);
-
         self.ecdsaWalletRegistry.seize(
             self.movingFundsTimeoutSlashingAmount,
             self.movingFundsTimeoutNotifierRewardMultiplier,
@@ -574,6 +572,8 @@ library MovingFunds {
             walletMembersIDs
         );
 
+        self.terminateWallet(walletPubKeyHash);
+
         // slither-disable-next-line reentrancy-events
         emit MovingFundsTimedOut(walletPubKeyHash);
     }
@@ -602,7 +602,7 @@ library MovingFunds {
 
         require(
             wallet.state == Wallets.WalletState.MovingFunds,
-            "ECDSA wallet must be in MovingFunds state"
+            "Wallet must be in MovingFunds state"
         );
 
         uint64 walletBtcBalance = self.getWalletBtcBalance(
@@ -1058,7 +1058,7 @@ library MovingFunds {
             walletState == Wallets.WalletState.Live ||
                 walletState == Wallets.WalletState.MovingFunds ||
                 walletState == Wallets.WalletState.Terminated,
-            "ECDSA wallet must be in Live or MovingFunds or Terminated state"
+            "Wallet must be in Live or MovingFunds or Terminated state"
         );
 
         sweepRequest.state = MovedFundsSweepRequestState.TimedOut;
@@ -1068,8 +1068,6 @@ library MovingFunds {
             walletState == Wallets.WalletState.Live ||
             walletState == Wallets.WalletState.MovingFunds
         ) {
-            self.terminateWallet(walletPubKeyHash);
-
             self.ecdsaWalletRegistry.seize(
                 self.movedFundsSweepTimeoutSlashingAmount,
                 self.movedFundsSweepTimeoutNotifierRewardMultiplier,
@@ -1077,6 +1075,8 @@ library MovingFunds {
                 wallet.ecdsaWalletID,
                 walletMembersIDs
             );
+
+            self.terminateWallet(walletPubKeyHash);
         }
 
         // slither-disable-next-line reentrancy-events

package/contracts/bridge/Redemption.sol

@@ -384,10 +384,10 @@ library Redemption {
     /// @param redeemer The Ethereum address of the redeemer who will be able to
     ///        claim Bank balance if anything goes wrong during the redemption.
     ///        In the most basic case, when someone redeems their Bitcoin
-    ///        balance from the Bank, `balanceOwner` is the same as `redemeer`.
+    ///        balance from the Bank, `balanceOwner` is the same as `redeemer`.
     ///        However, when a Vault is redeeming part of its balance for some
     ///        redeemer address (for example, someone who has earlier deposited
-    ///        into that Vault), `balanceOwner` is the Vault, and `redemeer` is
+    ///        into that Vault), `balanceOwner` is the Vault, and `redeemer` is
     ///        the address for which the vault is redeeming its balance to.
     /// @param redeemerOutputScript The redeemer's length-prefixed output
     ///        script (P2PKH, P2WPKH, P2SH or P2WSH) that will be used to lock
@@ -982,7 +982,7 @@ library Redemption {
             wallet.state == Wallets.WalletState.Live ||
                 wallet.state == Wallets.WalletState.MovingFunds ||
                 wallet.state == Wallets.WalletState.Terminated,
-            "The wallet must be in Live, MovingFunds or Terminated state"
+            "Wallet must be in Live, MovingFunds or Terminated state"
         );
 
         // It is worth noting that there is no need to check if
@@ -999,9 +999,6 @@ library Redemption {
             wallet.state == Wallets.WalletState.Live ||
             wallet.state == Wallets.WalletState.MovingFunds
         ) {
-            // Propagate timeout consequences to the wallet
-            self.notifyWalletTimedOutRedemption(walletPubKeyHash);
-
             // Slash the wallet operators and reward the notifier
             self.ecdsaWalletRegistry.seize(
                 self.redemptionTimeoutSlashingAmount,
@@ -1010,6 +1007,9 @@ library Redemption {
                 wallet.ecdsaWalletID,
                 walletMembersIDs
             );
+
+            // Propagate timeout consequences to the wallet
+            self.notifyWalletTimedOutRedemption(walletPubKeyHash);
         }
 
         // slither-disable-next-line reentrancy-events

package/contracts/bridge/VendingMachine.sol

@@ -261,7 +261,7 @@ contract VendingMachine is Ownable, IReceiveApproval {
     /// @notice Transfers vending machine upgrade initiator role to another
     ///         address. Can be called only by the current vending machine
     ///         upgrade initiator.
-    /// @param newInitiator The new vending machine upgrade initator
+    /// @param newInitiator The new vending machine upgrade initiator
     function transferVendingMachineUpgradeInitiatorRole(address newInitiator)
         external
         only(vendingMachineUpgradeInitiator)

package/contracts/bridge/Wallets.sol

@@ -287,7 +287,7 @@ library Wallets {
 
         require(
             self.registeredWallets[walletPubKeyHash].state == WalletState.Live,
-            "ECDSA wallet must be in Live state"
+            "Wallet must be in Live state"
         );
 
         moveFunds(self, walletPubKeyHash);
@@ -312,7 +312,7 @@ library Wallets {
         require(
             walletState == WalletState.Live ||
                 walletState == WalletState.MovingFunds,
-            "ECDSA wallet must be in Live or MovingFunds state"
+            "Wallet must be in Live or MovingFunds state"
         );
 
         if (walletState == WalletState.Live) {
@@ -348,7 +348,7 @@ library Wallets {
         Wallet storage wallet = self.registeredWallets[walletPubKeyHash];
         require(
             wallet.state == WalletState.Live,
-            "ECDSA wallet must be in Live state"
+            "Wallet must be in Live state"
         );
 
         /* solhint-disable-next-line not-rely-on-time */
@@ -435,7 +435,7 @@ library Wallets {
 
         require(
             wallet.state == WalletState.Closing,
-            "ECDSA wallet must be in Closing state"
+            "Wallet must be in Closing state"
         );
 
         require(
@@ -527,7 +527,7 @@ library Wallets {
         // not reported yet.
         require(
             wallet.state == WalletState.MovingFunds,
-            "ECDSA wallet must be in MovingFunds state"
+            "Wallet must be in MovingFunds state"
         );
 
         bytes32 targetWalletsCommitmentHash = wallet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keep-network/tbtc-v2",
-  "version": "0.1.1-dev.91+main.e2892ce31cdee7288281eb087f1037ac744e434c",
+  "version": "0.1.1-dev.94+main.a1f31b1c765eeff3d087786494923f102d43f077",
   "license": "MIT",
   "files": [
     "artifacts/",