2015-07-07 03:54:22 +03:00
|
|
|
// Copyright 2015 The go-ethereum Authors
|
2015-07-22 19:48:40 +03:00
|
|
|
// This file is part of the go-ethereum library.
|
2015-07-07 03:54:22 +03:00
|
|
|
//
|
2015-07-23 19:35:11 +03:00
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
2015-07-07 03:54:22 +03:00
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
2015-07-22 19:48:40 +03:00
|
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
2015-07-07 03:54:22 +03:00
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2015-07-22 19:48:40 +03:00
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2015-07-07 03:54:22 +03:00
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
2015-07-22 19:48:40 +03:00
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
2015-07-07 03:54:22 +03:00
|
|
|
|
2015-02-27 23:05:03 +02:00
|
|
|
package core
|
|
|
|
|
|
|
|
import (
|
2015-08-18 15:14:45 +03:00
|
|
|
"fmt"
|
2015-03-03 18:55:23 +02:00
|
|
|
"math/big"
|
|
|
|
|
2015-03-16 12:27:38 +02:00
|
|
|
"github.com/ethereum/go-ethereum/common"
|
2017-12-22 15:37:50 +03:00
|
|
|
"github.com/ethereum/go-ethereum/consensus"
|
2017-04-05 01:16:29 +03:00
|
|
|
"github.com/ethereum/go-ethereum/consensus/misc"
|
2015-04-02 00:58:26 +03:00
|
|
|
"github.com/ethereum/go-ethereum/core/state"
|
2015-03-17 00:48:18 +02:00
|
|
|
"github.com/ethereum/go-ethereum/core/types"
|
2016-03-02 00:32:43 +02:00
|
|
|
"github.com/ethereum/go-ethereum/core/vm"
|
2015-09-14 10:35:57 +03:00
|
|
|
"github.com/ethereum/go-ethereum/ethdb"
|
2016-07-14 18:17:03 +03:00
|
|
|
"github.com/ethereum/go-ethereum/params"
|
2015-02-27 23:05:03 +02:00
|
|
|
)
|
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// BlockGen creates blocks for testing.
|
|
|
|
// See GenerateChain for a detailed explanation.
|
|
|
|
type BlockGen struct {
|
2018-11-07 17:07:43 +03:00
|
|
|
i int
|
|
|
|
parent *types.Block
|
|
|
|
chain []*types.Block
|
|
|
|
header *types.Header
|
|
|
|
statedb *state.StateDB
|
2015-06-19 02:57:16 +03:00
|
|
|
|
2015-09-02 13:55:11 +03:00
|
|
|
gasPool *GasPool
|
2015-06-19 02:57:16 +03:00
|
|
|
txs []*types.Transaction
|
|
|
|
receipts []*types.Receipt
|
|
|
|
uncles []*types.Header
|
2016-10-20 14:36:29 +03:00
|
|
|
|
|
|
|
config *params.ChainConfig
|
2017-12-22 15:37:50 +03:00
|
|
|
engine consensus.Engine
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// SetCoinbase sets the coinbase of the generated block.
|
|
|
|
// It can be called at most once.
|
|
|
|
func (b *BlockGen) SetCoinbase(addr common.Address) {
|
2015-09-02 13:55:11 +03:00
|
|
|
if b.gasPool != nil {
|
2015-06-19 02:57:16 +03:00
|
|
|
if len(b.txs) > 0 {
|
|
|
|
panic("coinbase must be set before adding transactions")
|
|
|
|
}
|
|
|
|
panic("coinbase can only be set once")
|
|
|
|
}
|
|
|
|
b.header.Coinbase = addr
|
2015-09-02 13:55:11 +03:00
|
|
|
b.gasPool = new(GasPool).AddGas(b.header.GasLimit)
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// SetExtra sets the extra data field of the generated block.
|
|
|
|
func (b *BlockGen) SetExtra(data []byte) {
|
|
|
|
b.header.Extra = data
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2018-09-10 17:12:39 +03:00
|
|
|
// SetNonce sets the nonce field of the generated block.
|
|
|
|
func (b *BlockGen) SetNonce(nonce types.BlockNonce) {
|
|
|
|
b.header.Nonce = nonce
|
|
|
|
}
|
|
|
|
|
2019-05-10 17:04:10 +03:00
|
|
|
// SetDifficulty sets the difficulty field of the generated block. This method is
|
|
|
|
// useful for Clique tests where the difficulty does not depend on time. For the
|
|
|
|
// ethash tests, please use OffsetTime, which implicitly recalculates the diff.
|
|
|
|
func (b *BlockGen) SetDifficulty(diff *big.Int) {
|
|
|
|
b.header.Difficulty = diff
|
|
|
|
}
|
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// AddTx adds a transaction to the generated block. If no coinbase has
|
|
|
|
// been set, the block's coinbase is set to the zero address.
|
|
|
|
//
|
|
|
|
// AddTx panics if the transaction cannot be executed. In addition to
|
|
|
|
// the protocol-imposed limitations (gas limit, etc.), there are some
|
|
|
|
// further limitations on the content of transactions that can be
|
|
|
|
// added. Notably, contract code relying on the BLOCKHASH instruction
|
|
|
|
// will panic during execution.
|
|
|
|
func (b *BlockGen) AddTx(tx *types.Transaction) {
|
2018-01-29 13:47:08 +03:00
|
|
|
b.AddTxWithChain(nil, tx)
|
|
|
|
}
|
|
|
|
|
|
|
|
// AddTxWithChain adds a transaction to the generated block. If no coinbase has
|
|
|
|
// been set, the block's coinbase is set to the zero address.
|
|
|
|
//
|
|
|
|
// AddTxWithChain panics if the transaction cannot be executed. In addition to
|
|
|
|
// the protocol-imposed limitations (gas limit, etc.), there are some
|
|
|
|
// further limitations on the content of transactions that can be
|
|
|
|
// added. If contract code relies on the BLOCKHASH instruction,
|
|
|
|
// the block in chain will be returned.
|
|
|
|
func (b *BlockGen) AddTxWithChain(bc *BlockChain, tx *types.Transaction) {
|
2015-09-02 13:55:11 +03:00
|
|
|
if b.gasPool == nil {
|
2015-06-19 02:57:16 +03:00
|
|
|
b.SetCoinbase(common.Address{})
|
|
|
|
}
|
2021-06-30 16:17:01 +03:00
|
|
|
b.statedb.Prepare(tx.Hash(), len(b.txs))
|
2019-09-12 22:22:22 +03:00
|
|
|
receipt, err := ApplyTransaction(b.config, bc, &b.header.Coinbase, b.gasPool, b.statedb, b.header, tx, &b.header.GasUsed, vm.Config{})
|
2015-06-19 02:57:16 +03:00
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
b.txs = append(b.txs, tx)
|
|
|
|
b.receipts = append(b.receipts, receipt)
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2021-03-29 21:54:49 +03:00
|
|
|
// GetBalance returns the balance of the given address at the generated block.
|
|
|
|
func (b *BlockGen) GetBalance(addr common.Address) *big.Int {
|
|
|
|
return b.statedb.GetBalance(addr)
|
|
|
|
}
|
|
|
|
|
2019-03-27 19:11:24 +03:00
|
|
|
// AddUncheckedTx forcefully adds a transaction to the block without any
|
|
|
|
// validation.
|
|
|
|
//
|
|
|
|
// AddUncheckedTx will cause consensus failures when used during real
|
|
|
|
// chain processing. This is best used in conjunction with raw block insertion.
|
|
|
|
func (b *BlockGen) AddUncheckedTx(tx *types.Transaction) {
|
|
|
|
b.txs = append(b.txs, tx)
|
|
|
|
}
|
|
|
|
|
2015-12-17 15:13:30 +02:00
|
|
|
// Number returns the block number of the block being generated.
|
|
|
|
func (b *BlockGen) Number() *big.Int {
|
|
|
|
return new(big.Int).Set(b.header.Number)
|
|
|
|
}
|
|
|
|
|
2021-06-15 13:56:14 +03:00
|
|
|
// BaseFee returns the EIP-1559 base fee of the block being generated.
|
|
|
|
func (b *BlockGen) BaseFee() *big.Int {
|
|
|
|
return new(big.Int).Set(b.header.BaseFee)
|
|
|
|
}
|
|
|
|
|
2017-05-11 04:55:48 +03:00
|
|
|
// AddUncheckedReceipt forcefully adds a receipts to the block without a
|
2015-10-12 18:58:51 +03:00
|
|
|
// backing transaction.
|
|
|
|
//
|
2017-05-11 04:55:48 +03:00
|
|
|
// AddUncheckedReceipt will cause consensus failures when used during real
|
2016-03-15 20:08:18 +02:00
|
|
|
// chain processing. This is best used in conjunction with raw block insertion.
|
2015-10-12 18:58:51 +03:00
|
|
|
func (b *BlockGen) AddUncheckedReceipt(receipt *types.Receipt) {
|
2015-10-12 18:54:59 +03:00
|
|
|
b.receipts = append(b.receipts, receipt)
|
|
|
|
}
|
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// TxNonce returns the next valid transaction nonce for the
|
|
|
|
// account at addr. It panics if the account does not exist.
|
|
|
|
func (b *BlockGen) TxNonce(addr common.Address) uint64 {
|
2016-10-04 13:36:02 +03:00
|
|
|
if !b.statedb.Exist(addr) {
|
2015-06-19 02:57:16 +03:00
|
|
|
panic("account does not exist")
|
|
|
|
}
|
|
|
|
return b.statedb.GetNonce(addr)
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// AddUncle adds an uncle header to the generated block.
|
|
|
|
func (b *BlockGen) AddUncle(h *types.Header) {
|
|
|
|
b.uncles = append(b.uncles, h)
|
|
|
|
}
|
2015-06-16 13:41:50 +03:00
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// PrevBlock returns a previously generated block by number. It panics if
|
|
|
|
// num is greater or equal to the number of the block being generated.
|
|
|
|
// For index -1, PrevBlock returns the parent block given to GenerateChain.
|
|
|
|
func (b *BlockGen) PrevBlock(index int) *types.Block {
|
|
|
|
if index >= b.i {
|
2018-11-07 17:07:43 +03:00
|
|
|
panic(fmt.Errorf("block index %d out of range (%d,%d)", index, -1, b.i))
|
2015-06-16 13:41:50 +03:00
|
|
|
}
|
2015-06-19 02:57:16 +03:00
|
|
|
if index == -1 {
|
|
|
|
return b.parent
|
|
|
|
}
|
|
|
|
return b.chain[index]
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2015-09-17 13:32:00 +03:00
|
|
|
// OffsetTime modifies the time instance of a block, implicitly changing its
|
|
|
|
// associated difficulty. It's useful to test scenarios where forking is not
|
|
|
|
// tied to chain length directly.
|
|
|
|
func (b *BlockGen) OffsetTime(seconds int64) {
|
2019-04-02 23:28:48 +03:00
|
|
|
b.header.Time += uint64(seconds)
|
|
|
|
if b.header.Time <= b.parent.Header().Time {
|
2015-09-17 13:32:00 +03:00
|
|
|
panic("block time out of range")
|
|
|
|
}
|
2018-11-07 17:07:43 +03:00
|
|
|
chainreader := &fakeChainReader{config: b.config}
|
2019-04-02 23:28:48 +03:00
|
|
|
b.header.Difficulty = b.engine.CalcDifficulty(chainreader, b.header.Time, b.parent.Header())
|
2015-09-17 13:32:00 +03:00
|
|
|
}
|
|
|
|
|
2015-06-19 02:57:16 +03:00
|
|
|
// GenerateChain creates a chain of n blocks. The first block's
|
|
|
|
// parent will be the provided parent. db is used to store
|
|
|
|
// intermediate states and should contain the parent's state trie.
|
|
|
|
//
|
|
|
|
// The generator function is called with a new block generator for
|
|
|
|
// every block. Any transactions and uncles added to the generator
|
|
|
|
// become part of the block. If gen is nil, the blocks will be empty
|
|
|
|
// and their coinbase will be the zero address.
|
|
|
|
//
|
|
|
|
// Blocks created by GenerateChain do not contain valid proof of work
|
2015-08-31 18:09:50 +03:00
|
|
|
// values. Inserting them into BlockChain requires use of FakePow or
|
2015-06-19 02:57:16 +03:00
|
|
|
// a similar non-validating proof of work implementation.
|
2017-12-22 15:37:50 +03:00
|
|
|
func GenerateChain(config *params.ChainConfig, parent *types.Block, engine consensus.Engine, db ethdb.Database, n int, gen func(int, *BlockGen)) ([]*types.Block, []types.Receipts) {
|
2017-03-02 16:03:33 +03:00
|
|
|
if config == nil {
|
|
|
|
config = params.TestChainConfig
|
|
|
|
}
|
2015-09-30 19:23:31 +03:00
|
|
|
blocks, receipts := make(types.Blocks, n), make([]types.Receipts, n)
|
2018-11-07 17:07:43 +03:00
|
|
|
chainreader := &fakeChainReader{config: config}
|
2017-12-22 15:37:50 +03:00
|
|
|
genblock := func(i int, parent *types.Block, statedb *state.StateDB) (*types.Block, types.Receipts) {
|
2018-11-07 17:07:43 +03:00
|
|
|
b := &BlockGen{i: i, chain: blocks, parent: parent, statedb: statedb, config: config, engine: engine}
|
2019-02-08 12:11:31 +03:00
|
|
|
b.header = makeHeader(chainreader, parent, statedb, b.engine)
|
2017-12-22 15:37:50 +03:00
|
|
|
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 14:23:02 +03:00
|
|
|
// Set the difficulty for clique block. The chain maker doesn't have access
|
|
|
|
// to a chain, so the difficulty will be left unset (nil). Set it here to the
|
|
|
|
// correct value.
|
|
|
|
if b.header.Difficulty == nil {
|
|
|
|
if config.TerminalTotalDifficulty == nil {
|
|
|
|
// Clique chain
|
|
|
|
b.header.Difficulty = big.NewInt(2)
|
|
|
|
} else {
|
|
|
|
// Post-merge chain
|
|
|
|
b.header.Difficulty = big.NewInt(0)
|
|
|
|
}
|
|
|
|
}
|
2016-07-14 18:17:03 +03:00
|
|
|
// Mutate the state and block according to any hard-fork specs
|
|
|
|
if daoBlock := config.DAOForkBlock; daoBlock != nil {
|
|
|
|
limit := new(big.Int).Add(daoBlock, params.DAOForkExtraRange)
|
2017-12-22 15:37:50 +03:00
|
|
|
if b.header.Number.Cmp(daoBlock) >= 0 && b.header.Number.Cmp(limit) < 0 {
|
2016-07-14 18:17:03 +03:00
|
|
|
if config.DAOForkSupport {
|
2017-12-22 15:37:50 +03:00
|
|
|
b.header.Extra = common.CopyBytes(params.DAOForkBlockExtra)
|
2016-07-14 18:17:03 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-12-22 15:37:50 +03:00
|
|
|
if config.DAOForkSupport && config.DAOForkBlock != nil && config.DAOForkBlock.Cmp(b.header.Number) == 0 {
|
2017-04-05 01:16:29 +03:00
|
|
|
misc.ApplyDAOHardFork(statedb)
|
2016-07-14 18:17:03 +03:00
|
|
|
}
|
2018-09-10 17:12:39 +03:00
|
|
|
// Execute any user modifications to the block
|
2015-06-19 02:57:16 +03:00
|
|
|
if gen != nil {
|
|
|
|
gen(i, b)
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
2017-12-22 15:37:50 +03:00
|
|
|
if b.engine != nil {
|
2018-09-10 17:12:39 +03:00
|
|
|
// Finalize and seal the block
|
2019-04-30 16:42:36 +03:00
|
|
|
block, _ := b.engine.FinalizeAndAssemble(chainreader, b.header, statedb, b.txs, b.uncles, b.receipts)
|
2018-09-10 17:12:39 +03:00
|
|
|
|
2017-12-22 15:37:50 +03:00
|
|
|
// Write state changes to db
|
2018-02-05 19:40:32 +03:00
|
|
|
root, err := statedb.Commit(config.IsEIP158(b.header.Number))
|
2017-12-22 15:37:50 +03:00
|
|
|
if err != nil {
|
|
|
|
panic(fmt.Sprintf("state write error: %v", err))
|
|
|
|
}
|
2020-07-13 12:02:54 +03:00
|
|
|
if err := statedb.Database().TrieDB().Commit(root, false, nil); err != nil {
|
2018-02-05 19:40:32 +03:00
|
|
|
panic(fmt.Sprintf("trie write error: %v", err))
|
|
|
|
}
|
2017-12-22 15:37:50 +03:00
|
|
|
return block, b.receipts
|
2015-08-18 15:14:45 +03:00
|
|
|
}
|
2017-12-22 15:37:50 +03:00
|
|
|
return nil, nil
|
2015-06-19 02:57:16 +03:00
|
|
|
}
|
|
|
|
for i := 0; i < n; i++ {
|
2019-08-06 13:40:28 +03:00
|
|
|
statedb, err := state.New(parent.Root(), state.NewDatabase(db), nil)
|
2016-01-11 16:53:06 +02:00
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
2017-12-22 15:37:50 +03:00
|
|
|
block, receipt := genblock(i, parent, statedb)
|
2015-02-27 23:05:03 +02:00
|
|
|
blocks[i] = block
|
2015-09-30 19:23:31 +03:00
|
|
|
receipts[i] = receipt
|
2015-02-27 23:05:03 +02:00
|
|
|
parent = block
|
|
|
|
}
|
2015-09-30 19:23:31 +03:00
|
|
|
return blocks, receipts
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2017-12-22 15:37:50 +03:00
|
|
|
func makeHeader(chain consensus.ChainReader, parent *types.Block, state *state.StateDB, engine consensus.Engine) *types.Header {
|
2019-04-02 23:28:48 +03:00
|
|
|
var time uint64
|
|
|
|
if parent.Time() == 0 {
|
|
|
|
time = 10
|
2015-08-24 03:52:53 +03:00
|
|
|
} else {
|
2019-04-02 23:28:48 +03:00
|
|
|
time = parent.Time() + 10 // block time is fixed at 10 seconds
|
2015-08-24 03:52:53 +03:00
|
|
|
}
|
2021-05-17 16:13:22 +03:00
|
|
|
header := &types.Header{
|
2017-12-22 15:37:50 +03:00
|
|
|
Root: state.IntermediateRoot(chain.Config().IsEIP158(parent.Number())),
|
2015-06-19 02:57:16 +03:00
|
|
|
ParentHash: parent.Hash(),
|
|
|
|
Coinbase: parent.Coinbase(),
|
2019-04-02 23:28:48 +03:00
|
|
|
Difficulty: engine.CalcDifficulty(chain, time, &types.Header{
|
2017-02-02 00:36:51 +03:00
|
|
|
Number: parent.Number(),
|
2019-04-02 23:28:48 +03:00
|
|
|
Time: time - 10,
|
2017-02-02 00:36:51 +03:00
|
|
|
Difficulty: parent.Difficulty(),
|
2017-06-29 13:13:00 +03:00
|
|
|
UncleHash: parent.UncleHash(),
|
2017-02-02 00:36:51 +03:00
|
|
|
}),
|
2021-05-21 10:59:26 +03:00
|
|
|
GasLimit: parent.GasLimit(),
|
2017-02-02 00:36:51 +03:00
|
|
|
Number: new(big.Int).Add(parent.Number(), common.Big1),
|
|
|
|
Time: time,
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-06-02 16:13:10 +03:00
|
|
|
if chain.Config().IsLondon(header.Number) {
|
2021-05-17 16:13:22 +03:00
|
|
|
header.BaseFee = misc.CalcBaseFee(chain.Config(), parent.Header())
|
core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-06-02 16:13:10 +03:00
|
|
|
if !chain.Config().IsLondon(parent.Number()) {
|
2021-08-10 11:28:33 +03:00
|
|
|
parentGasLimit := parent.GasLimit() * params.ElasticityMultiplier
|
|
|
|
header.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
|
core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-06-02 16:13:10 +03:00
|
|
|
}
|
2021-05-17 16:13:22 +03:00
|
|
|
}
|
|
|
|
return header
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
|
|
|
|
2015-09-21 15:36:29 +03:00
|
|
|
// makeHeaderChain creates a deterministic chain of headers rooted at parent.
|
2017-12-22 15:37:50 +03:00
|
|
|
func makeHeaderChain(parent *types.Header, n int, engine consensus.Engine, db ethdb.Database, seed int) []*types.Header {
|
|
|
|
blocks := makeBlockChain(types.NewBlockWithHeader(parent), n, engine, db, seed)
|
2015-09-21 15:36:29 +03:00
|
|
|
headers := make([]*types.Header, len(blocks))
|
|
|
|
for i, block := range blocks {
|
|
|
|
headers[i] = block.Header()
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
2015-09-21 15:36:29 +03:00
|
|
|
return headers
|
2015-02-27 23:05:03 +02:00
|
|
|
}
|
2015-06-19 02:57:16 +03:00
|
|
|
|
2015-09-21 15:36:29 +03:00
|
|
|
// makeBlockChain creates a deterministic chain of blocks rooted at parent.
|
2017-12-22 15:37:50 +03:00
|
|
|
func makeBlockChain(parent *types.Block, n int, engine consensus.Engine, db ethdb.Database, seed int) []*types.Block {
|
|
|
|
blocks, _ := GenerateChain(params.TestChainConfig, parent, engine, db, n, func(i int, b *BlockGen) {
|
2015-06-19 02:57:16 +03:00
|
|
|
b.SetCoinbase(common.Address{0: byte(seed), 19: byte(i)})
|
|
|
|
})
|
2015-09-30 19:23:31 +03:00
|
|
|
return blocks
|
2015-06-19 02:57:16 +03:00
|
|
|
}
|
2018-11-07 17:07:43 +03:00
|
|
|
|
|
|
|
type fakeChainReader struct {
|
2019-11-20 11:53:01 +03:00
|
|
|
config *params.ChainConfig
|
2018-11-07 17:07:43 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Config returns the chain configuration.
|
|
|
|
func (cr *fakeChainReader) Config() *params.ChainConfig {
|
|
|
|
return cr.config
|
|
|
|
}
|
|
|
|
|
|
|
|
func (cr *fakeChainReader) CurrentHeader() *types.Header { return nil }
|
|
|
|
func (cr *fakeChainReader) GetHeaderByNumber(number uint64) *types.Header { return nil }
|
|
|
|
func (cr *fakeChainReader) GetHeaderByHash(hash common.Hash) *types.Header { return nil }
|
|
|
|
func (cr *fakeChainReader) GetHeader(hash common.Hash, number uint64) *types.Header { return nil }
|
|
|
|
func (cr *fakeChainReader) GetBlock(hash common.Hash, number uint64) *types.Block { return nil }
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 14:23:02 +03:00
|
|
|
func (cr *fakeChainReader) GetTd(hash common.Hash, number uint64) *big.Int { return nil }
|