Merge branch 'v2.5.0-fixes' into fix/FLY-2216

Author: Luisfc68

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on: [push, pull_request, workflow_dispatch]
 
 permissions:
   contents: read
+  packages: read
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

.github/workflows/fuzz.yml

@@ -0,0 +1,53 @@
+name: Fuzz test smart contracts
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - QA-Test
+      - Stable-Test
+      - master
+      - "v*.*.*"
+  pull_request:
+    branches:
+      - QA-Test
+      - Stable-Test
+      - master
+      - "v*.*.*"
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Use Node.js 20.15.1
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        with:
+          node-version: "20.15.1"
+
+      - name: NPM Login
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: npm config set //npm.pkg.github.com/:_authToken $GITHUB_TOKEN
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: "Install Foundry"
+        uses: "foundry-rs/foundry-toolchain@50d5a8956f2e319df19e6b57539d7e2acb9f8c1e" # v1.5.0
+        with:
+          version: stable
+
+      - name: Lint contracts
+        run: npm run lint:sol
+
+      - name: Compile contracts
+        run: npm run compile
+
+      - name: Fuzz test smart contracts
+        run: npm run test:fuzz

README.md

@@ -48,7 +48,6 @@ PegIn Quotes consist of:
         uint callTime;                          // the time (in seconds) that the LP has to perform the call on behalf of the user after the deposit achieves the number of confirmations
         uint depositConfirmations;              // the number of confirmations that the LP requires before making the call
         bool callOnRegister:                    // a boolean value indicating whether the callForUser can be called on registerPegIn.
-        uint256 productFeeAmount;               // the fee payed to the network DAO
         uint256 gasFee;                         // the fee payed to the LP to cover the gas of the RSK transaction
     }
 
@@ -72,7 +71,6 @@ PegOut Quotes consist of:
         uint transferTime;                      // the time (in seconds) that the LP has to transfer on behalf of the user after the deposit achieves the number of confirmations
         uint expireDate;                        // the timestamp to consider the quote expired
         uint expireBlock;                       // the block number to consider the quote expired
-        uint256 productFeeAmount;               // the fee payed to the network DAO
         uint256 gasFee;                         // the fee payed to the LP to cover the fee of the BTC transaction
     }
 

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "compile": "npm run lint:sol && forge build",
     "test": "npm run compile && make test-unit",
+    "test:fuzz": "npm run compile && make test-fuzz",
     "coverage": "forge coverage",
     "lint:ts": "npx prettier --check . && npx eslint .",
     "lint:sol": "solhint 'src/**/*.sol'",

script/ComputeStorageSlot.s.sol

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.25;
+
+import "forge-std/Script.sol";
+
+contract ComputeStorageSlot is Script {
+    function run() external view {
+        bytes32 slotPauseRegistry = bytes32(
+            uint256(
+                keccak256(
+                    abi.encode(
+                        uint256(keccak256("rsk.flyover.PauseRegistry")) - 1
+                    )
+                )
+            ) & ~uint256(0xff)
+        );
+        bytes32 slotEmergencyPause = bytes32(
+            uint256(
+                keccak256(
+                    abi.encode(
+                        uint256(keccak256("rsk.flyover.EmergencyPause")) - 1
+                    )
+                )
+            ) & ~uint256(0xff)
+        );
+        console.logBytes32(slotPauseRegistry);
+        console.logBytes32(slotEmergencyPause);
+    }
+}

script/HelperConfig.s.sol

@@ -5,11 +5,6 @@ import {Script} from "lib/forge-std/src/Script.sol";
 import {BridgeMock} from "../src/test-contracts/BridgeMock.sol";
 
 contract HelperConfig is Script {
-    error InvalidDaoFeeConfiguration(
-        uint256 feePercentage,
-        address feeCollector
-    );
-
     struct NetworkConfig {
         address bridge;
         uint256 minimumCollateral;
@@ -33,8 +28,6 @@ contract HelperConfig is Script {
         uint256 dustThreshold;
         uint256 btcBlockTime;
         bool mainnet;
-        uint256 daoFeePercentage;
-        address payable daoFeeCollector;
         uint48 adminDelay;
     }
 
@@ -193,23 +186,9 @@ contract HelperConfig is Script {
             cachedFlyoverConfig = getFlyoverLocalConfig();
         }
 
-        // Validate DAO fee configuration
-        _validateDaoFeeConfig(cachedFlyoverConfig);
-
         return cachedFlyoverConfig;
     }
 
-    /// @notice Validate that DAO fee configuration is consistent
-    /// @dev If feePercentage > 0, feeCollector must not be address(0)
-    function _validateDaoFeeConfig(FlyoverConfig memory cfg) internal pure {
-        if (cfg.daoFeePercentage > 0 && cfg.daoFeeCollector == address(0)) {
-            revert InvalidDaoFeeConfiguration(
-                cfg.daoFeePercentage,
-                cfg.daoFeeCollector
-            );
-        }
-    }
-
     /// @notice Build Flyover config for a specific network suffix
     /// @param suffix The network suffix (e.g., "MAINNET", "TESTNET")
     /// @param isMainnet Whether this is mainnet
@@ -250,16 +229,6 @@ contract HelperConfig is Script {
                     uint256(600)
                 ),
                 mainnet: isMainnet,
-                daoFeePercentage: vm.envOr(
-                    string.concat("DAO_FEE_PERCENTAGE_", suffix),
-                    uint256(0)
-                ),
-                daoFeeCollector: payable(
-                    vm.envOr(
-                        string.concat("DAO_FEE_COLLECTOR_", suffix),
-                        address(0)
-                    )
-                ),
                 adminDelay: uint48(
                     vm.envOr(string.concat("ADMIN_DELAY_", suffix), uint256(0))
                 )
@@ -286,13 +255,6 @@ contract HelperConfig is Script {
                 ),
                 btcBlockTime: vm.envOr("BTC_BLOCK_TIME_LOCAL", uint256(600)),
                 mainnet: false,
-                daoFeePercentage: vm.envOr(
-                    "DAO_FEE_PERCENTAGE_LOCAL",
-                    uint256(0)
-                ),
-                daoFeeCollector: payable(
-                    vm.envOr("DAO_FEE_COLLECTOR_LOCAL", address(0))
-                ),
                 adminDelay: uint48(vm.envOr("ADMIN_DELAY_LOCAL", uint256(0)))
             });
     }

