From 343f4b738767815c3aee9af81e7688ef0580847c Mon Sep 17 00:00:00 2001 From: ncying Date: Mon, 29 Jun 2020 10:43:13 +0800 Subject: [PATCH 1/2] update version no --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a221bc3df..417da3303 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ enablePlugins(sbtdocker.DockerPlugin, JavaServerAppPackaging, JDebPackaging, Sys name := "vsys" organization := "systems.v" -version := "0.3.0" +version := "0.3.1" scalaVersion in ThisBuild := "2.12.6" crossPaths := false publishArtifact in (Compile, packageDoc) := false From 23163bf8751f908c07639b0a0fd21c48ed27ff12 Mon Sep 17 00:00:00 2001 From: ncying Date: Mon, 29 Jun 2020 11:57:33 +0800 Subject: [PATCH 2/2] update fermat mainnet activated height --- src/main/scala/vsys/settings/BlockchainSettings.scala | 2 +- .../scala/vsys/settings/BlockchainSettingsSpecification.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/vsys/settings/BlockchainSettings.scala b/src/main/scala/vsys/settings/BlockchainSettings.scala index 64d7d5e5c..da0acc23d 100644 --- a/src/main/scala/vsys/settings/BlockchainSettings.scala +++ b/src/main/scala/vsys/settings/BlockchainSettings.scala @@ -17,7 +17,7 @@ object FunctionalitySettings { //TODO //set the value allowContractTransactionAfterHeight = 6100000, - allowDepositWithdrawContractAfterHeight = 12900000) + allowDepositWithdrawContractAfterHeight = 13140520) val TESTNET = FunctionalitySettings( numOfSlots = 60, diff --git a/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala b/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala index fcd6946d4..44e2ad98a 100644 --- a/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala +++ b/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala @@ -136,7 +136,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers { settings.functionalitySettings.numOfSlots should be (60) settings.functionalitySettings.mintingSpeed should be (1) settings.functionalitySettings.allowContractTransactionAfterHeight should be (6100000) // same as the setting - settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (12900000) + settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (13140520) settings.genesisSettings.blockTimestamp should be(1543286357457333127L) settings.genesisSettings.timestamp should be(1543286357457333127L) settings.genesisSettings.signature should be(ByteStr.decodeBase58("3yYNd7quEWaWytrAug4yGwQvpL3PVJegf9d9NTv9PVE3ouBYJs5PTQqxCjd294uK1zPLj6G5Tk447LqFMWdSFvaQ").toOption)