Candidate for 6.0.5 release

do-release.sh

@@ -36,30 +36,26 @@ if [[ $conf_version != $jar_version ]]; then
   exit 1
 fi
 
-openapi_files=("openapi.yaml" "openapi-ai.yaml")
+openapi_path="src/main/resources/api/openapi.yaml"
+version_line=$(grep 'version:' "$openapi_path")
 
-for file in "${openapi_files[@]}"; do
-  openapi_path="src/main/resources/api/$file"
-  version_line=$(grep 'version:' "$openapi_path")
-
-  if [[ -z $version_line ]]; then
-    echo "Error: Version line not found in $openapi_path"
-    exit 1
-  fi
+if [[ -z $version_line ]]; then
+  echo "Error: Version line not found in $openapi_path"
+  exit 1
+fi
 
-  actual_version=$(echo $version_line | awk -F '"' '{print $2}')
+actual_version=$(echo $version_line | awk -F '"' '{print $2}')
 
-  if [[ -z $actual_version ]]; then
-    echo "Error: Version not found in $openapi_path"
-    exit 1
-  fi
+if [[ -z $actual_version ]]; then
+  echo "Error: Version not found in $openapi_path"
+  exit 1
+fi
 
-  if [[ $actual_version != $jar_version ]]; then
-    echo "Version mismatch in $openapi_path: ($actual_version) != jar ($jar_version)."
-    echo "Removing jar $jar"
-    rm "$jar"
-    exit 1
-  fi
-done
+if [[ $actual_version != $jar_version ]]; then
+  echo "Version mismatch in $openapi_path: ($actual_version) != jar ($jar_version)."
+  echo "Removing jar $jar"
+  rm "$jar"
+  exit 1
+fi
 
 echo "do-release completed successfully"

ergo-core/src/main/scala/org/ergoplatform/http/api/ApiCodecs.scala

@@ -45,6 +45,14 @@ trait ApiCodecs extends JsonCodecs {
     fromTry(validationResult.toTry)
   }
 
+  private def fromTryAt[T](value: Try[T], cursor: ACursor): Decoder.Result[T] = value match {
+    case Success(result) => Right(result)
+    case Failure(e) => Left(DecodingFailure.fromThrowable(e, cursor.history))
+  }
+
+  private def decodeBase16(value: String, cursor: ACursor): Decoder.Result[Array[Byte]] =
+    fromTryAt(Base16.decode(value), cursor)
+
   implicit val leafDataEncoder: Encoder[LeafData] = Encoder.instance(xs => Base16.encode(xs).asJson)
 
   implicit val digestEncoder: Encoder[Digest] = Encoder.instance(x => Base16.encode(x).asJson)
@@ -338,11 +346,14 @@ trait ApiCodecs extends JsonCodecs {
           pubkey <- c.downField("pubkey").as[SigmaLeaf]
           proof <- c.downField("proof").as[String]
           position <- c.downField("position").as[NodePosition]
+          challengeBytes <- decodeBase16(challenge, c.downField("challenge"))
+          proofBytes <- decodeBase16(proof, c.downField("proof"))
+          proofTree <- fromTryAt(Try(SigSerializer.parseAndComputeChallenges(pubkey, proofBytes)(null)), c.downField("proof"))
         } yield
           RealSecretProof(
             pubkey,
-            Challenge @@ Base16.decode(challenge).get.toColl,
-            SigSerializer.parseAndComputeChallenges(pubkey, Base16.decode(proof).get)(null),
+            Challenge @@ challengeBytes.toColl,
+            proofTree,
             position
           )
       case h: String if h == "proofSimulated" =>
@@ -351,11 +362,14 @@ trait ApiCodecs extends JsonCodecs {
           pubkey <- c.downField("pubkey").as[SigmaLeaf]
           proof <- c.downField("proof").as[String]
           position <- c.downField("position").as[NodePosition]
+          challengeBytes <- decodeBase16(challenge, c.downField("challenge"))
+          proofBytes <- decodeBase16(proof, c.downField("proof"))
+          proofTree <- fromTryAt(Try(SigSerializer.parseAndComputeChallenges(pubkey, proofBytes)(null)), c.downField("proof"))
         } yield
           SimulatedSecretProof(
             pubkey,
-            Challenge @@ Base16.decode(challenge).get.toColl,
-            SigSerializer.parseAndComputeChallenges(pubkey, Base16.decode(proof).get)(null),
+            Challenge @@ challengeBytes.toColl,
+            proofTree,
             position
           )
       case _ =>

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
   *
@@ -12,5 +14,15 @@ package org.ergoplatform.modifiers.history.popow
   *                     to the block header)
   *
   */
-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/JsonSerializationCoreSpec.scala

@@ -1,7 +1,7 @@
 package org.ergoplatform.serialization
 
 import io.circe.syntax._
-import io.circe.ACursor
+import io.circe.{ACursor, Json}
 import org.ergoplatform.ErgoBox
 import org.ergoplatform.ErgoBox.{AdditionalRegisters, NonMandatoryRegisterId}
 import org.ergoplatform.http.api.ApiCodecs
@@ -14,6 +14,9 @@ import org.ergoplatform.wallet.Constants.ScanId
 import org.ergoplatform.wallet.boxes.TrackedBox
 import cats.syntax.either._
 import sigma.ast.{ErgoTree, EvaluatedValue, SType}
+import sigmastate.interpreter.SecretProven
+
+import scala.util.Try
 
 class JsonSerializationCoreSpec extends ErgoCorePropertyTest
   with ApiCodecs {
@@ -61,6 +64,26 @@ class JsonSerializationCoreSpec extends ErgoCorePropertyTest
     }
   }
 
+  property("secret proof decoder should reject invalid hex without throwing") {
+    val pubkey = proveDlogGen.sample.get
+    val pubkeyJson = Json.obj("op" -> pubkey.opCode.toByte.asJson, "h" -> pubkey.value.asJson)
+
+    Seq("zz" -> "00", "00" -> "zz").foreach { case (challenge, proof) =>
+      val json = Json.obj(
+        "hint" -> "proofReal".asJson,
+        "challenge" -> challenge.asJson,
+        "pubkey" -> pubkeyJson,
+        "proof" -> proof.asJson,
+        "position" -> "0".asJson
+      )
+
+      val decoded = Try(json.as[SecretProven])
+      decoded.isSuccess shouldBe true
+      decoded.get.isLeft shouldBe true
+      decoded.get.left.get.message.toLowerCase should include ("hex")
+    }
+  }
+
   private def checkTrackedBox(c: ACursor, b: TrackedBox)(implicit opts: Detalization) = {
     c.downField("spent").as[Boolean] shouldBe Right(b.spendingStatus.spent)
     c.downField("onchain").as[Boolean] shouldBe Right(b.chainStatus.onChain)

src/it/scala/org/ergoplatform/it/OpenApiSpec.scala

@@ -25,6 +25,9 @@ class OpenApiSpec extends AnyFlatSpec with IntegrationSuite {
     .withFallback(nodeSeedConfigs.head)
     .withFallback(allowLocalConfig)
 
+  // `lazy` so the container is only started when a test actually touches `node`.
+  // The single test below is currently `ignore`d (the openapi-checker image is gone),
+  // so without `lazy` we would start and tear down a node for nothing.
   lazy val node: Node = docker.startDevNetNode(offlineGeneratingPeer).get
 
   def renderTemplate(template: String, varMapping: Map[String, String]): String =