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

Optimize size estimation in FundTransaction

Browse source
This commit is contained in:
Steven Roose 2020-03-30 19:58:16 +01:00
parent 6939a7248f
commit 8aab8a24c8
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/blind.h
View file

@ -17,6 +17,8 @@
//! ELEMENTS: //! ELEMENTS:
// 52-bit rangeproof size // 52-bit rangeproof size
static const size_t DEFAULT_RANGEPROOF_SIZE = 4174; static const size_t DEFAULT_RANGEPROOF_SIZE = 4174;
// constant-size surjection proof
static const size_t SURJECTION_PROOF_SIZE = 67;
// 32 bytes of asset type, 32 bytes of asset blinding factor in sidechannel // 32 bytes of asset type, 32 bytes of asset blinding factor in sidechannel
static const size_t SIDECHANNEL_MSG_SIZE = 64; static const size_t SIDECHANNEL_MSG_SIZE = 64;

17
src/wallet/wallet.cpp
View file

@ -3223,6 +3223,7 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
change_prototype_txout.nAsset.vchCommitment.resize(33); change_prototype_txout.nAsset.vchCommitment.resize(33);
coin_selection_params.change_output_size = GetSerializeSize(change_prototype_txout); coin_selection_params.change_output_size = GetSerializeSize(change_prototype_txout);
coin_selection_params.change_output_size += DEFAULT_RANGEPROOF_SIZE/WITNESS_SCALE_FACTOR; coin_selection_params.change_output_size += DEFAULT_RANGEPROOF_SIZE/WITNESS_SCALE_FACTOR;
coin_selection_params.change_output_size += SURJECTION_PROOF_SIZE/WITNESS_SCALE_FACTOR;
} }
CFeeRate discard_rate = GetDiscardRate(*this, ::feeEstimator); CFeeRate discard_rate = GetDiscardRate(*this, ::feeEstimator);
@ -3266,6 +3267,14 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
// vouts to the payees // vouts to the payees
coin_selection_params.tx_noinputs_size = 11; // Static vsize overhead + outputs vsize. 4 nVersion, 4 nLocktime, 1 input count, 1 output count, 1 witness overhead (dummy, flag, stack size) coin_selection_params.tx_noinputs_size = 11; // Static vsize overhead + outputs vsize. 4 nVersion, 4 nLocktime, 1 input count, 1 output count, 1 witness overhead (dummy, flag, stack size)
// Account for the fee output in the tx.
if (g_con_elementsmode) {
CTxOut fee(::policyAsset, nFeeRet, CScript());
assert(fee.IsFee());
coin_selection_params.tx_noinputs_size += ::GetSerializeSize(fee, PROTOCOL_VERSION);
}
for (const CRecipient& recipient : vecSend) for (const CRecipient& recipient : vecSend)
{ {
CTxOut txout(recipient.asset, recipient.nAmount, recipient.scriptPubKey); CTxOut txout(recipient.asset, recipient.nAmount, recipient.scriptPubKey);
@ -3287,8 +3296,6 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
txout.nValue = txout.nValue.GetAmount() - nFeeRet % nSubtractFeeFromAmount; txout.nValue = txout.nValue.GetAmount() - nFeeRet % nSubtractFeeFromAmount;
} }
} }
// Include the fee cost for outputs. Note this is only used for BnB right now
coin_selection_params.tx_noinputs_size += ::GetSerializeSize(txout, PROTOCOL_VERSION);
// ELEMENTS: Core's logic isn't great here. We should be computing // ELEMENTS: Core's logic isn't great here. We should be computing
// cost of making output + future spend. We're not as concerned // cost of making output + future spend. We're not as concerned
// about dust anyways, so let's focus upstream. // about dust anyways, so let's focus upstream.
@ -3305,12 +3312,18 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
strFailReason = _("Transaction amount too small"); strFailReason = _("Transaction amount too small");
return false; return false;
} }
// Include the fee cost for outputs. Note this is only used for BnB right now
coin_selection_params.tx_noinputs_size += ::GetSerializeSize(txout, PROTOCOL_VERSION);
txNew.vout.push_back(txout); txNew.vout.push_back(txout);
if (blind_details) { if (blind_details) {
blind_details->o_pubkeys.push_back(recipient.confidentiality_key); blind_details->o_pubkeys.push_back(recipient.confidentiality_key);
if (blind_details->o_pubkeys.back().IsFullyValid()) { if (blind_details->o_pubkeys.back().IsFullyValid()) {
blind_details->num_to_blind++; blind_details->num_to_blind++;
blind_details->only_recipient_blind_index = txNew.vout.size()-1; blind_details->only_recipient_blind_index = txNew.vout.size()-1;
coin_selection_params.tx_noinputs_size += DEFAULT_RANGEPROOF_SIZE/WITNESS_SCALE_FACTOR;
coin_selection_params.tx_noinputs_size += SURJECTION_PROOF_SIZE/WITNESS_SCALE_FACTOR;
} }
} }
} }