cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Add IsNearUpgrade

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera 2020-12-19 21:51:07 +01:00
parent 420888aeae
commit c7e3e9fa7f
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chain/gen/slashfilter/slashfilter.go
View File

@ -28,9 +28,7 @@ func New(dstore ds.Batching) *SlashFilter {
} }
func (f *SlashFilter) MinedBlock(bh *types.BlockHeader, parentEpoch abi.ChainEpoch) error { func (f *SlashFilter) MinedBlock(bh *types.BlockHeader, parentEpoch abi.ChainEpoch) error {
if bh.Height > build.UpgradeOrangeHeight-build.Finality && if build.IsNearUpgrade(bh.Height, build.UpgradeOrangeHeight) {
bh.Height < build.UpgradeOrangeHeight+build.Finality {
// consenssus faults disabled during Upgrade Orange
return nil return nil
} }

6
chain/vm/syscalls.go
View File

@ -109,12 +109,10 @@ func (ss *syscallShim) VerifyConsensusFault(a, b, extra []byte) (*runtime2.Conse
} }
// workaround chain halt // workaround chain halt
if blockA.Height > build.UpgradeOrangeHeight-build.Finality && if build.IsNearUpgrade(blockA.Height, build.UpgradeOrangeHeight) {
blockA.Height < build.UpgradeOrangeHeight+build.Finality {
return nil, xerrors.Errorf("consensus reporting disabled around Upgrade Orange") return nil, xerrors.Errorf("consensus reporting disabled around Upgrade Orange")
} }
if blockB.Height > build.UpgradeOrangeHeight-build.Finality && if build.IsNearUpgrade(blockB.Height, build.UpgradeOrangeHeight) {
blockB.Height < build.UpgradeOrangeHeight+build.Finality {
return nil, xerrors.Errorf("consensus reporting disabled around Upgrade Orange") return nil, xerrors.Errorf("consensus reporting disabled around Upgrade Orange")
} }