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

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/30a38f39887300a2a7418e4640a6057b.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/30a38f39887300a2a7418e4640a6057b.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/30a38f39887300a2a7418e4640a6057b.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/30a38f39887300a2a7418e4640a6057b.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,

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

@@ -14209,6 +14209,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 +14329,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": [
@@ -14822,6 +14822,19 @@
           "stateMutability": "view",
           "type": "function"
         },
+        {
+          "inputs": [],
+          "name": "governance",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
         {
           "inputs": [
             {
@@ -14969,19 +14982,6 @@
           "stateMutability": "nonpayable",
           "type": "function"
         },
-        {
-          "inputs": [],
-          "name": "owner",
-          "outputs": [
-            {
-              "internalType": "address",
-              "name": "",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "view",
-          "type": "function"
-        },
         {
           "inputs": [
             {
@@ -15056,13 +15056,6 @@
           "stateMutability": "view",
           "type": "function"
         },
-        {
-          "inputs": [],
-          "name": "renounceOwnership",
-          "outputs": [],
-          "stateMutability": "nonpayable",
-          "type": "function"
-        },
         {
           "inputs": [
             {
@@ -15639,11 +15632,11 @@
           "inputs": [
             {
               "internalType": "address",
-              "name": "newOwner",
+              "name": "newGovernance",
               "type": "address"
             }
           ],
-          "name": "transferOwnership",
+          "name": "transferGovernance",
           "outputs": [],
           "stateMutability": "nonpayable",
           "type": "function"

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.47+main.dc6d5b7dff5d86505ab703bc7d29abfd9529c96f",
   "license": "MIT",
   "files": [
     "artifacts/",