@keep-network/tbtc-v2 0.1.1-dev.74 → 0.1.1-dev.77

package/contracts/bridge/BridgeState.sol

@@ -91,6 +91,14 @@ library BridgeState {
         // than `redemptionDustThreshold` in order to prevent redemption requests
         // with values lower or equal to `movingFundsDustThreshold`.
         uint64 movingFundsDustThreshold;
+        // Time after which the moving funds timeout can be reset in case the
+        // target wallet commitment cannot be submitted due to a lack of live
+        // wallets in the system. It is counted from the moment when the wallet
+        // was requested to move their funds and switched to the MovingFunds
+        // state or from the moment the timeout was reset the last time.
+        // Value in seconds. This value should be lower than the value
+        // of the `movingFundsTimeout`.
+        uint32 movingFundsTimeoutResetDelay;
         // Time after which the moving funds process can be reported as
         // timed out. It is counted from the moment when the wallet
         // was requested to move their funds and switched to the MovingFunds
@@ -283,6 +291,7 @@ library BridgeState {
     event MovingFundsParametersUpdated(
         uint64 movingFundsTxMaxTotalFee,
         uint64 movingFundsDustThreshold,
+        uint32 movingFundsTimeoutResetDelay,
         uint32 movingFundsTimeout,
         uint96 movingFundsTimeoutSlashingAmount,
         uint256 movingFundsTimeoutNotifierRewardMultiplier,
@@ -471,10 +480,17 @@ library BridgeState {
     ///        funds transaction.
     /// @param _movingFundsDustThreshold New value of the moving funds dust
     ///        threshold. It is the minimal satoshi amount that makes sense to
-    //         be transferred during the moving funds process. Moving funds
-    //         wallets having their BTC balance below that value can begin
-    //         closing immediately as transferring such a low value may not be
-    //         possible due to BTC network fees.
+    ///        be transferred during the moving funds process. Moving funds
+    ///        wallets having their BTC balance below that value can begin
+    ///        closing immediately as transferring such a low value may not be
+    ///        possible due to BTC network fees.
+    /// @param _movingFundsTimeoutResetDelay New value of the moving funds
+    ///        timeout reset delay in seconds. It is the time after which the
+    ///        moving funds timeout can be reset in case the target wallet
+    ///        commitment cannot be submitted due to a lack of live wallets
+    ///        in the system. It is counted from the moment when the wallet
+    ///        was requested to move their funds and switched to the MovingFunds
+    ///        state or from the moment the timeout was reset the last time.
     /// @param _movingFundsTimeout New value of the moving funds timeout in
     ///        seconds. It is the time after which the moving funds process can
     ///        be reported as timed out. It is counted from the moment when the
@@ -510,7 +526,9 @@ library BridgeState {
     ///      - Moving funds transaction max total fee must be greater than zero,
     ///      - Moving funds dust threshold must be greater than zero and lower
     ///        than the redemption dust threshold,
-    ///      - Moving funds timeout must be greater than zero,
+    ///      - Moving funds timeout reset delay must be greater than zero,
+    ///      - Moving funds timeout must be greater than the moving funds
+    ///        timeout reset delay,
     ///      - Moving funds timeout notifier reward multiplier must be in the
     ///        range [0, 100],
     ///      - Moved funds sweep transaction max total fee must be greater than zero,
@@ -521,6 +539,7 @@ library BridgeState {
         Storage storage self,
         uint64 _movingFundsTxMaxTotalFee,
         uint64 _movingFundsDustThreshold,
+        uint32 _movingFundsTimeoutResetDelay,
         uint32 _movingFundsTimeout,
         uint96 _movingFundsTimeoutSlashingAmount,
         uint256 _movingFundsTimeoutNotifierRewardMultiplier,
@@ -541,8 +560,13 @@ library BridgeState {
         );
 
         require(
-            _movingFundsTimeout > 0,
-            "Moving funds timeout must be greater than zero"
+            _movingFundsTimeoutResetDelay > 0,
+            "Moving funds timeout reset delay must be greater than zero"
+        );
+
+        require(
+            _movingFundsTimeout > _movingFundsTimeoutResetDelay,
+            "Moving funds timeout must be greater than its reset delay"
         );
 
         require(
@@ -567,6 +591,7 @@ library BridgeState {
 
         self.movingFundsTxMaxTotalFee = _movingFundsTxMaxTotalFee;
         self.movingFundsDustThreshold = _movingFundsDustThreshold;
+        self.movingFundsTimeoutResetDelay = _movingFundsTimeoutResetDelay;
         self.movingFundsTimeout = _movingFundsTimeout;
         self
             .movingFundsTimeoutSlashingAmount = _movingFundsTimeoutSlashingAmount;
@@ -582,6 +607,7 @@ library BridgeState {
         emit MovingFundsParametersUpdated(
             _movingFundsTxMaxTotalFee,
             _movingFundsDustThreshold,
+            _movingFundsTimeoutResetDelay,
             _movingFundsTimeout,
             _movingFundsTimeoutSlashingAmount,
             _movingFundsTimeoutNotifierRewardMultiplier,

package/contracts/bridge/MovingFunds.sol

@@ -268,7 +268,8 @@ library MovingFunds {
     ///      - The wallet must be in the MovingFunds state,
     ///      - The target wallets commitment must not be already submitted for
     ///        the given moving funds wallet,
-    ///      - Live wallets count must be zero.
+    ///      - Live wallets count must be zero,
+    ///      - The moving funds timeout reset delay must be elapsed.
     function resetMovingFundsTimeout(
         BridgeState.Storage storage self,
         bytes20 walletPubKeyHash
@@ -292,6 +293,14 @@ library MovingFunds {
 
         require(self.liveWalletsCount == 0, "Live wallets count must be zero");
 
+        require(
+            /* solhint-disable-next-line not-rely-on-time */
+            block.timestamp >
+                wallet.movingFundsRequestedAt +
+                    self.movingFundsTimeoutResetDelay,
+            "Moving funds timeout cannot be reset yet"
+        );
+
         /* solhint-disable-next-line not-rely-on-time */
         wallet.movingFundsRequestedAt = uint32(block.timestamp);
 

package/contracts/hardhat-dependency-compiler/@keep-network/ecdsa/contracts/WalletRegistry.sol

@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >0.0.0;
+import '@keep-network/ecdsa/contracts/WalletRegistry.sol';

package/deploy/05_deploy_bridge.ts

@@ -24,7 +24,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     log: true,
   })
   const Redemption = await deploy("Redemption", { from: deployer, log: true })
-  const Wallets = await deploy("Wallets", { from: deployer, log: true })
+  const Wallets = await deploy("Wallets", {
+    contract: "contracts/bridge/Wallets.sol:Wallets",
+    from: deployer,
+    log: true,
+  })
   const Fraud = await deploy("Fraud", { from: deployer, log: true })
   const MovingFunds = await deploy("MovingFunds", {
     from: deployer,

package/deploy/09_transfer_proxy_admin_ownership.ts

@@ -2,19 +2,26 @@ import type { HardhatRuntimeEnvironment } from "hardhat/types"
 import type { DeployFunction } from "hardhat-deploy/types"
 
 const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
-  const { ethers, getNamedAccounts, upgrades, deployments } = hre
-  const { esdm } = await getNamedAccounts()
-  const { deployer } = await ethers.getNamedSigners()
+  const { helpers, upgrades, deployments } = hre
+  const { esdm, deployer } = await helpers.signers.getNamedSigners()
+  const { log } = deployments
 
   // TODO: Once a DAO is established we want to switch to ProxyAdminWithDeputy and
   // use the DAO as the proxy admin owner and ESDM as the deputy. Until then we
-  // use governance as the owner of ProxyAdmin contract.
-  const newProxyAdminOwner = esdm
-
-  deployments.log(`transferring ProxyAdmin ownership to ${newProxyAdminOwner}`)
+  // use ESDM as the owner of ProxyAdmin contract.
+  const newProxyAdminOwner = esdm.address
 
   const proxyAdmin = await upgrades.admin.getInstance()
-  await proxyAdmin.connect(deployer).transferOwnership(newProxyAdminOwner)
+
+  const currentOwner = await proxyAdmin.owner()
+
+  // The `@openzeppelin/hardhat-upgrades` plugin deploys a single ProxyAdmin
+  // per network. We don't want to transfer the ownership if the owner is already
+  // set to the desired address.
+  if (!helpers.address.equal(currentOwner, newProxyAdminOwner)) {
+    log(`transferring ownership of ProxyAdmin to ${newProxyAdminOwner}`)
+    await proxyAdmin.connect(deployer).transferOwnership(newProxyAdminOwner)
+  }
 }
 
 export default func