Skip to content

Commit

Permalink
Merge pull request #303 from virtualeconomy/Riemann
Browse files Browse the repository at this point in the history
Riemann
  • Loading branch information
ncying committed Sep 28, 2021
2 parents a7697ab + 154b9f9 commit e8719a5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
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 @@ -28,7 +28,7 @@ object FunctionalitySettings {
//set the value
allowContractTransactionAfterHeight = 4236000,
allowDepositWithdrawContractAfterHeight = 12550000,
allowExchangeContractAfterHeight = Int.MaxValue)
allowExchangeContractAfterHeight = 18030000)

val configPath = "vsys.blockchain.custom.functionality"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers {
settings.functionalitySettings.mintingSpeed should be (1)
settings.functionalitySettings.allowContractTransactionAfterHeight should be (4236000) // same as the setting
settings.functionalitySettings.allowDepositWithdrawContractAfterHeight should be (12550000)
settings.functionalitySettings.allowExchangeContractAfterHeight should be (Int.MaxValue)
settings.functionalitySettings.allowExchangeContractAfterHeight should be (18030000)
settings.genesisSettings.blockTimestamp should be(1535356447650226656L)
settings.genesisSettings.timestamp should be(1535356447650226656L)
settings.genesisSettings.averageBlockDelay should be(60.seconds)
Expand Down

1 comment on commit e8719a5

@morganx20

This comment was marked as spam.

Please sign in to comment.