script/deployment/DeployCollateralManagement.s.sol

@@ -4,11 +4,13 @@ pragma solidity 0.8.25;
 import {Script, console} from "lib/forge-std/src/Script.sol";
 import {HelperConfig} from "../HelperConfig.s.sol";
 import {CollateralManagementContract} from "../../src/CollateralManagement.sol";
+import {PauseRegistry} from "../../src/PauseRegistry.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
 /// @title DeployCollateralManagement
 /// @notice Deploys the CollateralManagement contract with proxy pattern
+/// @dev Requires PAUSE_REGISTRY_PROXY env var
 contract DeployCollateralManagement is Script {
     struct DeploymentResult {
         address implementation;
@@ -22,16 +24,23 @@ contract DeployCollateralManagement is Script {
         uint256 deployerKey = helper.getDeployerPrivateKey();
         address deployer = vm.rememberKey(deployerKey);
 
+        address pauseRegistryProxy = vm.envAddress("PAUSE_REGISTRY_PROXY");
+        require(
+            pauseRegistryProxy != address(0),
+            "PAUSE_REGISTRY_PROXY required"
+        );
+
         vm.startBroadcast(deployerKey);
-        result = _deploy(deployer, cfg);
+        result = _deploy(deployer, cfg, pauseRegistryProxy);
         vm.stopBroadcast();
 
         _log(result);
     }
 
     function _deploy(
         address defaultAdmin,
-        HelperConfig.FlyoverConfig memory cfg
+        HelperConfig.FlyoverConfig memory cfg,
+        address pauseRegistryProxy
     ) private returns (DeploymentResult memory result) {
         result.implementation = address(new CollateralManagementContract());
         result.admin = address(new ProxyAdmin(defaultAdmin));
@@ -46,7 +55,8 @@ contract DeployCollateralManagement is Script {
                         cfg.adminDelay,
                         cfg.minimumCollateral,
                         cfg.resignDelayBlocks,
-                        cfg.rewardPercentage
+                        cfg.rewardPercentage,
+                        PauseRegistry(pauseRegistryProxy)
                     )
                 )
             )

script/deployment/DeployFlyover.s.sol

@@ -7,6 +7,7 @@ import {HelperConfig} from "../HelperConfig.s.sol";
 
 import {CollateralManagementContract} from "../../src/CollateralManagement.sol";
 import {FlyoverDiscovery} from "../../src/FlyoverDiscovery.sol";
+import {PauseRegistry} from "../../src/PauseRegistry.sol";
 import {PegInContract} from "../../src/PegInContract.sol";
 import {PegOutContract} from "../../src/PegOutContract.sol";
 
@@ -18,6 +19,7 @@ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.s
 /// @dev Gas optimized: single ProxyAdmin, inlined deployment logic, linked libraries
 contract DeployFlyover is Script {
     struct FlyoverDeployment {
+        address pauseRegistryProxy;
         address collateralManagementImpl;
         address collateralManagementProxy;
         address flyoverDiscoveryImpl;
@@ -54,6 +56,16 @@ contract DeployFlyover is Script {
         // Single ProxyAdmin for all contracts
         d.proxyAdmin = address(new ProxyAdmin(defaultAdmin));
 
+        // 0) PauseRegistry (shared by all)
+        PauseRegistry prImpl = new PauseRegistry();
+        d.pauseRegistryProxy = address(
+            new TransparentUpgradeableProxy(
+                address(prImpl),
+                d.proxyAdmin,
+                abi.encodeCall(prImpl.initialize, (0, defaultAdmin))
+            )
+        );
+
         // 1) CollateralManagement
         d.collateralManagementImpl = address(
             new CollateralManagementContract()
@@ -69,7 +81,8 @@ contract DeployFlyover is Script {
                         cfg.adminDelay,
                         cfg.minimumCollateral,
                         cfg.resignDelayBlocks,
-                        cfg.rewardPercentage
+                        cfg.rewardPercentage,
+                        PauseRegistry(d.pauseRegistryProxy)
                     )
                 )
             )
@@ -83,7 +96,12 @@ contract DeployFlyover is Script {
                 d.proxyAdmin,
                 abi.encodeCall(
                     FlyoverDiscovery.initialize,
-                    (defaultAdmin, cfg.adminDelay, d.collateralManagementProxy)
+                    (
+                        defaultAdmin,
+                        cfg.adminDelay,
+                        d.collateralManagementProxy,
+                        PauseRegistry(d.pauseRegistryProxy)
+                    )
                 )
             )
         );
@@ -103,8 +121,7 @@ contract DeployFlyover is Script {
                         cfg.minimumPegIn,
                         d.collateralManagementProxy,
                         cfg.mainnet,
-                        cfg.daoFeePercentage,
-                        cfg.daoFeeCollector
+                        PauseRegistry(d.pauseRegistryProxy)
                     )
                 )
             )
