diff --git a/consensus-client-it/src/test/scala/com/wavesplatform/api/NodeHttpApi.scala b/consensus-client-it/src/test/scala/com/wavesplatform/api/NodeHttpApi.scala index bbae09a..eba66b9 100644 --- a/consensus-client-it/src/test/scala/com/wavesplatform/api/NodeHttpApi.scala +++ b/consensus-client-it/src/test/scala/com/wavesplatform/api/NodeHttpApi.scala @@ -52,7 +52,7 @@ class NodeHttpApi(apiUri: Uri, backend: SttpBackend[Identity, ?], apiKeyValue: S if (currHeight >= atLeast) currHeight else { Thread.sleep(patienceConfig.interval.toMillis) - val waitBlocks = (atLeast - currHeight).min(1) + val waitBlocks = (atLeast - currHeight).max(1) eventually(timeout(MaxBlockDelay * waitBlocks)) { val h = height()(subsequentLoggingOptions) h should be >= atLeast diff --git a/local-network/configs/wavesnode/genesis-template.conf b/local-network/configs/wavesnode/genesis-template.conf index 91aaa3c..d0c505d 100644 --- a/local-network/configs/wavesnode/genesis-template.conf +++ b/local-network/configs/wavesnode/genesis-template.conf @@ -24,7 +24,7 @@ genesis-generator { # Private key: 5r7KpS3MNXxRcz9jMbpjZKhaZVxDxF74H4VLW6ydi4aT # Public key: 2JYMTjUK7tC8NQi6TD6oWgy41YbrnXuoLzZydrFKTKt6 # Address: 3FSgXpgbT6m1speWgVx3cVxAZKmdr4barHU - { seed-text = "devnet-1", nonce = 1, amount = 998036000000000 } + { seed-text = "devnet-1", nonce = 1, amount = 900000000000000 } # Miner on wavesnode-2 # Seed text: devnet-2 @@ -33,7 +33,7 @@ genesis-generator { # Private key: F17jrRWmrR7en6eY6ptvnUTNqc9W8RSP34hpX7bNhbht # Public key: FuibB1rJ1uHVvvY6FNmhLqnbvQBNtziWbh7zh5c1CQCG # Address: 3FSrRN8X7cDsLyYTScS8Yf8KSwZgJBwf1jU - { seed-text = "devnet-2", nonce = 0, amount = 998036000000000 } + { seed-text = "devnet-2", nonce = 0, amount = 800900102030000 } # Additional addresses diff --git a/local-network/configs/wavesnode/waves.conf b/local-network/configs/wavesnode/waves.conf index 663b5e1..d6620bf 100644 --- a/local-network/configs/wavesnode/waves.conf +++ b/local-network/configs/wavesnode/waves.conf @@ -62,7 +62,7 @@ waves { micro-block-interval = 200ms max-transactions-in-micro-block = 500 min-micro-block-age = 0ms - quorum = 0 + quorum = 1 # Solves a simultaneous mining on start interval-after-last-block-then-generation-is-allowed = 120d } @@ -115,6 +115,8 @@ waves { minimum-peers = 0 } + ntp-server = "47.91.111.180" # TODO: set to null after https://github.com/wavesplatform/Waves/pull/3978 + # Nodes synchronization settings synchronization { # Timeout to receive all requested blocks