Merge pull request #655 from vitelabs/release_v2.14.0

Release v2.14.0

Author: moraleinside

.github/workflows/dispatch-nightly-build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Read buildversion

.github/workflows/nightly-build.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:

.github/workflows/release-build.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:

common/upgrade/face.go

@@ -88,10 +88,10 @@ func GetAllPoints() []*UpgradePoint {
 IsSeedUpgrade checks whether current snapshot block height is over seed hard fork.
 Vite pre-mainnet hard forks at snapshot block height 3488471.
 Contents:
-  1. Vm log list hash add account address and prevHash since seed fork.
-  2. Create contract params add seed count since seed fork.
-  3. Verifier verifies seed count since seed fork.
-  4. Vm interpreters add SEED opcode since seed fork.
+ 1. Vm log list hash add account address and prevHash since seed fork.
+ 2. Create contract params add seed count since seed fork.
+ 3. Verifier verifies seed count since seed fork.
+ 4. Vm interpreters add SEED opcode since seed fork.
 */
 func IsSeedUpgrade(sHeight uint64) bool {
 	assertUpgradeNotNil()
@@ -102,11 +102,11 @@ func IsSeedUpgrade(sHeight uint64) bool {
 IsDexUpgrade checks whether current snapshot block height is over sprout hard fork.
 Vite pre-mainnet hard forks at snapshot block height 5442723.
 Features:
-  1. Dynamic quota acquisition. Quota acquisition from staking will reduce
-     when network traffic rate is too high.
-  2. Adjustment of quota consumption for some built-in contract transactions
-     and VM instructions.
-  3. ViteX decentralized exchange support.
+ 1. Dynamic quota acquisition. Quota acquisition from staking will reduce
+    when network traffic rate is too high.
+ 2. Adjustment of quota consumption for some built-in contract transactions
+    and VM instructions.
+ 3. ViteX decentralized exchange support.
 */
 func IsDexUpgrade(sHeight uint64) bool {
 	assertUpgradeNotNil()
@@ -128,9 +128,9 @@ func IsDexFeeUpgrade(sHeight uint64) bool {
 IsStemUpgrade checks whether current snapshot block height is over stem hard fork.
 Vite pre-mainnet hard forks at snapshot block height 8403110.
 Features:
-  1. Capability of placing/cancelling orders via delegation.
-  2. Super VIP membership. Stake and then enjoy zero trading fee!
-     (Additional operator fee cannot be exempted)
+ 1. Capability of placing/cancelling orders via delegation.
+ 2. Super VIP membership. Stake and then enjoy zero trading fee!
+    (Additional operator fee cannot be exempted)
 */
 func IsStemUpgrade(sHeight uint64) bool {
 	assertUpgradeNotNil()
@@ -181,7 +181,12 @@ func IsVersion12Upgrade(sHeight uint64) bool {
 	return upgrade.isActive(12, sHeight)
 }
 
-func IsVersionXUpgrade(sHeight uint64) bool {
+func IsVersion13Upgrade(sHeight uint64) bool {
 	assertUpgradeNotNil()
 	return upgrade.isActive(13, sHeight)
 }
+
+func IsVersionXUpgrade(sHeight uint64) bool {
+	assertUpgradeNotNil()
+	return upgrade.isActive(14, sHeight)
+}

common/upgrade/upgrade_init.go

@@ -55,6 +55,10 @@ func NewLatestUpgradeBox() *upgradeBox {
 			Height:  1,
 			Version: 13,
 		},
+		{
+			Height:  1,
+			Version: 14,
+		},
 	})
 }
 
@@ -120,10 +124,15 @@ func NewMainnetUpgradeBox() *upgradeBox {
 			Height:  116480000,
 			Version: 12,
 		},
+		{
+			Name:    "Version13",
+			Height:  166869900,
+			Version: 13,
+		},
 		{
 			Name:    "VersionX",
 			Height:  EndlessHeight,
-			Version: 13,
+			Version: 14,
 		},
 	})
 }

common/upgrade/upgrade_test.go

@@ -76,6 +76,10 @@ func TestMainnetUpgradeBox(t *testing.T) {
 			IsVersion12Upgrade,
 			116480000,
 		},
+		{
+			IsVersion13Upgrade,
+			166869900,
+		},
 		{
 			IsVersionXUpgrade,
 			EndlessHeight,
@@ -84,7 +88,7 @@ func TestMainnetUpgradeBox(t *testing.T) {
 	for _, ele := range cases {
 		testUpgradePoint(t, ele.fc, ele.sHeight)
 	}
-	assert.Equal(t, (int)(GetLatestPoint().Version), 12)
+	assert.Equal(t, (int)(GetLatestPoint().Version), 13)
 }
 
 func TestLatestUpgradeBox(t *testing.T) {
@@ -144,6 +148,10 @@ func TestLatestUpgradeBox(t *testing.T) {
 			IsVersion12Upgrade,
 			1,
 		},
+		{
+			IsVersion13Upgrade,
+			1,
+		},
 		{
 			IsVersionXUpgrade,
 			1,

ledger/pool/account_pool.go

@@ -90,6 +90,10 @@ func (accB *accountPoolBlock) Owner() *types.Address {
 	return &accB.block.AccountAddress
 }
 
+func (accB accountPoolBlock) Ready() bool {
+	return true
+}
+
 func newAccountPool(name string, rw *accountCh, v *common.Version, hashBlacklist Blacklist, log log15.Logger) *accountPool {
 	pool := &accountPool{}
 	pool.ID = name
@@ -109,11 +113,12 @@ func (accP *accountPool) Init(
 	accP.BCPool.init(tools)
 }
 
-/**
-1. compact for data
-	1.1. free blocks
-	1.2. snippet chain
-2. fetch block for snippet chain.
+/*
+*
+ 1. compact for data
+    1.1. free blocks
+    1.2. snippet chain
+ 2. fetch block for snippet chain.
 */
 func (accP *accountPool) Compact() int {
 	accP.chainHeadMu.Lock()
@@ -124,7 +129,7 @@ func (accP *accountPool) Compact() int {
 
 	defer monitor.LogTime("pool", "accountSnippet", now)
 	accP.loopTime = now
-	sum = sum + accP.loopGenSnippetChains()
+	sum = sum + accP.loopGenSnippetChains(false)
 	sum = sum + accP.loopAppendChains()
 
 	if now.After(accP.loopFetchTime.Add(time.Millisecond * 200)) {
@@ -137,7 +142,8 @@ func (accP *accountPool) Compact() int {
 	return sum
 }
 
-/**
+/*
+*
 try insert block to real chain.
 */
 func (accP *accountPool) pendingAccountTo(h *ledger.HashHeight, sHeight uint64) (*ledger.HashHeight, error) {

ledger/pool/bc_pool.go

@@ -329,7 +329,7 @@ func (a ByTailHeight) Len() int           { return len(a) }
 func (a ByTailHeight) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a ByTailHeight) Less(i, j int) bool { return a[i].tailHeight < a[j].tailHeight }
 
-func (bcp *BCPool) loopGenSnippetChains() int {
+func (bcp *BCPool) loopGenSnippetChains(readyFilter bool) int {
 	if len(bcp.blockpool.freeBlocks) == 0 {
 		return 0
 	}
@@ -343,6 +343,11 @@ func (bcp *BCPool) loopGenSnippetChains() int {
 	chains := copyMap(bcp.chainpool.snippetChains)
 
 	for _, v := range sortPending {
+		if readyFilter {
+			if !v.Ready() {
+				continue
+			}
+		}
 		if !tryInsert(chains, v) {
 			snippet := newSnippetChain(v, bcp.chainpool.genChainID())
 			chains = append(chains, snippet)
@@ -504,7 +509,7 @@ func (bcp *BCPool) CurrentChain() tree.Branch {
 
 func (bcp *BCPool) loop() {
 	for {
-		bcp.loopGenSnippetChains()
+		bcp.loopGenSnippetChains(false)
 		bcp.loopAppendChains()
 		bcp.loopFetchForSnippets()
 		time.Sleep(time.Second)

ledger/pool/mock_common_block.go

@@ -95,6 +95,10 @@ func (*mockCommonBlock) ReferHashes() ([]types.Hash, []types.Hash, *types.Hash)
 	panic("implement me")
 }
 
+func (mockCommonBlock) Ready() bool {
+	return true
+}
+
 func (m mockCommonBlock) computeHash() types.Hash {
 	var source []byte
 	// PrevHash

ledger/pool/pool.go

@@ -89,6 +89,7 @@ type commonBlock interface {
 	Latency() time.Duration
 	ShouldFetch() bool
 	ReferHashes() ([]types.Hash, []types.Hash, *types.Hash)
+	Ready() bool
 }
 
 func newForkBlock(v *common.Version, source types.BlockSource) *forkBlock {

ledger/pool/snapshot_pool.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/vitelabs/go-vite/v2/common"
 	"github.com/vitelabs/go-vite/v2/common/types"
+	"github.com/vitelabs/go-vite/v2/common/upgrade"
 	ledger "github.com/vitelabs/go-vite/v2/interfaces/core"
 	"github.com/vitelabs/go-vite/v2/ledger/pool/batch"
 	"github.com/vitelabs/go-vite/v2/ledger/pool/tree"
@@ -78,6 +79,14 @@ func (sb *snapshotPoolBlock) Owner() *types.Address {
 	return nil
 }
 
+func (sb snapshotPoolBlock) Ready() bool {
+	// If a block comes from the future with a maximum error of one second, then it is illegal.
+	if sb.block.Timestamp.After(time.Now().Add(time.Second)) {
+		return false
+	}
+	return true
+}
+
 func newSnapshotPool(
 	name string,
 	version *common.Version,
@@ -218,7 +227,8 @@ func (sp *snapshotPool) loopCompactSnapshot() int {
 	sp.chainHeadMu.Lock()
 	defer sp.chainHeadMu.Unlock()
 	sum := 0
-	sp.loopGenSnippetChains()
+	// Starting from version 13, consider whether the block is ready when filtering.
+	sp.loopGenSnippetChains(upgrade.IsVersion13Upgrade(sp.rw.headSnapshot().Height))
 	sum += sp.loopAppendChains()
 	now := time.Now()
 	if now.After(sp.nextFetchTime) {
@@ -343,49 +353,49 @@ func (sp *snapshotPool) loopFetchForSnapshot() {
 	return
 }
 
-//func (self *snapshotPool) makeQueue(q Package, info *offsetInfo) (uint64, error) {
-//	self.pool.RLock()
-//	defer self.pool.RUnLock()
-//	self.rMu.Lock()
-//	defer self.rMu.Unlock()
+//	func (self *snapshotPool) makeQueue(q Package, info *offsetInfo) (uint64, error) {
+//		self.pool.RLock()
+//		defer self.pool.RUnLock()
+//		self.rMu.Lock()
+//		defer self.rMu.Unlock()
 //
-//	cp := self.chainpool
-//	current := cp.current
+//		cp := self.chainpool
+//		current := cp.current
 //
-//	if info.offset == nil {
-//		info.offset = &ledger.HashHeight{Hash: current.tailHash, Height: current.tailHeight}
-//	} else {
-//		block := current.getBlock(info.offset.Height+1, false)
-//		if block == nil || block.PrevHash() != info.offset.Hash {
-//			return uint64(0), errors.New("current chain modify.")
+//		if info.offset == nil {
+//			info.offset = &ledger.HashHeight{Hash: current.tailHash, Height: current.tailHeight}
+//		} else {
+//			block := current.getBlock(info.offset.Height+1, false)
+//			if block == nil || block.PrevHash() != info.offset.Hash {
+//				return uint64(0), errors.New("current chain modify.")
+//			}
 //		}
-//	}
 //
-//	minH := info.offset.Height + 1
-//	headH := current.headHeight
-//	for i := minH; i <= headH; i++ {
-//		block := self.getCurrentBlock(i)
-//		if block == nil {
-//			return uint64(i - minH), errors.New("current chain modify")
-//		}
+//		minH := info.offset.Height + 1
+//		headH := current.headHeight
+//		for i := minH; i <= headH; i++ {
+//			block := self.getCurrentBlock(i)
+//			if block == nil {
+//				return uint64(i - minH), errors.New("current chain modify")
+//			}
 //
-//		if self.hashBlacklist.Exists(block.Hash()) {
-//			return uint64(i - minH), errors.New("block in blacklist")
-//		}
+//			if self.hashBlacklist.Exists(block.Hash()) {
+//				return uint64(i - minH), errors.New("block in blacklist")
+//			}
 //
-//		item := NewItem(block, nil)
+//			item := NewItem(block, nil)
 //
-//		err := q.AddItem(item)
-//		if err != nil {
-//			return uint64(i - minH), err
+//			err := q.AddItem(item)
+//			if err != nil {
+//				return uint64(i - minH), err
+//			}
+//			info.offset.Hash = item.Hash()
+//			info.offset.Height = item.Height()
 //		}
-//		info.offset.Hash = item.Hash()
-//		info.offset.Height = item.Height()
-//	}
 //
-//	return uint64(headH - minH), errors.New("all in")
+//		return uint64(headH - minH), errors.New("all in")
 //
-//}
+// }
 func (sp *snapshotPool) getCurrentBlock(i uint64) *snapshotPoolBlock {
 	b := sp.CurrentChain().GetKnot(i, false)
 	if b != nil {
@@ -394,16 +404,16 @@ func (sp *snapshotPool) getCurrentBlock(i uint64) *snapshotPoolBlock {
 	return nil
 }
 
-//func (self *snapshotPool) getPendingForCurrent() ([]commonBlock, error) {
-//	begin := self.chainpool.current.tailHeight + 1
-//	blocks := self.chainpool.getCurrentBlocks(begin, begin+10)
-//	err := self.checkChain(blocks)
-//	if err != nil {
-//		return nil, err
-//	}
+//	func (self *snapshotPool) getPendingForCurrent() ([]commonBlock, error) {
+//		begin := self.chainpool.current.tailHeight + 1
+//		blocks := self.chainpool.getCurrentBlocks(begin, begin+10)
+//		err := self.checkChain(blocks)
+//		if err != nil {
+//			return nil, err
+//		}
 //
-//	return blocks, nil
-//}
+//		return blocks, nil
+//	}
 func (sp *snapshotPool) fetchAccounts(accounts map[types.Address]*ledger.HashHeight, sHeight uint64, sHash types.Hash) {
 	for addr, hashH := range accounts {
 		ac := sp.pool.selfPendingAc(addr)