upgrade: configure demeter upgrade on mainnet

coredao-org · Nov 5, 2024 · de25d80 · de25d80
1 parent b1bf99c
commit de25d80
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 7 deletions.
diff --git a/core/systemcontracts/upgrade.go b/core/systemcontracts/upgrade.go
diff --git a/core/systemcontracts/upgrade_test.go b/core/systemcontracts/upgrade_test.go
@@ -79,12 +79,12 @@ func checkUpgradeConfig(url string, upgrade *Upgrade) error {
 }
 
 func TestUpgrade(t *testing.T) {
-	err := checkUpgradeConfig("https://raw.githubusercontent.com/coredao-org/core-genesis-contract/branch_testnet/genesis.json", poseidonUpgrade[buffaloNet])
+	err := checkUpgradeConfig("https://raw.githubusercontent.com/coredao-org/core-genesis-contract/branch_testnet/genesis.json", demeterUpgrade[buffaloNet])
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = checkUpgradeConfig("https://raw.githubusercontent.com/coredao-org/core-genesis-contract/master/genesis.json", poseidonUpgrade[mainNet])
+	err = checkUpgradeConfig("https://raw.githubusercontent.com/coredao-org/core-genesis-contract/master/genesis.json", demeterUpgrade[mainNet])
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/params/config.go b/params/config.go
@@ -119,10 +119,12 @@ var (
 		ZeusBlock:           big.NewInt(8_020_000),
 		HeraBlock:           big.NewInt(12_195_500),
 		PoseidonBlock:       big.NewInt(13_232_049),
-		BerlinBlock:         nil,
-		LondonBlock:         nil,
-		HertzBlock:          nil,
-		ShanghaiTime:        nil,
+		BerlinBlock:         big.NewInt(19_537_200),
+		LondonBlock:         big.NewInt(19_537_200),
+		HertzBlock:          big.NewInt(19_537_200),
+		ShanghaiTime:        newUint64(1731999600), // 2024-11-19 7:00:00 AM UTC
+		KeplerTime:          newUint64(1731999600),
+		DemeterTime:         newUint64(1731999600),
 		Satoshi: &SatoshiConfig{
 			Period: 3,
 			Epoch:  200,

diff --git a/params/version.go b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1  // Major version component of the current release
 	VersionMinor = 0  // Minor version component of the current release
-	VersionPatch = 11 // Patch version component of the current release
+	VersionPatch = 12 // Patch version component of the current release
 	VersionMeta  = "" // Version metadata to append to the version string
 )