From 264985de3975b180f0eb58d67cb0fce12195b951 Mon Sep 17 00:00:00 2001 From: ncying Date: Thu, 23 Sep 2021 11:48:37 +0800 Subject: [PATCH 1/2] add testnet Riemann activate height --- src/main/scala/vsys/settings/BlockchainSettings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/vsys/settings/BlockchainSettings.scala b/src/main/scala/vsys/settings/BlockchainSettings.scala index 336e1a748..fa3422d44 100644 --- a/src/main/scala/vsys/settings/BlockchainSettings.scala +++ b/src/main/scala/vsys/settings/BlockchainSettings.scala @@ -28,7 +28,7 @@ object FunctionalitySettings { //set the value allowContractTransactionAfterHeight = 4236000, allowDepositWithdrawContractAfterHeight = 12550000, - allowExchangeContractAfterHeight = Int.MaxValue) + allowExchangeContractAfterHeight = 18030000) val configPath = "vsys.blockchain.custom.functionality" } From 154b9f99dd343e9970ab31a74ac4883f35d2bc75 Mon Sep 17 00:00:00 2001 From: ncying Date: Thu, 23 Sep 2021 11:49:18 +0800 Subject: [PATCH 2/2] update related testnet for testnet Riemann activate height --- .../scala/vsys/settings/BlockchainSettingsSpecification.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala b/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala index 169322d64..a5aab69f0 100644 --- a/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala +++ b/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala @@ -99,7 +99,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers { settings.functionalitySettings.mintingSpeed should be (1) settings.functionalitySettings.allowContractTransactionAfterHeight should be (4236000) // same as the setting settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (12550000) - settings.functionalitySettings.allowExchangeContractAfterHeight should be (Int.MaxValue) + settings.functionalitySettings.allowExchangeContractAfterHeight should be (18030000) settings.genesisSettings.blockTimestamp should be(1535356447650226656L) settings.genesisSettings.timestamp should be(1535356447650226656L) settings.genesisSettings.averageBlockDelay should be(60.seconds)