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

Remove currentSnapshot #2273

Merged
merged 7 commits into from
Jan 28, 2021
Merged

Remove currentSnapshot #2273

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0bf2752
Remove currentSnapshot
erikzhang Jan 28, 2021
d0cf078
Optimize
shargon Jan 28, 2021
1036a62
Some optimize
erikzhang Jan 28, 2021
ebde8ee
Optimize
erikzhang Jan 28, 2021
215e9f4
Revert optimization on OnImport
erikzhang Jan 28, 2021
322a7c2
Update src/neo/Ledger/Blockchain.cs
erikzhang Jan 28, 2021
694871f
Update Blockchain.cs
erikzhang Jan 28, 2021
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
10 changes: 6 additions & 4 deletions src/neo/Ledger/Blockchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,14 @@ public SnapshotCache GetSnapshot()

private void OnImport(IEnumerable<Block> blocks, bool verify)
{
uint currentHeight = NativeContract.Ledger.CurrentIndex(View);
DataCache snapshot = View;
uint currentHeight = NativeContract.Ledger.CurrentIndex(snapshot);
foreach (Block block in blocks)
{
if (block.Index <= currentHeight) continue;
if (block.Index != currentHeight + 1)
throw new InvalidOperationException();
if (verify && !block.Verify(View))
if (verify && !block.Verify(snapshot))
erikzhang marked this conversation as resolved.
Show resolved Hide resolved
throw new InvalidOperationException();
Persist(block);
++currentHeight;
Expand Down Expand Up @@ -215,7 +216,8 @@ private void OnInventory(IInventory inventory, bool relay = true)

private VerifyResult OnNewBlock(Block block)
{
uint currentHeight = NativeContract.Ledger.CurrentIndex(View);
DataCache snapshot = View;
uint currentHeight = NativeContract.Ledger.CurrentIndex(snapshot);
if (block.Index <= currentHeight)
return VerifyResult.AlreadyExists;
if (block.Index - 1 > currentHeight)
Expand All @@ -225,7 +227,7 @@ private VerifyResult OnNewBlock(Block block)
}
if (block.Index == currentHeight + 1)
{
if (!block.Verify(View))
if (!block.Verify(snapshot))
return VerifyResult.Invalid;
block_cache.TryAdd(block.Hash, block);
block_cache_unverified.Remove(block.Index);
Expand Down