From 9b105195cb36168ad051a290eaff57f6a8fce4f8 Mon Sep 17 00:00:00 2001 From: tak Date: Wed, 4 Dec 2024 13:38:03 +0700 Subject: [PATCH] schedule mainnet hardfork of v1.7.0 --- contracts/oasys/deployments.go | 2 +- contracts/oasys/oasys_test.go | 2 +- params/config.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/oasys/deployments.go b/contracts/oasys/deployments.go index 958d9e573..326c39cea 100644 --- 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 index b1c6c39ba..fa49fe1a8 100644 --- 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 index 294eb501d..48add7b27 100644 --- 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,