activate Greenland at 8-20-2020 3pm DST (iotexproject#2383)

Author: dustinxie

action/protocol/execution/evm/evm_test.go

@@ -128,11 +128,11 @@ func TestConstantinople(t *testing.T) {
 		// after Greenland
 		{
 			action.EmptyAddress,
-			5553721,
+			6544441,
 		},
 		{
 			"io1pcg2ja9krrhujpazswgz77ss46xgt88afqlk6y",
-			5553721,
+			6544441,
 		},
 	}
 

action/protocol/staking/handlers_test.go

@@ -1957,7 +1957,7 @@ func TestProtocol_HandleConsignmentTransfer(t *testing.T) {
 		// case X: success
 		{
 			identityset.PrivateKey(32).HexString(),
-			5553821,
+			6544441,
 			identityset.Address(1),
 			false,
 			"Ethereum",

blockchain/genesis/genesis.go

@@ -57,7 +57,7 @@ func defaultConfig() Genesis {
 			EasterBlockHeight:       4478761,
 			FbkMigrationBlockHeight: 5157001,
 			FairbankBlockHeight:     5165641,
-			GreenlandBlockHeight:    5553721,
+			GreenlandBlockHeight:    6544441,
 		},
 		Account: Account{
 			InitBalanceMap: make(map[string]string),

config/heightupgrade.go

@@ -31,9 +31,9 @@ type (
 	HeightName int
 
 	// HeightUpgrade lists heights at which certain fixes take effect
-	// prior to Dardanelles, each epoch consists of 360 sub-epochs
+	// prior to Dardanelles, each epoch consists of 360 blocks (10s/block)
 	// so height = 360k + 1
-	// starting Dardanelles, each epoch consists of 720 sub-epochs
+	// starting Dardanelles, each epoch consists of 720 blocks (5s/block)
 	// however, DardanellesHeight is set to 360(2k + 1) + 1 (instead of 720k + 1)
 	// so height afterwards must be set to 360(2k + 1) + 1
 	HeightUpgrade struct {

config/heightupgrade_test.go

@@ -48,8 +48,8 @@ func TestNewHeightChange(t *testing.T) {
 	require.True(hu.IsPost(Fairbank, uint64(5165641)))
 	require.True(hu.IsPre(FbkMigration, uint64(5157000)))
 	require.True(hu.IsPost(FbkMigration, uint64(5157001)))
-	require.True(hu.IsPre(Greenland, uint64(5553720)))
-	require.True(hu.IsPost(Greenland, uint64(5553721)))
+	require.True(hu.IsPre(Greenland, uint64(6544440)))
+	require.True(hu.IsPost(Greenland, uint64(6544441)))
 	require.Panics(func() {
 		hu.IsPost(-1, 0)
 	})
@@ -63,5 +63,5 @@ func TestNewHeightChange(t *testing.T) {
 	require.Equal(hu.EasterBlockHeight(), uint64(4478761))
 	require.Equal(hu.FairbankBlockHeight(), uint64(5165641))
 	require.Equal(hu.FbkMigrationBlockHeight(), uint64(5157001))
-	require.Equal(hu.GreenlandBlockHeight(), uint64(5553721))
+	require.Equal(hu.GreenlandBlockHeight(), uint64(6544441))
 }