hash: introduce memory-optimized merkle root hash calculation routine

NewMerkleTree is a memory hog, we can do better than that:

BenchmarkMerkle/NewMerkleTree-8                       13          88434670 ns/op        20828207 B/op     300035 allocs/op
BenchmarkMerkle/CalcMerkleRoot-8                      15          69264150 ns/op               0 B/op          0 allocs/op
This commit is contained in:
Roman Khimov 2020-09-15 18:38:15 +03:00
parent 3f27cf5901
commit d52e79668b
9 changed files with 83 additions and 33 deletions

View file

@ -562,12 +562,7 @@ func (s *service) newBlockFromContext(ctx *dbft.Context) block.Block {
hashes := make([]util.Uint256, len(ctx.TransactionHashes)+1) hashes := make([]util.Uint256, len(ctx.TransactionHashes)+1)
hashes[0] = block.Block.ConsensusData.Hash() hashes[0] = block.Block.ConsensusData.Hash()
copy(hashes[1:], ctx.TransactionHashes) copy(hashes[1:], ctx.TransactionHashes)
mt, err := hash.NewMerkleTree(hashes) block.Block.MerkleRoot = hash.CalcMerkleRoot(hashes)
if err != nil {
s.log.Fatal("can't calculate merkle root for the new block")
return nil
}
block.Block.MerkleRoot = mt.Root()
return block return block
} }

View file

@ -47,25 +47,19 @@ func (b *Block) Header() *Header {
} }
// computeMerkleTree computes Merkle tree based on actual block's data. // computeMerkleTree computes Merkle tree based on actual block's data.
func (b *Block) computeMerkleTree() (*hash.MerkleTree, error) { func (b *Block) computeMerkleTree() util.Uint256 {
hashes := make([]util.Uint256, len(b.Transactions)+1) hashes := make([]util.Uint256, len(b.Transactions)+1)
hashes[0] = b.ConsensusData.Hash() hashes[0] = b.ConsensusData.Hash()
for i, tx := range b.Transactions { for i, tx := range b.Transactions {
hashes[i+1] = tx.Hash() hashes[i+1] = tx.Hash()
} }
return hash.NewMerkleTree(hashes) return hash.CalcMerkleRoot(hashes)
} }
// RebuildMerkleRoot rebuilds the merkleroot of the block. // RebuildMerkleRoot rebuilds the merkleroot of the block.
func (b *Block) RebuildMerkleRoot() error { func (b *Block) RebuildMerkleRoot() {
merkle, err := b.computeMerkleTree() b.MerkleRoot = b.computeMerkleTree()
if err != nil {
return err
}
b.MerkleRoot = merkle.Root()
return nil
} }
// Verify verifies the integrity of the block. // Verify verifies the integrity of the block.
@ -81,11 +75,8 @@ func (b *Block) Verify() error {
} }
} }
merkle, err := b.computeMerkleTree() merkle := b.computeMerkleTree()
if err != nil { if !b.MerkleRoot.Equals(merkle) {
return err
}
if !b.MerkleRoot.Equals(merkle.Root()) {
return errors.New("MerkleRoot mismatch") return errors.New("MerkleRoot mismatch")
} }
return nil return nil

View file

@ -111,11 +111,11 @@ func TestHashBlockEqualsHashHeader(t *testing.T) {
func TestBlockVerify(t *testing.T) { func TestBlockVerify(t *testing.T) {
block := newDumbBlock() block := newDumbBlock()
assert.NotNil(t, block.Verify()) assert.NotNil(t, block.Verify())
assert.Nil(t, block.RebuildMerkleRoot()) block.RebuildMerkleRoot()
assert.Nil(t, block.Verify()) assert.Nil(t, block.Verify())
block.Transactions = []*transaction.Transaction{} block.Transactions = []*transaction.Transaction{}
assert.NoError(t, block.RebuildMerkleRoot()) block.RebuildMerkleRoot()
assert.Nil(t, block.Verify()) assert.Nil(t, block.Verify())
} }

View file

@ -72,11 +72,7 @@ func newBlock(cfg config.ProtocolConfiguration, index uint32, prev util.Uint256,
}, },
Transactions: txs, Transactions: txs,
} }
err := b.RebuildMerkleRoot() b.RebuildMerkleRoot()
if err != nil {
panic(err)
}
b.Script.InvocationScript = testchain.Sign(b.GetSignedPart()) b.Script.InvocationScript = testchain.Sign(b.GetSignedPart())
return b return b
} }

