diff --git a/lib/2wp-utils.js b/lib/2wp-utils.js index ef4a718c..3e06a16f 100644 --- a/lib/2wp-utils.js +++ b/lib/2wp-utils.js @@ -14,7 +14,8 @@ const { getBridge } = require('./bridge-provider'); const { getBridgeState } = require('@rsksmart/bridge-state-data-parser'); const { getDerivedRSKAddressInformation } = require('@rsksmart/btc-rsk-derivation'); const btcEthUnitConverter = require('@rsksmart/btc-eth-unit-converter'); -const { PEGIN_EVENTS, DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC, PEGOUT_EVENTS } = require("./constants"); +const { PEGIN_EVENTS, DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC } = require('./constants/pegin-constants'); +const { PEGOUT_EVENTS } = require('./constants/pegout-constants'); const peginVerifier = require('pegin-address-verificator'); const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider'); diff --git a/lib/assertions/2wp.js b/lib/assertions/2wp.js index 7a9081fe..d640ef86 100644 --- a/lib/assertions/2wp.js +++ b/lib/assertions/2wp.js @@ -3,7 +3,7 @@ var {wait, removePrefix0x} = require('../utils'); var bitcoin = require('peglib').bitcoin; var rsk = require('peglib').rsk; -const {MAX_ESTIMATED_FEE_PER_PEGOUT, FEE_DIFFERENCE_PER_PEGOUT} = require('../constants'); +const { MAX_ESTIMATED_FEE_PER_PEGOUT, FEE_DIFFERENCE_PER_PEGOUT } = require('../constants/pegout-constants'); const {encodeOutpointValuesAsMap, decodeOutpointValues} = require("../varint"); const BTC_TX_FEE = bitcoin.btcToSatoshis(0.001); diff --git a/lib/constants.js b/lib/constants.js deleted file mode 100644 index 6c4e5238..00000000 --- a/lib/constants.js +++ /dev/null @@ -1,156 +0,0 @@ -const KEY_TYPE_BTC = 'btc'; -const KEY_TYPE_RSK = 'rsk'; -const KEY_TYPE_MST = 'mst'; - -const KEY_TYPES = [KEY_TYPE_BTC, KEY_TYPE_RSK, KEY_TYPE_MST]; - -const ERP_PUBKEYS = [ - '029cecea902067992d52c38b28bf0bb2345bda9b21eca76b16a17c477a64e43301', - '03284178e5fbcc63c54c3b38e3ef88adf2da6c526313650041b0ef955763634ebd', - '03776b1fd8f86da3c1db3d69699e8250a15877d286734ea9a6da8e9d8ad25d16c1', - '03ab0e2cd7ed158687fc13b88019990860cdb72b1f5777b58513312550ea1584bc', - '03b9fc46657cf72a1afa007ecf431de1cd27ff5cc8829fa625b66ca47b967e6b24' -]; - -const ERP_CSV_VALUE = 500; - -const MAX_INPUTS_PER_MIGRATION_TRANSACTION = 10; - -const REGTEST_FEDERATION_CHANGE_PRIVATE_KEYS = [ - 'c14991a187e185ca1442e75eb8f60a6a5efd4ca57ce31e50d6e841d9381e996b', - '488cdd0c11d602598225fe96c4b85c2afbec3f1d938cd88f4655831cb6ff454b', - '72255947e1aff21d3fc9c077c6a70912aede3674913d5c76b4128c1ec5692499', - 'fb69358d4760c80977497073e80281e47fa3e6ccf7371a215506ec295c1d8c69', - '857ec435ef0160993dc5f1e70f19f30b1b0249f061cc52294fd266cb093df173', -]; - -const REGTEST_FEDERATION_CHANGE_ADDRESSES = [ - '5252403bca6ac3c104abdd320a736fa38282045d', - '0d8c44bd578a4e7148d1758b3332b529e93e48c1', - '566bca18df14ed75efcc1a8a4f3947e81132dbbc', - '2e7c9159614ddc0185e335d3343e92700c3e5a2d', - 'f0652637df184eca87e6bde29893825721dfb79f', -]; - -const GENESIS_FEDERATION_ADDRESS = '2N5muMepJizJE1gR7FbHJU6CD18V3BpNF9p'; -const GENESIS_FEDERATION_REDEEM_SCRIPT = '0x522102cd53fc53a07f211641a677d250f6de99caf620e8e77071e811a28b3bcddf0be1210362634ab57dae9cb373a5d536e66a8c4f67468bbcfb063809bab643072d78a1242103c5946b3fbae03a654237da863c9ed534e0878657175b132b8ca630f245df04db53ae'; - -const MAX_ESTIMATED_FEE_PER_PEGOUT = 68600; -const FEE_DIFFERENCE_PER_PEGOUT = 3200; -const NUMBER_OF_BLOCKS_BTW_PEGOUTS = 50; - -const FEDERATION_ACTIVATION_AGE = 20; -const FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_BEGIN = 15; -const FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_END = 150; - -const PEGIN_REJECTION_REASONS = { - PEGIN_CAP_SURPASSED_REASON: '1', - LEGACY_PEGIN_MULTISIG_SENDER: '2', - LEGACY_PEGIN_UNDETERMINED_SENDER: '3', - PEGIN_V1_INVALID_PAYLOAD_REASON: '4', - INVALID_AMOUNT: '5', -}; - -const PEGIN_UNREFUNDABLE_REASONS = { - LEGACY_PEGIN_UNDETERMINED_SENDER: '1', - INVALID_AMOUNT: '3', -}; - -const PEGOUT_REJECTION_REASONS = { - LOW_AMOUNT: '1', - CALLER_CONTRACT: '2', - FEE_ABOVE_VALUE: '3', -}; - -const PEGOUT_EVENTS = { - RELEASE_REQUEST_RECEIVED: { - name: 'release_request_received', - signature: '0x1a4457a4460d48b40c5280955faf8e4685fa73f0866f7d8f573bdd8e64aca5b1' - }, - RELEASE_REQUEST_REJECTED: { - name: 'release_request_rejected', - signature: '0xb607c3e1fbe6b38cd145b15b837f7b722b199caa60e3057b36c141adee3b75e7' - }, - RELEASE_REQUESTED: { - name: 'release_requested', - signature: '0x7a7c29481528ac8c2b2e93aee658fddd4dc15304fa723a5c2b88514557bcc790' - }, - BATCH_PEGOUT_CREATED: { - name: 'batch_pegout_created', - signature: '0x483d0191cc4e784b04a41f6c4801a0766b43b1fdd0b9e3e6bfdca74e5b05c2eb' - }, - PEGOUT_TRANSACTION_CREATED: { - name: 'pegout_transaction_created', - signature: '0x9ee5d520fd5e6eaea3fd2e3ae4e35e9a9c0fb05c9d8f84b507f287da84b5117c' - }, - PEGOUT_CONFIRMED: { - name: 'pegout_confirmed', - signature: '0xc287f602476eeef8a547a3b82e79045c827c51362ff153f728b6d839bad099ef' - }, - ADD_SIGNATURE: { - name: 'add_signature', - signature: '0x83b6efe3a7d95459577ec9396f5d6f1e486ca2378130e2ba4d98a4da108ca743' - }, - RELEASE_BTC: { - name: 'release_btc', - signature: '0x655929b56d5c5a24f81ee80267d5151b9d680e7e703387999922e9070bc98a02' - }, -}; - -const PEGIN_EVENTS = { - PEGIN_BTC: { - name: 'pegin_btc', - signature: '0x44cdc782a38244afd68336ab92a0b39f864d6c0b2a50fa1da58cafc93cd2ae5a' - }, - REJECTED_PEGIN: { - name: 'rejected_pegin', - signature: '0x708ce1ead20561c5894a93be3fee64b326b2ad6c198f8253e4bb56f1626053d6' - }, - UNREFUNDABLE_PEGIN: { - name: 'unrefundable_pegin', - signature: '0x35be155c87e408cbbcb753dc12f95fc5a242a29460a3d7189e807e63d7c185a7' - }, -}; - -const PEGIN_V1_RSKT_PREFIX_HEX = '52534b54'; - -const MINIMUM_PEGOUT_AMOUNT_IN_SATOSHIS = 250_000; -const DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC = 0.5; - -const FEE_PER_KB_CHANGER_PRIVATE_KEY = '6a4b49312b91e203ddfb9bc2d900ebbd46fbede46a7462e770bedcb11ad405e9'; -const FEE_PER_KB_CHANGER_ADDRESS = '53f8f6dabd612b6137215ddd7758bb5cdd638922'; - -const FEE_PER_KB_RESPONSE_CODES = { - SUCCESSFUL_VOTE: 1, -}; - -module.exports = { - KEY_TYPE_BTC, - KEY_TYPE_RSK, - KEY_TYPE_MST, - KEY_TYPES, - ERP_PUBKEYS, - ERP_CSV_VALUE, - MAX_INPUTS_PER_MIGRATION_TRANSACTION, - REGTEST_FEDERATION_CHANGE_PRIVATE_KEYS, - REGTEST_FEDERATION_CHANGE_ADDRESSES, - MAX_ESTIMATED_FEE_PER_PEGOUT, - FEE_DIFFERENCE_PER_PEGOUT, - NUMBER_OF_BLOCKS_BTW_PEGOUTS, - GENESIS_FEDERATION_ADDRESS, - GENESIS_FEDERATION_REDEEM_SCRIPT, - FEDERATION_ACTIVATION_AGE, - PEGIN_REJECTION_REASONS, - PEGOUT_EVENTS, - FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_BEGIN, - FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_END, - PEGIN_EVENTS, - PEGIN_UNREFUNDABLE_REASONS, - PEGIN_V1_RSKT_PREFIX_HEX, - MINIMUM_PEGOUT_AMOUNT_IN_SATOSHIS, - DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC, - PEGOUT_REJECTION_REASONS, - FEE_PER_KB_CHANGER_PRIVATE_KEY, - FEE_PER_KB_CHANGER_ADDRESS, - FEE_PER_KB_RESPONSE_CODES, -}; diff --git a/lib/constants/federation-constants.js b/lib/constants/federation-constants.js new file mode 100644 index 00000000..7a76a08b --- /dev/null +++ b/lib/constants/federation-constants.js @@ -0,0 +1,57 @@ +const KEY_TYPE_BTC = 'btc'; +const KEY_TYPE_RSK = 'rsk'; +const KEY_TYPE_MST = 'mst'; + +const KEY_TYPES = [KEY_TYPE_BTC, KEY_TYPE_RSK, KEY_TYPE_MST]; + +const ERP_PUBKEYS = [ + '029cecea902067992d52c38b28bf0bb2345bda9b21eca76b16a17c477a64e43301', + '03284178e5fbcc63c54c3b38e3ef88adf2da6c526313650041b0ef955763634ebd', + '03776b1fd8f86da3c1db3d69699e8250a15877d286734ea9a6da8e9d8ad25d16c1', + '03ab0e2cd7ed158687fc13b88019990860cdb72b1f5777b58513312550ea1584bc', + '03b9fc46657cf72a1afa007ecf431de1cd27ff5cc8829fa625b66ca47b967e6b24' +]; + +const ERP_CSV_VALUE = 500; + +const MAX_INPUTS_PER_MIGRATION_TRANSACTION = 10; + +const REGTEST_FEDERATION_CHANGE_PRIVATE_KEYS = [ + 'c14991a187e185ca1442e75eb8f60a6a5efd4ca57ce31e50d6e841d9381e996b', + '488cdd0c11d602598225fe96c4b85c2afbec3f1d938cd88f4655831cb6ff454b', + '72255947e1aff21d3fc9c077c6a70912aede3674913d5c76b4128c1ec5692499', + 'fb69358d4760c80977497073e80281e47fa3e6ccf7371a215506ec295c1d8c69', + '857ec435ef0160993dc5f1e70f19f30b1b0249f061cc52294fd266cb093df173', +]; + +const REGTEST_FEDERATION_CHANGE_ADDRESSES = [ + '5252403bca6ac3c104abdd320a736fa38282045d', + '0d8c44bd578a4e7148d1758b3332b529e93e48c1', + '566bca18df14ed75efcc1a8a4f3947e81132dbbc', + '2e7c9159614ddc0185e335d3343e92700c3e5a2d', + 'f0652637df184eca87e6bde29893825721dfb79f', +]; + +const GENESIS_FEDERATION_ADDRESS = '2N5muMepJizJE1gR7FbHJU6CD18V3BpNF9p'; +const GENESIS_FEDERATION_REDEEM_SCRIPT = '0x522102cd53fc53a07f211641a677d250f6de99caf620e8e77071e811a28b3bcddf0be1210362634ab57dae9cb373a5d536e66a8c4f67468bbcfb063809bab643072d78a1242103c5946b3fbae03a654237da863c9ed534e0878657175b132b8ca630f245df04db53ae'; + +const FEDERATION_ACTIVATION_AGE = 20; +const FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_BEGIN = 15; +const FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_END = 150; + +module.exports = { + KEY_TYPE_BTC, + KEY_TYPE_RSK, + KEY_TYPE_MST, + KEY_TYPES, + ERP_PUBKEYS, + ERP_CSV_VALUE, + MAX_INPUTS_PER_MIGRATION_TRANSACTION, + REGTEST_FEDERATION_CHANGE_PRIVATE_KEYS, + REGTEST_FEDERATION_CHANGE_ADDRESSES, + GENESIS_FEDERATION_ADDRESS, + GENESIS_FEDERATION_REDEEM_SCRIPT, + FEDERATION_ACTIVATION_AGE, + FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_BEGIN, + FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_END, +}; diff --git a/lib/constants/fee-per-kb-constants.js b/lib/constants/fee-per-kb-constants.js new file mode 100644 index 00000000..011bb9fa --- /dev/null +++ b/lib/constants/fee-per-kb-constants.js @@ -0,0 +1,12 @@ +const FEE_PER_KB_CHANGER_PRIVATE_KEY = '6a4b49312b91e203ddfb9bc2d900ebbd46fbede46a7462e770bedcb11ad405e9'; +const FEE_PER_KB_CHANGER_ADDRESS = '53f8f6dabd612b6137215ddd7758bb5cdd638922'; + +const FEE_PER_KB_RESPONSE_CODES = { + SUCCESSFUL_VOTE: 1, +}; + +module.exports = { + FEE_PER_KB_CHANGER_PRIVATE_KEY, + FEE_PER_KB_CHANGER_ADDRESS, + FEE_PER_KB_RESPONSE_CODES, +}; diff --git a/lib/constants/pegin-constants.js b/lib/constants/pegin-constants.js new file mode 100644 index 00000000..5b80d929 --- /dev/null +++ b/lib/constants/pegin-constants.js @@ -0,0 +1,39 @@ + +const PEGIN_V1_RSKT_PREFIX_HEX = '52534b54'; +const DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC = 0.5; + +const PEGIN_REJECTION_REASONS = { + PEGIN_CAP_SURPASSED_REASON: '1', + LEGACY_PEGIN_MULTISIG_SENDER: '2', + LEGACY_PEGIN_UNDETERMINED_SENDER: '3', + PEGIN_V1_INVALID_PAYLOAD_REASON: '4', + INVALID_AMOUNT: '5', +}; + +const PEGIN_UNREFUNDABLE_REASONS = { + LEGACY_PEGIN_UNDETERMINED_SENDER: '1', + INVALID_AMOUNT: '3', +}; + +const PEGIN_EVENTS = { + PEGIN_BTC: { + name: 'pegin_btc', + signature: '0x44cdc782a38244afd68336ab92a0b39f864d6c0b2a50fa1da58cafc93cd2ae5a' + }, + REJECTED_PEGIN: { + name: 'rejected_pegin', + signature: '0x708ce1ead20561c5894a93be3fee64b326b2ad6c198f8253e4bb56f1626053d6' + }, + UNREFUNDABLE_PEGIN: { + name: 'unrefundable_pegin', + signature: '0x35be155c87e408cbbcb753dc12f95fc5a242a29460a3d7189e807e63d7c185a7' + }, +}; + +module.exports = { + PEGIN_V1_RSKT_PREFIX_HEX, + DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC, + PEGIN_REJECTION_REASONS, + PEGIN_UNREFUNDABLE_REASONS, + PEGIN_EVENTS, +}; diff --git a/lib/constants/pegout-constants.js b/lib/constants/pegout-constants.js new file mode 100644 index 00000000..959cccab --- /dev/null +++ b/lib/constants/pegout-constants.js @@ -0,0 +1,54 @@ +const MAX_ESTIMATED_FEE_PER_PEGOUT = 68600; +const FEE_DIFFERENCE_PER_PEGOUT = 3200; +const NUMBER_OF_BLOCKS_BTW_PEGOUTS = 50; +const MINIMUM_PEGOUT_AMOUNT_IN_SATOSHIS = 250_000; + +const PEGOUT_REJECTION_REASONS = { + LOW_AMOUNT: '1', + CALLER_CONTRACT: '2', + FEE_ABOVE_VALUE: '3', +}; + +const PEGOUT_EVENTS = { + RELEASE_REQUEST_RECEIVED: { + name: 'release_request_received', + signature: '0x1a4457a4460d48b40c5280955faf8e4685fa73f0866f7d8f573bdd8e64aca5b1' + }, + RELEASE_REQUEST_REJECTED: { + name: 'release_request_rejected', + signature: '0xb607c3e1fbe6b38cd145b15b837f7b722b199caa60e3057b36c141adee3b75e7' + }, + RELEASE_REQUESTED: { + name: 'release_requested', + signature: '0x7a7c29481528ac8c2b2e93aee658fddd4dc15304fa723a5c2b88514557bcc790' + }, + BATCH_PEGOUT_CREATED: { + name: 'batch_pegout_created', + signature: '0x483d0191cc4e784b04a41f6c4801a0766b43b1fdd0b9e3e6bfdca74e5b05c2eb' + }, + PEGOUT_TRANSACTION_CREATED: { + name: 'pegout_transaction_created', + signature: '0x9ee5d520fd5e6eaea3fd2e3ae4e35e9a9c0fb05c9d8f84b507f287da84b5117c' + }, + PEGOUT_CONFIRMED: { + name: 'pegout_confirmed', + signature: '0xc287f602476eeef8a547a3b82e79045c827c51362ff153f728b6d839bad099ef' + }, + ADD_SIGNATURE: { + name: 'add_signature', + signature: '0x83b6efe3a7d95459577ec9396f5d6f1e486ca2378130e2ba4d98a4da108ca743' + }, + RELEASE_BTC: { + name: 'release_btc', + signature: '0x655929b56d5c5a24f81ee80267d5151b9d680e7e703387999922e9070bc98a02' + }, +}; + +module.exports = { + MAX_ESTIMATED_FEE_PER_PEGOUT, + FEE_DIFFERENCE_PER_PEGOUT, + NUMBER_OF_BLOCKS_BTW_PEGOUTS, + MINIMUM_PEGOUT_AMOUNT_IN_SATOSHIS, + PEGOUT_REJECTION_REASONS, + PEGOUT_EVENTS, +}; diff --git a/lib/federate-starter.js b/lib/federate-starter.js index b78592d5..2f6058ce 100644 --- a/lib/federate-starter.js +++ b/lib/federate-starter.js @@ -4,7 +4,7 @@ var LineWrapper = require('stream-line-wrapper'); var { executeWithRetries } = require('./utils'); var HsmRunner = require('./hsm-runner').Runner; var FederateRunner = require('./federate-runner').Runner; -const { KEY_TYPES, KEY_TYPE_BTC, KEY_TYPE_RSK, KEY_TYPE_MST } = require('./constants'); +const { KEY_TYPES, KEY_TYPE_BTC, KEY_TYPE_RSK, KEY_TYPE_MST } = require('./constants/federation-constants'); var FEDERATE_OUTPUT = 'federate-{index}:'; var FEDERATE_COLORS = [ diff --git a/lib/federation-utils.js b/lib/federation-utils.js index bcdce5f2..8ff2f4a4 100644 --- a/lib/federation-utils.js +++ b/lib/federation-utils.js @@ -1,4 +1,4 @@ -const { KEY_TYPE_BTC, KEY_TYPE_RSK, KEY_TYPE_MST } = require('./constants'); +const { KEY_TYPE_BTC, KEY_TYPE_RSK, KEY_TYPE_MST } = require('./constants/federation-constants'); var comparePublicKeys = (publicKeyA, publicKeyB) => { if (publicKeyA < publicKeyB) { diff --git a/lib/rsk-utils.js b/lib/rsk-utils.js index 66d9442f..daed3cea 100644 --- a/lib/rsk-utils.js +++ b/lib/rsk-utils.js @@ -6,13 +6,10 @@ const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider'); const { wait, retryWithCheck, removePrefix0x } = require('./utils'); const { waitForBitcoinMempoolToGetTxs } = require('./btc-utils'); const { getLogger } = require('../logger'); -const { - PEGOUT_EVENTS, - FEE_PER_KB_CHANGER_PRIVATE_KEY, - FEE_PER_KB_CHANGER_ADDRESS, - FEE_PER_KB_RESPONSE_CODES, - DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC, -} = require('./constants'); +const { PEGOUT_EVENTS } = require('./constants/pegout-constants'); +const { FEE_PER_KB_CHANGER_PRIVATE_KEY, FEE_PER_KB_CHANGER_ADDRESS, FEE_PER_KB_RESPONSE_CODES } = require('./constants/fee-per-kb-constants'); +const { DEFAULT_RSK_ADDRESS_FUNDING_IN_BTC } = require('./constants/pegin-constants'); + const BtcTransactionHelper = require('btc-transaction-helper/btc-transaction-helper'); const { ethToWeis } = require('@rsksmart/btc-eth-unit-converter'); diff --git a/lib/tests/2wp.js b/lib/tests/2wp.js index 87aca968..e7943819 100644 --- a/lib/tests/2wp.js +++ b/lib/tests/2wp.js @@ -16,14 +16,9 @@ const { waitForRskMempoolToGetAtLeastThisManyTxs, } = require('../rsk-utils'); const BridgeTransactionParser = require('@rsksmart/bridge-transaction-parser'); -const { - PEGIN_REJECTION_REASONS, - PEGIN_UNREFUNDABLE_REASONS, - PEGOUT_EVENTS, - PEGIN_V1_RSKT_PREFIX_HEX, - MINIMUM_PEGOUT_AMOUNT_IN_SATOSHIS, - PEGOUT_REJECTION_REASONS, -} = require("../constants"); +const { PEGIN_REJECTION_REASONS, PEGIN_UNREFUNDABLE_REASONS, PEGIN_V1_RSKT_PREFIX_HEX } = require('../constants/pegin-constants'); +const { PEGOUT_EVENTS, MINIMUM_PEGOUT_AMOUNT_IN_SATOSHIS, PEGOUT_REJECTION_REASONS } = require('../constants/pegout-constants'); + const { sendPegin, ensurePeginIsRegistered, createSenderRecipientInfo, diff --git a/tests/00_00_04-change-federation.js b/tests/00_00_04-change-federation.js index 0e44b762..4b8bcb08 100644 --- a/tests/00_00_04-change-federation.js +++ b/tests/00_00_04-change-federation.js @@ -12,10 +12,10 @@ const { KEY_TYPE_MST, REGTEST_FEDERATION_CHANGE_PRIVATE_KEYS, FEDERATION_ACTIVATION_AGE, - FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_END, - ERP_PUBKEYS, - ERP_CSV_VALUE, -} = require('../lib/constants'); + FUNDS_MIGRATION_AGE_SINCE_ACTIVATION_END, + ERP_PUBKEYS, + ERP_CSV_VALUE, +} = require('../lib/constants/federation-constants'); // Generated with seed newFed1 const newFederator1PublicKey = '0x02f80abfd3dac069887f974ac033cb62991a0ed55b9880faf8b8cbd713b75d649e'; diff --git a/tests/01_02_01-pre_wasabi_fed_pubkeys_fork.js b/tests/01_02_01-pre_wasabi_fed_pubkeys_fork.js index 67f68df6..1abf647d 100644 --- a/tests/01_02_01-pre_wasabi_fed_pubkeys_fork.js +++ b/tests/01_02_01-pre_wasabi_fed_pubkeys_fork.js @@ -1,7 +1,7 @@ const contractMethodAssertions = require('../lib/assertions/contractMethods'); const expect = require('chai').expect; const { assertIsPublicKey } = require('../lib/assertions/misc'); -const { KEY_TYPE_BTC } = require('../lib/constants'); +const { KEY_TYPE_BTC } = require('../lib/constants/federation-constants'); const CustomError = require('../lib/CustomError'); const { getBridge } = require('../lib/precompiled-abi-forks-util'); const { getRskTransactionHelper } = require('../lib/rsk-tx-helper-provider'); diff --git a/tests/01_02_51-post_wasabi_fed_pubkeys_fork.js b/tests/01_02_51-post_wasabi_fed_pubkeys_fork.js index e0f90508..859e65f1 100644 --- a/tests/01_02_51-post_wasabi_fed_pubkeys_fork.js +++ b/tests/01_02_51-post_wasabi_fed_pubkeys_fork.js @@ -1,7 +1,7 @@ const { assertContractCallFails, assertContractCallReturnsWithCallback } = require('../lib/assertions/contractMethods'); const expect = require('chai').expect; const { assertIsPublicKey } = require('../lib/assertions/misc'); -const { KEY_TYPE_BTC } = require('../lib/constants'); +const { KEY_TYPE_BTC } = require('../lib/constants/federation-constants'); const CustomError = require('../lib/CustomError'); const { getBridge } = require('../lib/precompiled-abi-forks-util'); const { getRskTransactionHelper } = require('../lib/rsk-tx-helper-provider'); diff --git a/tests/01_05_53-post_hop_pegout_batching_second_requests.js b/tests/01_05_53-post_hop_pegout_batching_second_requests.js index e1784143..b572d7c6 100644 --- a/tests/01_05_53-post_hop_pegout_batching_second_requests.js +++ b/tests/01_05_53-post_hop_pegout_batching_second_requests.js @@ -7,7 +7,7 @@ const CustomError = require('../lib/CustomError'); const rskUtilsLegacy = require('../lib/rsk-utils-legacy'); const _2wpUtilsLegacy = require('../lib/2wp-utils-legacy'); const pegAssertions = require('../lib/assertions/2wp'); -const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants'); +const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants/pegout-constants'); const rskUtils = require('../lib/rsk-utils'); const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider'); diff --git a/tests/01_05_54-post_hop_pegout_batching_third_requests.js b/tests/01_05_54-post_hop_pegout_batching_third_requests.js index b256d4d6..4d54cd01 100644 --- a/tests/01_05_54-post_hop_pegout_batching_third_requests.js +++ b/tests/01_05_54-post_hop_pegout_batching_third_requests.js @@ -8,7 +8,7 @@ const rskUtilsLegacy = require('../lib/rsk-utils-legacy'); const _2wpUtilsLegacy = require('../lib/2wp-utils-legacy'); const { sequentialPromise, wait } = require('../lib/utils'); const pegAssertions = require('../lib/assertions/2wp'); -const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants'); +const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants/pegout-constants'); const { getBridgeState } = require('@rsksmart/bridge-state-data-parser'); const rskUtils = require('../lib/rsk-utils'); const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider'); diff --git a/tests/01_05_55-post_hop_pegout_batching_fourth_requests.js b/tests/01_05_55-post_hop_pegout_batching_fourth_requests.js index 6a1d6214..76cfe6a1 100644 --- a/tests/01_05_55-post_hop_pegout_batching_fourth_requests.js +++ b/tests/01_05_55-post_hop_pegout_batching_fourth_requests.js @@ -7,7 +7,7 @@ const rskUtilsLegacy = require('../lib/rsk-utils-legacy'); const CustomError = require('../lib/CustomError'); const _2wpUtilsLegacy = require('../lib/2wp-utils-legacy'); const pegAssertions = require('../lib/assertions/2wp'); -const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants'); +const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants/pegout-constants'); let currentBlockNumber; let pegoutCount = 0; diff --git a/tests/01_05_56-post_hop_pegout_batching_advance_blockchain.js b/tests/01_05_56-post_hop_pegout_batching_advance_blockchain.js index 4ca3b98d..4def8a1f 100644 --- a/tests/01_05_56-post_hop_pegout_batching_advance_blockchain.js +++ b/tests/01_05_56-post_hop_pegout_batching_advance_blockchain.js @@ -2,7 +2,7 @@ const { rsk } = require('peglib'); const rskUtilsLegacy = require('../lib/rsk-utils-legacy'); const CustomError = require('../lib/CustomError'); const pegAssertions = require('../lib/assertions/2wp'); -const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants'); +const { NUMBER_OF_BLOCKS_BTW_PEGOUTS } = require('../lib/constants/pegout-constants'); const rskUtils = require('../lib/rsk-utils'); const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider'); diff --git a/tests/01_05_57-post_hop_active_powpeg_redeem_script.js b/tests/01_05_57-post_hop_active_powpeg_redeem_script.js index fed64cf5..52c3127f 100644 --- a/tests/01_05_57-post_hop_active_powpeg_redeem_script.js +++ b/tests/01_05_57-post_hop_active_powpeg_redeem_script.js @@ -7,7 +7,7 @@ const CustomError = require('../lib/CustomError'); const removePrefix0x = require('../lib/utils').removePrefix0x; const {getRskTransactionHelpers} = require('../lib/rsk-tx-helper-provider'); const {getBridge} = require('../lib/precompiled-abi-forks-util'); -const {GENESIS_FEDERATION_ADDRESS, GENESIS_FEDERATION_REDEEM_SCRIPT} = require('../lib/constants'); +const { GENESIS_FEDERATION_ADDRESS, GENESIS_FEDERATION_REDEEM_SCRIPT } = require('../lib/constants/federation-constants'); describe('Calling getActivePowpegRedeemScript method after hop', function() { let rskTxHelpers; diff --git a/tests/01_06_51-post_fingerroot500_get-estimated_fees_for_next_pegout_should_returned_correct_estimated.js b/tests/01_06_51-post_fingerroot500_get-estimated_fees_for_next_pegout_should_returned_correct_estimated.js index fd16e274..b5048b98 100644 --- a/tests/01_06_51-post_fingerroot500_get-estimated_fees_for_next_pegout_should_returned_correct_estimated.js +++ b/tests/01_06_51-post_fingerroot500_get-estimated_fees_for_next_pegout_should_returned_correct_estimated.js @@ -1,7 +1,7 @@ const expect = require('chai').expect const { getBridge } = require('../lib/precompiled-abi-forks-util'); const CustomError = require('../lib/CustomError'); -const {MAX_ESTIMATED_FEE_PER_PEGOUT, FEE_DIFFERENCE_PER_PEGOUT} = require("../lib/constants"); +const { MAX_ESTIMATED_FEE_PER_PEGOUT, FEE_DIFFERENCE_PER_PEGOUT } = require("../lib/constants/pegout-constants"); const { getRskTransactionHelper } = require('../lib/rsk-tx-helper-provider'); let bridge; diff --git a/tests/03_00_01-powpeg_redeem_script.js b/tests/03_00_01-powpeg_redeem_script.js index 512f72ea..348d72b1 100644 --- a/tests/03_00_01-powpeg_redeem_script.js +++ b/tests/03_00_01-powpeg_redeem_script.js @@ -9,7 +9,7 @@ const removePrefix0x = require('../lib/utils').removePrefix0x; const { GENESIS_FEDERATION_ADDRESS, GENESIS_FEDERATION_REDEEM_SCRIPT, -} = require('../lib/constants'); +} = require('../lib/constants/federation-constants'); describe('Calling getActivePowpegRedeemScript method after last fork before fedchange', function() { let rskTxHelpers; diff --git a/tests/04_00_02-fedchange.js b/tests/04_00_02-fedchange.js index 91e02991..217ca256 100644 --- a/tests/04_00_02-fedchange.js +++ b/tests/04_00_02-fedchange.js @@ -28,7 +28,7 @@ const { REGTEST_FEDERATION_CHANGE_PRIVATE_KEYS, REGTEST_FEDERATION_CHANGE_ADDRESSES, FEDERATION_ACTIVATION_AGE -} = require('../lib/constants'); +} = require('../lib/constants/federation-constants'); const OTHER_PKS = [ '1722c8adb8a702553bb2b4fa7c8de97e0b572e13404a1263b5b31fead3d9784f', diff --git a/tests/04_00_05-fastbridge_operation_with_rejection.js b/tests/04_00_05-fastbridge_operation_with_rejection.js index a842e4c2..be63a34f 100644 --- a/tests/04_00_05-fastbridge_operation_with_rejection.js +++ b/tests/04_00_05-fastbridge_operation_with_rejection.js @@ -4,7 +4,7 @@ const btcEthUnitConverter = require('@rsksmart/btc-eth-unit-converter'); const CustomError = require('../lib/CustomError'); const lbc = require('../lib/liquidity-bridge-contract'); const { REFUNDED_USER_ERROR } = require("../lib/flyover-pegin-response-codes"); -const { ERP_PUBKEYS, ERP_CSV_VALUE } = require("../lib/constants") +const { ERP_PUBKEYS, ERP_CSV_VALUE } = require("../lib/constants/federation-constants") const { sendTxWithCheck, triggerRelease, getFedsPubKeys } = require('../lib/rsk-utils'); const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider'); const { getBtcClient } = require('../lib/btc-client-provider'); diff --git a/tests/04_00_06-fastbridge_after_fed_change.js b/tests/04_00_06-fastbridge_after_fed_change.js index 66970d36..9eea6ff6 100644 --- a/tests/04_00_06-fastbridge_after_fed_change.js +++ b/tests/04_00_06-fastbridge_after_fed_change.js @@ -4,7 +4,7 @@ const { UNPROCESSABLE_TX_AMOUNT_SENT_BELOW_MINIMUM_ERROR } = require("../lib/fly const CustomError = require('../lib/CustomError'); const lbc = require('../lib/liquidity-bridge-contract'); const { sendTxWithCheck, getFedsPubKeys } = require('../lib/rsk-utils'); -const { ERP_PUBKEYS, ERP_CSV_VALUE } = require("../lib/constants") +const { ERP_PUBKEYS, ERP_CSV_VALUE } = require("../lib/constants/federation-constants") const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider'); const { getBtcClient } = require('../lib/btc-client-provider'); const { ensure0x } = require('../lib/utils'); diff --git a/tests/05_00_01-fee_per_kb.js b/tests/05_00_01-fee_per_kb.js index f9aefecb..d68d452e 100644 --- a/tests/05_00_01-fee_per_kb.js +++ b/tests/05_00_01-fee_per_kb.js @@ -5,7 +5,7 @@ const rsk = peglib.rsk; const pegUtils = peglib.pegUtils; const rskUtilsLegacy = require('../lib/rsk-utils-legacy'); const CustomError = require('../lib/CustomError'); -const { FEE_PER_KB_CHANGER_PRIVATE_KEY } = require('../lib/constants'); +const { FEE_PER_KB_CHANGER_PRIVATE_KEY } = require('../lib/constants/fee-per-kb-constants'); const NETWORK = bitcoin.networks.testnet; diff --git a/tests/05_00_01-powpeg_redeem_script.js b/tests/05_00_01-powpeg_redeem_script.js index 26e39ad2..134141d4 100644 --- a/tests/05_00_01-powpeg_redeem_script.js +++ b/tests/05_00_01-powpeg_redeem_script.js @@ -18,7 +18,7 @@ const { KEY_TYPE_BTC, KEY_TYPE_RSK, KEY_TYPE_MST, -} = require('../lib/constants'); +} = require('../lib/constants/federation-constants'); const INITIAL_FEDERATION_SIZE = 3; let rskTxHelpers;