Merge pull request ethereum#209 from etclabscore/feat/1099-etc-mainnet

forkid,params: set 1099 etc mainnet activation number
NoteGio · Oct 15, 2020 · 6e449fc · 6e449fc
2 parents 8339c8f + ac18a9c
commit 6e449fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
@@ -161,7 +161,11 @@ func TestCreation(t *testing.T) {
 				{9573000, ID{Hash: checksumToBytes(0x7ba22882), Next: 10500839}},
 				{9573001, ID{Hash: checksumToBytes(0x7ba22882), Next: 10500839}},
 				{10500838, ID{Hash: checksumToBytes(0x7ba22882), Next: 10500839}},
-				{10500839, ID{Hash: checksumToBytes(0x9007bfcc), Next: 0}},
+				{10500839, ID{Hash: checksumToBytes(0x9007bfcc), Next: 11_700_000}},
+				{10500840, ID{Hash: checksumToBytes(0x9007bfcc), Next: 11_700_000}},
+				{11_699_999, ID{Hash: checksumToBytes(0x9007bfcc), Next: 11_700_000}},
+				{11_700_000, ID{Hash: checksumToBytes(0xdb63a1ca), Next: 0}},
+				{11_700_001, ID{Hash: checksumToBytes(0xdb63a1ca), Next: 0}},
 			},
 		},
 		{
@@ -322,7 +326,7 @@ func TestGatherForks(t *testing.T) {
 		{
 			"classic",
 			params.ClassicChainConfig,
-			[]uint64{1150000, 2500000, 3000000, 5000000, 5900000, 8772000, 9573000, 10500839},
+			[]uint64{1150000, 2500000, 3000000, 5000000, 5900000, 8772000, 9573000, 10500839, 11_700_000},
 		},
 		{
 			"mainnet",

diff --git a/params/config_classic.go b/params/config_classic.go
@@ -16,7 +16,6 @@
 package params
 
 import (
-	"math"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -71,7 +70,7 @@ var (
 		EIP2028FBlock: big.NewInt(10_500_839),
 		EIP2200FBlock: big.NewInt(10_500_839), // RePetersburg (=~ re-1283)
 
-		ECIP1099FBlock: big.NewInt(math.MaxInt64), // Etchash (planned for block 11_700_000)
+		ECIP1099FBlock: big.NewInt(11_700_000), // Etchash (DAG size limit)
 
 		DisposalBlock:      big.NewInt(5900000),
 		ECIP1017FBlock:     big.NewInt(5000000),