mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge pull request #1276 from delta1/issues-1263
fix: segfault on getpeginaddress rpc when not in elements mode
This commit is contained in:
commit
c248983aab
3 changed files with 40 additions and 0 deletions
|
|
@ -197,6 +197,13 @@ RPCHelpMan getpeginaddress()
|
|||
|
||||
// Get P2CH deposit address on mainchain from most recent fedpegscript.
|
||||
const auto& fedpegscripts = GetValidFedpegScripts(pwallet->chain().getTip(), Params().GetConsensus(), true /* nextblock_validation */);
|
||||
if (fedpegscripts.empty()) {
|
||||
std::string message = "No valid fedpegscripts.";
|
||||
if (!g_con_elementsmode) {
|
||||
message += " Not running in Elements mode, check your 'chain' param.";
|
||||
}
|
||||
throw JSONRPCError(RPC_INTERNAL_ERROR, message);
|
||||
}
|
||||
CTxDestination mainchain_dest(WitnessV0ScriptHash(calculate_contract(fedpegscripts.front().second, dest_script)));
|
||||
// P2SH-wrapped is the only valid choice for non-dynafed chains but still an
|
||||
// option for dynafed-enabled ones as well
|
||||
|
|
|
|||
|
|
@ -122,6 +122,7 @@ BASE_SCRIPTS = [
|
|||
'feature_block.py',
|
||||
'rpc_fundrawtransaction.py --legacy-wallet',
|
||||
'rpc_fundrawtransaction.py --descriptors',
|
||||
'wallet_elements_regression_1263.py',
|
||||
'p2p_compactblocks.py',
|
||||
'p2p_compactblocks_blocksonly.py',
|
||||
'feature_segwit.py --legacy-wallet',
|
||||
|
|
|
|||
32
test/functional/wallet_elements_regression_1263.py
Executable file
32
test/functional/wallet_elements_regression_1263.py
Executable file
|
|
@ -0,0 +1,32 @@
|
|||
#!/usr/bin/env python3
|
||||
# Copyright (c) 2017-2020 The Bitcoin Core developers
|
||||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
"""Test getpeginaddress when started with Bitcoin chain params.
|
||||
|
||||
This doesn't make sense and should fail gracefully, but is causing a segfault.
|
||||
This functional test should catch any regression to this fix.
|
||||
"""
|
||||
|
||||
from test_framework.util import assert_raises_rpc_error
|
||||
from test_framework.test_framework import BitcoinTestFramework
|
||||
|
||||
class RegressionTest(BitcoinTestFramework):
|
||||
def set_test_params(self):
|
||||
self.setup_clean_chain = True
|
||||
self.num_nodes = 1
|
||||
self.chain = "regtest"
|
||||
|
||||
def skip_test_if_missing_module(self):
|
||||
self.skip_if_no_wallet()
|
||||
|
||||
def run_test(self):
|
||||
self.log.info("Start in Bitcoin regtest mode")
|
||||
self.nodes[0].createwallet("pegin")
|
||||
rpc = self.nodes[0].get_wallet_rpc("pegin")
|
||||
|
||||
self.log.info("Call getpeginaddress")
|
||||
assert_raises_rpc_error(-32603, "No valid fedpegscripts. Not running in Elements mode, check your 'chain' param.", rpc.getpeginaddress)
|
||||
|
||||
if __name__ == '__main__':
|
||||
RegressionTest().main()
|
||||
Loading…
Add table
Add a link
Reference in a new issue