Merge pull request #412 from rsksmart/feature/FLY-2195

Feature/FLY-2195 - Remove DAO contributor functionality

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/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/DeployFlyover.s.sol

@@ -102,9 +102,7 @@ contract DeployFlyover is Script {
                         cfg.dustThreshold,
                         cfg.minimumPegIn,
                         d.collateralManagementProxy,
-                        cfg.mainnet,
-                        cfg.daoFeePercentage,
-                        cfg.daoFeeCollector
+                        cfg.mainnet
                     )
                 )
             )
@@ -124,9 +122,7 @@ contract DeployFlyover is Script {
                         cfg.dustThreshold,
                         d.collateralManagementProxy,
                         cfg.mainnet,
-                        cfg.btcBlockTime,
-                        cfg.daoFeePercentage,
-                        cfg.daoFeeCollector
+                        cfg.btcBlockTime
                     )
                 )
             )

script/deployment/DeployPegIn.s.sol

@@ -57,9 +57,7 @@ contract DeployPegIn is Script {
                         cfg.dustThreshold,
                         cfg.minimumPegIn,
                         collateralManagementProxy,
-                        cfg.mainnet,
-                        cfg.daoFeePercentage,
-                        cfg.daoFeeCollector
+                        cfg.mainnet
                     )
                 )
             )

script/deployment/DeployPegOut.s.sol

@@ -57,9 +57,7 @@ contract DeployPegOut is Script {
                         cfg.dustThreshold,
                         collateralManagementProxy,
                         cfg.mainnet,
-                        cfg.btcBlockTime,
-                        cfg.daoFeePercentage,
-                        cfg.daoFeeCollector
+                        cfg.btcBlockTime
                     )
                 )
             )

script/helpers/QuoteParser.sol

@@ -19,7 +19,7 @@ import {BtcAddressParser} from "./BtcAddressParser.sol";
  * - btcRefundAddr: BTC refund address (string)
  * - rskRefundAddr: RSK refund address (address)
  * - lpBTCAddr: LP Bitcoin address (string)
- * - callFee, penaltyFee, value, gasFee, productFeeAmount: (uint256)
+ * - callFee, penaltyFee, value, gasFee: (uint256)
  * - contractAddr: Destination contract address (address)
  * - data: Call data (bytes)
  * - gasLimit: Gas limit (uint32)
@@ -37,7 +37,7 @@ import {BtcAddressParser} from "./BtcAddressParser.sol";
  * - rskRefundAddress: RSK refund address (address)
  * - lpBtcAddr: LP Bitcoin address (string)
  * - depositAddr: Deposit address (string)
- * - callFee, penaltyFee, value, gasFee, productFeeAmount: (uint256)
+ * - callFee, penaltyFee, value, gasFee: (uint256)
  * - nonce: Quote nonce (int64 or string)
  * - agreementTimestamp: Agreement timestamp (uint32)
  * - depositDateLimit: Deposit date limit (uint32)
@@ -103,7 +103,6 @@ abstract contract QuoteParser is BtcAddressParser {
         );
         quote.callOnRegister = vm.parseJsonBool(json, ".callOnRegister");
         quote.gasFee = vm.parseJsonUint(json, ".gasFee");
-        quote.productFeeAmount = vm.parseJsonUint(json, ".productFeeAmount");
     }
 
     /// @notice Parse a PegOut quote from JSON string
@@ -153,7 +152,6 @@ abstract contract QuoteParser is BtcAddressParser {
         quote.transferConfirmations = uint16(
             vm.parseJsonUint(json, ".transferConfirmations")
         );
-        quote.productFeeAmount = vm.parseJsonUint(json, ".productFeeAmount");
         quote.gasFee = vm.parseJsonUint(json, ".gasFee");
         quote.expireBlock = uint32(vm.parseJsonUint(json, ".expireBlocks"));
         quote.expireDate = uint32(vm.parseJsonUint(json, ".expireDate"));