Cap on peers database size

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.16, 2.12.20, 2.11.12]
+        scala: [2.13.18, 2.12.20, 2.11.12]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -64,7 +64,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.16, 2.12.20, 2.11.12]
+        scala: [2.13.18, 2.12.20, 2.11.12]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:

.gitignore

@@ -7,6 +7,7 @@ devnet
 .ensime
 .ensime_cache/
 scorex.yaml
+*.iml
 
 # LLM reports on code analysis etc
 llm_generated

avldb/build.sbt

@@ -2,7 +2,7 @@ import sbt.Keys.testFrameworks
 
 val scala211 = "2.11.12"
 val scala212 = "2.12.20"
-val scala213 = "2.13.16"
+val scala213 = "2.13.18"
 
 name := "avldb"
 
@@ -30,7 +30,7 @@ val Versions = new {
 libraryDependencies ++= Seq(
   "ch.qos.logback" % "logback-classic" % "1.2.13",
   "com.google.guava" % "guava" % "23.0",
-  "org.scorexfoundation" %% "scrypto" % "2.3.0",
+  "org.scorexfoundation" %% "scrypto" % "3.1.1",
   "org.scalatest" %% "scalatest" % "3.2.19" % Test,
   "org.scalacheck" %% "scalacheck" % Versions.scalacheck(scalaVersion.value) % Test,
   Versions.scalatestplus(scalaVersion.value),

build.sbt

@@ -6,7 +6,7 @@ logLevel := Level.Debug
 // this values should be in sync with ergo-wallet/build.sbt
 val scala211 = "2.11.12"
 val scala212 = "2.12.20"
-val scala213 = "2.13.16"
+val scala213 = "2.13.18"
 
 lazy val commonSettings = Seq(
   organization := "org.ergoplatform",
@@ -39,11 +39,11 @@ lazy val commonSettings = Seq(
 
 publishArtifact in (Compile, packageDoc) := false
 
-val circeVersion = "0.13.0"
+val circeVersion = "0.14.15"
 val akkaVersion = "2.6.10"
 val akkaHttpVersion = "10.2.4"
 
-val sigmaStateVersion = "6.0.3"
+val sigmaStateVersion = "6.0.6"
 val ficusVersion = "1.4.7"
 
 // for testing current sigmastate build (see sigmastate-ergo-it jenkins job)
@@ -336,7 +336,7 @@ lazy val ergo = (project in file("."))
       "com.github.scopt" %% "scopt" % "4.1.0",
 
       // API dependencies
-      "de.heikoseeberger" %% "akka-http-circe" % "1.20.0",
+      "de.heikoseeberger" %% "akka-http-circe" % "1.39.2",
 
       // app dependencies
       // jaxb-api is included only to avoid a runtime exception

ergo-core/build.sbt

@@ -1,16 +1,16 @@
 // this values should be in sync with root (i.e. ../build.sbt)
 val scala211 = "2.11.12"
 val scala212 = "2.12.20"
-val scala213 = "2.13.16"
+val scala213 = "2.13.18"
 
 val deps211 = Seq(
   "io.circe" %% "circe-core" % "0.10.0",
   "io.circe" %% "circe-generic" % "0.10.0",
   "io.circe" %% "circe-parser" % "0.10.0")
 val deps212 = Seq(
-  "io.circe" %% "circe-core" % "0.13.0",
-  "io.circe" %% "circe-generic" % "0.13.0",
-  "io.circe" %% "circe-parser" % "0.13.0")
+  "io.circe" %% "circe-core" % "0.14.15",
+  "io.circe" %% "circe-generic" % "0.14.15",
+  "io.circe" %% "circe-parser" % "0.14.15")
 
 publishMavenStyle := true
 Test / publishArtifact := false

ergo-core/src/main/scala/org/ergoplatform/modifiers/history/extension/ExtensionCandidate.scala

@@ -7,7 +7,6 @@ import scorex.crypto.authds.merkle.{BatchMerkleProof, Leaf, MerkleProof, MerkleT
 import scorex.crypto.hash.Digest32
 import scorex.util.ModifierId
 import scala.annotation.nowarn
-import scala.collection.mutable
 /**
   * Extension block section with header id not provided
   *
@@ -49,9 +48,8 @@ class ExtensionCandidate(val fields: Seq[(Array[Byte], Array[Byte])]) {
     val indices = keys.flatMap(key => fields.find(_._1 sameElements key)
       .map(Extension.kvToLeaf)
       .map(kv => Leaf[Digest32](LeafData @@ kv)(Algos.hash).hash)
-      .flatMap(leafData => interlinksMerkleTree.elementsHashIndex.get(
-        new mutable.WrappedArray.ofByte(leafData))))
-    if (indices.isEmpty) None else interlinksMerkleTree.proofByIndices(indices)(Algos.hash)
+      .flatMap(leafData => interlinksMerkleTree.indexByElementHash(leafData)))
+    if (indices.isEmpty) None else interlinksMerkleTree.proofByIndices(indices)
   }
 }
 

ergo-core/src/main/scala/org/ergoplatform/modifiers/history/popow/NipopowAlgos.scala

@@ -75,6 +75,8 @@ class NipopowAlgos(val chainSettings: ChainSettings) {
       Int.MaxValue
     }
 
+  def hasValidPow(header: Header): Boolean = powScheme.validate(header).isSuccess
+
   /**
     * Computes best score of a given chain.
     * The score value depends on number of µ-superblocks in the given chain.
@@ -96,6 +98,8 @@ class NipopowAlgos(val chainSettings: ChainSettings) {
     * end function
     */
   def bestArg(chain: Seq[Header])(m: Int): Int = {
+    require(m >= 1, s"$m < 1")
+
     @scala.annotation.tailrec
     def loop(level: Int, acc: Seq[(Int, Int)] = Seq.empty): Seq[(Int, Int)] =
       if (level == 0) {
@@ -130,7 +134,6 @@ class NipopowAlgos(val chainSettings: ChainSettings) {
     val k = params.k
     val m = params.m
 
-    require(params.k >= 1, s"$k < 1")
     require(chain.lengthCompare(k + m) >= 0, s"Can not prove chain of size < ${k + m}")
     require(chain.head.header.isGenesis, "Can not prove non-anchored chain")
 

ergo-core/src/main/scala/org/ergoplatform/modifiers/history/popow/NipopowProof.scala

@@ -72,7 +72,12 @@ case class NipopowProof(popowAlgos: NipopowAlgos,
     * @return true if the proof is valid
     */
   lazy val isValid: Boolean = {
-    this.hasValidConnections && this.hasValidHeights && this.hasValidProofs && this.hasValidDifficultyHeaders
+    PoPowParams.isValid(m, k) &&
+      this.hasValidConnections &&
+      this.hasValidHeights &&
+      this.hasValidProofs &&
+      this.hasValidDifficultyHeaders &&
+      this.hasValidPow
   }
 
   /**
@@ -155,6 +160,8 @@ case class NipopowProof(popowAlgos: NipopowAlgos,
       suffixHead.checkInterlinksProof()
   }
 
+  lazy val hasValidPow: Boolean = headersChain.forall(popowAlgos.hasValidPow)
+
 }
 
 object NipopowProof {

ergo-core/src/main/scala/org/ergoplatform/modifiers/history/popow/PoPowParams.scala

@@ -1,5 +1,7 @@
 package org.ergoplatform.modifiers.history.popow
 
+import scala.util.Try
+
 /**
   * NiPoPoW proof params from the KMZ17 paper
   *
@@ -10,7 +12,20 @@ package org.ergoplatform.modifiers.history.popow
   *                     to calculate difficulty to be added to the proof). One-shot use means using the proof to just
   *                     to prove that a best chain contains some header (e.g. to work with a transaction corresponding
   *                     to the block header)
+  * @param minChainLength - minimal length of a proof's header chain acceptable for the params, always m + k.
+  *                     Kept as groundwork for the proof-length checks of the NiPoPoW parsing rework (#2461),
+  *                     not read by validation yet
   *
   */
-case class PoPowParams(m: Int, k: Int, continuous: Boolean)
+final class PoPowParams private (val m: Int, val k: Int, val continuous: Boolean, val minChainLength: Int)
+
+object PoPowParams {
+  def isValid(m: Int, k: Int): Boolean =
+    m >= 1 && k >= 1 && m.toLong + k.toLong <= Int.MaxValue
+
+  def apply(m: Int, k: Int, continuous: Boolean): Try[PoPowParams] = Try {
+    require(isValid(m, k), s"Invalid NiPoPoW parameters: m=$m, k=$k")
+    new PoPowParams(m, k, continuous, m + k)
+  }
+}
 

ergo-core/src/test/scala/org/ergoplatform/serialization/ContextExtensionSpec.scala

@@ -0,0 +1,79 @@
+package org.ergoplatform.serialization
+
+import org.ergoplatform.modifiers.mempool.{ErgoTransaction, ErgoTransactionSerializer}
+import org.ergoplatform.settings.Constants.TrueTree
+import org.ergoplatform.utils.ErgoCorePropertyTest
+import org.ergoplatform.{ErgoBoxCandidate, Input}
+import scorex.crypto.authds.ADKey
+import scorex.util.encode.Base16
+import sigma.ast.IntConstant
+import sigma.interpreter.{ContextExtension, ProverResult}
+
+import scala.util.Try
+
+/**
+  * Pins the sigma-state 6.0.6 change "reject negative-id vars in ContextExtension
+  * deserializer" and documents its consensus impact.
+  *
+  * The wire format itself did not change: var ids are written as one raw byte via
+  * signed `put(id)` (verified against the published sources of both 6.0.3 and 6.0.6).
+  * What changed is the reader only: 6.0.6 adds an explicit
+  * "Negative id of context extension variable" guard, so transactions carrying such
+  * extensions now fail at parse time with a `SerializerException`.
+  *
+  * Before 6.0.6 the same transaction could still be serialized/parsed successfully;
+  * negative ids were rejected later, at proving/verification time, with different
+  * exceptions (e.g., `NegativeArraySizeException`, `ArrayIndexOutOfBoundsException`).
+  * Those paths are covered by `ErgoTransactionSpec`. This spec adds the missing
+  * serializer-level and transaction-parser-level coverage that directly answers the
+  * review's confirm-item.
+  *
+  * Consensus impact: a hand-crafted transaction with a negative extension id could,
+  * in principle, be mined by an un-upgraded node and rejected by upgraded nodes.
+  * All known wallets/SDKs use small non-negative var ids, so no such transactions
+  * are known; the change is a soft-fork-style tightening that is safe once the
+  * majority of hashrate is upgraded.
+  */
+class ContextExtensionSpec extends ErgoCorePropertyTest {
+
+  private val serializer = ContextExtension.serializer
+
+  property("ContextExtension deserialization rejects negative var id") {
+    // wire layout: [values count][id][serialized value]
+    val bytes = serializer.toBytes(ContextExtension(Map(56.toByte -> IntConstant(0))))
+    bytes(1) = 0xC8.toByte // id 56 -> -56 as signed byte
+    val parsed = Try(serializer.fromBytes(bytes))
+    parsed.isFailure shouldBe true
+    parsed.failed.get.getMessage.contains("Negative id") shouldBe true
+  }
+
+  property("ContextExtension serialization writes var id byte raw") {
+    // pins that the rejected wire bytes are producible by ordinary node code;
+    // the writer does not range-check the id
+    val bytes = serializer.toBytes(ContextExtension(Map((-56).toByte -> IntConstant(0))))
+    bytes(1) shouldBe 0xC8.toByte
+  }
+
+  property("ContextExtension valid ids round-trip") {
+    Seq(0.toByte, 127.toByte).foreach { id =>
+      val ce = ContextExtension(Map(id -> IntConstant(1)))
+      serializer.fromBytes(serializer.toBytes(ce)) shouldBe ce
+    }
+  }
+
+  property("ErgoTransaction parsing rejects negative context extension var id") {
+    val boxId = ADKey @@ Base16.decode("c95c2ccf55e03cac6659f71ca4df832d28e2375569cec178dcb17f3e2e5f7742").get
+    val input = Input(
+      boxId,
+      ProverResult(Array.emptyByteArray, ContextExtension(Map((-10).toByte -> IntConstant(0))))
+    )
+    val output = new ErgoBoxCandidate(1000000000L, TrueTree, 0)
+    val tx = ErgoTransaction(IndexedSeq(input), IndexedSeq.empty, IndexedSeq(output))
+
+    val bytes = ErgoTransactionSerializer.toBytes(tx)
+    val parsed = Try(ErgoTransactionSerializer.parseBytes(bytes))
+    parsed.isFailure shouldBe true
+    parsed.failed.get.getMessage.contains("Negative id") shouldBe true
+  }
+
+}

ergo-wallet/build.sbt

@@ -1,16 +1,16 @@
 // this values should be in sync with root (i.e. ../build.sbt)
 val scala211 = "2.11.12"
 val scala212 = "2.12.20"
-val scala213 = "2.13.16"
+val scala213 = "2.13.18"
 
 val deps211 = Seq(
   "io.circe" %% "circe-core" % "0.10.0",
   "io.circe" %% "circe-generic" % "0.10.0",
   "io.circe" %% "circe-parser" % "0.10.0")
 val deps212 = Seq(
-  "io.circe" %% "circe-core" % "0.13.0",
-  "io.circe" %% "circe-generic" % "0.13.0",
-  "io.circe" %% "circe-parser" % "0.13.0")
+  "io.circe" %% "circe-core" % "0.14.15",
+  "io.circe" %% "circe-generic" % "0.14.15",
+  "io.circe" %% "circe-parser" % "0.14.15")
 
 libraryDependencies ++= Seq(
   "org.scodec" %% "scodec-bits" % "1.1.34",