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

Optimize MerkleTree (3x) #1203

Merged
merged 7 commits into from
Nov 7, 2019
Merged

Optimize MerkleTree (3x) #1203

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73b3246
Optimize MerkleTree
shargon Nov 6, 2019
19fce94
Update MerkleTree.cs
erikzhang Nov 7, 2019
46cde1b
Merge branch 'master' into merkle-optimize
erikzhang Nov 7, 2019
d6c04cf
Merge branch 'master' into merkle-optimize
shargon Nov 7, 2019
0f8da75
Update MerkleTree.cs
shargon Nov 7, 2019
4e82405
Merge branch 'master' into merkle-optimize
vncoelho Nov 7, 2019
8ed4232
Merge branch 'master' into merkle-optimize
erikzhang Nov 7, 2019
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
16 changes: 14 additions & 2 deletions neo/Cryptography/MerkleTree.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;

namespace Neo.Cryptography
{
public class MerkleTree
{
private MerkleTreeNode root;
private readonly MerkleTreeNode root;

public int Depth { get; private set; }

Expand All @@ -25,6 +26,8 @@ private static MerkleTreeNode Build(MerkleTreeNode[] leaves)
{
if (leaves.Length == 0) throw new ArgumentException();
if (leaves.Length == 1) return leaves[0];

var buffer = new byte[64];
MerkleTreeNode[] parents = new MerkleTreeNode[(leaves.Length + 1) / 2];
for (int i = 0; i < parents.Length; i++)
{
Expand All @@ -40,11 +43,20 @@ private static MerkleTreeNode Build(MerkleTreeNode[] leaves)
parents[i].RightChild = leaves[i * 2 + 1];
leaves[i * 2 + 1].Parent = parents[i];
}
parents[i].Hash = new UInt256(Crypto.Default.Hash256(parents[i].LeftChild.Hash.ToArray().Concat(parents[i].RightChild.Hash.ToArray()).ToArray()));
parents[i].Hash = Concat(buffer, parents[i].LeftChild.Hash, parents[i].RightChild.Hash);
}
return Build(parents); //TailCall
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static UInt256 Concat(byte[] buffer, UInt256 hash1, UInt256 hash2)
{
Buffer.BlockCopy(hash1.ToArray(), 0, buffer, 0, 32);
Buffer.BlockCopy(hash2.ToArray(), 0, buffer, 32, 32);

return new UInt256(Crypto.Default.Hash256(buffer));
}

public static UInt256 ComputeRoot(IReadOnlyList<UInt256> hashes)
{
if (hashes.Count == 0) throw new ArgumentException();
Expand Down