@@ -125,8 +142,7 @@ contract DeployFlyover is Script {
                         d.collateralManagementProxy,
                         cfg.mainnet,
                         cfg.btcBlockTime,
-                        cfg.daoFeePercentage,
-                        cfg.daoFeeCollector
+                        PauseRegistry(d.pauseRegistryProxy)
                     )
                 )
             )
@@ -148,6 +164,7 @@ contract DeployFlyover is Script {
     function _log(FlyoverDeployment memory d) private pure {
         console.log("=== FLYOVER DEPLOYMENT ===");
         console.log("ProxyAdmin:", d.proxyAdmin);
+        console.log("PauseRegistry proxy:", d.pauseRegistryProxy);
         console.log("CollateralManagement impl:", d.collateralManagementImpl);
         console.log("CollateralManagement proxy:", d.collateralManagementProxy);
         console.log("FlyoverDiscovery impl:", d.flyoverDiscoveryImpl);

script/deployment/DeployFlyoverDiscovery.s.sol

@@ -4,12 +4,13 @@ pragma solidity 0.8.25;
 import {Script, console} from "lib/forge-std/src/Script.sol";
 import {HelperConfig} from "../HelperConfig.s.sol";
 import {FlyoverDiscovery} from "../../src/FlyoverDiscovery.sol";
+import {PauseRegistry} from "../../src/PauseRegistry.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
 /// @title DeployFlyoverDiscovery
 /// @notice Deploys the FlyoverDiscovery contract with proxy pattern
-/// @dev Requires COLLATERAL_MANAGEMENT_PROXY env var
+/// @dev Requires COLLATERAL_MANAGEMENT_PROXY and PAUSE_REGISTRY_PROXY env vars
 contract DeployFlyoverDiscovery is Script {
     struct DeploymentResult {
         address implementation;
@@ -26,13 +27,23 @@ contract DeployFlyoverDiscovery is Script {
         address collateralManagementProxy = vm.envAddress(
             "COLLATERAL_MANAGEMENT_PROXY"
         );
+        address pauseRegistryProxy = vm.envAddress("PAUSE_REGISTRY_PROXY");
         require(
             collateralManagementProxy != address(0),
             "COLLATERAL_MANAGEMENT_PROXY required"
         );
+        require(
+            pauseRegistryProxy != address(0),
+            "PAUSE_REGISTRY_PROXY required"
+        );
 
         vm.startBroadcast(deployerKey);
-        result = _deploy(deployer, cfg, collateralManagementProxy);
+        result = _deploy(
+            deployer,
+            cfg,
+            collateralManagementProxy,
+            pauseRegistryProxy
+        );
         vm.stopBroadcast();
 
         _log(result);
@@ -41,7 +52,8 @@ contract DeployFlyoverDiscovery is Script {
     function _deploy(
         address defaultAdmin,
         HelperConfig.FlyoverConfig memory cfg,
-        address collateralManagementProxy
+        address collateralManagementProxy,
+        address pauseRegistryProxy
     ) private returns (DeploymentResult memory result) {
         result.implementation = address(new FlyoverDiscovery());
         result.admin = address(new ProxyAdmin(defaultAdmin));
@@ -51,7 +63,12 @@ contract DeployFlyoverDiscovery is Script {
                 result.admin,
                 abi.encodeCall(
                     FlyoverDiscovery.initialize,
-                    (defaultAdmin, cfg.adminDelay, collateralManagementProxy)
+                    (
+                        defaultAdmin,
+                        cfg.adminDelay,
+                        collateralManagementProxy,
+                        PauseRegistry(pauseRegistryProxy)
+                    )
                 )
             )
         );