- Moved logic to decode and encode utxo outpoint values to a util fun…

…ction. - Moved pegout event names to a constant file.
rsksmart · Jun 10, 2024 · adaea22 · adaea22
1 parent 13ea2e4
commit adaea22
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 20 deletions.
diff --git a/lib/constants.js b/lib/constants.js
@@ -46,6 +46,15 @@ const PEGIN_REJECTION_REASONS = {
   PEGIN_V1_INVALID_PAYLOAD_REASON: '4'
 };
 
+const PEGOUT_EVENTS = {
+  RELEASE_REQUEST_RECEIVED: "release_request_received",
+  RELEASE_REQUEST_REJECTED: "release_request_rejected",
+  RELEASE_REQUESTED: "release_requested",
+  BATCH_PEGOUT_CREATED: "batch_pegout_created",
+  PEGOUT_TRANSACTION_CREATED: "pegout_transaction_created",
+  PEGOUT_CONFIRMED: "pegout_confirmed"
+}
+
 module.exports = {
   KEY_TYPE_BTC,
   KEY_TYPE_RSK,
@@ -63,4 +72,5 @@ module.exports = {
   GENESIS_FEDERATION_REDEEM_SCRIPT,
   FEDERATION_ACTIVATION_AGE,
   PEGIN_REJECTION_REASONS,
+  PEGOUT_EVENTS
 };
diff --git a/lib/tests/2wp.js b/lib/tests/2wp.js
@@ -10,8 +10,9 @@ const { getDerivedRSKAddressInformation } = require('@rsksmart/btc-rsk-derivatio
 const btcEthUnitConverter = require('@rsksmart/btc-eth-unit-converter');
 const { sendTxToBridge, sendPegin, ensurePeginIsRegistered, donateToBridge } = require('../2wp-utils');
 const { waitAndUpdateBridge } = require('../rsk-utils');
-const {VarInt} = require("../varint");
+const { VarInt, decodeOutpointValues, encodeOutpointValuesAsMap } = require("../varint");
 const {getBridgeState} = require("@rsksmart/bridge-state-data-parser");
+const {PEGOUT_EVENTS} = require("../constants");
 
 const DONATION_AMOUNT = 250;
 const REJECTED_REASON = 1;
@@ -153,7 +154,7 @@ const execute = (description, getRskHost) => {
 
         const isIris300AlreadyActive = await Runners.common.forks.iris300.isAlreadyActive();
         if (isIris300AlreadyActive) {
-            const pegoutRequestReceivedEvent = await rskUtils.findEventInBlock(rskTxHelper, 'release_request_received');
+            const pegoutRequestReceivedEvent = await rskUtils.findEventInBlock(rskTxHelper, PEGOUT_EVENTS.RELEASE_REQUEST_RECEIVED);
             expect(pegoutRequestReceivedEvent).to.not.be.null;
             const btcDestinationAddress = pegoutRequestReceivedEvent.arguments.btcDestinationAddress;
             expect(pegoutRequestReceivedEvent.arguments.sender.toLowerCase()).to.equal(ensure0x(recipientRskAddressInfo.address));
@@ -169,43 +170,34 @@ const execute = (description, getRskHost) => {
         const pegoutCreatedValidations = async (localRskTxHelper) => {
           const isPapyrus200AlreadyActive = await Runners.common.forks.papyrus200.isAlreadyActive();
           if (isPapyrus200AlreadyActive) {
-            const pegoutRequestedEvent = await rskUtils.findEventInBlock(localRskTxHelper, 'release_requested');
+            const pegoutRequestedEvent = await rskUtils.findEventInBlock(localRskTxHelper, PEGOUT_EVENTS.RELEASE_REQUESTED);
             expect(pegoutRequestedEvent).to.not.be.null;
             expect(Number(pegoutRequestedEvent.arguments.amount)).to.equal(pegoutValueInSatoshis);
           }
           const isHop400AlreadyActive = await Runners.common.forks.hop400.isAlreadyActive();
           if (isHop400AlreadyActive) {
-            const batchPegoutCreatedEvent = await rskUtils.findEventInBlock(localRskTxHelper, 'batch_pegout_created');
+            const batchPegoutCreatedEvent = await rskUtils.findEventInBlock(localRskTxHelper, PEGOUT_EVENTS.BATCH_PEGOUT_CREATED);
             expect(batchPegoutCreatedEvent).to.not.be.null;
             expect(batchPegoutCreatedEvent.arguments.releaseRskTxHashes.includes(pegoutTransaction.transactionHash)).to.be.true;
           }
 
           const isLovell700AlreadyActive = await Runners.common.forks.lovell700.isAlreadyActive();
           if (isLovell700AlreadyActive) {
-            const pegoutTransactionCreatedEvent = await rskUtils.findEventInBlock(localRskTxHelper, 'pegout_transaction_created');
+            const pegoutTransactionCreatedEvent = await rskUtils.findEventInBlock(localRskTxHelper, PEGOUT_EVENTS.PEGOUT_TRANSACTION_CREATED);
             expect(pegoutTransactionCreatedEvent).to.not.be.null;
             const encodedUtxoOutpointValues = Buffer.from(removePrefix0x(pegoutTransactionCreatedEvent.arguments.utxoOutpointValues), 'hex');
 
-            const federationUtxoValues = activeFederationUtxosBeforePegout.reduce((map, utxo) => {
-              map[utxo.valueInSatoshis] = Buffer.from(new VarInt(utxo.valueInSatoshis).encode()).toString("hex");
-              return map;
-            }, {});
+            const federationUtxoValues = encodeOutpointValuesAsMap(activeFederationUtxosBeforePegout);
 
-            let offset = 0;
-            let idx = 0;
-            while (encodedUtxoOutpointValues.length > offset) {
-              let utxoOutpointValue = new VarInt(encodedUtxoOutpointValues, offset);
-              expect(utxoOutpointValue.value in federationUtxoValues).to.be.true
+            const outpointValues = decodeOutpointValues(encodedUtxoOutpointValues);
 
-              offset += utxoOutpointValue.getSizeInBytes();
-              idx++;
-            }
+            expect(outpointValues.every(value => value in federationUtxoValues)).to.be.true;
           }
         };
 
         const pegoutConfirmedValidations = async (localRskTxHelper) => {
           if (isFingerroot500AlreadyActive) {
-            const pegoutConfirmedEvent = await rskUtils.findEventInBlock(localRskTxHelper, 'pegout_confirmed');
+            const pegoutConfirmedEvent = await rskUtils.findEventInBlock(localRskTxHelper, PEGOUT_EVENTS.PEGOUT_CONFIRMED);
             expect(pegoutConfirmedEvent).to.not.be.null;
           }
         };
@@ -243,7 +235,7 @@ const execute = (description, getRskHost) => {
         const pegoutTransaction = await sendTxToBridge(rskTxHelper, PEGOUT_UNDER_MINIMUM_VALUE_IN_BTC, recipientRskAddressInfo.address);
         const isIris300AlreadyActive = await Runners.common.forks.iris300.isAlreadyActive();
         if (isIris300AlreadyActive) {
-            const pegoutRejectedEvent = await rskUtils.findEventInBlock(rskTxHelper, 'release_request_rejected');
+            const pegoutRejectedEvent = await rskUtils.findEventInBlock(rskTxHelper, PEGOUT_EVENTS.RELEASE_REQUEST_REJECTED);
             expect(pegoutRejectedEvent).to.not.be.null;
             const pegoutValueInSatoshis = Number(btcEthUnitConverter.btcToSatoshis(PEGOUT_UNDER_MINIMUM_VALUE_IN_BTC));
             expect(Number(pegoutRejectedEvent.arguments.amount)).to.equal(pegoutValueInSatoshis);

diff --git a/lib/varint.js b/lib/varint.js
@@ -63,4 +63,25 @@ class VarInt {
   }
 }
 
-module.exports = { VarInt };
+const decodeOutpointValues = (encodedUtxoOutpointValues) => {
+  let offset = 0;
+  let idx = 0;
+  const outpointValues = [];
+  while (encodedUtxoOutpointValues.length > offset) {
+    let utxoOutpointValue = new VarInt(encodedUtxoOutpointValues, offset);
+    outpointValues.push(utxoOutpointValue);
+    offset += utxoOutpointValue.getSizeInBytes();
+    idx++;
+  }
+  return outpointValues;
+}
+
+const encodeOutpointValuesAsMap = (utxos) => {
+  const encodeOutpointValues = utxos.reduce((map, utxo) => {
+    map[utxo.valueInSatoshis] = Buffer.from(new VarInt(utxo.valueInSatoshis).encode()).toString("hex");
+    return map;
+  }, {});
+  return encodeOutpointValues;
+}
+
+module.exports = { VarInt, decodeOutpointValues, encodeOutpointValuesAsMap };