diff --git a/core/chain_makers.go b/core/chain_makers.go index ef680f8d27..ddcf9814ee 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -122,16 +122,14 @@ func (b *BlockGen) addTx(bc *BlockChain, vmConfig vm.Config, tx *types.Transacti var ( blockContext = NewEVMBlockContext(b.header, bc, &b.header.Coinbase) evm = vm.NewEVM(blockContext, b.statedb, b.cm.config, vmConfig) - gasPool = b.gasPool gasUsed = &b.header.GasUsed ) // Berachain: PoL txs do not count towards block gas. if tx.Type() == types.PoLTxType { - gasPool = new(GasPool).AddGas(params.PoLTxGasLimit) gasUsed = new(uint64) } b.statedb.SetTxContext(tx.Hash(), len(b.txs)) - receipt, err := ApplyTransaction(evm, gasPool, b.statedb, b.header, tx, gasUsed) + receipt, err := ApplyTransaction(evm, b.gasPool, b.statedb, b.header, tx, gasUsed) if err != nil { panic(err) } diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index fc8143ecdb..2bc030cfae 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1249,11 +1249,7 @@ func AccessList(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrH if err != nil { return nil, 0, nil, fmt.Errorf( "failed to apply transaction: %v err: %v", - args.ToTransaction( - types.LegacyTxType, - b.ChainConfig().IsPrague1(header.Number, header.Time), - b.ChainConfig().Berachain.Prague1.PoLDistributorAddress, - ).Hash(), + args.ToTransaction(types.LegacyTxType, isPrague1, distributorAddress).Hash(), err, ) } diff --git a/params/config.go b/params/config.go index 6e10404a39..7855271be3 100644 --- a/params/config.go +++ b/params/config.go @@ -193,9 +193,9 @@ var ( }, Berachain: BerachainConfig{ Prague1: Prague1Config{ - Time: newUint64(17446744073709551614), - MinimumBaseFeeWei: 1000000000, // 1 gwei - BaseFeeChangeDenominator: 48, // 6x increase from the default + Time: newUint64(17446744073709551614), // TODO: set mainnet timestamp. + MinimumBaseFeeWei: 10000000000, // 10 gwei + BaseFeeChangeDenominator: 48, // 6x increase from the default }, }, } @@ -231,8 +231,8 @@ var ( Berachain: BerachainConfig{ Prague1: Prague1Config{ Time: newUint64(1754496000), - MinimumBaseFeeWei: 1000000000, // 1 gwei - BaseFeeChangeDenominator: 48, // 6x increase from the default + MinimumBaseFeeWei: 10000000000, // 10 gwei + BaseFeeChangeDenominator: 48, // 6x increase from the default }, }, }