View file

@ -66,10 +66,7 @@ func createGenesisBlock(cfg config.ProtocolConfiguration) (*block.Block, error)
Nonce: 2083236893, Nonce: 2083236893,
}, },
} }
b.RebuildMerkleRoot()
if err = b.RebuildMerkleRoot(); err != nil {
return nil, err
}
return b, nil return b, nil
} }

View file

@ -0,0 +1,37 @@
package hash
import (
"math/rand"
"testing"
"time"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/stretchr/testify/require"
)
func BenchmarkMerkle(t *testing.B) {
var err error
var hashes = make([]util.Uint256, 100000)
var h = make([]byte, 32)
r := rand.New(rand.NewSource(time.Now().UnixNano()))
for i := range hashes {
r.Read(h)
hashes[i], err = util.Uint256DecodeBytesBE(h)
require.NoError(t, err)
}
t.Run("NewMerkleTree", func(t *testing.B) {
t.ResetTimer()
for n := 0; n < t.N; n++ {
tr, err := NewMerkleTree(hashes)
require.NoError(t, err)
_ = tr.Root()
}
})
t.Run("CalcMerkleRoot", func(t *testing.B) {
t.ResetTimer()
for n := 0; n < t.N; n++ {
_ = CalcMerkleRoot(hashes)
}
})
}

View file

@ -66,6 +66,38 @@ func buildMerkleTree(leaves []*MerkleTreeNode) *MerkleTreeNode {
return buildMerkleTree(parents) return buildMerkleTree(parents)
} }
// CalcMerkleRoot calculcates Merkle root hash value for a given slice of hashes.
// It doesn't create a full MerkleTree structure and it uses given slice as a
// scratchpad, so it will destroy its contents in the process. But it's much more
// memory efficient if you only need root hash value, while NewMerkleTree would
// make 3*N allocations for N hashes, this function will only make 4. It also is
// an error to call this function for zero-length hashes slice, the function will
// panic.
func CalcMerkleRoot(hashes []util.Uint256) util.Uint256 {
if len(hashes) == 0 {
panic("length of the hashes cannot be zero")
}
if len(hashes) == 1 {
return hashes[0]
}
scratch := make([]byte, 64)
parents := hashes[:(len(hashes)+1)/2]
for i := 0; i < len(parents); i++ {
copy(scratch, hashes[i*2].BytesBE())
if i*2+1 == len(hashes) {
copy(scratch[32:], hashes[i*2].BytesBE())
} else {
copy(scratch[32:], hashes[i*2+1].BytesBE())
}
parents[i] = DoubleSha256(scratch)
}
return CalcMerkleRoot(parents)
}
// MerkleTreeNode represents a node in the MerkleTree. // MerkleTreeNode represents a node in the MerkleTree.
type MerkleTreeNode struct { type MerkleTreeNode struct {
hash util.Uint256 hash util.Uint256

View file

@ -18,6 +18,8 @@ func testComputeMerkleTree(t *testing.T, hexHashes []string, result string) {
merkle, err := NewMerkleTree(hashes) merkle, err := NewMerkleTree(hashes)
require.NoError(t, err) require.NoError(t, err)
optimized := CalcMerkleRoot(hashes)
assert.Equal(t, result, optimized.StringLE())
assert.Equal(t, result, merkle.Root().StringLE()) assert.Equal(t, result, merkle.Root().StringLE())
assert.Equal(t, true, merkle.root.IsRoot()) assert.Equal(t, true, merkle.root.IsRoot())
assert.Equal(t, false, merkle.root.IsLeaf()) assert.Equal(t, false, merkle.root.IsLeaf())

View file

@ -177,7 +177,7 @@ func NewBlock(t *testing.T, bc blockchainer.Blockchainer, offset uint32, primary
}, },
Transactions: txs, Transactions: txs,
} }
_ = b.RebuildMerkleRoot() b.RebuildMerkleRoot()
b.Script.InvocationScript = Sign(b.GetSignedPart()) b.Script.InvocationScript = Sign(b.GetSignedPart())
return b return b