@keep-network/tbtc-v2 0.1.1-dev.46 → 0.1.1-dev.49

package/build/contracts/bridge/Sweep.sol/Sweep.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/09e5fe1834fb92f92c380a4c77e206a4.json"
+  "buildInfo": "../../../build-info/62c9b8bdd92c3e06af3174d60bfc6e85.json"
 }

package/build/contracts/bridge/VendingMachine.sol/VendingMachine.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/09e5fe1834fb92f92c380a4c77e206a4.json"
+  "buildInfo": "../../../build-info/62c9b8bdd92c3e06af3174d60bfc6e85.json"
 }

package/build/contracts/bridge/Wallets.sol/Wallets.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/09e5fe1834fb92f92c380a4c77e206a4.json"
+  "buildInfo": "../../../build-info/62c9b8bdd92c3e06af3174d60bfc6e85.json"
 }

package/build/contracts/token/TBTC.sol/TBTC.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/09e5fe1834fb92f92c380a4c77e206a4.json"
+  "buildInfo": "../../../build-info/62c9b8bdd92c3e06af3174d60bfc6e85.json"
 }

package/build/contracts/vault/IVault.sol/IVault.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/09e5fe1834fb92f92c380a4c77e206a4.json"
+  "buildInfo": "../../../build-info/62c9b8bdd92c3e06af3174d60bfc6e85.json"
 }

package/build/contracts/vault/TBTCVault.sol/TBTCVault.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/09e5fe1834fb92f92c380a4c77e206a4.json"
+  "buildInfo": "../../../build-info/62c9b8bdd92c3e06af3174d60bfc6e85.json"
 }

package/contracts/bridge/Bridge.sol

@@ -15,7 +15,7 @@
 
 pragma solidity ^0.8.9;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "@keep-network/random-beacon/contracts/Governable.sol";
 
 import {IWalletOwner as EcdsaWalletOwner} from "@keep-network/ecdsa/contracts/api/IWalletOwner.sol";
 
@@ -57,7 +57,7 @@ import "../bank/Bank.sol";
 /// TODO: Revisit all events and look which parameters should be indexed.
 /// TODO: Align the convention around `param` and `dev` endings. They should
 ///       not have a punctuation mark.
