Skip to content

Commit

Permalink
Merge pull request ElementsProject#1276 from delta1/issues-1263
Browse files Browse the repository at this point in the history
fix: segfault on getpeginaddress rpc when not in elements mode
  • Loading branch information
jamesdorfman authored Oct 18, 2023
2 parents e14d987 + 5326676 commit c248983
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/wallet/rpc/elements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/functional/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
'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',
Expand Down
32 changes: 32 additions & 0 deletions test/functional/wallet_elements_regression_1263.py
Original file line number Diff line number Diff line change
@@ -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()

0 comments on commit c248983

Please sign in to comment.