Skip to content

Commit 6fcb716

Browse files
committed
[genesis] set Newfoundland to activate at 05-30-2022 11pm UTC (#3396)
1 parent ae35d37 commit 6fcb716

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

blockchain/genesis/genesis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func defaultConfig() Genesis {
6868
KamchatkaBlockHeight: 13816441,
6969
LordHoweBlockHeight: 13979161,
7070
MidwayBlockHeight: 16509241,
71-
NewfoundlandBlockHeight: 36509241,
71+
NewfoundlandBlockHeight: 17662681,
7272
ToBeEnabledBlockHeight: math.MaxUint64,
7373
},
7474
Account: Account{

blockchain/genesis/heightupgrade_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ func TestNewHeightChange(t *testing.T) {
5050
require.True(cfg.IsLordHowe(uint64(13979161)))
5151
require.False(cfg.IsMidway(uint64(16509240)))
5252
require.True(cfg.IsMidway(uint64(16509241)))
53-
require.False(cfg.IsNewfoundland(uint64(36509240)))
54-
require.True(cfg.IsNewfoundland(uint64(36509241)))
53+
require.False(cfg.IsNewfoundland(uint64(17662680)))
54+
require.True(cfg.IsNewfoundland(uint64(17662681)))
5555

5656
require.Equal(cfg.PacificBlockHeight, uint64(432001))
5757
require.Equal(cfg.AleutianBlockHeight, uint64(864001))
@@ -69,5 +69,5 @@ func TestNewHeightChange(t *testing.T) {
6969
require.Equal(cfg.KamchatkaBlockHeight, uint64(13816441))
7070
require.Equal(cfg.LordHoweBlockHeight, uint64(13979161))
7171
require.Equal(cfg.MidwayBlockHeight, uint64(16509241))
72-
require.Equal(cfg.NewfoundlandBlockHeight, uint64(36509241))
72+
require.Equal(cfg.NewfoundlandBlockHeight, uint64(17662681))
7373
}

ioctl/util/util.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,9 @@ func AliasIsHdwalletKey(addressOrAlias string) bool {
226226
// IsNewfoundland returns whether the height passed NewfoundlandHeight
227227
func IsNewfoundland(chainID uint32, h uint64) bool {
228228
var newfoundland uint64 = math.MaxUint64
229-
// TODO: when make next release, update newfoundland to correct HF block number
230229
switch chainID {
231230
case 1:
232-
newfoundland = 20027641
231+
newfoundland = 17662681
233232
case 2:
234233
newfoundland = 14268961
235234
}

ioctl/util/util_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func TestNewfoundland(t *testing.T) {
103103
h uint64
104104
is bool
105105
}{
106-
{1, 20027640, false},
107-
{1, 20027641, true},
106+
{1, 17662680, false},
107+
{1, 17662681, true},
108108
{2, 14268960, false},
109109
{2, 14268961, true},
110110
{3, 1, false},

0 commit comments

Comments
 (0)