Skip to content

Set Spiral classic activation block #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meowsbits merged 1 commit into from
Dec 6, 2023
Merged

Set Spiral classic activation block #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions core/forkid/forkid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,11 @@ func TestCreation(t *testing.T) {
{13_189_133, 0, ID{Hash: checksumToBytes(0x0f6bf187), Next: 14_525_000}},
{13_189_134, 0, ID{Hash: checksumToBytes(0x0f6bf187), Next: 14_525_000}},
{14_524_999, 0, ID{Hash: checksumToBytes(0x0f6bf187), Next: 14_525_000}},
{14_525_000, 0, ID{Hash: checksumToBytes(0x7fd1bb25), Next: 0}},
{14_525_001, 0, ID{Hash: checksumToBytes(0x7fd1bb25), Next: 0}},
{14_525_000, 0, ID{Hash: checksumToBytes(0x7fd1bb25), Next: 19_250_000}},
{14_525_001, 0, ID{Hash: checksumToBytes(0x7fd1bb25), Next: 19_250_000}},
{19_249_999, 0, ID{Hash: checksumToBytes(0x7fd1bb25), Next: 19_250_000}},
{19_250_000, 0, ID{Hash: checksumToBytes(0xbe46d57c), Next: 0}},
{19_250_001, 0, ID{Hash: checksumToBytes(0xbe46d57c), Next: 0}},
},
},
{
Expand Down Expand Up @@ -491,7 +494,7 @@ func TestGatherForks(t *testing.T) {
{
"classic",
params.ClassicChainConfig,
[]uint64{1150000, 2500000, 3000000, 5000000, 5900000, 8772000, 9573000, 10500839, 11_700_000, 13_189_133, 14_525_000},
[]uint64{1150000, 2500000, 3000000, 5000000, 5900000, 8772000, 9573000, 10500839, 11_700_000, 13_189_133, 14_525_000, 19_250_000},
[]uint64{},
},
{
Expand Down
8 changes: 4 additions & 4 deletions params/config_classic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ var (

// Spiral, aka Shanghai (partially)
// EIP4399FBlock: nil, // Supplant DIFFICULTY with PREVRANDAO. ETC does not spec 4399 because it's still PoW, and 4399 is only applicable for the PoS system.
EIP3651FBlock: nil, // Warm COINBASE (gas reprice)
EIP3855FBlock: nil, // PUSH0 instruction
EIP3860FBlock: nil, // Limit and meter initcode
EIP3651FBlock: big.NewInt(19_250_000), // Warm COINBASE (gas reprice)
EIP3855FBlock: big.NewInt(19_250_000), // PUSH0 instruction
EIP3860FBlock: big.NewInt(19_250_000), // Limit and meter initcode
// EIP4895FBlock: nil, // Beacon chain push withdrawals as operations
EIP6049FBlock: nil, // Deprecate SELFDESTRUCT (noop)
EIP6049FBlock: big.NewInt(19_250_000), // Deprecate SELFDESTRUCT (noop)

RequireBlockHashes: map[uint64]common.Hash{
1920000: common.HexToHash("0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f"),
Expand Down