From 69ccca675dafab78eca7208c96510b6f52d443cd Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Thu, 4 Jun 2020 17:19:30 +0300 Subject: [PATCH] core: fix PrevHash calculation for MPTRoot This was differing from C# notion of PrevHash. It's not a previous root, but rather a hash of the previous serialized MPTRoot structure (that is to be signed by CNs). --- pkg/core/blockchain.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/core/blockchain.go b/pkg/core/blockchain.go index 88bb71db9..f20646f11 100644 --- a/pkg/core/blockchain.go +++ b/pkg/core/blockchain.go @@ -835,7 +835,7 @@ func (bc *Blockchain) storeBlock(block *block.Block) error { if err != nil { return errors.WithMessagef(err, "can't get previous state root") } - prevHash = prev.Root + prevHash = hash.DoubleSha256(prev.GetSignedPart()) } err := bc.AddStateRoot(&state.MPTRoot{ MPTRootBase: state.MPTRootBase{ @@ -1803,7 +1803,7 @@ func (bc *Blockchain) verifyStateRoot(r *state.MPTRoot) error { prev, err := bc.GetStateRoot(r.Index - 1) if err != nil { return errors.New("can't get previous state root") - } else if !prev.Root.Equals(r.PrevHash) { + } else if !r.PrevHash.Equals(hash.DoubleSha256(prev.GetSignedPart())) { return errors.New("previous hash mismatch") } else if prev.Version != r.Version { return errors.New("version mismatch")