Merge pull request #595 from etclabscore/feature/classic-spiral

Set Spiral classic activation block

Author: meowsbits

core/forkid/forkid_test.go

@@ -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}},
 			},
 		},
 		{
@@ -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{},
 		},
 		{

params/config_classic.go

@@ -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"),