wip

Author: phearnot

consensus-client-it/src/test/scala/units/block/validation/BaseBlockValidationSuite.scala

@@ -237,13 +237,13 @@ trait BaseBlockValidationSuite extends BaseDockerTestSuite {
     transferAssetTokenToClSender()
     leaveSetupMinerAndJoinOthers()
   }
-  
+
   protected def getMainChainLastBlock: EcBlock = {
     val mainChainId = waves1.api.dataByKey(chainContractAddress, "mainChainId").collect { case i: IntegerDataEntry => i.value }.getOrElse(0L)
     val elParentBlockId = waves1.api.dataByKey(chainContractAddress, f"chain_$mainChainId%08d").collect {
       case s: StringDataEntry => BlockHash("0x" + s.value.split(",")(1))
     }.get
-    
+
     ec1.engineApi.getBlockByHash(elParentBlockId).explicitGet().get
   }
 }

consensus-client-it/src/test/scala/units/docker/BaseContainer.scala

@@ -18,6 +18,7 @@ abstract class BaseContainer(val hostName: String) {
   }
 
   def stop(): Unit = {
+    container.getDockerClient.stopContainerCmd(container.getContainerId).exec()
     container.stop()
   }
 

consensus-client-it/src/test/scala/units/docker/DockerImages.scala

@@ -5,5 +5,5 @@ import units.test.TestEnvironment.WavesDockerImage
 
 object DockerImages {
   val WavesNode             = parse(WavesDockerImage)
-  val OpGethExecutionClient = parse("ghcr.io/unitsnetwork/op-geth:v1.101603.0-1")
+  val OpGethExecutionClient = parse("ghcr.io/unitsnetwork/op-geth:1.6.3-race-detector")
 }

consensus-client-it/src/test/scala/units/docker/WavesNodeContainer.scala

@@ -66,7 +66,7 @@ class WavesNodeContainer(
         .withStopTimeout(5) // Otherwise we don't have logs in the end
     }
 
-  lazy val apiPort = container.getMappedPort(ApiPort)
+  lazy val apiPort          = container.getMappedPort(ApiPort)
   lazy val unitsNetworkPort = container.getMappedPort(UnitsNetworkPort)
 
   lazy val api = new NodeHttpApi(uri"http://${container.getHost}:$apiPort", httpClientBackend)
@@ -75,7 +75,7 @@ class WavesNodeContainer(
 }
 
 object WavesNodeContainer {
-  val ApiPort = 6869
+  val ApiPort          = 6869
   val UnitsNetworkPort = 6865
 
   val GenesisTemplateFile = new File(s"$ConfigsDir/wavesnode/genesis-template.conf")
@@ -89,12 +89,8 @@ object WavesNodeContainer {
     val templateFile = ConfigsDir.resolve("wavesnode/genesis-template.conf").toAbsolutePath
 
     val origConfig = ConfigFactory.parseFile(templateFile.toFile)
-    val gap        = 25.seconds // To force node mining at start, otherwise it schedules
-    val overrides = ConfigFactory.parseString(
-      s"""genesis-generator {
-         |  timestamp = ${System.currentTimeMillis() - gap.toMillis}
-         |}""".stripMargin
-    )
+    // To force node mining at start, otherwise it schedules
+    val overrides = ConfigFactory.parseString(s"genesis-generator.timestamp = ${System.currentTimeMillis() - 25.seconds.toMillis}")
 
     val genesisSettings = GenesisBlockGenerator.parseSettings(overrides.withFallback(origConfig))
 

consensus-client-it/src/test/scala/units/http/OkHttpLogger.scala

@@ -12,7 +12,7 @@ object OkHttpLogger extends Interceptor with ScorexLogging {
     val req     = chain.request()
     val bodyStr = readRequestBody(req)
 
-    val currRequestId = (Json.parse(bodyStr) \ "id").asOpt[Long].getOrElse(LoggingUtil.currRequestId.toLong)
+    val currRequestId = (Json.parse(bodyStr) \ "id").as[Long]
     log.debug(s"[$currRequestId] ${req.method()} ${req.url()}: body=$bodyStr")
     val res = chain.proceed(req)
     log.debug(s"[$currRequestId] HTTP ${res.code()}: body=${readResponseBody(res)}")

contracts/waves/src/main.ride

@@ -848,6 +848,12 @@ func join(rewardAddressHex: String) = {
   let normalizedRewardAddress = normalizeEthAddress(rewardAddressHex)
   strict checkNotOverride = ensureNotOverrideOtherMinerPk(normalizedRewardAddress)
 
+  let minerLeftKey = "miner_" + newMiner + "_left"
+  let minerCanJoinAtHeight = this.getInteger(minerLeftKey).valueOrElse(-20) + 20
+
+  strict minerCanJoin = height >= minerCanJoinAtHeight ||
+    throw("Miner can join after height " + minerCanJoinAtHeight.toString())
+
   # Here is 980 complexity consumed, all code below spent more than 1000 of free complexity
 
   # If a miner changed the reward address, we need to delete the previous mapping
@@ -863,7 +869,8 @@ func join(rewardAddressHex: String) = {
   [
     StringEntry(allMinersKey, updatedAllMiners),
     StringEntry(minerRewardAddressKey(newMiner), "0x" + normalizedRewardAddress),
-    BinaryEntry(minerPkKey(normalizedRewardAddress), i.originCallerPublicKey)
+    BinaryEntry(minerPkKey(normalizedRewardAddress), i.originCallerPublicKey),
+    DeleteEntry(minerLeftKey)
   ] ++ deletePrevRewardAddressPk
 }
 
@@ -877,9 +884,9 @@ func leave() = {
   let rewardAddrKey = minerRewardAddressKey(leavingMiner)
   strict prevRewardAddress = this.getString(rewardAddrKey).valueOrErrorMessage("miner has never joined")
 
-  if (thisEpochMiner == i.originCaller) then throw("designated miner can't leave")
-  else [
-    StringEntry(allMinersKey, remainingMiners.makeString_2C(SEP))
+  [
+    StringEntry(allMinersKey, remainingMiners.makeString_2C(SEP)),
+    IntegerEntry("miner_" + leavingMiner + "_left", height)
     # TODO Get miner info at epoch start
     # DeleteEntry(rewardAddrKey), # Can cause empty miner reward address for next blocks
     # DeleteEntry(minerPkKey(prevRewardAddress))