Merge pull request #116 from oasysgames/feat/schedule-mainnet-hardfor…

…k-v1.7.0 schedule mainnet hardfork of v1.7.0
oasysgames · Dec 4, 2024 · 2ee4602 · 2ee4602
2 parents 86f15ed + 9b10519
commit 2ee4602
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/contracts/oasys/deployments.go b/contracts/oasys/deployments.go
@@ -22,7 +22,7 @@ var deploymentSets = map[common.Hash]map[uint64]deploymentSet{
 		1892000: deploymentSet{deployments10},
 		4089588: deploymentSet{deployments11},
 		5095900: deploymentSet{deployments12},
-		9999999: deploymentSet{deployments13}, // TODO:
+		5498661: deploymentSet{deployments13},
 	},
 	params.OasysTestnetGenesisHash: {
 		1:       deploymentSet{deployments0},

diff --git a/contracts/oasys/oasys_test.go b/contracts/oasys/oasys_test.go
@@ -1184,7 +1184,7 @@ func TestDeploy(t *testing.T) {
 				{1892000, []deployFn{_deployments10}},
 				{4089588, []deployFn{_deployments11}},
 				{5095900, []deployFn{_deployments12}},
-				{9999999, []deployFn{_deployments13}},
+				{5498661, []deployFn{_deployments13}},
 			},
 		},
 		{

diff --git a/params/config.go b/params/config.go
@@ -234,7 +234,7 @@ var (
 		BerlinBlock:         big.NewInt(0),
 		LondonBlock:         big.NewInt(0),
 		ShanghaiTime:        newUint64(1721910600), // Thu Jul 25 2024 21:30:00 GMT+0900
-		CancunTime:          newUint64(9999999999),
+		CancunTime:          newUint64(1734336000), // Mon Dec 16 2024 17:00:00 GMT+0900
 
 		Oasys: &OasysConfig{
 			Period: 15,