From 7a9671980b00934d5ef7e8037c7e0550da185958 Mon Sep 17 00:00:00 2001 From: Alexey Kiselev Date: Tue, 18 Apr 2017 12:50:07 +0300 Subject: [PATCH] Forks activation time was updated. --- .../wavesplatform/settings/BlockchainSettings.scala | 12 ++++++------ .../settings/BlockchainSettingsSpecification.scala | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala b/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala index e7ef90913f1..f7b07c2451e 100644 --- a/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala +++ b/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala @@ -36,9 +36,9 @@ object FunctionalitySettings { allowLeaseTransactionAfterTimestamp = 1491192000000L, requirePaymentUniqueId = 1491192000000L, allowExchangeTransactionAfterTimestamp = 1491192000000L, - allowInvalidReissueInSameBlockUntilTimestamp = 1492682400000L, - allowMultipleLeaseCancelTransactionUntilTimestamp = 1492682400000L, - resetEffectiveBalancesAtHeight = 460400) + allowInvalidReissueInSameBlockUntilTimestamp = 1492768800000L, + allowMultipleLeaseCancelTransactionUntilTimestamp = 1492768800000L, + resetEffectiveBalancesAtHeight = 462000) val TESTNET = FunctionalitySettings( allowTemporaryNegativeUntil = 1477958400000L, @@ -52,9 +52,9 @@ object FunctionalitySettings { allowLeaseTransactionAfterTimestamp = Long.MinValue, requirePaymentUniqueId = 1485942685000L, allowExchangeTransactionAfterTimestamp = 1483228800000L, - allowInvalidReissueInSameBlockUntilTimestamp = 1492473600000L, - allowMultipleLeaseCancelTransactionUntilTimestamp = 1492473600000L, - resetEffectiveBalancesAtHeight = 49500) + allowInvalidReissueInSameBlockUntilTimestamp = 1492560000000L, + allowMultipleLeaseCancelTransactionUntilTimestamp = 1492560000000L, + resetEffectiveBalancesAtHeight = 51500) val configPath = "waves.blockchain.custom.functionality" diff --git a/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala b/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala index 8cf35e6a228..abc680dfffa 100644 --- a/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala +++ b/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala @@ -93,10 +93,10 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers { settings.functionalitySettings.allowUnissuedAssetsUntil should be(1479416400000L) settings.functionalitySettings.allowBurnTransactionAfterTimestamp should be(1481110521000L) settings.functionalitySettings.requirePaymentUniqueId should be(1485942685000L) - settings.functionalitySettings.allowInvalidReissueInSameBlockUntilTimestamp should be(1492473600000L) - settings.functionalitySettings.allowMultipleLeaseCancelTransactionUntilTimestamp should be(1492473600000L) + settings.functionalitySettings.allowInvalidReissueInSameBlockUntilTimestamp should be(1492560000000L) + settings.functionalitySettings.allowMultipleLeaseCancelTransactionUntilTimestamp should be(1492560000000L) settings.functionalitySettings.allowExchangeTransactionAfterTimestamp should be(1483228800000L) - settings.functionalitySettings.resetEffectiveBalancesAtHeight should be(49500) + settings.functionalitySettings.resetEffectiveBalancesAtHeight should be(51500) settings.genesisSettings.timestamp should be (1478000000000L) settings.genesisSettings.signature should be ("5uqnLK3Z9eiot6FyYBfwUnbyid3abicQbAZjz38GQ1Q8XigQMxTK4C1zNkqS1SVw7FqSidbZKxWAKLVoEsp4nNqa") settings.genesisSettings.initialBalance should be (10000000000000000L) @@ -131,9 +131,9 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers { settings.functionalitySettings.allowTransactionsFromFutureUntil should be(1479168000000L) settings.functionalitySettings.allowUnissuedAssetsUntil should be(1479416400000L) settings.functionalitySettings.allowBurnTransactionAfterTimestamp should be(1491192000000L) - settings.functionalitySettings.allowInvalidReissueInSameBlockUntilTimestamp should be(1492682400000L) - settings.functionalitySettings.allowMultipleLeaseCancelTransactionUntilTimestamp should be(1492682400000L) - settings.functionalitySettings.resetEffectiveBalancesAtHeight should be(460400) + settings.functionalitySettings.allowInvalidReissueInSameBlockUntilTimestamp should be(1492768800000L) + settings.functionalitySettings.allowMultipleLeaseCancelTransactionUntilTimestamp should be(1492768800000L) + settings.functionalitySettings.resetEffectiveBalancesAtHeight should be(462000) settings.functionalitySettings.requirePaymentUniqueId should be(1491192000000L) settings.functionalitySettings.allowExchangeTransactionAfterTimestamp should be(1491192000000L) settings.genesisSettings.timestamp should be (1465742577614L)