From d48e27038bd837802596336c6d97d0bcd96c1466 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 9 Jul 2024 21:54:44 +1000 Subject: [PATCH 1/3] xdpos 2.0 release for mainnet (#574) * xdpos 2.0 release for mainnet --- common/constants.go | 11 +++++------ params/version.go | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/common/constants.go b/common/constants.go index cbe997f115..4053542f30 100644 --- a/common/constants.go +++ b/common/constants.go @@ -36,7 +36,7 @@ var TIP2019Block = big.NewInt(1) var TIPSigning = big.NewInt(3000000) var TIPRandomize = big.NewInt(3464000) -var TIPV2SwitchBlock = big.NewInt(99999999900) +var TIPV2SwitchBlock = big.NewInt(78678000) // Target 21st Aug 2024 var TIPIncreaseMasternodes = big.NewInt(5000000) // Upgrade MN Count at Block. var TIPNoHalvingMNReward = big.NewInt(38383838) // hardfork no halving masternodes reward @@ -45,10 +45,9 @@ var TIPXDCX = big.NewInt(38383838) var TIPXDCXLending = big.NewInt(38383838) var TIPXDCXCancellationFee = big.NewInt(38383838) var TIPXDCXCancellationFeeTestnet = big.NewInt(38383838) -var TIPXDCXMinerDisable = big.NewInt(88999999900) -var TIPXDCXReceiverDisable = big.NewInt(99999999999) +var TIPXDCXMinerDisable = big.NewInt(78678000) // Target 21st Aug 2024 +var TIPXDCXReceiverDisable = big.NewInt(78678900) // Target 21st Aug 2024, safer to release after disable miner var Eip1559Block = big.NewInt(9999999999) -var TIPXDCXDISABLE = big.NewInt(99999999900) var BerlinBlock = big.NewInt(76321000) // Target 19th June 2024 var LondonBlock = big.NewInt(76321000) // Target 19th June 2024 var MergeBlock = big.NewInt(76321000) // Target 19th June 2024 @@ -85,8 +84,8 @@ var BaseTopUp = big.NewInt(100) var BaseRecall = big.NewInt(100) var TIPTRC21Fee = big.NewInt(38383838) var TIPTRC21FeeTestnet = big.NewInt(38383838) -var BlockNumberGas50x = big.NewInt(99999999900) -var LimitTimeFinality = uint64(30) // limit in 30 block +var BlockNumberGas50x = big.NewInt(78678000) // Target 21st Aug 2024 +var LimitTimeFinality = uint64(30) // limit in 30 block var IgnoreSignerCheckBlockArray = map[uint64]bool{ uint64(1032300): true, diff --git a/params/version.go b/params/version.go index 6e9d48d38d..2d584ca43d 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 3 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta1" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "" // Version metadata to append to the version string ) // Version holds the textual version string. From 950de52e4256dfc9b4b9d39cf1938a5d48dc684b Mon Sep 17 00:00:00 2001 From: Liam Lai Date: Tue, 9 Jul 2024 22:15:50 +1000 Subject: [PATCH 2/3] add stable sufix in the mainnet version --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 2d584ca43d..1b5dea34b2 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 0 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release - VersionMeta = "" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "stable" // Version metadata to append to the version string ) // Version holds the textual version string. From 520fb284f55a5270ed7dd2a44de20e61dc7616d6 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Thu, 18 Jul 2024 10:24:20 +0800 Subject: [PATCH 3/3] Revert "revert https://github.com/XinFinOrg/XDPoSChain/pull/497 behavior for v1 engine (#531)" This reverts commit 2bbecdcbbcb9293fc57e7de35a362264952afa05. --- consensus/XDPoS/engines/engine_v1/engine.go | 1 - 1 file changed, 1 deletion(-) diff --git a/consensus/XDPoS/engines/engine_v1/engine.go b/consensus/XDPoS/engines/engine_v1/engine.go index 7a862370c8..7fce2e6a86 100644 --- a/consensus/XDPoS/engines/engine_v1/engine.go +++ b/consensus/XDPoS/engines/engine_v1/engine.go @@ -154,7 +154,6 @@ func (x *XDPoS_v1) verifyHeaderWithCache(chain consensus.ChainReader, header *ty // looking those up from the database. This is useful for concurrently verifying // a batch of new headers. func (x *XDPoS_v1) verifyHeader(chain consensus.ChainReader, header *types.Header, parents []*types.Header, fullVerify bool) error { - fullVerify = false // If we're running a engine faking, accept any block as valid if x.config.SkipV1Validation { return nil