Merge pull request #341 from rsksmart/feature/GBI-2805

feature/GBI-2805 - RSKIP-305 support

Author: Luisfc68

contracts/LiquidityBridgeContractV2.sol

@@ -6,6 +6,7 @@ import "./Bridge.sol";
 import "./QuotesV2.sol";
 import "./SignatureValidator.sol";
 import "@rsksmart/btc-transaction-solidity-helper/contracts/BtcUtils.sol";
+import "@rsksmart/btc-transaction-solidity-helper/contracts/OpCodes.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 
@@ -35,6 +36,7 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
     uint constant public QUOTE_HASH_OUTPUT = 1;
     uint constant public SAT_TO_WEI_CONVERSION = 10**10;
 
+
     struct Registry {
         uint32 timestamp;
         bool success;
@@ -766,13 +768,16 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
                 quote.liquidityProviderBtcAddress
             )
         );
+        bytes1 OP_DROP = 0x75;
+        bytes1 OP_PUSHBYTES_32 = 0x20;
         bytes memory flyoverRedeemScript = bytes.concat(
-            hex"20",
+            OP_PUSHBYTES_32,
             derivationValue,
-            hex"75",
+            OP_DROP,
             bridge.getActivePowpegRedeemScript()
         );
-        return BtcUtils.validateP2SHAdress(depositAddress, flyoverRedeemScript, mainnet);
+        bytes memory segwitScript = bytes.concat(OpCodes.OP_0, OP_PUSHBYTES_32, sha256(flyoverRedeemScript));
+        return BtcUtils.validateP2SHAdress(depositAddress, segwitScript, mainnet);
     }
 
     /**

test/pegin.test.ts

@@ -547,7 +547,7 @@ describe("LiquidityBridgeContractV2 pegin process should", () => {
           productFeeAmount: BigInt("6000000000000000"),
           gasFee: BigInt("3000000000000000"),
         },
-        address: "2NAXHKYRnTme4oDCk9mSPfdf4ga2tZ1xM5B",
+        address: "2MxoZvDm7QeVmKDjFumt7esg5ZH91Mc8aBE",
       },
       {
         quote: {
@@ -579,7 +579,7 @@ describe("LiquidityBridgeContractV2 pegin process should", () => {
           productFeeAmount: BigInt("7000000000000000"),
           gasFee: BigInt("4000000000000000"),
         },
-        address: "2NCDJzPze5eosHN5Tx4pf5GF2zXtaKDUHzX",
+        address: "2N6Tr7iYL3QrE31ZBnY1VRZRdjYoYhBuTfU",
       },
       {
         quote: {
@@ -611,7 +611,7 @@ describe("LiquidityBridgeContractV2 pegin process should", () => {
           productFeeAmount: BigInt("8000000000000000"),
           gasFee: BigInt("5000000000000000"),
         },
-        address: "2N7rxjtHjbxr8W3U3HVncyHJhEhBQ3tBa9w",
+        address: "2N3q4cy9k3y8srvJaW8HFT4125r1KQjfuj2",
       },
     ];