Skip to content

Commit 72e4742

Browse files
authored
[staking] set fairbank height to around June 01 3pm (iotexproject#2166)
* [staking] set fairbank height to around June 01 3pm
1 parent 2afb7b4 commit 72e4742

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

action/protocol/rewarding/protocol_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,16 @@ func TestProtocol_Handle(t *testing.T) {
280280
sm.EXPECT().Snapshot().Return(1).AnyTimes()
281281
sm.EXPECT().Revert(gomock.Any()).Return(nil).AnyTimes()
282282

283+
cfg.Genesis.NumSubEpochs = 15
283284
rp := rolldpos.NewProtocol(
284285
cfg.Genesis.NumCandidateDelegates,
285286
cfg.Genesis.NumDelegates,
286287
cfg.Genesis.NumSubEpochs,
288+
rolldpos.EnableDardanellesSubEpoch(cfg.Genesis.DardanellesBlockHeight, cfg.Genesis.DardanellesNumSubEpochs),
287289
)
290+
require.Equal(t, cfg.Genesis.FairbankBlockHeight, rp.GetEpochHeight(cfg.Genesis.FoundationBonusP2StartEpoch))
291+
require.Equal(t, cfg.Genesis.FoundationBonusP2StartEpoch, rp.GetEpochNum(cfg.Genesis.FairbankBlockHeight))
292+
require.Equal(t, cfg.Genesis.FoundationBonusP2EndEpoch, cfg.Genesis.FoundationBonusP2StartEpoch+24*365)
288293
require.NoError(t, rp.Register(registry))
289294
pp := poll.NewLifeLongDelegatesProtocol(cfg.Genesis.Delegates)
290295
require.NoError(t, pp.Register(registry))

blockchain/genesis/genesis.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ func defaultConfig() Genesis {
5555
DardanellesBlockHeight: 1816201,
5656
DaytonaBlockHeight: 3238921,
5757
EasterBlockHeight: 4478761,
58-
FbkMigrationBlockHeight: 4330441,
59-
FairbankBlockHeight: 4339081,
58+
FbkMigrationBlockHeight: 5157001,
59+
FairbankBlockHeight: 5165641,
6060
},
6161
Account: Account{
6262
InitBalanceMap: make(map[string]string),
6363
},
6464
Poll: Poll{
6565
PollMode: "nativeMix",
6666
EnableGravityChainVoting: true,
67-
GravityChainCeilingHeight: 19937937, // TODO: replace with accurate height before Fairbank launch
67+
GravityChainCeilingHeight: 10199000,
6868
ProbationEpochPeriod: 6,
6969
ProbationIntensityRate: 90,
7070
UnproductiveDelegateMaxCacheSize: 20,
@@ -80,8 +80,8 @@ func defaultConfig() Genesis {
8080
FoundationBonusStr: unit.ConvertIotxToRau(80).String(),
8181
NumDelegatesForFoundationBonus: 36,
8282
FoundationBonusLastEpoch: 8760,
83-
FoundationBonusP2StartEpoch: 0, // TODO: replace with fair bank epoch
84-
FoundationBonusP2EndEpoch: 0, // TODO: replace with fair bank epoch + 8760
83+
FoundationBonusP2StartEpoch: 9698,
84+
FoundationBonusP2EndEpoch: 18458,
8585
},
8686
Staking: Staking{
8787
VoteWeightCalConsts: VoteWeightCalConsts{

config/heightupgrade_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ func TestNewHeightChange(t *testing.T) {
4343
require.True(hu.IsPost(Daytona, uint64(3238921)))
4444
require.True(hu.IsPre(Easter, uint64(4478760)))
4545
require.True(hu.IsPost(Easter, uint64(4478761)))
46-
require.True(hu.IsPre(Fairbank, uint64(4339080)))
47-
require.True(hu.IsPost(Fairbank, uint64(4339081)))
48-
require.True(hu.IsPre(FbkMigration, uint64(4330440)))
49-
require.True(hu.IsPost(FbkMigration, uint64(4330441)))
46+
require.True(hu.IsPre(Fairbank, uint64(5165640)))
47+
require.True(hu.IsPost(Fairbank, uint64(5165641)))
48+
require.True(hu.IsPre(FbkMigration, uint64(5157000)))
49+
require.True(hu.IsPost(FbkMigration, uint64(5157001)))
5050
require.Panics(func() {
5151
hu.IsPost(-1, 0)
5252
})
@@ -58,6 +58,6 @@ func TestNewHeightChange(t *testing.T) {
5858
require.Equal(hu.DardanellesBlockHeight(), uint64(1816201))
5959
require.Equal(hu.DaytonaBlockHeight(), uint64(3238921))
6060
require.Equal(hu.EasterBlockHeight(), uint64(4478761))
61-
require.Equal(hu.FairbankBlockHeight(), uint64(4339081))
62-
require.Equal(hu.FbkMigrationBlockHeight(), uint64(4330441))
61+
require.Equal(hu.FairbankBlockHeight(), uint64(5165641))
62+
require.Equal(hu.FbkMigrationBlockHeight(), uint64(5157001))
6363
}

0 commit comments

Comments
 (0)