update to latest node snapshot

phearnot · phearnot · commit 85a2b4250d88 · 2025-11-19T19:15:40.000+03:00
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
@@ -47,6 +47,7 @@ jobs:
 
   local-network:
     name: Run Local Network tests
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/build.sbt b/build.sbt
@@ -9,7 +9,7 @@ git.uncommittedSignifier := Some("DIRTY")
 inScope(Global)(
   Seq(
     onChangedBuildSource := ReloadOnSourceChanges,
-    scalaVersion         := "3.7.3",
+    scalaVersion         := "3.7.4",
     organization         := "network.units",
     organizationName     := "Units Network",
     resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.mavenLocal),
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
@@ -26,7 +26,7 @@ class NodeHttpApi(apiUri: Uri, backend: SttpBackend[Identity, ?], apiKeyValue: S
     extends IntegrationTestEventually
     with Matchers
     with ScorexLogging {
-  def blockHeader(atHeight: Int)(implicit loggingOptions: LoggingOptions = LoggingOptions()): Option[BlockHeaderResponse] = {
+  def blockHeader(atHeight: Height)(implicit loggingOptions: LoggingOptions = LoggingOptions()): Option[BlockHeaderResponse] = {
     if (loggingOptions.logRequest) log.debug(s"${loggingOptions.prefix} blockHeader($atHeight)")
     basicRequest
       .get(uri"$apiUri/blocks/headers/at/$atHeight")
@@ -45,7 +45,7 @@ class NodeHttpApi(apiUri: Uri, backend: SttpBackend[Identity, ?], apiKeyValue: S
     }
   }
 
-  def waitForHeight(atLeast: Int)(implicit loggingOptions: LoggingOptions = LoggingOptions()): Height = {
+  def waitForHeight(atLeast: Height)(implicit loggingOptions: LoggingOptions = LoggingOptions()): Height = {
     if (loggingOptions.logCall) log.debug(s"${loggingOptions.prefix} waitForHeight($atLeast)")
     val subsequentLoggingOptions = loggingOptions.copy(logCall = false, logResult = false, logRequest = false)
     val currHeight               = height()(using subsequentLoggingOptions)
@@ -258,7 +258,8 @@ object NodeHttpApi {
 
   case class HeightResponse(height: Height)
   object HeightResponse {
-    implicit val heightResponseFormat: OFormat[HeightResponse] = Json.format[HeightResponse]
+    given Reads[Height] = Reads.IntReads.map(Height.apply)
+    given OFormat[HeightResponse] = Json.format[HeightResponse]
   }
 
   case class BroadcastResponse(id: String)
@@ -268,7 +269,8 @@ object NodeHttpApi {
 
   case class TransactionInfoResponse(height: Height, applicationStatus: String)
   object TransactionInfoResponse {
-    implicit val transactionInfoResponseFormat: OFormat[TransactionInfoResponse] = Json.format[TransactionInfoResponse]
+    given Reads[Height] = Reads.IntReads.map(Height.apply)
+    given OFormat[TransactionInfoResponse] = Json.format[TransactionInfoResponse]
   }
 
   case class BalanceResponse(balance: Long)
diff --git a/consensus-client-it/src/test/scala/units/AssetRegistryTestSuite.scala b/consensus-client-it/src/test/scala/units/AssetRegistryTestSuite.scala
@@ -1,13 +1,15 @@
 package units
 
+import com.wavesplatform.state.Height
+
 class AssetRegistryTestSuite extends BaseDockerTestSuite {
   private val clRecipient = clRichAccount1
   private val elSender    = elRichAccount1
 
   private val userAmount = 1
   private val elAmount   = UnitsConvert.toAtomic(userAmount, 18)
 
-  private var activationEpoch = 0
+  private var activationEpoch = Height(0)
 
   "WAVES and issued asset are not registered before activation" in {
     standardBridge.isRegistered(TErc20Address, ignoreExceptions = true) shouldBe false
diff --git a/consensus-client-it/src/test/scala/units/C2ENativeTokenTransfersViaDepositsTestSuite.scala b/consensus-client-it/src/test/scala/units/C2ENativeTokenTransfersViaDepositsTestSuite.scala
@@ -57,7 +57,7 @@ class C2ENativeTokenTransfersViaDepositsTestSuite extends BaseDockerTestSuite {
     waves1.api.broadcastAndWait(
       TxHelpers.dataEntry(
         chainContractAccount,
-        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)
+        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)
       )
     )
 
diff --git a/consensus-client-it/src/test/scala/units/ManyTransfersTestSuite.scala b/consensus-client-it/src/test/scala/units/ManyTransfersTestSuite.scala
@@ -183,7 +183,7 @@ class ManyTransfersTestSuite extends BaseDockerTestSuite {
     waves1.api.broadcastAndWait(
       TxHelpers.dataEntry(
         chainContractAccount,
-        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)
+        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)
       )
     )
 
diff --git a/consensus-client-it/src/test/scala/units/MultipleTransfersViaDepositsTestSuite.scala b/consensus-client-it/src/test/scala/units/MultipleTransfersViaDepositsTestSuite.scala
@@ -196,7 +196,7 @@ class MultipleTransfersViaDepositsTestSuite extends BaseDockerTestSuite {
     waves1.api.broadcastAndWait(
       TxHelpers.dataEntry(
         chainContractAccount,
-        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)
+        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)
       )
     )
 
diff --git a/consensus-client-it/src/test/scala/units/SyncingTestSuite.scala b/consensus-client-it/src/test/scala/units/SyncingTestSuite.scala
@@ -63,7 +63,7 @@ class SyncingTestSuite extends BaseDockerTestSuite {
 
     step("Rollback CL")
     val elWaitHeight = ec1.web3j.ethBlockNumber().send().getBlockNumber.intValueExact() + 1
-    waves1.api.rollback(Height(contractBlock.epoch - 1))
+    waves1.api.rollback(contractBlock.epoch - 1)
 
     step("Wait for EL blocks")
     eventually(Timeout(2.minutes), Interval(10.seconds)) {
diff --git a/consensus-client-it/src/test/scala/units/block/validation/AssetValidTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/AssetValidTestSuite.scala
@@ -6,12 +6,15 @@ import com.wavesplatform.common.utils.EitherExt2.explicitGet
 import com.wavesplatform.lang.v1.compiler.Terms
 import com.wavesplatform.transaction.TxHelpers
 import com.wavesplatform.transaction.smart.InvokeScriptTransaction
+import org.scalatest.concurrent.PatienceConfiguration.{Interval, Timeout}
 import units.*
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
 
+import scala.concurrent.duration.*
+
 class AssetValidTestSuite extends BaseBlockValidationSuite {
   "Valid block: asset token, correct transfer" in {
     val balanceBefore          = terc20.getBalance(elRecipient)
@@ -67,21 +70,15 @@ class AssetValidTestSuite extends BaseBlockValidationSuite {
       NetworkL2Block.signed(payload, actingMiner.privateKey).explicitGet()
     )
 
-    step("Assertion: Block exists on EC1")
-    eventually {
-      ec1.engineApi
-        .getBlockByHash(simulatedBlockHash)
-        .explicitGet()
-        .getOrElse(fail(s"Block $simulatedBlockHash was not found on EC1"))
+    step("Assertion: EL height grows")
+    eventually(Timeout(30.seconds), Interval(2.seconds)) {
+      val elBlockAfter = ec1.engineApi.getLastExecutionBlock().explicitGet()
+      elBlockAfter.hash shouldBe simulatedBlockHash
     }
 
     step("Assertion: Deposited transaction changes balances")
     val balanceAfter = terc20.getBalance(elRecipient)
     balanceAfter.longValue shouldBe (balanceBefore.longValue + elAssetTokenAmount.longValue)
-
-    step("Assertion: EL height grows")
-    val elBlockAfter = ec1.engineApi.getLastExecutionBlock().explicitGet()
-    elBlockAfter.hash shouldBe simulatedBlockHash
   }
 
   override def beforeAll(): Unit = setupForAssetTokenTransfer()
diff --git a/consensus-client-it/src/test/scala/units/block/validation/BaseBlockValidationSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/BaseBlockValidationSuite.scala
@@ -123,7 +123,7 @@ trait BaseBlockValidationSuite extends BaseDockerTestSuite {
     waves1.api.broadcastAndWait(
       TxHelpers.dataEntry(
         chainContractAccount,
-        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)
+        IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)
       )
     )
 
diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeValidTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeValidTestSuite.scala
@@ -6,13 +6,16 @@ import com.wavesplatform.common.utils.EitherExt2.explicitGet
 import com.wavesplatform.lang.v1.compiler.Terms
 import com.wavesplatform.transaction.TxHelpers
 import com.wavesplatform.transaction.smart.InvokeScriptTransaction
+import org.scalatest.concurrent.PatienceConfiguration.{Interval, Timeout}
 import org.web3j.protocol.core.DefaultBlockParameterName
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
 import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
+import scala.concurrent.duration.*
+
 class NativeValidTestSuite extends BaseBlockValidationSuite {
   "Valid block: native token, correct transfer" in {
     val ethBalanceBefore       = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
@@ -67,21 +70,15 @@ class NativeValidTestSuite extends BaseBlockValidationSuite {
       NetworkL2Block.signed(payload, actingMiner.privateKey).explicitGet()
     )
 
-    step("Assertion: Block exists on EC1")
-    eventually {
-      ec1.engineApi
-        .getBlockByHash(simulatedBlockHash)
-        .explicitGet()
-        .getOrElse(fail(s"Block $simulatedBlockHash was not found on EC1"))
+    step("Assertion: EL height grows")
+    eventually(Timeout(30.seconds), Interval(2.seconds)) {
+      val elBlockAfter = ec1.engineApi.getLastExecutionBlock().explicitGet()
+      elBlockAfter.hash shouldBe simulatedBlockHash
     }
 
     step("Assertion: Deposited transaction changes balances")
     val ethBalanceAfter = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
     ethBalanceBefore.longValue shouldBe ethBalanceAfter.longValue - elNativeTokenAmount.longValue
-
-    step("Assertion: EL height grows")
-    val elBlockAfter = ec1.engineApi.getLastExecutionBlock().explicitGet()
-    elBlockAfter.hash shouldBe simulatedBlockHash
   }
 
   override def beforeAll(): Unit = setupForNativeTokenTransfer()
diff --git a/consensus-client-it/src/test/scala/units/block/validation/NoTransfersTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NoTransfersTestSuite.scala
@@ -5,10 +5,13 @@ import com.wavesplatform.common.utils.EitherExt2.explicitGet
 import com.wavesplatform.lang.v1.compiler.Terms
 import com.wavesplatform.transaction.TxHelpers
 import com.wavesplatform.transaction.smart.InvokeScriptTransaction
+import org.scalatest.concurrent.PatienceConfiguration.{Interval, Timeout}
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
 import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
+import scala.concurrent.duration.*
+
 class NoTransfersTestSuite extends BaseBlockValidationSuite {
   "Valid block: no transfers" in {
     val elParentBlock: EcBlock = getMainChainLastBlock
@@ -45,17 +48,11 @@ class NoTransfersTestSuite extends BaseBlockValidationSuite {
       NetworkL2Block.signed(payload, actingMiner.privateKey).explicitGet()
     )
 
-    step("Assertion: Block exists on EC1")
-    eventually {
-      ec1.engineApi
-        .getBlockByHash(simulatedBlockHash)
-        .explicitGet()
-        .getOrElse(fail(s"Block $simulatedBlockHash was not found on EC1"))
-    }
-
     step("Assertion: EL height grows")
-    val elBlockAfter = ec1.engineApi.getLastExecutionBlock().explicitGet()
-    elBlockAfter.hash shouldBe simulatedBlockHash
+    eventually(Timeout(30.seconds), Interval(2.seconds)) {
+      val elBlockAfter = ec1.engineApi.getLastExecutionBlock().explicitGet()
+      elBlockAfter.hash shouldBe simulatedBlockHash
+    }
   }
 
   override def beforeAll(): Unit = setupForNativeTokenTransfer()
diff --git a/consensus-client-it/src/test/scala/units/client/HttpChainContractClient.scala b/consensus-client-it/src/test/scala/units/client/HttpChainContractClient.scala
@@ -5,7 +5,7 @@ import com.wavesplatform.account.{Address, KeyPair}
 import com.wavesplatform.api.LoggingBackend.LoggingOptions
 import com.wavesplatform.api.NodeHttpApi
 import com.wavesplatform.common.state.ByteStr
-import com.wavesplatform.state.DataEntry
+import com.wavesplatform.state.{DataEntry, Height}
 import com.wavesplatform.transaction.Asset.IssuedAsset
 import com.wavesplatform.utils.ScorexLogging
 import org.scalatest.OptionValues
@@ -29,7 +29,7 @@ class HttpChainContractClient(api: NodeHttpApi, override val contract: Address)
   private val fiveBlocks              = WavesNodeContainer.MaxBlockDelay * 5
   lazy val nativeTokenId: IssuedAsset = IssuedAsset(ByteStr.decodeBase58(getStringData("tokenId").getOrElse(fail("Call setup first"))).get)
 
-  def getEpochFirstBlock(epochNumber: Int): Option[ContractBlock] =
+  def getEpochFirstBlock(epochNumber: Height): Option[ContractBlock] =
     getEpochMeta(epochNumber).flatMap { epochData =>
       getEpochFirstBlock(epochData.lastBlockHash)
     }
@@ -64,7 +64,7 @@ class HttpChainContractClient(api: NodeHttpApi, override val contract: Address)
   }
 
   // This is different from blockchain.height, because we wait this from a contract block
-  def waitForEpoch(atLeast: Int, chainId: Long = DefaultMainChainId): Unit = {
+  def waitForEpoch(atLeast: Height, chainId: Long = DefaultMainChainId): Unit = {
     log.debug(s"waitForEpoch($atLeast)")
     eventually {
       val lastBlock = getLastBlockMeta(chainId).value
diff --git a/src/main/scala/units/ELUpdater.scala b/src/main/scala/units/ELUpdater.scala
@@ -11,7 +11,7 @@ import com.wavesplatform.lang.v1.compiler.Terms.FUNCTION_CALL
 import com.wavesplatform.network.ChannelGroupExt
 import com.wavesplatform.state.diffs.FeeValidation.{FeeConstants, FeeUnit, ScriptExtraFee}
 import com.wavesplatform.state.diffs.TransactionDiffer.TransactionValidationError
-import com.wavesplatform.state.{Blockchain, BooleanDataEntry}
+import com.wavesplatform.state.{Blockchain, BooleanDataEntry, Height}
 import com.wavesplatform.transaction.*
 import com.wavesplatform.transaction.TxValidationError.InvokeRejectError
 import com.wavesplatform.transaction.smart.InvokeScriptTransaction
@@ -369,7 +369,7 @@ class ELUpdater(
 
     state match {
       case origState @ Working(epochInfo = epochInfo, chainStatus = m: Mining)
-          if epochInfo.number == blockchain.height && m.currentPayload == payloadOrId =>
+          if epochInfo.number == Height(blockchain.height) && m.currentPayload == payloadOrId =>
         waitForRefApprovalOnCl match {
           case Some(waitingTime) =>
             scheduler.scheduleOnceLabeled("waitForApproval", waitingTime) {
@@ -609,7 +609,7 @@ class ELUpdater(
             case FollowingChain(_, Some(nextExpectedBlock)) =>
               logger.debug(s"Waiting for block $nextExpectedBlock from peers")
               scheduler.scheduleOnceLabeled("nextCheck", WaitRequestedBlockTimeout) {
-                if (blockchain.height == prevState.epochInfo.number) {
+                if (Height(blockchain.height) == prevState.epochInfo.number) {
                   check(missedBlock)
                 }
               }
@@ -626,7 +626,7 @@ class ELUpdater(
     prevState.chainStatus.nextExpectedBlock match {
       case Some(missedBlock) =>
         scheduler.scheduleOnceLabeled("firstCheck", WaitRequestedBlockTimeout) {
-          if (blockchain.height == prevState.epochInfo.number) {
+          if (Height(blockchain.height) == prevState.epochInfo.number) {
             check(missedBlock)
           }
         }
@@ -697,7 +697,7 @@ class ELUpdater(
         lazy val errorOrMinerChanged = newEpochInfo.forall(_.miner != prevState.epochInfo.miner)
 
         if (
-          blockchain.height != prevState.epochInfo.number
+          Height(blockchain.height) != prevState.epochInfo.number
           || !blockchain.vrf(blockchain.height).contains(prevState.epochInfo.hitSource)
           || errorOrMinerChanged
         ) {
@@ -994,8 +994,8 @@ class ELUpdater(
       logger.debug(s"Unexpected state on sync: $other")
   })
 
-  private def validateRandao(block: EcBlock, epochNumber: Int): Result[Unit] =
-    blockchain.vrf(epochNumber) match {
+  private def validateRandao(block: EcBlock, epochNumber: Height): Result[Unit] =
+    blockchain.vrf(epochNumber.toInt) match {
       case None => s"VRF of $epochNumber epoch is empty".asLeft
       case Some(vrf) =>
         val expectedPrevRandao = calculateRandao(vrf, block.parentHash)
@@ -1020,7 +1020,7 @@ class ELUpdater(
       }
     } yield ()
 
-  private def validateTimestamp(newNetworkBlock: NetworkL2Block, parentEcBlock: EcBlock, epoch: Int): Result[Unit] = {
+  private def validateTimestamp(newNetworkBlock: NetworkL2Block, parentEcBlock: EcBlock, epoch: Height): Result[Unit] = {
     val minAppendTs = parentEcBlock.timestamp + chainContractClient.getOptions.blockDelayInSeconds.valueAtEpoch(epoch)
     Either.raiseUnless(newNetworkBlock.timestamp >= minAppendTs) {
       s"timestamp (${newNetworkBlock.timestamp}) of appended block must be greater or equal $minAppendTs, Δ${minAppendTs - newNetworkBlock.timestamp}s"
@@ -1395,7 +1395,7 @@ class ELUpdater(
   } yield Some(lastElWithdrawalIndex)
 
   private def prepareTransactions(
-      epochNumber: Int,
+      epochNumber: Height,
       chainContractOptions: ChainContractOptions,
       startAssetRegistryIndex: Int,
       endAssetRegistryIndexExcl: Int,
@@ -1720,7 +1720,7 @@ object ELUpdater {
   val WaitRequestedBlockTimeout: FiniteDuration       = 2.seconds
   private val MaxTransfersInLogs                      = 5 // Cut huge logs
 
-  case class EpochInfo(number: Int, miner: Address, rewardAddress: EthAddress, hitSource: ByteStr, prevEpochLastBlockHash: Option[BlockHash])
+  case class EpochInfo(number: Height, miner: Address, rewardAddress: EthAddress, hitSource: ByteStr, prevEpochLastBlockHash: Option[BlockHash])
 
   sealed trait State
   object State {
diff --git a/src/main/scala/units/client/contract/ChainContractClient.scala b/src/main/scala/units/client/contract/ChainContractClient.scala
diff --git a/src/main/scala/units/client/contract/ChainContractOptions.scala b/src/main/scala/units/client/contract/ChainContractOptions.scala
diff --git a/src/main/scala/units/client/contract/ContractBlock.scala b/src/main/scala/units/client/contract/ContractBlock.scala
diff --git a/src/main/scala/units/el/DepositedTransaction.scala b/src/main/scala/units/el/DepositedTransaction.scala
diff --git a/src/test/scala/units/C2ETransfersTestSuite.scala b/src/test/scala/units/C2ETransfersTestSuite.scala
diff --git a/src/test/scala/units/TestSettings.scala b/src/test/scala/units/TestSettings.scala
diff --git a/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala b/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class C2ENativeTokenTransfersViaDepositsTestSuite extends BaseDockerTestSuite {`
`57`	`57`	`waves1.api.broadcastAndWait(`
`58`	`58`	`TxHelpers.dataEntry(`
`59`	`59`	`chainContractAccount,`
`60`		`- IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)`
	`60`	`+ IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)`
`61`	`61`	`)`
`62`	`62`	`)`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class ManyTransfersTestSuite extends BaseDockerTestSuite {`
`183`	`183`	`waves1.api.broadcastAndWait(`
`184`	`184`	`TxHelpers.dataEntry(`
`185`	`185`	`chainContractAccount,`
`186`		`- IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)`
	`186`	`+ IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)`
`187`	`187`	`)`
`188`	`188`	`)`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ class MultipleTransfersViaDepositsTestSuite extends BaseDockerTestSuite {`
`196`	`196`	`waves1.api.broadcastAndWait(`
`197`	`197`	`TxHelpers.dataEntry(`
`198`	`198`	`chainContractAccount,`
`199`		`- IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)`
	`199`	`+ IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)`
`200`	`200`	`)`
`201`	`201`	`)`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ trait BaseBlockValidationSuite extends BaseDockerTestSuite {`
`123`	`123`	`waves1.api.broadcastAndWait(`
`124`	`124`	`TxHelpers.dataEntry(`
`125`	`125`	`chainContractAccount,`
`126`		`- IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch)`
	`126`	`+ IntegerDataEntry("strictC2ETransfersActivationEpoch", activationEpoch.toInt)`
`127`	`127`	`)`
`128`	`128`	`)`
`129`	`129`