Skip to content

Commit

Permalink
Merge pull request #209 from virtualeconomy/Fermat
Browse files Browse the repository at this point in the history
update version number
  • Loading branch information
ncying authored Jun 30, 2020
2 parents 059558f + 23163bf commit d7ae89d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/vsys/settings/BlockchainSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object FunctionalitySettings {
//TODO
//set the value
allowContractTransactionAfterHeight = 6100000,
allowDepositWithdrawContractAfterHeight = 12900000)
allowDepositWithdrawContractAfterHeight = 13140520)

val TESTNET = FunctionalitySettings(
numOfSlots = 60,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d7ae89d

Please sign in to comment.