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

[master-2.x] Add try-catch when receive a new tx #2066

Merged
merged 6 commits into from
Nov 20, 2020
Merged

[master-2.x] Add try-catch when receive a new tx #2066

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2dfaae
fix tx.verify
Nov 17, 2020
1c6e5ec
format
Nov 17, 2020
9701142
fix
Nov 18, 2020
2dd1f6a
catch tx.verify exception to avoid state state influence
Nov 18, 2020
5f6ebee
add RelayResultReason.Error
Nov 20, 2020
5f59eac
Merge branch 'master-2.x' into fix_tx_references
shargon Nov 20, 2020
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
32 changes: 19 additions & 13 deletions neo/Ledger/Blockchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,20 +393,26 @@ private void OnNewHeaders(Header[] headers)

private RelayResultReason OnNewTransaction(Transaction transaction)
{
if (transaction.Type == TransactionType.MinerTransaction)
return RelayResultReason.Invalid;
if (ContainsTransaction(transaction.Hash))
return RelayResultReason.AlreadyExists;
if (!MemPool.CanTransactionFitInPool(transaction))
return RelayResultReason.OutOfMemory;
if (!transaction.Verify(currentSnapshot, MemPool.GetVerifiedTransactions()))
return RelayResultReason.Invalid;
if (!Plugin.CheckPolicy(transaction))
return RelayResultReason.PolicyFail;

if (!MemPool.TryAdd(transaction.Hash, transaction))
return RelayResultReason.OutOfMemory;
try
{
if (transaction.Type == TransactionType.MinerTransaction)
return RelayResultReason.Invalid;
if (ContainsTransaction(transaction.Hash))
return RelayResultReason.AlreadyExists;
if (!MemPool.CanTransactionFitInPool(transaction))
return RelayResultReason.OutOfMemory;
if (!transaction.Verify(currentSnapshot, MemPool.GetVerifiedTransactions()))
return RelayResultReason.Invalid;
if (!Plugin.CheckPolicy(transaction))
return RelayResultReason.PolicyFail;

if (!MemPool.TryAdd(transaction.Hash, transaction))
return RelayResultReason.OutOfMemory;
}
catch
{
return RelayResultReason.Invalid;
shargon marked this conversation as resolved.
Show resolved Hide resolved
}
system.LocalNode.Tell(new LocalNode.RelayDirectly { Inventory = transaction });
return RelayResultReason.Succeed;
}
Expand Down