add new englishHeight for slashing (iotexproject#1811)

Author: koseoyoung

blockchain/genesis/genesis.go

@@ -53,6 +53,7 @@ func defaultConfig() Genesis {
 			BeringBlockHeight:       1512001,
 			CookBlockHeight:         1641601,
 			DardanellesBlockHeight:  1816201,
+			EnglishBlockHeight:      3000001,
 		},
 		Account: Account{
 			InitBalanceMap: make(map[string]string),
@@ -132,6 +133,8 @@ type (
 		CookBlockHeight uint64 `yaml:"cookHeight"`
 		// DardanellesBlockHeight is the start height of 5s block internal
 		DardanellesBlockHeight uint64 `yaml:"dardanellesHeight"`
+		// EnglishBlockHeight is the start height of kick-out for slashing
+		EnglishBlockHeight uint64 `yaml:englishHeight`
 	}
 	// Account contains the configs for account protocol
 	Account struct {

config/heightupgrade.go

@@ -19,6 +19,7 @@ const (
 	Bering
 	Cook
 	Dardanelles
+	English
 )
 
 type (
@@ -32,6 +33,7 @@ type (
 		beringHeight      uint64
 		cookHeight        uint64
 		dardanellesHeight uint64
+		englishHeight     uint64
 	}
 )
 
@@ -43,6 +45,7 @@ func NewHeightUpgrade(cfg *genesis.Genesis) HeightUpgrade {
 		cfg.BeringBlockHeight,
 		cfg.CookBlockHeight,
 		cfg.DardanellesBlockHeight,
+		cfg.EnglishBlockHeight,
 	}
 }
 
@@ -60,6 +63,8 @@ func (hu *HeightUpgrade) IsPost(name HeightName, height uint64) bool {
 		h = hu.cookHeight
 	case Dardanelles:
 		h = hu.dardanellesHeight
+	case English:
+		h = hu.englishHeight
 	default:
 		log.Panic("invalid height name!")
 	}
@@ -85,3 +90,6 @@ func (hu *HeightUpgrade) CookBlockHeight() uint64 { return hu.cookHeight }
 
 // DardanellesBlockHeight returns the dardanelles height
 func (hu *HeightUpgrade) DardanellesBlockHeight() uint64 { return hu.dardanellesHeight }
+
+// EnglishBlockHeight returns the english height
+func (hu *HeightUpgrade) EnglishBlockHeight() uint64 { return hu.englishHeight }

config/heightupgrade_test.go

@@ -20,6 +20,7 @@ func TestNewHeightChange(t *testing.T) {
 	require.Equal(2, Bering)
 	require.Equal(3, Cook)
 	require.Equal(4, Dardanelles)
+	require.Equal(5, English)
 
 	cfg := Default
 	cfg.Genesis.PacificBlockHeight = uint64(432001)
@@ -35,6 +36,8 @@ func TestNewHeightChange(t *testing.T) {
 	require.True(hu.IsPost(Cook, uint64(1641601)))
 	require.True(hu.IsPre(Dardanelles, uint64(1816200)))
 	require.True(hu.IsPost(Dardanelles, uint64(1816201)))
+	require.True(hu.IsPre(English, uint64(3000000)))
+	require.True(hu.IsPost(English, uint64(3000001)))
 	require.Panics(func() {
 		hu.IsPost(-1, 0)
 	})
@@ -44,5 +47,6 @@ func TestNewHeightChange(t *testing.T) {
 	require.Equal(hu.BeringBlockHeight(), uint64(1512001))
 	require.Equal(hu.CookBlockHeight(), uint64(1641601))
 	require.Equal(hu.DardanellesBlockHeight(), uint64(1816201))
+	require.Equal(hu.EnglishBlockHeight(), uint64(3000001))
 
 }