Stable test

.gitignore

@@ -1,7 +1,9 @@
+.openzeppelin
 node_modules
 build
 .vscode
 .idea
 coverage
 coverage.json
 .secret
+.DS_Store

.solhint.json

@@ -0,0 +1,26 @@
+{
+  "extends": "solhint:recommended",
+  "rules": {
+    "avoid-throw": "off",
+    "compiler-version": [
+      "error",
+      "^0.8.3"
+    ],
+    "max-line-length": ["error", 120],
+    "max-states-count": ["error", 20],
+    "avoid-tx-origin": "off",
+    "not-rely-on-time": "off",
+    "func-visibility": [
+      "warn",
+      {
+        "ignoreConstructors": true
+      }
+    ],
+    "no-global-import": "off",
+    "no-inline-assembly": "off",
+    "var-name-mixedcase": "off",
+    "reason-string": "off",
+    "no-unused-vars": "error",
+    "no-empty-blocks": "off"
+  }
+}

config.js

@@ -26,7 +26,7 @@ exports.deploy = async (name, network, act) => {
         return testConfig;
     }
 
-    if (!oldConfig[network][name].deployed) {
+    if (!oldConfig[network][name].deployed || network === "rskRegtest") {
         await act(oldConfig[network][name]);
         oldConfig[network][name].deployed = true;
         this.write(oldConfig)

config.json

@@ -2,22 +2,60 @@
   "rskTestnet": {
     "SafeMath": {
       "address": "0x343714bf746AcaF55BC1BAF93D2C47E42A762eC1",
+      "deployed": false
+    },
+    "SignatureValidator": {
+      "address": "0xFe2746b892fFFf26E9a8F45935E7510d72028416",
+      "deployed": true
+    },
+    "LiquidityBridgeContractAdmin": {
+      "address": "0x1de4FF655DC7BC289cCa9D232755005265B4C94b",
+      "deployed": false
+    },
+    "LiquidityBridgeContract": {
+      "address": "0x890D3AFD0F14D870DE24798329bf36ce8939D0b4",
       "deployed": true
     },
+    "LiquidityBridgeContractProxy": {
+      "address": "0x81e0038E7b88496cf3CdDd684f74711e5451870B",
+      "deployed": false
+    },
+    "Migrations": {
+      "address": "0x9574a4972320d9988C110dAF950c89CC638B3b75",
+      "deployed": true
+    }
+  },
+  "rskRegtest": {
+    "Migrations": {
+      "address": "0xdac5481925A298B95Bf5b54c35b68FC6fc2eF423",
+      "deployed": true
+    },
+    "SafeMath": {
+      "address": "",
+      "deployed": false
+    },
     "SignatureValidator": {
-      "address": "0xEE0e4fb6b967D3eAC2E2Af188eDAE5E319C0CD74",
+      "address": "0xeFb80DB9E2d943A492Bd988f4c619495cA815643",
       "deployed": true
     },
     "LiquidityBridgeContractAdmin": {
-      "address": "0x0Cf562069E64aB810963F017F560c021F298aa40",
+      "address": "0x73ec81da0C72DD112e06c09A6ec03B5544d26F05",
       "deployed": true
     },
     "LiquidityBridgeContract": {
-      "address": "0x6C69D66AF194b5b7c484E86765a95F6160b8b767",
+      "address": "0xA66939ac57893C2E65425a5D66099Bc20C76D4CD",
       "deployed": true
     },
     "LiquidityBridgeContractProxy": {
-      "address": "0x1007D87b2Ee25768bC9A58b4A0B564e12Be554bF",
+      "address": "0x1eD614cd3443EFd9c70F04b6d777aed947A4b0c4",
+      "deployed": true
+    },
+    "Quotes": {
+      "address": "0x463F29B11503e198f6EbeC9903b4e5AaEddf6D29",
+      "deployed": true
+    },
+    "BtcUtils": {
+      "address": "0x987c1f13d417F7E04d852B44badc883E4E9782e1",
       "deployed": true
     }
   }

contracts/Bridge.sol

@@ -3,61 +3,128 @@ pragma solidity ^0.8.3;
 
 interface Bridge {
 
-    function getBtcBlockchainBestChainHeight (  ) external view returns ( int );
-    function getStateForBtcReleaseClient (  ) external view returns ( bytes memory);
-    function getStateForDebugging (  ) external view returns ( bytes memory  );
-    function getBtcBlockchainInitialBlockHeight (  ) external view returns ( int );
-    function getBtcBlockchainBlockHashAtDepth ( int256 depth ) external view returns ( bytes memory );
-    function getBtcTxHashProcessedHeight ( string calldata hash ) external view returns ( int64 );
-    function isBtcTxHashAlreadyProcessed ( string calldata hash ) external view returns ( bool );
-    function getFederationAddress (  ) external view returns ( string memory );
-    function registerBtcTransaction ( bytes calldata atx, int256 height, bytes calldata pmt ) external;
-    function addSignature ( bytes calldata pubkey, bytes[] calldata signatures, bytes calldata txhash ) external;
-    function receiveHeaders ( bytes[] calldata blocks ) external;
-    function receiveHeader ( bytes calldata ablock ) external returns ( int256 );
-    function getFederationSize (  ) external view returns ( int256 );
-    function getFederationThreshold (  ) external view returns ( int256 );
-    function getFederatorPublicKey ( int256 index ) external view returns ( bytes memory);
-    function getFederatorPublicKeyOfType ( int256 index, string calldata atype ) external returns ( bytes memory);
-    function getFederationCreationTime (  ) external view returns ( int256 );
-    function getFederationCreationBlockNumber (  ) external view returns ( int256 );
-    function getRetiringFederationAddress (  ) external view returns ( string memory );
-    function getRetiringFederationSize (  ) external view returns ( int256 );
-    function getRetiringFederationThreshold (  ) external view returns ( int256 );
-    function getRetiringFederatorPublicKey ( int256 index ) external view returns ( bytes memory);
-    function getRetiringFederatorPublicKeyOfType ( int256 index,string calldata atype ) external view returns ( bytes memory);
-    function getRetiringFederationCreationTime (  ) external view returns ( int256 );
-    function getRetiringFederationCreationBlockNumber (  ) external view returns ( int256 );
-    function createFederation (  ) external returns ( int256 );
-    function addFederatorPublicKey ( bytes calldata  key ) external returns ( int256 );
-    function addFederatorPublicKeyMultikey ( bytes calldata btcKey, bytes calldata rskKey, bytes calldata mstKey ) external returns ( int256 );
-    function commitFederation ( bytes calldata hash ) external returns ( int256 );
-    function rollbackFederation (  ) external returns ( int256 );
-    function getPendingFederationHash (  ) external view returns ( bytes memory);
-    function getPendingFederationSize (  ) external view  returns ( int256 );
-    function getPendingFederatorPublicKey ( int256 index ) external view returns ( bytes memory);
-    function getPendingFederatorPublicKeyOfType ( int256 index, string calldata atype ) external view returns ( bytes memory);
-    function getLockWhitelistSize (  ) external view returns ( int256 );
-    function getLockWhitelistAddress ( int256 index ) external view returns ( string memory);
-    function getLockWhitelistEntryByAddress ( string calldata aaddress ) external view  returns ( int256 );
-    function addLockWhitelistAddress ( string calldata aaddress, int256 maxTransferValue ) external returns ( int256 );
-    function addOneOffLockWhitelistAddress ( string calldata aaddress, int256 maxTransferValue ) external returns ( int256 );
-    function addUnlimitedLockWhitelistAddress ( string calldata aaddress ) external returns ( int256 ); 
-    function removeLockWhitelistAddress ( string calldata aaddress ) external returns ( int256 );
-    function setLockWhitelistDisableBlockDelay ( int256 disableDelay ) external returns ( int256 );
-    function getFeePerKb (  ) external view returns ( int256 );
-    function voteFeePerKbChange ( int256 feePerKb ) external returns ( int256 );
-    function updateCollections (  ) external;
-    function getMinimumLockTxValue (  ) external view returns ( int256 );
-    function getBtcTransactionConfirmations ( bytes32  txHash, bytes32 blockHash, uint256 merkleBranchPath, bytes32[] calldata merkleBranchHashes ) external view returns ( int256 );
-    function getLockingCap (  ) external view returns ( int256 );
-    function increaseLockingCap ( int256 newLockingCap ) external returns ( bool );
-    function registerBtcCoinbaseTransaction ( bytes calldata btcTxSerialized, bytes32 blockHash, bytes calldata pmtSerialized, bytes32 witnessMerkleRoot, bytes32 witnessReservedValue ) external;
-    function hasBtcBlockCoinbaseTransactionInformation ( bytes32 blockHash ) external returns ( bool );
-    function registerFastBridgeBtcTransaction ( bytes calldata btcTxSerialized, uint256 height, bytes calldata pmtSerialized, bytes32 derivationArgumentsHash, bytes calldata userRefundBtcAddress, address payable liquidityBridgeContractAddress, bytes calldata liquidityProviderBtcAddress, bool shouldTransferToContract ) external returns ( int256 );
-    function getActiveFederationCreationBlockHeight (  ) external view  returns ( uint256 );
-    function getBtcBlockchainBestBlockHeader (  ) external view  returns ( bytes memory );
-    function getBtcBlockchainBlockHeaderByHash ( bytes32 btcBlockHash ) external view returns ( bytes memory );
-    function getBtcBlockchainBlockHeaderByHeight ( uint256 btcBlockHeight ) external view  returns ( bytes memory );
-    function getBtcBlockchainParentBlockHeaderByHash ( bytes32 btcBlockHash ) external view  returns ( bytes memory);
+    receive() external payable;
+
+    function getBtcBlockchainBestChainHeight() external view returns (int);
+
+    function getStateForBtcReleaseClient() external view returns (bytes memory);
+
+    function getStateForDebugging() external view returns (bytes memory);
+
+    function getBtcBlockchainInitialBlockHeight() external view returns (int);
+
+    function getBtcBlockchainBlockHashAtDepth(int256 depth) external view returns (bytes memory);
+
+    function getBtcTxHashProcessedHeight(string calldata hash) external view returns (int64);
+
+    function isBtcTxHashAlreadyProcessed(string calldata hash) external view returns (bool);
+
+    function getFederationAddress() external view returns (string memory);
+
+    function registerBtcTransaction(bytes calldata atx, int256 height, bytes calldata pmt) external;
+
+    function addSignature(bytes calldata pubkey, bytes[] calldata signatures, bytes calldata txhash) external;
+
+    function receiveHeaders(bytes[] calldata blocks) external;
+
+    function receiveHeader(bytes calldata ablock) external returns (int256);
+
+    function getFederationSize() external view returns (int256);
+
+    function getFederationThreshold() external view returns (int256);
+
+    function getFederatorPublicKey(int256 index) external view returns (bytes memory);
+
+    function getFederatorPublicKeyOfType(int256 index, string calldata atype) external returns (bytes memory);
+
+    function getFederationCreationTime() external view returns (int256);
+
+    function getFederationCreationBlockNumber() external view returns (int256);
+
+    function getRetiringFederationAddress() external view returns (string memory);
+
+    function getRetiringFederationSize() external view returns (int256);
+
+    function getRetiringFederationThreshold() external view returns (int256);
+
+    function getRetiringFederatorPublicKey(int256 index) external view returns (bytes memory);
+
+    function getRetiringFederatorPublicKeyOfType(int256 index, string calldata atype)
+    external view returns (bytes memory);
+
+    function getRetiringFederationCreationTime() external view returns (int256);
+
+    function getRetiringFederationCreationBlockNumber() external view returns (int256);
+
+    function createFederation() external returns (int256);
+
+    function addFederatorPublicKey(bytes calldata key) external returns (int256);
+
+    function addFederatorPublicKeyMultikey(bytes calldata btcKey, bytes calldata rskKey,
+        bytes calldata mstKey) external returns (int256);
+
+    function commitFederation(bytes calldata hash) external returns (int256);
+
+    function rollbackFederation() external returns (int256);
+
+    function getPendingFederationHash() external view returns (bytes memory);
+
+    function getPendingFederationSize() external view returns (int256);
+
+    function getPendingFederatorPublicKey(int256 index) external view returns (bytes memory);
+
+    function getPendingFederatorPublicKeyOfType(int256 index, string calldata atype)
+    external view returns (bytes memory);
+
+    function getLockWhitelistSize() external view returns (int256);
+
+    function getLockWhitelistAddress(int256 index) external view returns (string memory);
+
+    function getLockWhitelistEntryByAddress(string calldata aaddress) external view returns (int256);
+
+    function addLockWhitelistAddress(string calldata aaddress, int256 maxTransferValue) external returns (int256);
+
+    function addOneOffLockWhitelistAddress(string calldata aaddress, int256 maxTransferValue)
+        external returns (int256);
+
+    function addUnlimitedLockWhitelistAddress(string calldata aaddress) external returns (int256);
+
+    function removeLockWhitelistAddress(string calldata aaddress) external returns (int256);
+
+    function setLockWhitelistDisableBlockDelay(int256 disableDelay) external returns (int256);
+
+    function getFeePerKb() external view returns (int256);
+
+    function voteFeePerKbChange(int256 feePerKb) external returns (int256);
+
+    function updateCollections() external;
+
+    function getMinimumLockTxValue() external view returns (int256);
+
+    function getBtcTransactionConfirmations(bytes32 txHash, bytes32 blockHash,
+        uint256 merkleBranchPath, bytes32[] calldata merkleBranchHashes) external view returns (int256);
+
+    function getLockingCap() external view returns (int256);
+
+    function increaseLockingCap(int256 newLockingCap) external returns (bool);
+
+    function registerBtcCoinbaseTransaction(bytes calldata btcTxSerialized, bytes32 blockHash,
+        bytes calldata pmtSerialized, bytes32 witnessMerkleRoot, bytes32 witnessReservedValue) external;
+
+    function hasBtcBlockCoinbaseTransactionInformation(bytes32 blockHash) external returns (bool);
+
+    function registerFastBridgeBtcTransaction(bytes calldata btcTxSerialized, uint256 height,
+        bytes calldata pmtSerialized, bytes32 derivationArgumentsHash,
+        bytes calldata userRefundBtcAddress, address payable liquidityBridgeContractAddress,
+        bytes calldata liquidityProviderBtcAddress, bool shouldTransferToContract) external returns (int256);
+
+    function getActiveFederationCreationBlockHeight() external view returns (uint256);
+
+    function getBtcBlockchainBestBlockHeader() external view returns (bytes memory);
+
+    function getBtcBlockchainBlockHeaderByHash(bytes32 btcBlockHash) external view returns (bytes memory);
+
+    function getBtcBlockchainBlockHeaderByHeight(uint256 btcBlockHeight) external view returns (bytes memory);
+
+    function getBtcBlockchainParentBlockHeaderByHash(bytes32 btcBlockHash) external view returns (bytes memory);
 }