Skip to content

Commit 239a9a3

Browse files
committed
remove FixRewardErroCheckPosition flag
1 parent 64dd415 commit 239a9a3

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

action/protocol/context.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ type (
108108
FixGasAndNonceUpdate bool
109109
FixUnproductiveDelegates bool
110110
CorrectGasRefund bool
111-
FixRewardErroCheckPosition bool
112111
EnableWeb3Rewarding bool
113112
SkipSystemActionNonce bool
114113
}
@@ -245,7 +244,6 @@ func WithFeatureCtx(ctx context.Context) context.Context {
245244
FixGasAndNonceUpdate: g.IsOkhotsk(height),
246245
FixUnproductiveDelegates: g.IsOkhotsk(height),
247246
CorrectGasRefund: g.IsOkhotsk(height),
248-
FixRewardErroCheckPosition: g.IsOkhotsk(height),
249247
EnableWeb3Rewarding: g.IsPalau(height),
250248
SkipSystemActionNonce: g.IsPalau(height),
251249
},

action/protocol/rewarding/reward.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,8 @@ func (p *Protocol) GrantBlockReward(
9797
return nil, nil
9898
}
9999
rewardAddr, err := address.FromString(rewardAddrStr)
100-
fCtx := protocol.MustGetFeatureCtx(ctx)
101-
if fCtx.FixRewardErroCheckPosition {
102-
if err != nil {
103-
return nil, err
104-
}
100+
if err != nil {
101+
return nil, err
105102
}
106103

107104
a := admin{}
@@ -111,11 +108,6 @@ func (p *Protocol) GrantBlockReward(
111108
if err := p.updateAvailableBalance(ctx, sm, a.blockReward); err != nil {
112109
return nil, err
113110
}
114-
if !fCtx.FixRewardErroCheckPosition {
115-
if err != nil {
116-
return nil, err
117-
}
118-
}
119111
if err := p.grantToAccount(ctx, sm, rewardAddr, a.blockReward); err != nil {
120112
return nil, err
121113
}

0 commit comments

Comments
 (0)