Merge pull request #243 from rsksmart/flyover-2.1

Flyover 2.1 -> QA-Test

.github/workflows/ci.yml

@@ -32,6 +32,9 @@ jobs:
       - name: Install truffle
         run: npm install -g truffle
 
+      - name: NPM Login
+        run: npm config set //npm.pkg.github.com/:_authToken ${{ secrets.GITHUB_TOKEN }}
+
       - name: Install dependencies
         run: npm ci
       # - name: Lint source and tests

.github/workflows/slither.yml

@@ -13,6 +13,9 @@ jobs:
         with:
           node-version: '19.6.0'
 
+      - name: NPM Login
+        run: npm config set //npm.pkg.github.com/:_authToken ${{ secrets.GITHUB_TOKEN }}
+
       - name: Install dependencies
         run: npm ci
 

contracts/Bridge.sol

@@ -35,7 +35,7 @@ interface Bridge {
 
     function getFederatorPublicKey(int256 index) external view returns (bytes memory);
 
-    function getFederatorPublicKeyOfType(int256 index, string calldata atype) external returns (bytes memory);
+    function getFederatorPublicKeyOfType(int256 index, string calldata atype) external view returns (bytes memory);
 
     function getFederationCreationTime() external view returns (int256);
 
@@ -111,7 +111,7 @@ interface Bridge {
     function registerBtcCoinbaseTransaction(bytes calldata btcTxSerialized, bytes32 blockHash,
         bytes calldata pmtSerialized, bytes32 witnessMerkleRoot, bytes32 witnessReservedValue) external;
 
-    function hasBtcBlockCoinbaseTransactionInformation(bytes32 blockHash) external returns (bool);
+    function hasBtcBlockCoinbaseTransactionInformation(bytes32 blockHash) external view returns (bool);
 
     function registerFastBridgeBtcTransaction(bytes calldata btcTxSerialized, uint256 height,
         bytes calldata pmtSerialized, bytes32 derivationArgumentsHash,

contracts/LiquidityBridgeContractV2.sol

@@ -145,6 +145,10 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
         require(msg.sender == address(bridge), "LBC007");
     }
 
+    function version() external pure returns (string memory) {
+        return "1.3.0";
+    }
+
     function getProviderIds() external view returns (uint) {
         return providerId;
     }
@@ -255,28 +259,39 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
         return (providerId);
     }
 
-    function getProviders(
-        uint[] memory providerIds
-    ) external view returns (LiquidityProvider[] memory) {
-        LiquidityProvider[] memory providersToReturn = new LiquidityProvider[](
-            providerIds.length
-        );
+    function getProviders() external view returns (LiquidityProvider[] memory) {
         uint count = 0;
-
-        for (uint i = 0; i < providerIds.length; i++) {
-            uint id = providerIds[i];
-            if (
-                (isRegistered(liquidityProviders[id].provider) ||
-                    isRegisteredForPegout(liquidityProviders[id].provider)) &&
-                liquidityProviders[id].status
-            ) {
-                providersToReturn[count] = liquidityProviders[id];
+        LiquidityProvider storage lp;
+        for (uint i = 1; i <= providerId; i++) {
+            if (shouldBeListed(liquidityProviders[i])) {
+                count++;
+            }
+        }
+        LiquidityProvider[] memory providersToReturn = new LiquidityProvider[](count);
+        count = 0;
+        for (uint i = 1; i <= providerId; i++) {
+            lp = liquidityProviders[i];
+            if (shouldBeListed(lp)) {
+                providersToReturn[count] = lp;
                 count++;
             }
         }
         return providersToReturn;
     }
 
+    function getProvider(address providerAddress) public view returns (LiquidityProvider memory) {
+        for (uint i = 1; i <= providerId; i++) {
+            if (liquidityProviders[i].provider == providerAddress) {
+                return liquidityProviders[i];
+            }
+        }
+        revert("LBC001");
+    }
+
+    function shouldBeListed(LiquidityProvider storage lp) private view returns(bool){
+        return (isRegistered(lp.provider) || isRegisteredForPegout(lp.provider)) && lp.status;
+    }
+
     /**
         @dev Increases the amount of collateral of the sender
      */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquidity-bridge-contract",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "## registerFastBridgeBtcTransaction",
   "main": "index.js",
   "scripts": {
@@ -44,8 +44,9 @@
   "dependencies": {
     "@openzeppelin/contracts": "^4.8.0",
     "@openzeppelin/contracts-upgradeable": "^4.8.2",
-    "@rsksmart/btc-transaction-solidity-helper": "^0.1.1",
+    "@rsksmart/btc-transaction-solidity-helper": "^0.2.1",
     "@truffle/hdwallet-provider": "^2.1.3",
+    "bech32": "^2.0.0",
     "chai": "^4.3.4",
     "chai-bn": "^0.3.0",
     "truffle-assertions": "^0.9.2",

readme.MD

@@ -140,15 +140,19 @@ Registers msg.sender as a liquidity provider with msg.value as collateral
     The registered provider ID
 
 ### **getProviders**
-    function getProviders(
-        uint[] memory providerIds
-    ) external view returns (LiquidityProvider[] memory)
+    function getProviders() external view returns (LiquidityProvider[] memory)
 Retrieves the information of a group of liquidity providers
-#### Parametets
-    * providerIds: IDs of the providers to fetch
 #### Return value
     Array with the information of the requested LPs
 
+### **getProvider**
+    function getProvider(address providerAddress) external view returns (LiquidityProvider memory)
+Retrieves the information of a specific liquidity provider, regardless if it has resigned or has been disabled
+#### Parameters
+    * providerAddress: address of the provider to fetch
+#### Return value
+    Information of the requested LP
+
 ### **withdrawCollateral**
     function withdrawCollateral() external
 Used to withdraw the locked collateral. It is only for LPs who have resigned