Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Tests] Don't create dust outputs in small_txpuzzle_randfee #2153

Merged
merged 1 commit into from
Feb 1, 2021
Merged

[Tests] Don't create dust outputs in small_txpuzzle_randfee #2153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions test/functional/feature_fee_estimation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from test_framework.mininode import CTransaction, CTxIn, CTxOut, COutPoint, ToHex, COIN

# Use as minTxFee
MIN_FEE = Decimal("0.0001")
MIN_FEE = Decimal("0.00001")

# Construct 2 trivial P2SH's and the ScriptSigs that spend them
# So we can create many transactions without needing to spend
Expand All @@ -35,6 +35,9 @@ def small_txpuzzle_randfee(from_node, conflist, unconflist, amount, min_fee, fee
It adds the newly created outputs to the unconfirmed list.
Returns (raw transaction, fee)
"""
# Don't send dust (3 * dustRelayFee.GetFee(182))
DUST_THRESHOLD = 55
assert int(amount*COIN) > DUST_THRESHOLD
# It's best to exponentially distribute our random fees
# because the buckets are exponentially spaced.
# Exponentially distributed from 1-128 * fee_increment
Expand All @@ -54,15 +57,24 @@ def small_txpuzzle_randfee(from_node, conflist, unconflist, amount, min_fee, fee
tx.vin.append(CTxIn(COutPoint(int(t["txid"], 16), t["vout"]), b""))
if total_in <= amount + fee:
raise RuntimeError("Insufficient funds: need %d, have %d"%(amount+fee, total_in))
tx.vout.append(CTxOut(int((total_in - amount - fee)*COIN), P2SH_1))
tx.vout.append(CTxOut(int(amount*COIN), P2SH_2))

tx.vout.append(CTxOut(int(amount * COIN), P2SH_1))
# Prevent the creation of dust change outputs (otherwise add the change value to the fee)
change = int((total_in - amount - fee)*COIN)
if change > DUST_THRESHOLD:
tx.vout.append(CTxOut(change, P2SH_2))
else:
fee += change

# These transactions don't need to be signed, but we still have to insert
# the ScriptSig that will satisfy the ScriptPubKey.
for inp in tx.vin:
inp.scriptSig = SCRIPT_SIG[inp.prevout.n]
txid = from_node.sendrawtransaction(ToHex(tx), True)
unconflist.append({ "txid" : txid, "vout" : 0 , "amount" : total_in - amount - fee})
unconflist.append({ "txid" : txid, "vout" : 1 , "amount" : amount})

unconflist.append({"txid": txid, "vout": 0, "amount": amount})
if change > DUST_THRESHOLD:
unconflist.append({ "txid" : txid, "vout" : 1 , "amount" : total_in - amount - fee})

return (ToHex(tx), fee)

Expand Down