Add NumLowFeeTxnPerBlock config to control building block logic

Signed-off-by: Yilun <zyl.skysniper@gmail.com>

chain/collector.go

@@ -57,11 +57,17 @@ func (tc *TxnCollector) Cleanup(txns []*transaction.Transaction) error {
 	return tc.TxnSource.CleanSubmittedTransactions(txns)
 }
 
-type sortTxnsByPrice []*transaction.Transaction
+type sortTxnsByPriceSize []*transaction.Transaction
 
-func (s sortTxnsByPrice) Len() int           { return len(s) }
-func (s sortTxnsByPrice) Less(i, j int) bool { return s[i].UnsignedTx.Fee > s[j].UnsignedTx.Fee }
-func (s sortTxnsByPrice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s sortTxnsByPriceSize) Len() int      { return len(s) }
+func (s sortTxnsByPriceSize) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+
+func (s sortTxnsByPriceSize) Less(i, j int) bool {
+	if s[i].UnsignedTx.Fee == s[j].UnsignedTx.Fee {
+		return s[i].GetSize() < s[j].GetSize()
+	}
+	return s[i].UnsignedTx.Fee > s[j].UnsignedTx.Fee
+}
 
 type TxnCollection struct {
 	txns map[Uint160][]*transaction.Transaction
@@ -75,7 +81,7 @@ func NewTxnCollection(txnLists map[Uint160][]*transaction.Transaction) *TxnColle
 		txnLists[addr] = txnList[1:]
 	}
 
-	sort.Sort(sort.Reverse(sortTxnsByPrice(tops)))
+	sort.Sort(sort.Reverse(sortTxnsByPriceSize(tops)))
 
 	return &TxnCollection{
 		txns: txnLists,
@@ -97,16 +103,19 @@ func (tc *TxnCollection) Update() error {
 	}
 	if txnList, ok := tc.txns[hashes[0]]; ok && len(txnList) > 0 {
 		tc.tops[0], tc.txns[hashes[0]] = txnList[0], txnList[1:]
-		sort.Sort(sort.Reverse(sortTxnsByPrice(tc.tops)))
+		sort.Sort(sort.Reverse(sortTxnsByPriceSize(tc.tops)))
 	} else {
 		tc.tops = tc.tops[1:]
 	}
 
 	return nil
 }
 
-func (tc *TxnCollection) Pop() {
-	if len(tc.tops) > 0 {
-		tc.tops = tc.tops[1:]
+func (tc *TxnCollection) Pop() *transaction.Transaction {
+	if len(tc.tops) == 0 {
+		return nil
 	}
+	top := tc.tops[0]
+	tc.tops = tc.tops[1:]
+	return top
 }

chain/mining.go

@@ -46,6 +46,7 @@ func (bm *BuiltinMining) BuildBlock(ctx context.Context, height uint32, chordID
 	txnHashList = append(txnHashList, coinbase.Hash())
 	totalTxsSize := coinbase.GetSize()
 	txCount := 1
+	lowFeeTxCount := 0
 
 	if winnerType == pb.TXN_SIGNER {
 		if _, err = DefaultLedger.Store.GetTransaction(winnerHash); err != nil {
@@ -75,27 +76,25 @@ func (bm *BuiltinMining) BuildBlock(ctx context.Context, height uint32, chordID
 		default:
 		}
 
+		if txCount >= int(config.Parameters.NumTxnPerBlock) {
+			break
+		}
+
 		txn := txnCollection.Peek()
 		if txn == nil {
 			break
 		}
 
-		if txn.UnsignedTx.Fee < int64(config.Parameters.MinTxnFee) {
+		if txn.UnsignedTx.Fee < int64(config.Parameters.MinTxnFee) && uint32(lowFeeTxCount) >= config.Parameters.NumLowFeeTxnPerBlock {
 			log.Warning("transaction fee is too low")
-			txnCollection.Pop()
-			continue
+			break
 		}
 
 		totalTxsSize = totalTxsSize + txn.GetSize()
 		if totalTxsSize > config.MaxBlockSize {
 			break
 		}
 
-		txCount++
-		if txCount > int(config.Parameters.NumTxnPerBlock) {
-			break
-		}
-
 		if err := VerifyTransaction(txn); err != nil {
 			log.Warningf("invalid transaction: %v", err)
 			txnCollection.Pop()
@@ -118,8 +117,13 @@ func (bm *BuiltinMining) BuildBlock(ctx context.Context, height uint32, chordID
 		if err = txnCollection.Update(); err != nil {
 			bvs.Reset()
 			txnCollection.Pop()
-		} else {
-			bvs.Commit()
+			continue
+		}
+
+		bvs.Commit()
+		txCount++
+		if txn.UnsignedTx.Fee < int64(config.Parameters.MinTxnFee) {
+			lowFeeTxCount++
 		}
 	}
 

consensus/config.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"time"

consensus/consensus.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"fmt"

consensus/message.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"crypto/sha256"

consensus/proposal.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"bytes"

consensus/proposing.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"bytes"

consensus/state.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"sync"

consensus/util.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"encoding/binary"

consensus/vote.go

@@ -1,4 +1,4 @@
-package moca
+package consensus
 
 import (
 	"fmt"

nknd.go

@@ -38,7 +38,7 @@ import (
 )
 
 const (
-	NetVersionNum = 4 // This is temporary and will be removed soon after mainnet is stabilized
+	NetVersionNum = 5 // This is temporary and will be removed soon after mainnet is stabilized
 )
 
 var (
@@ -260,7 +260,7 @@ func nknMain(c *cli.Context) error {
 
 	go ws.Start()
 
-	consensus, err := moca.NewConsensus(account, localNode)
+	consensus, err := consensus.NewConsensus(account, localNode)
 	if err != nil {
 		return err
 	}

pb/transaction.go

@@ -98,14 +98,14 @@ func (m *GenerateID) ToMap() map[string]interface{} {
 
 func (m *RegisterName) ToMap() map[string]interface{} {
 	return map[string]interface{}{
-		"registrant": common.BytesToUint160(m.Registrant),
+		"registrant": common.HexStr(m.Registrant),
 		"name":       m.Name,
 	}
 }
 
 func (m *Subscribe) ToMap() map[string]interface{} {
 	return map[string]interface{}{
-		"subscriber": common.BytesToUint160(m.Subscriber),
+		"subscriber": common.HexStr(m.Subscriber),
 		"identifier": m.Identifier,
 		"topic":      m.Topic,
 		"bucket":     m.Bucket,

util/config/config.go

@@ -129,6 +129,8 @@ var (
 		WalletFile:                "wallet.json",
 		MaxGetIDSeeds:             3,
 		DBFilesCacheCapacity:      100,
+		NumLowFeeTxnPerBlock:      4,
+		MinTxnFee:                 10000000,
 	}
 )
 
@@ -150,6 +152,7 @@ type Configuration struct {
 	CAPath                    string        `json:"CAPath"`
 	MaxHdrSyncReqs            int           `json:"MaxConcurrentSyncHeaderReqs"`
 	GenesisBlockProposer      string        `json:"GenesisBlockProposer"`
+	NumLowFeeTxnPerBlock      uint32        `json:"NumLowFeeTxnPerBlock"`
 	MinTxnFee                 int64         `json:"MinTxnFee"`
 	RegisterIDFee             int64         `json:"RegisterIDFee"`
 	Hostname                  string        `json:"Hostname"`