mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-30 00:23:46 +00:00
Merge branch 'ethereum:master' into portal
This commit is contained in:
Chen Kai
GitHub
commit
c2bef98ad5
5 changed files with 109 additions and 75 deletions
|
|
@ -17,12 +17,9 @@
|
|||
package core
|
||||
|
||||
import (
|
||||
crand "crypto/rand"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math"
|
||||
"math/big"
|
||||
mrand "math/rand"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
|
|
@ -43,45 +40,41 @@ const (
|
|||
numberCacheLimit = 2048
|
||||
)
|
||||
|
||||
// HeaderChain implements the basic block header chain logic that is shared by
|
||||
// core.BlockChain and light.LightChain. It is not usable in itself, only as
|
||||
// a part of either structure.
|
||||
// HeaderChain implements the basic block header chain logic. It is not usable
|
||||
// in itself, but rather an internal structure of core.Blockchain.
|
||||
//
|
||||
// HeaderChain is responsible for maintaining the header chain including the
|
||||
// header query and updating.
|
||||
//
|
||||
// The components maintained by headerchain includes: (1) total difficulty
|
||||
// (2) header (3) block hash -> number mapping (4) canonical number -> hash mapping
|
||||
// and (5) head header flag.
|
||||
// The data components maintained by HeaderChain include:
|
||||
//
|
||||
// It is not thread safe either, the encapsulating chain structures should do
|
||||
// the necessary mutex locking/unlocking.
|
||||
// - total difficulty
|
||||
// - header
|
||||
// - block hash -> number mapping
|
||||
// - canonical number -> hash mapping
|
||||
// - head header flag.
|
||||
//
|
||||
// It is not thread safe, the encapsulating chain structures should do the
|
||||
// necessary mutex locking/unlocking.
|
||||
type HeaderChain struct {
|
||||
config *params.ChainConfig
|
||||
chainDb ethdb.Database
|
||||
genesisHeader *types.Header
|
||||
|
||||
currentHeader atomic.Value // Current head of the header chain (may be above the block chain!)
|
||||
currentHeaderHash common.Hash // Hash of the current head of the header chain (prevent recomputing all the time)
|
||||
currentHeader atomic.Pointer[types.Header] // Current head of the header chain (maybe above the block chain!)
|
||||
currentHeaderHash common.Hash // Hash of the current head of the header chain (prevent recomputing all the time)
|
||||
|
||||
headerCache *lru.Cache[common.Hash, *types.Header]
|
||||
tdCache *lru.Cache[common.Hash, *big.Int] // most recent total difficulties
|
||||
numberCache *lru.Cache[common.Hash, uint64] // most recent block numbers
|
||||
|
||||
procInterrupt func() bool
|
||||
|
||||
rand *mrand.Rand
|
||||
engine consensus.Engine
|
||||
engine consensus.Engine
|
||||
}
|
||||
|
||||
// NewHeaderChain creates a new HeaderChain structure. ProcInterrupt points
|
||||
// to the parent's interrupt semaphore.
|
||||
func NewHeaderChain(chainDb ethdb.Database, config *params.ChainConfig, engine consensus.Engine, procInterrupt func() bool) (*HeaderChain, error) {
|
||||
// Seed a fast but crypto originating random generator
|
||||
seed, err := crand.Int(crand.Reader, big.NewInt(math.MaxInt64))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hc := &HeaderChain{
|
||||
config: config,
|
||||
chainDb: chainDb,
|
||||
|
|
@ -89,7 +82,6 @@ func NewHeaderChain(chainDb ethdb.Database, config *params.ChainConfig, engine c
|
|||
tdCache: lru.NewCache[common.Hash, *big.Int](tdCacheLimit),
|
||||
numberCache: lru.NewCache[common.Hash, uint64](numberCacheLimit),
|
||||
procInterrupt: procInterrupt,
|
||||
rand: mrand.New(mrand.NewSource(seed.Int64())),
|
||||
engine: engine,
|
||||
}
|
||||
hc.genesisHeader = hc.GetHeaderByNumber(0)
|
||||
|
|
@ -525,7 +517,7 @@ func (hc *HeaderChain) GetCanonicalHash(number uint64) common.Hash {
|
|||
// CurrentHeader retrieves the current head header of the canonical chain. The
|
||||
// header is retrieved from the HeaderChain's internal cache.
|
||||
func (hc *HeaderChain) CurrentHeader() *types.Header {
|
||||
return hc.currentHeader.Load().(*types.Header)
|
||||
return hc.currentHeader.Load()
|
||||
}
|
||||
|
||||
// SetCurrentHeader sets the in-memory head header marker of the canonical chan
|
||||
|
|
|
|||
|
|
@ -49,83 +49,86 @@ type PrecompiledContract interface {
|
|||
// PrecompiledContractsHomestead contains the default set of pre-compiled Ethereum
|
||||
// contracts used in the Frontier and Homestead releases.
|
||||
var PrecompiledContractsHomestead = map[common.Address]PrecompiledContract{
|
||||
common.BytesToAddress([]byte{1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{0x1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{0x2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{0x3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{0x4}): &dataCopy{},
|
||||
}
|
||||
|
||||
// PrecompiledContractsByzantium contains the default set of pre-compiled Ethereum
|
||||
// contracts used in the Byzantium release.
|
||||
var PrecompiledContractsByzantium = map[common.Address]PrecompiledContract{
|
||||
common.BytesToAddress([]byte{1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{5}): &bigModExp{eip2565: false},
|
||||
common.BytesToAddress([]byte{6}): &bn256AddByzantium{},
|
||||
common.BytesToAddress([]byte{7}): &bn256ScalarMulByzantium{},
|
||||
common.BytesToAddress([]byte{8}): &bn256PairingByzantium{},
|
||||
common.BytesToAddress([]byte{0x1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{0x2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{0x3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{0x4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{0x5}): &bigModExp{eip2565: false},
|
||||
common.BytesToAddress([]byte{0x6}): &bn256AddByzantium{},
|
||||
common.BytesToAddress([]byte{0x7}): &bn256ScalarMulByzantium{},
|
||||
common.BytesToAddress([]byte{0x8}): &bn256PairingByzantium{},
|
||||
}
|
||||
|
||||
// PrecompiledContractsIstanbul contains the default set of pre-compiled Ethereum
|
||||
// contracts used in the Istanbul release.
|
||||
var PrecompiledContractsIstanbul = map[common.Address]PrecompiledContract{
|
||||
common.BytesToAddress([]byte{1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{5}): &bigModExp{eip2565: false},
|
||||
common.BytesToAddress([]byte{6}): &bn256AddIstanbul{},
|
||||
common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
|
||||
common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
|
||||
common.BytesToAddress([]byte{9}): &blake2F{},
|
||||
common.BytesToAddress([]byte{0x1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{0x2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{0x3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{0x4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{0x5}): &bigModExp{eip2565: false},
|
||||
common.BytesToAddress([]byte{0x6}): &bn256AddIstanbul{},
|
||||
common.BytesToAddress([]byte{0x7}): &bn256ScalarMulIstanbul{},
|
||||
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
|
||||
common.BytesToAddress([]byte{0x9}): &blake2F{},
|
||||
}
|
||||
|
||||
// PrecompiledContractsBerlin contains the default set of pre-compiled Ethereum
|
||||
// contracts used in the Berlin release.
|
||||
var PrecompiledContractsBerlin = map[common.Address]PrecompiledContract{
|
||||
common.BytesToAddress([]byte{1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{5}): &bigModExp{eip2565: true},
|
||||
common.BytesToAddress([]byte{6}): &bn256AddIstanbul{},
|
||||
common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
|
||||
common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
|
||||
common.BytesToAddress([]byte{9}): &blake2F{},
|
||||
common.BytesToAddress([]byte{0x1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{0x2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{0x3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{0x4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{0x5}): &bigModExp{eip2565: true},
|
||||
common.BytesToAddress([]byte{0x6}): &bn256AddIstanbul{},
|
||||
common.BytesToAddress([]byte{0x7}): &bn256ScalarMulIstanbul{},
|
||||
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
|
||||
common.BytesToAddress([]byte{0x9}): &blake2F{},
|
||||
}
|
||||
|
||||
// PrecompiledContractsCancun contains the default set of pre-compiled Ethereum
|
||||
// contracts used in the Cancun release.
|
||||
var PrecompiledContractsCancun = map[common.Address]PrecompiledContract{
|
||||
common.BytesToAddress([]byte{1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{5}): &bigModExp{eip2565: true},
|
||||
common.BytesToAddress([]byte{6}): &bn256AddIstanbul{},
|
||||
common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
|
||||
common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
|
||||
common.BytesToAddress([]byte{9}): &blake2F{},
|
||||
common.BytesToAddress([]byte{0x0a}): &kzgPointEvaluation{},
|
||||
common.BytesToAddress([]byte{0x1}): &ecrecover{},
|
||||
common.BytesToAddress([]byte{0x2}): &sha256hash{},
|
||||
common.BytesToAddress([]byte{0x3}): &ripemd160hash{},
|
||||
common.BytesToAddress([]byte{0x4}): &dataCopy{},
|
||||
common.BytesToAddress([]byte{0x5}): &bigModExp{eip2565: true},
|
||||
common.BytesToAddress([]byte{0x6}): &bn256AddIstanbul{},
|
||||
common.BytesToAddress([]byte{0x7}): &bn256ScalarMulIstanbul{},
|
||||
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
|
||||
common.BytesToAddress([]byte{0x9}): &blake2F{},
|
||||
common.BytesToAddress([]byte{0xa}): &kzgPointEvaluation{},
|
||||
}
|
||||
|
||||
// PrecompiledContractsBLS contains the set of pre-compiled Ethereum
|
||||
// contracts specified in EIP-2537. These are exported for testing purposes.
|
||||
var PrecompiledContractsBLS = map[common.Address]PrecompiledContract{
|
||||
common.BytesToAddress([]byte{11}): &bls12381G1Add{},
|
||||
common.BytesToAddress([]byte{12}): &bls12381G1Mul{},
|
||||
common.BytesToAddress([]byte{13}): &bls12381G1MultiExp{},
|
||||
common.BytesToAddress([]byte{14}): &bls12381G2Add{},
|
||||
common.BytesToAddress([]byte{15}): &bls12381G2Mul{},
|
||||
common.BytesToAddress([]byte{16}): &bls12381G2MultiExp{},
|
||||
common.BytesToAddress([]byte{17}): &bls12381Pairing{},
|
||||
common.BytesToAddress([]byte{18}): &bls12381MapG1{},
|
||||
common.BytesToAddress([]byte{19}): &bls12381MapG2{},
|
||||
// PrecompiledContractsPrague contains the set of pre-compiled Ethereum
|
||||
// contracts used in the Prague release.
|
||||
var PrecompiledContractsPrague = map[common.Address]PrecompiledContract{
|
||||
common.BytesToAddress([]byte{0x0b}): &bls12381G1Add{},
|
||||
common.BytesToAddress([]byte{0x0c}): &bls12381G1Mul{},
|
||||
common.BytesToAddress([]byte{0x0d}): &bls12381G1MultiExp{},
|
||||
common.BytesToAddress([]byte{0x0e}): &bls12381G2Add{},
|
||||
common.BytesToAddress([]byte{0x0f}): &bls12381G2Mul{},
|
||||
common.BytesToAddress([]byte{0x10}): &bls12381G2MultiExp{},
|
||||
common.BytesToAddress([]byte{0x11}): &bls12381Pairing{},
|
||||
common.BytesToAddress([]byte{0x12}): &bls12381MapG1{},
|
||||
common.BytesToAddress([]byte{0x13}): &bls12381MapG2{},
|
||||
}
|
||||
|
||||
var PrecompiledContractsBLS = PrecompiledContractsPrague
|
||||
|
||||
var (
|
||||
PrecompiledAddressesPrague []common.Address
|
||||
PrecompiledAddressesCancun []common.Address
|
||||
PrecompiledAddressesBerlin []common.Address
|
||||
PrecompiledAddressesIstanbul []common.Address
|
||||
|
|
@ -149,11 +152,16 @@ func init() {
|
|||
for k := range PrecompiledContractsCancun {
|
||||
PrecompiledAddressesCancun = append(PrecompiledAddressesCancun, k)
|
||||
}
|
||||
for k := range PrecompiledContractsPrague {
|
||||
PrecompiledAddressesPrague = append(PrecompiledAddressesPrague, k)
|
||||
}
|
||||
}
|
||||
|
||||
// ActivePrecompiles returns the precompiles enabled with the current configuration.
|
||||
func ActivePrecompiles(rules params.Rules) []common.Address {
|
||||
switch {
|
||||
case rules.IsPrague:
|
||||
return PrecompiledAddressesPrague
|
||||
case rules.IsCancun:
|
||||
return PrecompiledAddressesCancun
|
||||
case rules.IsBerlin:
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@ type (
|
|||
func (evm *EVM) precompile(addr common.Address) (PrecompiledContract, bool) {
|
||||
var precompiles map[common.Address]PrecompiledContract
|
||||
switch {
|
||||
case evm.chainRules.IsPrague:
|
||||
precompiles = PrecompiledContractsPrague
|
||||
case evm.chainRules.IsCancun:
|
||||
precompiles = PrecompiledContractsCancun
|
||||
case evm.chainRules.IsBerlin:
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@ func (c Config) MarshalTOML() (interface{}, error) {
|
|||
BlobPool blobpool.Config
|
||||
GPO gasprice.Config
|
||||
EnablePreimageRecording bool
|
||||
VMTrace string
|
||||
VMTraceConfig string
|
||||
DocRoot string `toml:"-"`
|
||||
RPCGasCap uint64
|
||||
RPCEVMTimeout time.Duration
|
||||
|
|
@ -91,6 +93,8 @@ func (c Config) MarshalTOML() (interface{}, error) {
|
|||
enc.BlobPool = c.BlobPool
|
||||
enc.GPO = c.GPO
|
||||
enc.EnablePreimageRecording = c.EnablePreimageRecording
|
||||
enc.VMTrace = c.VMTrace
|
||||
enc.VMTraceConfig = c.VMTraceConfig
|
||||
enc.DocRoot = c.DocRoot
|
||||
enc.RPCGasCap = c.RPCGasCap
|
||||
enc.RPCEVMTimeout = c.RPCEVMTimeout
|
||||
|
|
@ -136,6 +140,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
|
|||
BlobPool *blobpool.Config
|
||||
GPO *gasprice.Config
|
||||
EnablePreimageRecording *bool
|
||||
VMTrace *string
|
||||
VMTraceConfig *string
|
||||
DocRoot *string `toml:"-"`
|
||||
RPCGasCap *uint64
|
||||
RPCEVMTimeout *time.Duration
|
||||
|
|
@ -246,6 +252,12 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
|
|||
if dec.EnablePreimageRecording != nil {
|
||||
c.EnablePreimageRecording = *dec.EnablePreimageRecording
|
||||
}
|
||||
if dec.VMTrace != nil {
|
||||
c.VMTrace = *dec.VMTrace
|
||||
}
|
||||
if dec.VMTraceConfig != nil {
|
||||
c.VMTraceConfig = *dec.VMTraceConfig
|
||||
}
|
||||
if dec.DocRoot != nil {
|
||||
c.DocRoot = *dec.DocRoot
|
||||
}
|
||||
|
|
|
|||
|
|
@ -337,6 +337,26 @@ var Forks = map[string]*params.ChainConfig{
|
|||
ShanghaiTime: u64(0),
|
||||
CancunTime: u64(15_000),
|
||||
},
|
||||
"Prague": {
|
||||
ChainID: big.NewInt(1),
|
||||
HomesteadBlock: big.NewInt(0),
|
||||
EIP150Block: big.NewInt(0),
|
||||
EIP155Block: big.NewInt(0),
|
||||
EIP158Block: big.NewInt(0),
|
||||
ByzantiumBlock: big.NewInt(0),
|
||||
ConstantinopleBlock: big.NewInt(0),
|
||||
PetersburgBlock: big.NewInt(0),
|
||||
IstanbulBlock: big.NewInt(0),
|
||||
MuirGlacierBlock: big.NewInt(0),
|
||||
BerlinBlock: big.NewInt(0),
|
||||
LondonBlock: big.NewInt(0),
|
||||
ArrowGlacierBlock: big.NewInt(0),
|
||||
MergeNetsplitBlock: big.NewInt(0),
|
||||
TerminalTotalDifficulty: big.NewInt(0),
|
||||
ShanghaiTime: u64(0),
|
||||
CancunTime: u64(0),
|
||||
PragueTime: u64(0),
|
||||
},
|
||||
}
|
||||
|
||||
// AvailableForks returns the set of defined fork names
|
||||
|
|
|
|||
Loading…
Reference in a new issue