Skip to content

Commit 1e22146

Browse files
authored
Merge pull request #200 from virtualeconomy/feature/fermat_setting
version and setting for Fermat testnet
2 parents 601b285 + 67c1f44 commit 1e22146

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ enablePlugins(sbtdocker.DockerPlugin, JavaServerAppPackaging, JDebPackaging, Sys
77

88
name := "vsys"
99
organization := "systems.v"
10-
version := "0.2.2"
10+
version := "0.3.0"
1111
scalaVersion in ThisBuild := "2.12.6"
1212
crossPaths := false
1313
publishArtifact in (Compile, packageDoc) := false

src/main/scala/vsys/settings/BlockchainSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object FunctionalitySettings {
2525
//TODO
2626
//set the value
2727
allowContractTransactionAfterHeight = 4236000,
28-
allowDepositWithdrawContractAfterHeight = Int.MaxValue)
28+
allowDepositWithdrawContractAfterHeight = 12550000)
2929

3030
val configPath = "vsys.blockchain.custom.functionality"
3131
}

src/test/scala/vsys/settings/BlockchainSettingsSpecification.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers {
9494
settings.functionalitySettings.numOfSlots should be (60)
9595
settings.functionalitySettings.mintingSpeed should be (1)
9696
settings.functionalitySettings.allowContractTransactionAfterHeight should be (4236000) // same as the setting
97-
settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (Int.MaxValue)
97+
settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (12550000)
9898
settings.genesisSettings.blockTimestamp should be(1535356447650226656L)
9999
settings.genesisSettings.timestamp should be(1535356447650226656L)
100100
settings.genesisSettings.averageBlockDelay should be(60.seconds)

0 commit comments

Comments
 (0)