@keep-network/tbtc-v2 0.1.1-dev.90 → 0.1.1-dev.93

package/contracts/bridge/MovingFunds.sol

@@ -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);
     }
@@ -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
@@ -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/deploy/04_deploy_bank.ts

@@ -8,7 +8,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const Bank = await deploy("Bank", {
     contract:
-      deployments.getNetworkName() === "hardhat" ? "BankStub" : undefined,
+      process.env.TEST_USE_STUBS_TBTC === "true" ? "BankStub" : undefined,
     from: deployer,
     args: [],
     log: true,

package/deploy/05_deploy_bridge.ts

@@ -37,7 +37,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const bridge = await helpers.upgrades.deployProxy("Bridge", {
     contractName:
-      deployments.getNetworkName() === "hardhat" ? "BridgeStub" : undefined,
+      process.env.TEST_USE_STUBS_TBTC === "true" ? "BridgeStub" : undefined,
     initializerArgs: [
       Bank.address,
       Relay.address,

package/export.json

@@ -13178,6 +13178,11 @@
     "Bank": {
       "address": "0x7290f72B5C67052DDE8e6E179F7803c493e90d3f",
       "abi": [
+        {
+          "inputs": [],
+          "stateMutability": "nonpayable",
+          "type": "constructor"
+        },
         {
           "anonymous": false,
           "inputs": [
@@ -13637,24 +13642,6 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
-        {
-          "inputs": [
-            {
-              "internalType": "address",
-              "name": "addr",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "amount",
-              "type": "uint256"
-            }
-          ],
-          "name": "setBalance",
-          "outputs": [],
-          "stateMutability": "nonpayable",
-          "type": "function"
-        },
         {
           "inputs": [
             {
@@ -15483,38 +15470,6 @@
             }
           ]
         },
-        {
-          "type": "function",
-          "name": "processPendingMovedFundsSweepRequest",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "bytes20",
-              "name": "walletPubKeyHash"
-            },
-            {
-              "type": "tuple",
-              "name": "utxo",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "txHash"
-                },
-                {
-                  "type": "uint32",
-                  "name": "txOutputIndex"
-                },
-                {
-                  "type": "uint64",
-                  "name": "txOutputValue"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
         {
           "type": "function",
           "name": "receiveBalanceApproval",
@@ -15720,220 +15675,6 @@
           ],
           "outputs": []
         },
-        {
-          "type": "function",
-          "name": "setActiveWallet",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "bytes20",
-              "name": "activeWalletPubKeyHash"
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setDepositDustThreshold",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "uint64",
-              "name": "_depositDustThreshold"
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setDepositTxMaxFee",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "uint64",
-              "name": "_depositTxMaxFee"
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setMovedFundsSweepTxMaxTotalFee",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "uint64",
-              "name": "_movedFundsSweepTxMaxTotalFee"
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setMovingFundsTxMaxTotalFee",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "uint64",
-              "name": "_movingFundsTxMaxTotalFee"
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setPendingMovedFundsSweepRequest",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "bytes20",
-              "name": "walletPubKeyHash"
-            },
-            {
-              "type": "tuple",
-              "name": "utxo",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "txHash"
-                },
-                {
-                  "type": "uint32",
-                  "name": "txOutputIndex"
-                },
-                {
-                  "type": "uint64",
-                  "name": "txOutputValue"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setProcessedMovedFundsSweepRequests",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "tuple[]",
-              "name": "utxos",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "txHash"
-                },
-                {
-                  "type": "uint32",
-                  "name": "txOutputIndex"
-                },
-                {
-                  "type": "uint64",
-                  "name": "txOutputValue"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setRedemptionDustThreshold",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "uint64",
-              "name": "_redemptionDustThreshold"
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setRedemptionTreasuryFeeDivisor",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "uint64",
-              "name": "_redemptionTreasuryFeeDivisor"
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setSpentMainUtxos",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "tuple[]",
-              "name": "utxos",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "txHash"
-                },
-                {
-                  "type": "uint32",
-                  "name": "txOutputIndex"
-                },
-                {
-                  "type": "uint64",
-                  "name": "txOutputValue"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setSweptDeposits",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "tuple[]",
-              "name": "utxos",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "txHash"
-                },
-                {
-                  "type": "uint32",
-                  "name": "txOutputIndex"
-                },
-                {
-                  "type": "uint64",
-                  "name": "txOutputValue"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
         {
           "type": "function",
           "name": "setVaultStatus",
@@ -15952,94 +15693,6 @@
           ],
           "outputs": []
         },
-        {
-          "type": "function",
-          "name": "setWallet",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "bytes20",
-              "name": "walletPubKeyHash"
-            },
-            {
-              "type": "tuple",
-              "name": "wallet",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "ecdsaWalletID"
-                },
-                {
-                  "type": "bytes32",
-                  "name": "mainUtxoHash"
-                },
-                {
-                  "type": "uint64",
-                  "name": "pendingRedemptionsValue"
-                },
-                {
-                  "type": "uint32",
-                  "name": "createdAt"
-                },
-                {
-                  "type": "uint32",
-                  "name": "movingFundsRequestedAt"
-                },
-                {
-                  "type": "uint32",
-                  "name": "closingStartedAt"
-                },
-                {
-                  "type": "uint32",
-                  "name": "pendingMovedFundsSweepRequestsCount"
-                },
-                {
-                  "type": "uint8",
-                  "name": "state"
-                },
-                {
-                  "type": "bytes32",
-                  "name": "movingFundsTargetWalletsCommitmentHash"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
-        {
-          "type": "function",
-          "name": "setWalletMainUtxo",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "bytes20",
-              "name": "walletPubKeyHash"
-            },
-            {
-              "type": "tuple",
-              "name": "utxo",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "txHash"
-                },
-                {
-                  "type": "uint32",
-                  "name": "txOutputIndex"
-                },
-                {
-                  "type": "uint64",
-                  "name": "txOutputValue"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
         {
           "type": "function",
           "name": "spentMainUTXOs",
@@ -16465,38 +16118,6 @@
             }
           ]
         },
-        {
-          "type": "function",
-          "name": "timeoutPendingMovedFundsSweepRequest",
-          "constant": false,
-          "payable": false,
-          "gas": 29000000,
-          "inputs": [
-            {
-              "type": "bytes20",
-              "name": "walletPubKeyHash"
-            },
-            {
-              "type": "tuple",
-              "name": "utxo",
-              "components": [
-                {
-                  "type": "bytes32",
-                  "name": "txHash"
-                },
-                {
-                  "type": "uint32",
-                  "name": "txOutputIndex"
-                },
-                {
-                  "type": "uint64",
-                  "name": "txOutputValue"
-                }
-              ]
-            }
-          ],
-          "outputs": []
-        },
         {
           "type": "function",
           "name": "transferGovernance",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keep-network/tbtc-v2",
-  "version": "0.1.1-dev.90+main.2dc332df7ee85498251060c7bbecc0d4e0f0add0",
+  "version": "0.1.1-dev.93+main.559b6e2597a9d2395df901adec25179331f1a16a",
   "license": "MIT",
   "files": [
     "artifacts/",
@@ -22,7 +22,8 @@
     "lint:fix:eslint": "eslint . --fix",
     "lint:sol": "solhint 'contracts/**/*.sol'",
     "lint:fix:sol": "solhint 'contracts/**/*.sol' --fix",
-    "test": "hardhat test",
+    "test": "TEST_USE_STUBS_TBTC=true hardhat test",
+    "test:integration": "NODE_ENV=integration-test hardhat test ./test/integration/*.test.ts",
     "prepublishOnly": "./scripts/prepare-artifacts.sh --network $npm_config_network"
   },
   "dependencies": {