From 45db702623cd0aa5871b72432c4436ec74df4c15 Mon Sep 17 00:00:00 2001 From: jeremy-then Date: Tue, 24 Sep 2024 22:12:04 -0400 Subject: [PATCH] Adds 'should reject and refund a legacy pegin from a multisig account with the value exactly minimum' test Rebases --- lib/constants.js | 1 + lib/tests/2wp.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/constants.js b/lib/constants.js index a50e2192..b33a1a84 100644 --- a/lib/constants.js +++ b/lib/constants.js @@ -45,6 +45,7 @@ const FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_END = 150; const PEGIN_REJECTION_REASONS = { PEGIN_CAP_SURPASSED_REASON: '1', + LEGACY_PEGIN_MULTISIG_SENDER: '2', PEGIN_V1_INVALID_PAYLOAD_REASON: '4', INVALID_AMOUNT: '5', }; diff --git a/lib/tests/2wp.js b/lib/tests/2wp.js index 8d3727a6..e7e05774 100644 --- a/lib/tests/2wp.js +++ b/lib/tests/2wp.js @@ -40,7 +40,12 @@ const execute = (description, getRskHost) => { federationAddress = await bridge.methods.getFederationAddress().call(); minimumPeginValueInSatoshis = Number(await bridge.methods.getMinimumLockTxValue().call()); +<<<<<<< HEAD btcFeeInSatoshis = btcToSatoshis(await btcTxHelper.getFee()); +======= + minimumPeginValueInBtc = Number(satoshisToBtc(minimumPeginValueInSatoshis)); + btcFeeInSatoshis = Number(btcToSatoshis(await btcTxHelper.getFee())); +>>>>>>> f0c37e5 (Adds 'should reject and refund a legacy pegin from a multisig account with the value exactly minimum' test) await btcTxHelper.importAddress(federationAddress, 'federation');