gasprice: move policy-based minGasPrice retrieval our of NeoXBurn

AnnaShaleva · AnnaShaleva · commit 47d271238a77 · 2024-07-02T14:14:10.000+03:00
Bug introduced by e427cda. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go
@@ -236,7 +236,7 @@ func (oracle *Oracle) suggestTipCapInternal(ctx context.Context, head *types.Hea
 			return nil, nil, nil, fmt.Errorf("failed to get state at %d to calculate base fee: %w", head.Number.Uint64(), err)
 		}
 		lastBaseFee = eip1559.CalcBaseFeeDBFT(cfg, head, state)
-		if cfg.IsNeoXBurn(head.Number, head.Time) {
+		if cfg.DBFT != nil {
 			lastMinGasTipCap = state.GetState(systemcontracts.PolicyProxyHash, systemcontracts.GetMinGasTipCapStateHash()).Big()
 		} else {
 			lastMinGasTipCap = new(big.Int)

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ func (oracle Oracle) suggestTipCapInternal(ctx context.Context, head types.Hea`
`236`	`236`	`return nil, nil, nil, fmt.Errorf("failed to get state at %d to calculate base fee: %w", head.Number.Uint64(), err)`
`237`	`237`	`}`
`238`	`238`	`lastBaseFee = eip1559.CalcBaseFeeDBFT(cfg, head, state)`
`239`		`- if cfg.IsNeoXBurn(head.Number, head.Time) {`
	`239`	`+ if cfg.DBFT != nil {`
`240`	`240`	`lastMinGasTipCap = state.GetState(systemcontracts.PolicyProxyHash, systemcontracts.GetMinGasTipCapStateHash()).Big()`
`241`	`241`	`} else {`
`242`	`242`	`lastMinGasTipCap = new(big.Int)`