add a simple ledger

Author: txhsl

block.go

@@ -1,9 +1,19 @@
 package dbft
 
-import "github.com/ethereum/go-ethereum/core/types"
+import (
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/nspcc-dev/neo-go/pkg/util"
+)
 
 type Block struct {
-	header       *types.Header
-	transactions []*types.Transaction
-	bls          []byte
+	Header       *types.Header
+	Transactions []*types.Transaction
+	Signature    []byte
+}
+
+// Hash implements Block interface. Hash returns unsealed block hash that doesn't
+// include Nonce, MixDigest fields and Extra's signature part, thus, can be used
+// only for worker's block identification and information purposes.
+func (b *Block) Hash() util.Uint256 {
+	return util.Uint256(WorkerSealHash(b.Header))
 }

dbft.go

@@ -21,12 +21,12 @@ type Node struct {
 	globalPubKey    *tpke.PublicKey // public key for users' encryption
 	scaler          int             // a scaler factor generated by DKG for computation speed up
 
+	blocks   map[uint64]*Block    // blocks
 	height   uint64               // current height
 	view     byte                 // view number
 	viewLock bool                 // a lock to stop change view after decryption sharing
 	txList   []*types.Transaction // transactions selected for next block
 	proposal *types.Header        // consensus proposal as a header
-	localSig []byte               // bls signature
 
 	// message pool
 	prepareResponses map[uint16]*message.PrepareResponse
@@ -49,6 +49,7 @@ func NewNode(index byte, prv *tpke.PrivateKey, pub *tpke.PublicKey, globalPub *t
 		neighborPubKeys:  make(map[uint16]*tpke.PublicKey),
 		globalPubKey:     globalPub,
 		scaler:           scaler,
+		blocks:           make(map[uint64]*Block),
 		height:           0,
 		view:             0,
 		viewLock:         false,
@@ -57,7 +58,6 @@ func NewNode(index byte, prv *tpke.PrivateKey, pub *tpke.PublicKey, globalPub *t
 		txPool:           make([]*types.Transaction, 0),
 		txList:           nil,
 		proposal:         nil,
-		localSig:         nil,
 		prepareResponses: make(map[uint16]*message.PrepareResponse),
 		finalizes:        make(map[uint16]*message.Finalize),
 		commits:          make(map[uint16]*message.Commit),
@@ -324,19 +324,23 @@ func (n *Node) HandleMsg(m *message.Payload) {
 			}
 
 			// finish
-			n.localSig = sig.ToBytes()
+			n.blocks[n.height+1] = &Block{
+				Header:       n.proposal,
+				Transactions: n.txList,
+				Signature:    sig.ToBytes(),
+			}
 			n.height += 1
 			n.view = 0
 			n.viewLock = false
 
 			// reset for next round
-			// n.txList = nil
-			// n.proposal = nil
-			// n.txPool = make([]*types.Transaction, 0)
-			// n.prepareResponses = make(map[uint16]*message.PrepareResponse)
-			// n.finalizes = make(map[uint16]*message.Agree)
-			// n.commits = make(map[uint16]*message.Commit)
-			// n.changeViews = make(map[uint16]*message.ChangeView)
+			n.txList = nil
+			n.proposal = nil
+			n.txPool = make([]*types.Transaction, 0)
+			n.prepareResponses = make(map[uint16]*message.PrepareResponse)
+			n.finalizes = make(map[uint16]*message.Finalize)
+			n.commits = make(map[uint16]*message.Commit)
+			n.changeViews = make(map[uint16]*message.ChangeView)
 		}
 	} else if m.Type() == payload.ChangeViewType {
 		changeView := m.Payload().(message.ChangeView)

dbft_test.go

@@ -145,17 +145,13 @@ func TestDBFT(t *testing.T) {
 		}
 	}
 
-	hash := nodes[0].proposal.Hash()
-	sig := nodes[0].localSig
+	hash := nodes[0].blocks[1].Hash()
 	for i := 0; i < 7; i++ {
 		if nodes[i].height < 1 {
 			t.Fatalf("invalid consensus")
 		}
-		if nodes[i].proposal.Hash().Cmp(hash) != 0 {
-			t.Fatalf("invalid hash")
-		}
-		if !bytes.Equal(nodes[i].localSig, sig) {
-			t.Fatalf("invalid bls sig")
+		if nodes[i].blocks[1].Hash().CompareTo(hash) != 0 {
+			t.Fatalf("invalid block")
 		}
 	}
 }

helper.go

@@ -1,7 +1,14 @@
 package dbft
 
 import (
+	"io"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/txhsl/tpke"
+	"golang.org/x/crypto/sha3"
 )
 
 func EncodeSignatureShare(s *tpke.SignatureShare) []byte {
@@ -43,3 +50,47 @@ func DecodeDecryptionShare(bs [][]byte) []*tpke.DecryptionShare {
 	}
 	return ss
 }
+
+// WorkerSealHash returns the hash of a header prior to it being sealed. WorkerSealHash is
+// override to exclude those header fields that will be changed by dBFT during
+// block sealing: MixDigest, Nonce and last [crypto.SignatureLength] bytes of
+// Extra.
+//
+// Be careful no to use WorkerSealHash anywhere where "the honest" WorkerSealHash is required.
+func WorkerSealHash(header *types.Header) (hash common.Hash) {
+	hasher := sha3.NewLegacyKeccak256()
+	encodeUnchangeableHeader(hasher, header)
+	hasher.(crypto.KeccakState).Read(hash[:])
+	return hash
+}
+
+// encodeUnchangeableHeader encodes those header fields that won't be changed by
+// dBFT during block sealing: every header field except MixDigest, Nonce and last
+// [crypto.SignatureLength] bytes of Extra.
+func encodeUnchangeableHeader(w io.Writer, header *types.Header) {
+	enc := []interface{}{
+		header.ParentHash,
+		header.UncleHash,
+		header.Coinbase,
+		header.Root,
+		header.TxHash,
+		header.ReceiptHash,
+		header.Bloom,
+		header.Difficulty,
+		header.Number,
+		header.GasLimit,
+		header.GasUsed,
+		header.Time,
+		// Do not include validators addresses into hashable part.
+		header.Extra, // Yes, this will panic if extra is too short.
+	}
+	if header.BaseFee != nil {
+		enc = append(enc, header.BaseFee)
+	}
+	if header.WithdrawalsHash != nil {
+		panic("unexpected withdrawal hash value in dbft")
+	}
+	if err := rlp.Encode(w, enc); err != nil {
+		panic("can't encode: " + err.Error())
+	}
+}