Skip to content

Commit

Permalink
Merge pull request #107 from virtualeconomy/main/set_euclid_activate_…
Browse files Browse the repository at this point in the history
…height

Set mainnet contract activate height
  • Loading branch information
ncying authored Aug 16, 2019
2 parents c630a1d + d54080a commit 51c8b7d
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 @@ -15,7 +15,7 @@ object FunctionalitySettings {
mintingSpeed = 1,
//TODO
//set the value
allowContractTransactionAfterHeight = Int.MaxValue)
allowContractTransactionAfterHeight = 6100000)

val TESTNET = FunctionalitySettings(
numOfSlots = 60,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers {
settings.addressSchemeCharacter should be('M')
settings.functionalitySettings.numOfSlots should be (60)
settings.functionalitySettings.mintingSpeed should be (1)
settings.functionalitySettings.allowContractTransactionAfterHeight should be (Int.MaxValue) // same as the setting
settings.functionalitySettings.allowContractTransactionAfterHeight should be (6100000) // same as the setting
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 51c8b7d

Please sign in to comment.