Renames variables.

Author: jeremy-then

lib/constants/bridge-constants.js

@@ -1,5 +1,7 @@
 const BRIDGE_ADDRESS = '0x0000000000000000000000000000000001000006';
+const FLYOVER_DERIVATION_HASH = '0000000000000000000000000000000000000000000000000000000000000001';
 
 module.exports = {
-    BRIDGE_ADDRESS
+    BRIDGE_ADDRESS,
+    FLYOVER_DERIVATION_HASH,
 };

lib/federation-utils.js

@@ -120,6 +120,29 @@ const getProposedFederationPublicKeys = async (bridge) => {
 
 };
 
+const getProposedFederationInfo = async (bridge) => {
+
+  const proposedFederationInfoResponses = await Promise.all([
+      bridge.methods.getProposedFederationSize().call(),
+      bridge.methods.getProposedFederationAddress().call(),
+      bridge.methods.getProposedFederationCreationBlockNumber().call(),
+      bridge.methods.getProposedFederationCreationTime().call()
+  ]);
+
+  const size = Number(proposedFederationInfoResponses[0]);
+  const address = proposedFederationInfoResponses[1];
+  const creationBlockNumber = Number(proposedFederationInfoResponses[2]);
+  const creationTime = Number(proposedFederationInfoResponses[3]);
+
+  return {
+      size,
+      address,
+      creationBlockNumber,
+      creationTime,
+  };
+
+};
+
 const getRetiringFederationPublicKeys = async (bridge) => {
 
   const retiringFederationKeys = [];
@@ -144,29 +167,6 @@ const getRetiringFederationPublicKeys = async (bridge) => {
 
 };
 
-const getProposedFederationInfo = async (bridge) => {
-
-  const proposedFederationInfoResponses = await Promise.all([
-      bridge.methods.getProposedFederationSize().call(),
-      bridge.methods.getProposedFederationAddress().call(),
-      bridge.methods.getProposedFederationCreationBlockNumber().call(),
-      bridge.methods.getProposedFederationCreationTime().call()
-  ]);
-
-  const size = Number(proposedFederationInfoResponses[0]);
-  const address = proposedFederationInfoResponses[1];
-  const creationBlockNumber = Number(proposedFederationInfoResponses[2]);
-  const creationTime = Number(proposedFederationInfoResponses[3]);
-
-  return {
-      size,
-      address,
-      creationBlockNumber,
-      creationTime,
-  };
-
-};
-
 const getActiveFederationInfo = async (bridge) => {
 
   const activeFederationInfoResponses = await Promise.all([

lib/tests/change-federation.js

@@ -17,7 +17,7 @@ const BridgeTransactionParser = require('@rsksmart/bridge-transaction-parser');
 const redeemScriptParser = require('@rsksmart/powpeg-redeemscript-parser');
 const { btcToWeis, satoshisToBtc } = require('@rsksmart/btc-eth-unit-converter');
 const { expect } = require('chai');
-const { BRIDGE_ADDRESS } = require('../constants/bridge-constants');
+const { BRIDGE_ADDRESS, FLYOVER_DERIVATION_HASH } = require('../constants/bridge-constants');
 const { 
     KEY_TYPE_BTC, 
     KEY_TYPE_RSK, 
@@ -131,8 +131,8 @@ const execute = (description, newFederationConfig, makeDonationPegins = false) =
             expectedNewFederationErpRedeemScript = expectedNewFederationErpRedeemScriptBuffer.toString('hex');
             expectedNewFederationAddress = redeemScriptParser.getAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer);
 
-            const flyoverPowpegRedeemScript = redeemScriptParser.getFlyoverRedeemScript(expectedNewFederationErpRedeemScriptBuffer, "0000000000000000000000000000000000000000000000000000000000000001");
-            expectedFlyoverAddress = redeemScriptParser.getAddressFromRedeemScript('REGTEST', flyoverPowpegRedeemScript);
+            const flyoverNewFederationRedeemScript = redeemScriptParser.getFlyoverRedeemScript(expectedNewFederationErpRedeemScriptBuffer, FLYOVER_DERIVATION_HASH);
+            expectedFlyoverAddress = redeemScriptParser.getAddressFromRedeemScript('REGTEST', flyoverNewFederationRedeemScript);
 
             initialActiveFederationInfo = await getActiveFederationInfo(bridge);
 
@@ -307,25 +307,25 @@ const execute = (description, newFederationConfig, makeDonationPegins = false) =
             expect(finalBridgeState.pegoutsWaitingForConfirmations.length).to.be.equal(1, 'There should be one pegout waiting for confirmations.');
             expect(finalBridgeState.pegoutsWaitingForSignatures.length).to.be.equal(0, 'No pegout should be waiting for signatures.');
 
-            const svpPegoutWaitingForConfirmations = finalBridgeState.pegoutsWaitingForConfirmations[0];
+            const svpFundTxWaitingForConfirmations = finalBridgeState.pegoutsWaitingForConfirmations[0];
 
-            const pegoutCreationBlockNumber = Number(svpPegoutWaitingForConfirmations.pegoutCreationBlockNumber);
+            const pegoutCreationBlockNumber = Number(svpFundTxWaitingForConfirmations.pegoutCreationBlockNumber);
 
             const expectedPegoutCreationBlockNumber = commitFederationCreationBlockNumber + 1;
             expect(pegoutCreationBlockNumber).to.be.equal(expectedPegoutCreationBlockNumber, 'The svp fund tx pegout creation block number should be the block that contains the first updateCollections call right after the commitFederation call.');
 
-            const rawSvpBtcTransaction = svpPegoutWaitingForConfirmations.btcRawTx;
+            const rawSvpFundTransaction = svpFundTxWaitingForConfirmations.btcRawTx;
 
-            const btcTransaction = bitcoinJsLib.Transaction.fromHex(rawSvpBtcTransaction);
+            const svpFundTransaction = bitcoinJsLib.Transaction.fromHex(rawSvpFundTransaction);
 
-            expect(btcTransaction.outs.length).to.be.equal(3, 'The SVP fund transaction should have 3 outputs.');
+            expect(svpFundTransaction.outs.length).to.be.equal(3, 'The SVP fund transaction should have 3 outputs.');
 
             const proposedFederationAddress = await bridge.methods.getProposedFederationAddress().call();
 
             // The output addresses should be in the expected order.
-            const proposedFederationOutput = btcTransaction.outs[0];
-            const proposedFederationFlyoverOutput = btcTransaction.outs[1];
-            const activeFederationOutput = btcTransaction.outs[2];
+            const proposedFederationOutput = svpFundTransaction.outs[0];
+            const proposedFederationFlyoverOutput = svpFundTransaction.outs[1];
+            const activeFederationOutput = svpFundTransaction.outs[2];
 
             const actualProposedFederationAddress = bitcoinJsLib.address.fromOutputScript(proposedFederationOutput.script, btcTxHelper.btcConfig.network);
             expect(actualProposedFederationAddress).to.be.equal(proposedFederationAddress, 'The proposed federation address in the SVP fund transaction should be the first output.');
@@ -344,21 +344,21 @@ const execute = (description, newFederationConfig, makeDonationPegins = false) =
             expect(proposedFederationFlyoverOutput.value).to.be.equal(expectedFlyoverOutputValue, 'The flyover output value should be double the minimum pegout value.');
 
             // Only the svp fund tx hash unsigned value should be in storage
-            await assertOnlySvpFundTxHashUnsignedIsInStorage(rskTxHelper, btcTransaction.getId());
+            await assertOnlySvpFundTxHashUnsignedIsInStorage(rskTxHelper, svpFundTransaction.getId());
 
             // The release_requested event should be emitted with the expected values
             const releaseRequestedEvent = await rskUtils.findEventInBlock(rskTxHelper, PEGOUT_EVENTS.RELEASE_REQUESTED.name, expectedPegoutCreationBlockNumber);
             const expectedReleaseRequestedAmount = expectedProposedFederationOutputValue + expectedFlyoverOutputValue;
             expect(Number(releaseRequestedEvent.arguments.amount)).to.be.equal(expectedReleaseRequestedAmount, 'The amount in the release requested event should be the sum of the proposed federation and flyover output values.');
             expect(releaseRequestedEvent, 'The release requested event should be emitted.').to.not.be.null;
-            expect(removePrefix0x(releaseRequestedEvent.arguments.btcTxHash)).to.be.equal(btcTransaction.getId(), 'The btc tx hash in the release requested event should be the tx id of the SVP fund tx.');
+            expect(removePrefix0x(releaseRequestedEvent.arguments.btcTxHash)).to.be.equal(svpFundTransaction.getId(), 'The btc tx hash in the release requested event should be the tx id of the SVP fund tx.');
 
             // The pegout_transaction_created event should be emitted with the expected values
             const pegoutTransactionCreatedEvent = await rskUtils.findEventInBlock(rskTxHelper, PEGOUT_EVENTS.PEGOUT_TRANSACTION_CREATED.name, expectedPegoutCreationBlockNumber);
             expect(pegoutTransactionCreatedEvent, 'The pegout transaction created event should be emitted.').to.not.be.null;
-            expect(removePrefix0x(pegoutTransactionCreatedEvent.arguments.btcTxHash)).to.be.equal(btcTransaction.getId(), 'The btc tx hash in the pegout transaction created event should be the tx id of the SVP fund tx.');
+            expect(removePrefix0x(pegoutTransactionCreatedEvent.arguments.btcTxHash)).to.be.equal(svpFundTransaction.getId(), 'The btc tx hash in the pegout transaction created event should be the tx id of the SVP fund tx.');
 
-            await assertPegoutTransactionCreatedOutpointValues(initialBridgeState, finalBridgeState, btcTransaction, pegoutTransactionCreatedEvent);
+            await assertPegoutTransactionCreatedOutpointValues(initialBridgeState, finalBridgeState, svpFundTransaction, pegoutTransactionCreatedEvent);
 
         });