GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge ElementsProject/elements#1039: claimpegin: sanity-check fee in case fallbackfee is disabled, throw explicit exception

Browse source 
fc8bfc1f2c claimpegin: add regression test for behavior when fallbackfee is disabled (Andrew Poelstra)
fd520079a1 claimpegin: sanity-check fee in case fallbackfee is disabled, throw explicit exception (Andrew Poelstra)

Pull request description:

  Produce a much less confusing error message in `claimpegin` in the case that estimatesmartfee fails and no fallbackfee is set.

ACKs for top commit:
  stevenroose:
    ACK fc8bfc1f2c

Tree-SHA512: 2ae658ab3dc90b7319d047c192401a0dcc97e015e45b5b0db71db1d89d63605ba107312d8b4cf1c4aaef72437aa20aa33b442744f64fc08535b15610e6f4a526
This commit is contained in:
Andrew Poelstra 2021-09-15 22:35:49 +00:00
commit b456b72353
No known key found for this signature in database
GPG key ID: C588D63CE41B97C1
2 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/wallet/rpcwallet.cpp
View file

@ -5876,7 +5876,12 @@ static UniValue createrawpegin(const JSONRPCRequest& request, T_tx_ref& txBTCRef
unsigned int nBytes = GetVirtualTransactionSize(CTransaction(mtx)) +
(1+1+72+1+33/WITNESS_SCALE_FACTOR);
CCoinControl coin_control;
CAmount nFeeNeeded = GetMinimumFee(*pwallet, nBytes, coin_control, nullptr);
FeeCalculation feeCalc;
CAmount nFeeNeeded = GetMinimumFee(*pwallet, nBytes, coin_control, &feeCalc);
if (nFeeNeeded == CAmount{0} && feeCalc.reason == FeeReason::FALLBACK) {
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.");
}
mtx.vout[0].nValue = mtx.vout[0].nValue.GetAmount() - nFeeNeeded;
mtx.vout[1].nValue = mtx.vout[1].nValue.GetAmount() + nFeeNeeded;

30
test/functional/wallet_fallbackfee.py
View file

@ -5,10 +5,11 @@
"""Test wallet replace-by-fee capabilities in conjunction with the fallbackfee."""
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_raises_rpc_error
from test_framework.util import rpc_port ## ELEMENTS
class WalletRBFTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
self.num_nodes = 2
self.setup_clean_chain = True
def skip_test_if_missing_module(self):
@ -26,5 +27,32 @@ class WalletRBFTest(BitcoinTestFramework):
assert_raises_rpc_error(-4, "Fee estimation failed", lambda: self.nodes[0].fundrawtransaction(self.nodes[0].createrawtransaction([], [{self.nodes[0].getnewaddress(): 1}])))
assert_raises_rpc_error(-6, "Fee estimation failed", lambda: self.nodes[0].sendmany("", {self.nodes[0].getnewaddress(): 1}))
## ELEMENTS: test claimpegin with fallback fee set to zero
# getpeginaddress does not work with descriptor wallets yet
if not self.options.descriptors:
extra_args = [
'-fallbackfee=0',
'-mainchainrpchost=127.0.0.1',
'-mainchainrpcport=%s' % rpc_port(0),
'-parentgenesisblockhash=%s' % self.nodes[0].getblockhash(0),
'-con_parent_chain_signblockscript=51',
'-parentscriptprefix=75',
]
self.restart_node(0)
self.restart_node(1, extra_args)
addrs = self.nodes[1].getpeginaddress()
txid = self.nodes[0].sendtoaddress(addrs["mainchain_address"], 5)
raw = self.nodes[0].getrawtransaction(txid)
self.nodes[0].generate(12)
proof = self.nodes[0].gettxoutproof([txid])
assert_raises_rpc_error(-6, "Fee estimation failed", lambda: self.nodes[1].claimpegin(raw, proof))
# Try again with fallbackfee below the min relay fee. It should just work
# (will let the relay fee override the fallbackfee)
extra_args[0] = '-fallbackfee=0.00000001'
self.restart_node(1, extra_args)
self.nodes[1].claimpegin(raw, proof)
if __name__ == '__main__':
WalletRBFTest().main()