Dev upgrade merge from master to fix rpc nodes (#615)

* merge from master * merge from master
XinFinOrg · Aug 23, 2024 · f154466 · f154466
1 parent d05199d
commit f154466
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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(78678000) // Target 21st Aug 2024
+var TIPV2SwitchBlock = big.NewInt(80370000) // Target 2nd Oct 2024
 
 var TIPIncreaseMasternodes = big.NewInt(5000000) // Upgrade MN Count at Block.
 var TIPNoHalvingMNReward = big.NewInt(38383838)  // hardfork no halving masternodes reward
@@ -45,8 +45,8 @@ var TIPXDCX = big.NewInt(38383838)
 var TIPXDCXLending = big.NewInt(38383838)
 var TIPXDCXCancellationFee = big.NewInt(38383838)
 var TIPXDCXCancellationFeeTestnet = big.NewInt(38383838)
-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 TIPXDCXMinerDisable = big.NewInt(80370000)    // Target 2nd Oct 2024
+var TIPXDCXReceiverDisable = big.NewInt(80370900) // Target 2nd Oct 2024, safer to release after disable miner
 var Eip1559Block = big.NewInt(9999999999)
 var BerlinBlock = big.NewInt(76321000)   // Target 19th June 2024
 var LondonBlock = big.NewInt(76321000)   // Target 19th June 2024
@@ -84,7 +84,7 @@ var BaseTopUp = big.NewInt(100)
 var BaseRecall = big.NewInt(100)
 var TIPTRC21Fee = big.NewInt(38383838)
 var TIPTRC21FeeTestnet = big.NewInt(38383838)
-var BlockNumberGas50x = big.NewInt(78678000) // Target 21st Aug 2024
+var BlockNumberGas50x = big.NewInt(80370000) // Target 2nd Oct 2024
 var LimitTimeFinality = uint64(30)           // limit in 30 block
 
 var IgnoreSignerCheckBlockArray = map[uint64]bool{

diff --git a/common/constants/constants.go.testnet b/common/constants/constants.go.testnet
@@ -46,7 +46,7 @@ var TIPXDCXLending = big.NewInt(23779191)
 var TIPXDCXCancellationFee = big.NewInt(23779191)
 var TIPXDCXCancellationFeeTestnet = big.NewInt(23779191)
 var TIPXDCXMinerDisable = big.NewInt(61290000) // Target 31st March 2024
-var TIPXDCXReceiverDisable = big.NewInt(9999999999)
+var TIPXDCXReceiverDisable = big.NewInt(66825000) // Target 26 Aug 2024
 var BerlinBlock = big.NewInt(61290000)
 var LondonBlock = big.NewInt(61290000)
 var MergeBlock = big.NewInt(61290000)