update to latest node snapshot

Author: phearnot

.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

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),

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)

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

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)
       )
     )
 

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)
       )
     )
 

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)
       )
     )
 

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)) {

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)
       )
     )
 

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