forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: schedule DarwinV2 (#1016)

Browse source 
* minor

* feat: schedule DarwinV2
This commit is contained in:
HAOYUatHZ 2024-08-30 08:10:12 +08:00 committed by GitHub
parent 40f425df86
commit 961db0f415
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/blockchain_test.go
View file

@ -4728,6 +4728,7 @@ func TestCurieTransition(t *testing.T) {
json.Unmarshal(b, &config) json.Unmarshal(b, &config)
config.CurieBlock = big.NewInt(2) config.CurieBlock = big.NewInt(2)
config.DarwinTime = nil config.DarwinTime = nil
config.DarwinV2Time = nil
var ( var (
db = rawdb.NewMemoryDatabase() db = rawdb.NewMemoryDatabase()

1
core/state_processor_test.go
View file

@ -67,6 +67,7 @@ func TestStateProcessorErrors(t *testing.T) {
BernoulliBlock: big.NewInt(0), BernoulliBlock: big.NewInt(0),
CurieBlock: big.NewInt(0), CurieBlock: big.NewInt(0),
DarwinTime: new(uint64), DarwinTime: new(uint64),
DarwinV2Time: new(uint64),
} }
signer = types.LatestSigner(config) signer = types.LatestSigner(config)
key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")

1
core/vm/runtime/runtime.go
View file

@ -75,6 +75,7 @@ func setDefaults(cfg *Config) {
BernoulliBlock: new(big.Int), BernoulliBlock: new(big.Int),
CurieBlock: new(big.Int), CurieBlock: new(big.Int),
DarwinTime: new(uint64), DarwinTime: new(uint64),
DarwinV2Time: new(uint64),
} }
} }

3
eth/gasprice/gasprice_test.go
View file

@ -153,11 +153,14 @@ func newTestBackend(t *testing.T, londonBlock *big.Int, pending bool, pendingTxC
config.CurieBlock = londonBlock config.CurieBlock = londonBlock
config.ShanghaiTime = nil config.ShanghaiTime = nil
config.DarwinTime = nil config.DarwinTime = nil
config.DarwinV2Time = nil
if londonBlock != nil { if londonBlock != nil {
shanghaiTime := londonBlock.Uint64() * 12 shanghaiTime := londonBlock.Uint64() * 12
config.ShanghaiTime = &shanghaiTime config.ShanghaiTime = &shanghaiTime
darwinTime := londonBlock.Uint64() * 12 darwinTime := londonBlock.Uint64() * 12
config.DarwinTime = &darwinTime config.DarwinTime = &darwinTime
darwinV2Time := londonBlock.Uint64() * 12
config.DarwinV2Time = &darwinV2Time
} }
config.TerminalTotalDifficulty = common.Big0 config.TerminalTotalDifficulty = common.Big0

3
internal/ethapi/transaction_args_test.go
View file

@ -234,11 +234,14 @@ func newBackendMock() *backendMock {
config.CurieBlock = config.LondonBlock config.CurieBlock = config.LondonBlock
config.ShanghaiTime = nil config.ShanghaiTime = nil
config.DarwinTime = nil config.DarwinTime = nil
config.DarwinV2Time = nil
if config.LondonBlock != nil { if config.LondonBlock != nil {
shanghaiTime := config.LondonBlock.Uint64() * 12 shanghaiTime := config.LondonBlock.Uint64() * 12
config.ShanghaiTime = &shanghaiTime config.ShanghaiTime = &shanghaiTime
darwinTime := config.LondonBlock.Uint64() * 12 darwinTime := config.LondonBlock.Uint64() * 12
config.DarwinTime = &darwinTime config.DarwinTime = &darwinTime
darwinV2Time := config.LondonBlock.Uint64() * 12
config.DarwinV2Time = &darwinV2Time
} }
return &backendMock{ return &backendMock{

2
params/config.go
View file

@ -205,6 +205,7 @@ var (
BernoulliBlock: big.NewInt(3747132), BernoulliBlock: big.NewInt(3747132),
CurieBlock: big.NewInt(4740239), CurieBlock: big.NewInt(4740239),
DarwinTime: newUint64(1723622400), DarwinTime: newUint64(1723622400),
DarwinV2Time: newUint64(1724832000),
Clique: &CliqueConfig{ Clique: &CliqueConfig{
Period: 3, Period: 3,
Epoch: 30000, Epoch: 30000,
@ -245,6 +246,7 @@ var (
BernoulliBlock: big.NewInt(5220340), BernoulliBlock: big.NewInt(5220340),
CurieBlock: big.NewInt(7096836), CurieBlock: big.NewInt(7096836),
DarwinTime: newUint64(1724227200), DarwinTime: newUint64(1724227200),
DarwinV2Time: newUint64(1725264000),
Clique: &CliqueConfig{ Clique: &CliqueConfig{
Period: 3, Period: 3,
Epoch: 30000, Epoch: 30000,