-contract Bridge is Ownable, EcdsaWalletOwner {
+contract Bridge is Governable, EcdsaWalletOwner {
     using BridgeState for BridgeState.Storage;
     using Deposit for BridgeState.Storage;
     using Sweep for BridgeState.Storage;
@@ -236,6 +236,8 @@ contract Bridge is Ownable, EcdsaWalletOwner {
         self.walletMaxAge = 26 weeks; // ~6 months
         self.walletMaxBtcTransfer = 10e8; // 10 BTC
         self.walletClosingPeriod = 40 days;
+
+        _transferGovernance(msg.sender);
     }
 
     /// @notice Used by the depositor to reveal information about their P2(W)SH
@@ -790,7 +792,10 @@ contract Bridge is Ownable, EcdsaWalletOwner {
     /// @param vault The address of the vault
     /// @param isTrusted flag indicating whether the vault is trusted or not
     /// @dev Can only be called by the Governance.
-    function setVaultStatus(address vault, bool isTrusted) external onlyOwner {
+    function setVaultStatus(address vault, bool isTrusted)
+        external
+        onlyGovernance
+    {
         self.isVaultTrusted[vault] = isTrusted;
         emit VaultStatusUpdated(vault, isTrusted);
     }
@@ -823,7 +828,7 @@ contract Bridge is Ownable, EcdsaWalletOwner {
         uint64 depositDustThreshold,
         uint64 depositTreasuryFeeDivisor,
         uint64 depositTxMaxFee
-    ) external onlyOwner {
+    ) external onlyGovernance {
         self.updateDepositParameters(
             depositDustThreshold,
             depositTreasuryFeeDivisor,
@@ -871,7 +876,7 @@ contract Bridge is Ownable, EcdsaWalletOwner {
         uint64 redemptionTreasuryFeeDivisor,
         uint64 redemptionTxMaxFee,
         uint256 redemptionTimeout
-    ) external onlyOwner {
+    ) external onlyGovernance {
         self.updateRedemptionParameters(
             redemptionDustThreshold,
             redemptionTreasuryFeeDivisor,
@@ -897,7 +902,7 @@ contract Bridge is Ownable, EcdsaWalletOwner {
     function updateMovingFundsParameters(
         uint64 movingFundsTxMaxTotalFee,
         uint32 movingFundsTimeout
-    ) external onlyOwner {
+    ) external onlyGovernance {
         self.updateMovingFundsParameters(
             movingFundsTxMaxTotalFee,
             movingFundsTimeout
@@ -935,7 +940,7 @@ contract Bridge is Ownable, EcdsaWalletOwner {
         uint32 walletMaxAge,
         uint64 walletMaxBtcTransfer,
         uint32 walletClosingPeriod
-    ) external onlyOwner {
+    ) external onlyGovernance {
         self.updateWalletParameters(
             walletCreationPeriod,
             walletMinBtcBalance,
@@ -968,7 +973,7 @@ contract Bridge is Ownable, EcdsaWalletOwner {
         uint256 fraudNotifierRewardMultiplier,
         uint256 fraudChallengeDefeatTimeout,
         uint256 fraudChallengeDepositAmount
-    ) external onlyOwner {
+    ) external onlyGovernance {
         self.updateFraudParameters(
             fraudSlashingAmount,
             fraudNotifierRewardMultiplier,
@@ -1247,13 +1252,19 @@ contract Bridge is Ownable, EcdsaWalletOwner {
     /// @return bank Address of the Bank the Bridge belongs to.
     /// @return relay Address of the Bitcoin relay providing the current Bitcoin
     ///         network difficulty.
+    /// @return ecdsaWalletRegistry Address of the ECDSA Wallet Registry.
     function contractReferences()
         external
         view
-        returns (Bank bank, IRelay relay)
+        returns (
+            Bank bank,
+            IRelay relay,
+            EcdsaWalletRegistry ecdsaWalletRegistry
+        )
     {
         bank = self.bank;
         relay = self.relay;
+        ecdsaWalletRegistry = self.ecdsaWalletRegistry;
     }
 
     /// @notice Address where the deposit treasury fees will be sent to.

package/deploy/04_deploy_bank.ts

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

package/deploy/05_deploy_bridge.ts

@@ -14,7 +14,9 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // script from `@keep-network/ecdsa` is not invoked once again.
   const WalletRegistry = await deployments.get("WalletRegistry")
 
-  const txProofDifficultyFactor = 6
+  // For local tests use `1`.
+  const txProofDifficultyFactor =
+    deployments.getNetworkName() === "hardhat" ? 1 : 6
 
   const Deposit = await deploy("Deposit", { from: deployer, log: true })
   const Sweep = await deploy("Sweep", { from: deployer, log: true })
@@ -27,6 +29,8 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   })
 
   const Bridge = await deploy("Bridge", {
+    contract:
+      deployments.getNetworkName() === "hardhat" ? "BridgeStub" : undefined,
     from: deployer,
     args: [
       Bank.address,

package/deploy/07_transfer_ownership.ts

@@ -6,12 +6,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer, governance } = await getNamedAccounts()
 
   await helpers.ownable.transferOwnership("Bank", governance, deployer)
-
-  await helpers.ownable.transferOwnership("Bridge", governance, deployer)
 }
 
 export default func
 
 func.tags = ["TransferOwnership"]
-func.dependencies = ["Bank", "Bridge"]
+func.dependencies = ["Bank"]
 func.runAtTheEnd = true

package/deploy/08_transfer_governance.ts

@@ -0,0 +1,20 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types"
+import { DeployFunction } from "hardhat-deploy/types"
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { getNamedAccounts, deployments } = hre
+  const { deployer, governance } = await getNamedAccounts()
+
+  await deployments.execute(
+    "Bridge",
+    { from: deployer },
+    "transferGovernance",
+    governance
+  )
+}
+
+export default func
+
+func.tags = ["TransferGovernance"]
+func.dependencies = ["Bridge"]
+func.runAtTheEnd = true

package/export.json

@@ -13012,11 +13012,6 @@
     "Bank": {
       "address": "0xAd5d57aD9bB17d34Debb88566ab2F5dB879Cc46F",
       "abi": [
-        {
-          "inputs": [],
-          "stateMutability": "nonpayable",
-          "type": "constructor"
-        },
         {
           "anonymous": false,
           "inputs": [
@@ -13471,6 +13466,24 @@
           "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": [
             {
@@ -13986,7 +13999,7 @@
             },
             {
               "internalType": "address",
-              "name": "_ecdsaWalletRegistry",
+              "name": "_walletRegistry",
               "type": "address"
             },
             {
@@ -14209,6 +14222,25 @@
           "name": "FraudParametersUpdated",
           "type": "event"
         },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "oldGovernance",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "address",
+              "name": "newGovernance",
+              "type": "address"
+            }
+          ],
+          "name": "GovernanceTransferred",
+          "type": "event"
+        },
         {
           "anonymous": false,
           "inputs": [
@@ -14310,25 +14342,6 @@
           "name": "NewWalletRequested",
           "type": "event"
         },
-        {
-          "anonymous": false,
-          "inputs": [
-            {
-              "indexed": true,
-              "internalType": "address",
-              "name": "previousOwner",
-              "type": "address"
-            },
-            {
-              "indexed": true,
-              "internalType": "address",
-              "name": "newOwner",
-              "type": "address"
-            }
-          ],
-          "name": "OwnershipTransferred",
-          "type": "event"
-        },
         {
           "anonymous": false,
           "inputs": [
@@ -14651,6 +14664,11 @@
               "internalType": "contract IRelay",
               "name": "relay",
               "type": "address"
+            },
+            {
+              "internalType": "contract IWalletRegistry",
+              "name": "ecdsaWalletRegistry",
+              "type": "address"
             }
           ],
           "stateMutability": "view",
@@ -14822,6 +14840,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "governance",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -14969,19 +15000,6 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
-        {
-          "inputs": [],
-          "name": "owner",
-          "outputs": [
-            {
-              "internalType": "address",
-              "name": "",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "view",
-          "type": "function"
-        },
         {
           "inputs": [
             {
@@ -15056,13 +15074,6 @@
           "stateMutability": "view",
           "type": "function"
         },
-        {
-          "inputs": [],
-          "name": "renounceOwnership",
-          "outputs": [],
-          "stateMutability": "nonpayable",
-          "type": "function"
-        },
         {
           "inputs": [
             {
@@ -15215,6 +15226,144 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [
+            {
+              "internalType": "bytes20",
+              "name": "activeWalletPubKeyHash",
+              "type": "bytes20"
+            }
+          ],
+          "name": "setActiveWallet",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint64",
+              "name": "_depositDustThreshold",
+              "type": "uint64"
+            }
+          ],
+          "name": "setDepositDustThreshold",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint64",
+              "name": "_depositTxMaxFee",
+              "type": "uint64"
+            }
+          ],
+          "name": "setDepositTxMaxFee",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint64",
+              "name": "_movingFundsTxMaxTotalFee",
+              "type": "uint64"
+            }
+          ],
+          "name": "setMovingFundsTxMaxTotalFee",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint64",
+              "name": "_redemptionDustThreshold",
+              "type": "uint64"
+            }
+          ],
+          "name": "setRedemptionDustThreshold",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint64",
+              "name": "_redemptionTreasuryFeeDivisor",
+              "type": "uint64"
+            }
+          ],
+          "name": "setRedemptionTreasuryFeeDivisor",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "components": [
+                {
+                  "internalType": "bytes32",
+                  "name": "txHash",
+                  "type": "bytes32"
+                },
+                {
+                  "internalType": "uint32",
+                  "name": "txOutputIndex",
+                  "type": "uint32"
+                },
+                {
+                  "internalType": "uint64",
+                  "name": "txOutputValue",
+                  "type": "uint64"
+                }
+              ],
+              "internalType": "struct BitcoinTx.UTXO[]",
+              "name": "utxos",
+              "type": "tuple[]"
+            }
+          ],
+          "name": "setSpentMainUtxos",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "components": [
+                {
+                  "internalType": "bytes32",
+                  "name": "txHash",
+                  "type": "bytes32"
+                },
+                {
+                  "internalType": "uint32",
+                  "name": "txOutputIndex",
+                  "type": "uint32"
+                },
+                {
+                  "internalType": "uint64",
+                  "name": "txOutputValue",
+                  "type": "uint64"
+                }
+              ],
+              "internalType": "struct BitcoinTx.UTXO[]",
+              "name": "utxos",
+              "type": "tuple[]"
+            }
+          ],
+          "name": "setSweptDeposits",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -15233,6 +15382,101 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
+        {
+          "inputs": [
+            {
+              "internalType": "bytes20",
+              "name": "walletPubKeyHash",
+              "type": "bytes20"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "bytes32",
+                  "name": "ecdsaWalletID",
+                  "type": "bytes32"
+                },
+                {
+                  "internalType": "bytes32",
+                  "name": "mainUtxoHash",
+                  "type": "bytes32"
+                },
+                {
+                  "internalType": "uint64",
+                  "name": "pendingRedemptionsValue",
+                  "type": "uint64"
+                },
+                {
+                  "internalType": "uint32",
+                  "name": "createdAt",
+                  "type": "uint32"
+                },
+                {
+                  "internalType": "uint32",
+                  "name": "movingFundsRequestedAt",
+                  "type": "uint32"
+                },
+                {
+                  "internalType": "uint32",
+                  "name": "closingStartedAt",
+                  "type": "uint32"
+                },
+                {
+                  "internalType": "enum Wallets.WalletState",
+                  "name": "state",
+                  "type": "uint8"
+                },
+                {
+                  "internalType": "bytes32",
+                  "name": "movingFundsTargetWalletsCommitmentHash",
+                  "type": "bytes32"
+                }
+              ],
+              "internalType": "struct Wallets.Wallet",
+              "name": "wallet",
+              "type": "tuple"
+            }
+          ],
+          "name": "setWallet",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "bytes20",
+              "name": "walletPubKeyHash",
+              "type": "bytes20"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "bytes32",
+                  "name": "txHash",
+                  "type": "bytes32"
+                },
+                {
+                  "internalType": "uint32",
+                  "name": "txOutputIndex",
+                  "type": "uint32"
+                },
+                {
+                  "internalType": "uint64",
+                  "name": "txOutputValue",
+                  "type": "uint64"
+                }
+              ],
+              "internalType": "struct BitcoinTx.UTXO",
+              "name": "utxo",
+              "type": "tuple"
+            }
+          ],
+          "name": "setWalletMainUtxo",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -15639,11 +15883,11 @@
           "inputs": [
             {
               "internalType": "address",
-              "name": "newOwner",
+              "name": "newGovernance",
               "type": "address"
             }
           ],
-          "name": "transferOwnership",
+          "name": "transferGovernance",
           "outputs": [],
           "stateMutability": "nonpayable",
           "type": "function"
@@ -15674,6 +15918,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [
+            {
+              "internalType": "bytes20",
+              "name": "walletPubKeyHash",
+              "type": "bytes20"
+            }
+          ],
+          "name": "unsetWalletMainUtxo",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
         {
           "inputs": [
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keep-network/tbtc-v2",
-  "version": "0.1.1-dev.46+main.90853bcc69b37e76f1ab229667fb2263eb931959",
+  "version": "0.1.1-dev.49+main.73325e5cb7b966d3daf56e2d40a75b30f0e6ce91",
   "license": "MIT",
   "files": [
     "artifacts/",