Merge pull request #200 from virtualeconomy/feature/fermat_setting

version and setting for Fermat testnet
virtualeconomy · May 8, 2020 · 1e22146 · 1e22146
2 parents 601b285 + 67c1f44
commit 1e22146
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ enablePlugins(sbtdocker.DockerPlugin, JavaServerAppPackaging, JDebPackaging, Sys
 
 name := "vsys"
 organization := "systems.v"
-version := "0.2.2"
+version := "0.3.0"
 scalaVersion in ThisBuild := "2.12.6"
 crossPaths := false
 publishArtifact in (Compile, packageDoc) := false

diff --git a/src/main/scala/vsys/settings/BlockchainSettings.scala b/src/main/scala/vsys/settings/BlockchainSettings.scala
@@ -25,7 +25,7 @@ object FunctionalitySettings {
     //TODO
     //set the value
     allowContractTransactionAfterHeight = 4236000,
-    allowDepositWithdrawContractAfterHeight = Int.MaxValue)
+    allowDepositWithdrawContractAfterHeight = 12550000)
 
   val configPath = "vsys.blockchain.custom.functionality"
 }

diff --git a/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala b/src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala
@@ -94,7 +94,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers {
     settings.functionalitySettings.numOfSlots should be (60)
     settings.functionalitySettings.mintingSpeed should be (1)
     settings.functionalitySettings.allowContractTransactionAfterHeight should be (4236000) // same as the setting
-    settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (Int.MaxValue)
+    settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (12550000)
     settings.genesisSettings.blockTimestamp should be(1535356447650226656L)
     settings.genesisSettings.timestamp should be(1535356447650226656L)
     settings.genesisSettings.averageBlockDelay should be(60.seconds)