neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix auto-IS and tests (#2331)

Browse Source 
* fix CTxLockRequest::GetMinFee()

* Force regular IS txes to include MIN_FEE * n_inputs fee on creation regardless of auto-IS status

* set_autoix_spork_state should bump mocked time

* make sure IS fee matches the expected one

* turn off spork16 and test all types of txes again
This commit is contained in:
UdjinM6 2018-10-15 14:59:57 +03:00 committed by GitHub
parent f7b0b57596
commit 90ad75911a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qa/rpc-tests/p2p-autoinstantsend.py
View File

@ -190,6 +190,8 @@ class AutoInstantSendTest(BitcoinTestFramework):
return info['SPORK_16_INSTANTSEND_AUTOLOCKS']
def set_autoix_spork_state(self, state):
set_mocktime(get_mocktime() + 1)
set_node_times(self.nodes, get_mocktime())
if state:
value = 0
else:
@ -260,6 +262,10 @@ class AutoInstantSendTest(BitcoinTestFramework):
def send_regular_IX(self):
receiver_addr = self.nodes[self.receiver_idx].getnewaddress()
txid = self.nodes[0].instantsendtoaddress(receiver_addr, 1.0)
MIN_FEE = satoshi_round(-0.0001)
fee = self.nodes[0].gettransaction(txid)['fee']
expected_fee = MIN_FEE * len(self.nodes[0].getrawtransaction(txid, True)['vin'])
assert_equal(fee, expected_fee)
return self.check_IX_lock(txid)
@ -296,5 +302,12 @@ class AutoInstantSendTest(BitcoinTestFramework):
assert(self.send_simple_tx())
assert(not self.send_complex_tx())
self.set_autoix_spork_state(False)
assert(not self.get_autoix_spork_state())
assert(self.send_regular_IX())
assert(not self.send_simple_tx())
assert(not self.send_complex_tx())
if __name__ == '__main__':
AutoInstantSendTest().main()

6
src/instantx.cpp
View File

@ -979,7 +979,7 @@ bool CTxLockRequest::IsValid() const
CAmount nValueOut = tx->GetValueOut();
if (nValueIn - nValueOut < GetMinFee()) {
if (nValueIn - nValueOut < GetMinFee(false)) {
LogPrint("instantsend", "CTxLockRequest::IsValid -- did not include enough fees in transaction: fees=%d, tx=%s", nValueOut - nValueIn, ToString());
return false;
}
@ -987,9 +987,9 @@ bool CTxLockRequest::IsValid() const
return true;
}
CAmount CTxLockRequest::GetMinFee() const
CAmount CTxLockRequest::GetMinFee(bool fForceMinFee) const
{
if (IsSimple()) {
if (!fForceMinFee && CInstantSend::CanAutoLock() && IsSimple()) {
return CAmount();
}
CAmount nMinFee = MIN_FEE;

2
src/instantx.h
View File

@ -191,7 +191,7 @@ public:
}
bool IsValid() const;
CAmount GetMinFee() const;
CAmount GetMinFee(bool fForceMinFee) const;
int GetMaxSignatures() const;
// checks if related transaction is "simple" to lock it automatically

2
src/qt/coincontroldialog.cpp
View File

@ -569,7 +569,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
nPayFee = coinControl->nMinimumTotalFee;
// InstantSend Fee
if (coinControl->fUseInstantSend) nPayFee = std::max(nPayFee, CTxLockRequest(txDummy).GetMinFee());
if (coinControl->fUseInstantSend) nPayFee = std::max(nPayFee, CTxLockRequest(txDummy).GetMinFee(true));
// Allow free? (require at least hard-coded threshold and default to that if no estimate)
double mempoolEstimatePriority = mempool.estimateSmartPriority(nTxConfirmTarget);

4
src/wallet/wallet.cpp
View File

@ -3408,7 +3408,7 @@ bool CWallet::ConvertList(std::vector<CTxIn> vecTxIn, std::vector<CAmount>& vecA
bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet,
int& nChangePosInOut, std::string& strFailReason, const CCoinControl* coinControl, bool sign, AvailableCoinsType nCoinType, bool fUseInstantSend, int nExtraPayloadSize)
{
CAmount nFeePay = fUseInstantSend ? CTxLockRequest().GetMinFee() : 0;
CAmount nFeePay = fUseInstantSend ? CTxLockRequest().GetMinFee(true) : 0;
CAmount nValue = 0;
int nChangePosRequest = nChangePosInOut;
@ -3751,7 +3751,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
nFeeNeeded = coinControl->nMinimumTotalFee;
}
if(fUseInstantSend) {
nFeeNeeded = std::max(nFeeNeeded, CTxLockRequest(txNew).GetMinFee());
nFeeNeeded = std::max(nFeeNeeded, CTxLockRequest(txNew).GetMinFee(true));
}
if (coinControl && coinControl->fOverrideFeeRate)
nFeeNeeded = coinControl->nFeeRate.GetFee(nBytes);