Meticulous Release. Etica Hardfork 1, phase 2 (final phase of the har…

…dfork).
etica · Feb 9, 2024 · f45baaf · f45baaf
1 parent 383b2d5
commit f45baaf
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 46 deletions.
diff --git a/params/config_etica.go b/params/config_etica.go
@@ -61,9 +61,47 @@ var (
 		EIP1014FBlock: big.NewInt(0),
 		EIP1052FBlock: big.NewInt(0),
 		EIP1234FBlock:  big.NewInt(0), // added
-		EIP1283FBlock: big.NewInt(0), // added
+		//EIP1283FBlock: big.NewInt(0), // added
 
-		PetersburgBlock: big.NewInt(0),
+		//PetersburgBlock: big.NewInt(0),
+
+		ETIP1017FBlock:     big.NewInt(0), // EGAZ tail emission, fixed 2 EGAZ per block reward
+
+		DisposalBlock:      big.NewInt(4481020), // Stop difficulty bomb
+
+		// Istanbul eq, aka Phoenix
+		// ECIP-1088
+		EIP152FBlock:  big.NewInt(4481010),
+		EIP1108FBlock: big.NewInt(4481010),
+		EIP1344FBlock: big.NewInt(4481010),
+		EIP1884FBlock: big.NewInt(4481010),
+		EIP2028FBlock: big.NewInt(4481010),
+		EIP2200FBlock: big.NewInt(4481010), // RePetersburg (=~ re-1283)
+
+		// ECIP1099 For the smoothest possible transition activation should occur on 
+		//  a block in which an epoch transition to an even epoch number is occurring.
+		//	Epoch 388/2 = 194 (good) = block 11_640_000
+		//	Epoch 389/2 = 194.5 (bad) -
+		//	Epoch 390/2 = 195 (good) = block 11_700_000
+		//ECIP1099FBlock:           big.NewInt(8_700_000), // Etchash (DAG size limit) (never activated yet, 8_700_000 is just indicative)
+
+		// Berlin eq, aka Magneto
+		EIP2565FBlock: big.NewInt(4481050),
+		EIP2718FBlock: big.NewInt(4481050),
+		EIP2929FBlock: big.NewInt(4481050),
+		EIP2930FBlock: big.NewInt(4481050),
+
+		// London (partially), aka Mystique
+		EIP3529FBlock: big.NewInt(4481100),
+		EIP3541FBlock: big.NewInt(4481100),
+
+        // Spiral, aka Shanghai (partially)
+		EIP3651FBlock: big.NewInt(4481150), // Warm COINBASE (gas reprice)
+		EIP3855FBlock: big.NewInt(4481150), // PUSH0 instruction
+		EIP3860FBlock: big.NewInt(4481150), // Limit and meter initcode
+		EIP6049FBlock: big.NewInt(4481150), // Deprecate SELFDESTRUCT (noop)
+
+		EticaSmartContractv2: big.NewInt(4481000), // Etica smart contract (Meticulous, Etica Hardfork 1)
 
 
 	}

diff --git a/params/config_etica_prerelease.go → params/config_eticav1.go b/params/config_etica_prerelease.go → params/config_eticav1.go
@@ -22,8 +22,9 @@ import (
 )
 
 var (
-	// EticaChainConfig is the chain parameters to run a node on the Etica main network.
-	prerelaseEticaChainConfig = &coregeth.CoreGethChainConfig{
+	// Eticav1ChainConfig is the chain parameters to run a node on the Etica main network.
+	// keep it as legacy
+	Eticav1ChainConfig = &coregeth.CoreGethChainConfig{
 		NetworkID:                 61803,
 		ChainID:                   big.NewInt(61803),
 		Ethash:                        new(ctypes.EthashConfig),
@@ -61,47 +62,9 @@ var (
 		EIP1014FBlock: big.NewInt(0),
 		EIP1052FBlock: big.NewInt(0),
 		EIP1234FBlock:  big.NewInt(0), // added
-		//EIP1283FBlock: big.NewInt(0), // added
+		EIP1283FBlock: big.NewInt(0), // added
 
-		//PetersburgBlock: big.NewInt(0),
-
-		ETIP1017FBlock:     big.NewInt(0), // EGAZ tail emission, fixed 2 EGAZ per block reward
-
-		DisposalBlock:      big.NewInt(8600000), // Stop difficulty bomb
-
-		// Istanbul eq, aka Phoenix
-		// ECIP-1088
-		EIP152FBlock:  big.NewInt(8700000),
-		EIP1108FBlock: big.NewInt(8700000),
-		EIP1344FBlock: big.NewInt(8700000),
-		EIP1884FBlock: big.NewInt(8700000),
-		EIP2028FBlock: big.NewInt(8700000),
-		EIP2200FBlock: big.NewInt(8700000), // RePetersburg (=~ re-1283)
-
-		// ECIP1099 For the smoothest possible transition activation should occur on 
-		//  a block in which an epoch transition to an even epoch number is occurring.
-		//	Epoch 388/2 = 194 (good) = block 11_640_000
-		//	Epoch 389/2 = 194.5 (bad) -
-		//	Epoch 390/2 = 195 (good) = block 11_700_000
-		//ECIP1099FBlock:           big.NewInt(8_700_000), // Etchash (DAG size limit) (never activated yet, 8_700_000 is just indicative)
-
-		// Berlin eq, aka Magneto
-		EIP2565FBlock: big.NewInt(8701000),
-		EIP2718FBlock: big.NewInt(8701000),
-		EIP2929FBlock: big.NewInt(8701000),
-		EIP2930FBlock: big.NewInt(8701000),
-
-		// London (partially), aka Mystique
-		EIP3529FBlock: big.NewInt(8702000),
-		EIP3541FBlock: big.NewInt(8702000),
-
-        // Spiral, aka Shanghai (partially)
-		EIP3651FBlock: big.NewInt(8703000), // Warm COINBASE (gas reprice)
-		EIP3855FBlock: big.NewInt(8703000), // PUSH0 instruction
-		EIP3860FBlock: big.NewInt(8703000), // Limit and meter initcode
-		EIP6049FBlock: big.NewInt(8703000), // Deprecate SELFDESTRUCT (noop)
-
-		//EticaSmartContractv2: big.NewInt(8800000), // need to be set to mainnet block height + delay
+		PetersburgBlock: big.NewInt(0),
 
 
 	}

diff --git a/params/vars/etica_upgrades.go b/params/vars/etica_upgrades.go
@@ -24,12 +24,12 @@ import (
 
 
 // Etica Mainnet Smart Contract //
-var EticaSmartContractAddress = common.HexToAddress("") // will be set to mainnet: 0x34c61EA91bAcdA647269d4e310A86b875c09946f
+var EticaSmartContractAddress = common.HexToAddress("0x34c61EA91bAcdA647269d4e310A86b875c09946f") // Etica Mainnet Smart Contract
 // Crucible Testnet Smart Contract //
 var CrucibleSmartContractAddress = common.HexToAddress("0x558593Bc92E6F242a604c615d93902fc98efcA82")
 
 // --------- Smart contract hardfork 1, main smart contract loads bytecode from following contract ----------- //
-var EticaSmartContractAddressv2 = common.HexToAddress("") // waiting for deployment
+var EticaSmartContractAddressv2 = common.HexToAddress("0x64cB3Bc8cF8324432838B5c58519F782482C9861") // Etica v2, Meticulous Hardfork
 var CrucibleSmartContractAddressv2 = common.HexToAddress("0x3cA0Dc9373F33993Ec25643B92759ce637C8400f")
 // --------- Smart contract hardfork 1 ----------- //