nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8796

Browse Source 
7a4a03d wallet2: do not commit transactions more than once (moneromooo-monero)
This commit is contained in:
luigi1111 2023-04-25 11:24:15 -04:00
commit df2eb0da0a
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wallet/wallet2.cpp
View File

@ -6753,6 +6753,24 @@ void wallet2::commit_tx(pending_tx& ptx)
crypto::hash txid; crypto::hash txid;
txid = get_transaction_hash(ptx.tx); txid = get_transaction_hash(ptx.tx);
// if it's already processed, bail
if (std::find_if(m_transfers.begin(), m_transfers.end(), [&txid](const transfer_details &td) { return td.m_txid == txid; }) != m_transfers.end())
{
MDEBUG("Transaction " << txid << " already processed");
return;
}
if (m_unconfirmed_txs.find(txid) != m_unconfirmed_txs.end())
{
MDEBUG("Transaction " << txid << " already processed");
return;
}
if (m_confirmed_txs.find(txid) != m_confirmed_txs.end())
{
MDEBUG("Transaction " << txid << " already processed");
return;
}
crypto::hash payment_id = crypto::null_hash; crypto::hash payment_id = crypto::null_hash;
std::vector<cryptonote::tx_destination_entry> dests; std::vector<cryptonote::tx_destination_entry> dests;
uint64_t amount_in = 0; uint64_t amount_in = 0;

34
tests/functional_tests/transfer.py
View File

@ -52,6 +52,7 @@ class TransferTest():
self.check_tx_notes() self.check_tx_notes()
self.check_rescan() self.check_rescan()
self.check_is_key_image_spent() self.check_is_key_image_spent()
self.check_multiple_submissions()
def reset(self): def reset(self):
print('Resetting blockchain') print('Resetting blockchain')
@ -829,6 +830,39 @@ class TransferTest():
res = daemon.is_key_image_spent(ki) res = daemon.is_key_image_spent(ki)
assert res.spent_status == expected assert res.spent_status == expected
def check_multiple_submissions(self):
daemon = Daemon()
print('Testing multiple submissions')
dst = {'address': '42ey1afDFnn4886T7196doS9GPMzexD9gXpsZJDwVjeRVdFCSoHnv7KPbBeGpzJBzHRCAs9UxqeoyFQMYbqSWYTfJJQAWDm', 'amount': 1000000000000}
self.wallet[0].refresh()
res = self.wallet[0].get_balance()
balance = res.balance
res = self.wallet[0].transfer([dst], ring_size = 16, get_tx_key = False, get_tx_hex = False, get_tx_metadata = True)
tx_hex = res.tx_metadata
tx_fee = res.fee
res = self.wallet[0].relay_tx(tx_hex)
# submit again before mined
res = self.wallet[0].relay_tx(tx_hex)
daemon.generateblocks('44Kbx4sJ7JDRDV5aAhLJzQCjDz2ViLRduE3ijDZu3osWKBjMGkV1XPk4pfDUMqt1Aiezvephdqm6YD19GKFD9ZcXVUTp6BW', 1)
self.wallet[0].refresh()
res = self.wallet[0].get_balance()
assert res.balance == balance - tx_fee
balance = res.balance
# submit again after mined
res = self.wallet[0].relay_tx(tx_hex)
daemon.generateblocks('44Kbx4sJ7JDRDV5aAhLJzQCjDz2ViLRduE3ijDZu3osWKBjMGkV1XPk4pfDUMqt1Aiezvephdqm6YD19GKFD9ZcXVUTp6BW', 1)
self.wallet[0].refresh()
res = self.wallet[0].get_balance()
assert res.balance == balance
if __name__ == '__main__': if __name__ == '__main__':
TransferTest().run_test() TransferTest().run_test()