feat: add discovery split poc

Author: Luisfc68

.solhint.json

@@ -2,7 +2,7 @@
   "extends": "solhint:recommended",
   "rules": {
     "avoid-throw": "off",
-    "compiler-version": ["error", "^0.8.18"],
+    "compiler-version": ["error", "0.8.25"],
     "max-line-length": ["error", 120],
     "max-states-count": ["error", 20],
     "avoid-tx-origin": "off",

contracts/Bridge.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 
 interface Bridge {
 
@@ -129,4 +129,4 @@ interface Bridge {
     function getBtcBlockchainBlockHeaderByHeight(uint256 btcBlockHeight) external view returns (bytes memory);
 
     function getBtcBlockchainParentBlockHeaderByHash(bytes32 btcBlockHash) external view returns (bytes memory);
-}
+}

contracts/BridgeMock.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 
 import "./Bridge.sol";
 

contracts/LiquidityBridgeContract.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 pragma experimental ABIEncoderV2;
 
 import "./Bridge.sol";
 import "./Quotes.sol";
 import "./SignatureValidator.sol";
 import "@rsksmart/btc-transaction-solidity-helper/contracts/BtcUtils.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
 
 /**
     @title Contract that assists with the Flyover protocol
@@ -157,7 +157,8 @@ contract LiquidityBridgeContract is Initializable, OwnableUpgradeable, Reentranc
         require(_rewardPercentage <= 100, "LBC004");
         require(_minimumCollateral >= 0.03 ether, "LBC072");
         require(_resignDelayBlocks >= 60, "LBC073");
-        __Ownable_init_unchained();
+        __Ownable_init_unchained(msg.sender);
+        __ReentrancyGuard_init_unchained();
         bridge = Bridge(_bridgeAddress);
         minCollateral = _minimumCollateral;
         minPegIn = _minimumPegIn;

contracts/LiquidityBridgeContractAdmin.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
-contract LiquidityBridgeContractAdmin is ProxyAdmin {}
+contract LiquidityBridgeContractAdmin is ProxyAdmin {
+    constructor() ProxyAdmin(msg.sender) {}
+}

contracts/LiquidityBridgeContractProxy.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 contract LiquidityBridgeContractProxy is TransparentUpgradeableProxy {
   constructor(address _logic, address _admin, bytes memory _data)
     TransparentUpgradeableProxy(_logic,_admin, _data) payable {}
-}
+}

contracts/LiquidityBridgeContractV2.sol

@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 pragma experimental ABIEncoderV2;
 
 import "./Bridge.sol";
 import "./QuotesV2.sol";
 import "./SignatureValidator.sol";
 import "@rsksmart/btc-transaction-solidity-helper/contracts/BtcUtils.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
 
 /**
     @title Contract that assists with the Flyover protocol
  */
 
-contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, ReentrancyGuardUpgradeable {
+contract LiquidityBridgeContractV2 is OwnableUpgradeable, ReentrancyGuardUpgradeable {
     uint16 constant public MAX_CALL_GAS_COST = 35000;
     uint16 constant public MAX_REFUND_GAS_LIMIT = 2300;
 
@@ -135,6 +135,11 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
         _;
     }
 
+    function initializeV2() public initializer {
+        __Ownable_init_unchained(msg.sender);
+        __ReentrancyGuard_init_unchained();
+    }
+
     function setProviderStatus(
         uint _providerId,
         bool status
@@ -150,22 +155,10 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
         return "1.3.0";
     }
 
-    function getProviderIds() external view returns (uint) {
-        return providerId;
-    }
-
-    function getBridgeAddress() external view returns (address) {
-        return address(bridge);
-    }
-
     function getMinCollateral() public view returns (uint) {
         return minCollateral;
     }
 
-    function getMinPegIn() external view returns (uint) {
-        return minPegIn;
-    }
-
     function getRewardPercentage() external view returns (uint) {
         return rewardP;
     }
@@ -174,14 +167,6 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
         return resignDelayInBlocks;
     }
 
-    function getDustThreshold() external view returns (uint) {
-        return dust;
-    }
-
-    function isPegOutQuoteCompleted(bytes32 quoteHash) external view returns (bool) {
-        return pegoutRegistry[quoteHash].completed;
-    }
-
     /**
         @dev Checks whether a liquidity provider can deliver a pegin service
         @return Whether the liquidity provider is registered and has enough locked collateral

contracts/Migrations.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 
 contract Migrations {
   address public owner = msg.sender;

contracts/Mock.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 
 import "./LiquidityBridgeContract.sol";
 

contracts/Quotes.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity 0.8.25;
 
 library Quotes {
     struct PeginQuote {
@@ -138,4 +138,4 @@ library Quotes {
         );
     }
 
-}
+}