diff --git a/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala b/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala index 5792b5c91cb..177dbecc10d 100644 --- a/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala +++ b/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala @@ -45,7 +45,7 @@ object FunctionalitySettings { requireSortedTransactionsAfter = 1477958400000L, generatingBalanceDepthFrom50To1000AfterHeight = Long.MinValue, minimalGeneratingBalanceAfterTimestamp = Long.MinValue, - allowTransactionsFromFutureUntil = Long.MinValue, + allowTransactionsFromFutureUntil = 1478100000000L, allowUnissuedAssetsUntil = 1479416400000L, allowBurnTransactionAfterTimestamp = 1481110521000L, allowLeaseTransactionAfterTimestamp = Long.MinValue, diff --git a/src/main/scala/scorex/app/RunnableApplication.scala b/src/main/scala/scorex/app/RunnableApplication.scala index c2d4908311e..c57f40846e5 100755 --- a/src/main/scala/scorex/app/RunnableApplication.scala +++ b/src/main/scala/scorex/app/RunnableApplication.scala @@ -25,6 +25,8 @@ import scala.concurrent.duration._ import scala.reflect.runtime.universe.Type import scala.util.Try +import com.wavesplatform.state2._ + trait RunnableApplication extends Application with Shutdownable with ScorexLogging { protected val apiRoutes: Seq[ApiRoute] @@ -123,7 +125,7 @@ trait RunnableApplication extends Application with Shutdownable with ScorexLoggi val maybeGenesisSignature = Option(settings.blockchainSettings.genesisSettings.signature).filter(_.trim.nonEmpty) transactionModule.blockStorage.blockchainUpdater.processBlock(Block.genesis(consensusModule.genesisData, transactionModule.genesisData, - settings.blockchainSettings.genesisSettings.blockTimestamp, maybeGenesisSignature)) + settings.blockchainSettings.genesisSettings.blockTimestamp, maybeGenesisSignature)).explicitGet() log.info("Genesis block has been added to the state") } diff --git a/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala b/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala index ac8c7100afb..0165be6e60f 100644 --- a/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala +++ b/src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala @@ -106,7 +106,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers { settings.functionalitySettings.requireSortedTransactionsAfter should be(1477958400000L) settings.functionalitySettings.generatingBalanceDepthFrom50To1000AfterHeight should be(Long.MinValue) settings.functionalitySettings.minimalGeneratingBalanceAfterTimestamp should be(Long.MinValue) - settings.functionalitySettings.allowTransactionsFromFutureUntil should be(Long.MinValue) + settings.functionalitySettings.allowTransactionsFromFutureUntil should be(1478100000000L) settings.functionalitySettings.allowUnissuedAssetsUntil should be(1479416400000L) settings.functionalitySettings.allowBurnTransactionAfterTimestamp should be(1481110521000L) settings.functionalitySettings.requirePaymentUniqueId should be(1485942685000L)