Candidate for 6.0.0 release

build.sbt

@@ -18,8 +18,8 @@ lazy val commonSettings = Seq(
   // without the tag version resolves to [branch name]-[git commit hash]-SNAPSHOT
   // don't set the version manually
   resolvers ++= Seq("Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/",
-    "Bintray" at "https://jcenter.bintray.com/", //for org.ethereum % leveldbjni-all 
     "SonaType" at "https://oss.sonatype.org/content/groups/public",
+    "Repo for leveldbjni-all" at "https://gitlab.com/api/v4/projects/61211221/packages/maven",
     "Typesafe maven releases" at "https://dl.bintray.com/typesafe/maven-releases/",
     "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"),
   homepage := Some(url("http://ergoplatform.org/")),
@@ -33,11 +33,13 @@ lazy val commonSettings = Seq(
   ),
 )
 
+publishArtifact in (Compile, packageDoc) := false
+
 val circeVersion = "0.13.0"
 val akkaVersion = "2.6.10"
 val akkaHttpVersion = "10.2.4"
 
-val sigmaStateVersion = "5.0.13"
+val sigmaStateVersion = "5.0.14-479-aab382e8-SNAPSHOT"
 val ficusVersion = "1.4.7"
 
 // for testing current sigmastate build (see sigmastate-ergo-it jenkins job)

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

@@ -1,6 +1,8 @@
 package org.ergoplatform.http.api
 
 import cats.syntax.either._
+import sigmastate.utils.Helpers._
+
 import io.circe._
 import io.circe.syntax._
 import org.bouncycastle.util.BigIntegers
@@ -14,24 +16,22 @@ import org.ergoplatform.sdk.wallet.secrets.{DhtSecretKey, DlogSecretKey}
 import org.ergoplatform.settings.{Algos, ErgoAlgos}
 import org.ergoplatform.wallet.Constants.ScanId
 import org.ergoplatform.wallet.boxes.TrackedBox
-import org.ergoplatform.wallet.interface4j.SecretString
 import org.ergoplatform.wallet.interpreter.TransactionHintsBag
 import org.ergoplatform.validation.ValidationResult
 import scorex.crypto.authds.merkle.MerkleProof
 import scorex.crypto.authds.{LeafData, Side}
 import scorex.crypto.hash.Digest
 import scorex.util.encode.Base16
-import sigmastate.Values.SigmaBoolean
 import sigmastate._
-import sigmastate.crypto.CryptoConstants.EcPointType
-import sigmastate.crypto.DLogProtocol.{DLogProverInput, FirstDLogProverMessage, ProveDlog}
+import sigmastate.crypto.DLogProtocol.{DLogProverInput, FirstDLogProverMessage}
 import sigmastate.crypto.VerifierMessage.Challenge
 import sigmastate.crypto._
 import sigmastate.interpreter._
-import sigmastate.serialization.OpCodes
-import org.ergoplatform.sdk.JsonCodecs
-import sigmastate.eval.Extensions.ArrayOps
-import sigmastate.utils.Helpers._
+import org.ergoplatform.sdk.{JsonCodecs, SecretString}
+import sigma.crypto.EcPointType
+import sigma.data._
+import sigma.serialization.{OpCodes, SigSerializer}
+import sigma.Extensions.ArrayOps
 
 import java.math.BigInteger
 import scala.annotation.nowarn
@@ -129,7 +129,7 @@ trait ApiCodecs extends JsonCodecs {
   })
 
   implicit val secretBigIntEncoder: Encoder[BigInteger] = Encoder.instance { w =>
-    ErgoAlgos.encode(BigIntegers.asUnsignedByteArray(CryptoConstants.groupSize, w)).asJson
+    ErgoAlgos.encode(BigIntegers.asUnsignedByteArray(sigma.crypto.groupSize, w)).asJson
   }
 
   implicit val secretBigIntDecoder: Decoder[BigInteger] = arrayBytesDecoder.map { bytes =>

ergo-core/src/main/scala/org/ergoplatform/mining/AutolykosPowScheme.scala

@@ -15,8 +15,8 @@ import org.ergoplatform.nodeView.mempool.TransactionMembershipProof
 import scorex.crypto.authds.{ADDigest, SerializedAdProof}
 import scorex.crypto.hash.{Blake2b256, Digest32}
 import scorex.util.{ModifierId, ScorexLogging}
-import sigmastate.crypto.DLogProtocol.ProveDlog
-import sigmastate.crypto.CryptoFacade
+import sigma.crypto.CryptoFacade
+import sigma.data.ProveDlog
 
 import scala.annotation.tailrec
 import scala.util.Try

ergo-core/src/main/scala/org/ergoplatform/mining/AutolykosSolution.scala

@@ -2,6 +2,7 @@ package org.ergoplatform.mining
 
 import cats.syntax.either._
 import sigmastate.utils.Helpers._
+
 import io.circe.syntax._
 import io.circe.{Decoder, Encoder, HCursor}
 import org.bouncycastle.util.BigIntegers
@@ -10,8 +11,7 @@ import org.ergoplatform.modifiers.history.header.Header.Version
 import org.ergoplatform.settings.Algos
 import org.ergoplatform.serialization.ErgoSerializer
 import scorex.util.serialization.{Reader, Writer}
-import sigmastate.crypto.CryptoConstants
-import sigmastate.crypto.CryptoConstants.EcPointType
+import sigma.crypto.{CryptoConstants, EcPointType}
 
 /**
   * Solution for an Autolykos PoW puzzle.

ergo-core/src/main/scala/org/ergoplatform/mining/DefaultFakePowScheme.scala

@@ -3,7 +3,7 @@ package org.ergoplatform.mining
 import org.ergoplatform.modifiers.history.header.Header
 import scorex.crypto.authds.ADDigest
 import scorex.crypto.hash.Digest32
-import sigmastate.crypto.CryptoConstants.EcPointType
+import sigma.crypto.EcPointType
 
 import scala.util.{Random, Success, Try}
 

ergo-core/src/main/scala/org/ergoplatform/mining/ProofOfUpcomingTransactions.scala

@@ -2,6 +2,7 @@ package org.ergoplatform.mining
 
 import cats.syntax.either._
 import sigmastate.utils.Helpers._
+
 import io.circe.{Encoder, Json}
 import org.ergoplatform.modifiers.history.BlockTransactions
 import org.ergoplatform.nodeView.mempool.TransactionMembershipProof

ergo-core/src/main/scala/org/ergoplatform/mining/WorkMessage.scala

@@ -4,7 +4,7 @@ import io.circe.syntax._
 import io.circe.{Encoder, Json}
 import org.ergoplatform.http.api.ApiCodecs
 import org.ergoplatform.nodeView.history.ErgoHistoryUtils.Height
-import sigmastate.crypto.DLogProtocol.ProveDlog
+import sigma.data.ProveDlog
 
 
 /**

ergo-core/src/main/scala/org/ergoplatform/mining/mining.scala

@@ -2,10 +2,9 @@ package org.ergoplatform
 
 import org.bouncycastle.util.BigIntegers
 import scorex.crypto.hash.Blake2b256
-import sigmastate.crypto.CryptoConstants.EcPointType
-import sigmastate.crypto.{BcDlogGroup, CryptoConstants}
+import sigma.crypto.{BcDlogGroup, CryptoConstants, EcPointType}
+import sigma.serialization.{GroupElementSerializer, SigmaSerializer}
 import sigmastate.crypto.DLogProtocol.DLogProverInput
-import sigmastate.serialization.{GroupElementSerializer, SigmaSerializer}
 
 package object mining {
 

ergo-core/src/main/scala/org/ergoplatform/modifiers/ErgoFullBlock.scala

@@ -2,6 +2,7 @@ package org.ergoplatform.modifiers
 
 import cats.syntax.either._
 import sigmastate.utils.Helpers._
+
 import io.circe.syntax._
 import io.circe.{Decoder, Encoder, HCursor, Json}
 import org.ergoplatform.http.api.ApiCodecs

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

@@ -2,6 +2,7 @@ package org.ergoplatform.modifiers.history
 
 import cats.syntax.either._
 import sigmastate.utils.Helpers._
+
 import io.circe.syntax._
 import io.circe.{Decoder, Encoder, HCursor}
 import org.ergoplatform.http.api.ApiCodecs

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

@@ -18,6 +18,7 @@ import scorex.crypto.hash.Digest32
 import scorex.util.serialization.{Reader, Writer}
 import scorex.util.{ModifierId, bytesToId, idToBytes}
 import scorex.util.Extensions._
+import sigma.VersionContext
 
 import scala.annotation.nowarn
 import scala.collection.mutable
@@ -145,7 +146,9 @@ object BlockTransactionsSerializer extends ErgoSerializer[BlockTransactions] {
     }
     w.putUInt(bt.txs.size.toLong)
     bt.txs.foreach { tx =>
-      ErgoTransactionSerializer.serialize(tx, w)
+      VersionContext.withVersions(VersionContext.V6SoftForkVersion, VersionContext.V6SoftForkVersion) {
+        ErgoTransactionSerializer.serialize(tx, w)
+      }
     }
   }
 
@@ -170,8 +173,13 @@ object BlockTransactionsSerializer extends ErgoSerializer[BlockTransactions] {
       txCount = r.getUInt().toIntExact
     }
 
-    val txs = (1 to txCount).map { _ =>
-      ErgoTransactionSerializer.parse(r)
+    val txs: IndexedSeq[ErgoTransaction] = {
+      val version = VersionContext.fromBlockVersion(blockVersion)
+      VersionContext.withVersions(version.activatedVersion, version.ergoTreeVersion) {
+        (1 to txCount).map { _ =>
+          ErgoTransactionSerializer.parse(r)
+        }
+      }
     }
     BlockTransactions(headerId, blockVersion, txs, Some(r.position - startPos))
   }

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

@@ -6,9 +6,9 @@ import org.ergoplatform.modifiers.history.header.Header._
 import org.ergoplatform.nodeView.history.ErgoHistoryUtils._
 import org.ergoplatform.settings.Constants
 import scorex.util._
-import sigmastate.crypto.CryptoConstants.EcPointType
-import sigmastate.eval.CGroupElement
-import sigmastate.eval.Extensions._
+import sigma.crypto.EcPointType
+import sigma.data.CGroupElement
+import sigma.Extensions._
 
 /**
   * Only header fields that can be predicted by a miner

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

@@ -2,6 +2,7 @@ package org.ergoplatform.modifiers.history.extension
 
 import cats.syntax.either._
 import sigmastate.utils.Helpers._
+
 import com.google.common.primitives.Bytes
 import io.circe.syntax._
 import io.circe.{Decoder, Encoder, HCursor}

ergo-core/src/main/scala/org/ergoplatform/modifiers/history/header/Header.scala

@@ -17,9 +17,10 @@ import org.ergoplatform.serialization.ErgoSerializer
 import scorex.crypto.authds.ADDigest
 import scorex.crypto.hash.Digest32
 import scorex.util._
-import sigmastate.crypto.CryptoConstants.EcPointType
-import sigmastate.eval.Extensions._
-import sigmastate.eval.{CAvlTree, CBigInt, CGroupElement, CHeader}
+import sigma.Colls
+import sigma.Extensions._
+import sigma.crypto.EcPointType
+import sigma.data.{CAvlTree, CBigInt, CGroupElement, CHeader}
 
 import scala.annotation.nowarn
 import scala.concurrent.duration.FiniteDuration
@@ -138,14 +139,31 @@ object Header extends ApiCodecs {
     */
   val Interpreter50Version: Byte = 3
 
+  /**
+    * Block version after the 6.0 soft-fork
+    * 6.0 interpreter (EIP-50)
+    */
+  val Interpreter60Version: Byte = 4
+
+  // todo: pass NetworkType, not String
+  // todo: comments
+  def interpreter60VersionActivationHeight(networkTypeName: String): Int = {
+    if(networkTypeName == "mainnet") {
+      ???  // todo: set
+    } else if(networkTypeName == "testnet") {
+      1548800  // todo: set
+    } else {
+      //devnet
+      ???  // todo: set
+    }
+  }
 
   def toSigma(header: Header): sigma.Header =
     CHeader(
-      id = header.id.toBytes.toColl,
       version = header.version,
       parentId = header.parentId.toBytes.toColl,
       ADProofsRoot = header.ADProofsRoot.asInstanceOf[Array[Byte]].toColl,
-      stateRoot = CAvlTree(ErgoInterpreter.avlTreeFromDigest(header.stateRoot.toColl)),
+      stateRootDigest = header.stateRoot.toColl,
       transactionsRoot = header.transactionsRoot.asInstanceOf[Array[Byte]].toColl,
       timestamp = header.timestamp,
       nBits = header.nBits,
@@ -155,7 +173,8 @@ object Header extends ApiCodecs {
       powOnetimePk = CGroupElement(header.powSolution.w),
       powNonce = header.powSolution.n.toColl,
       powDistance = CBigInt(header.powSolution.d.bigInteger),
-      votes = header.votes.toColl
+      votes = header.votes.toColl,
+      unparsedBytes = Colls.emptyColl[Byte] // todo: fix after merging w. 5.0.23
     )
 
   val modifierTypeId: NetworkObjectTypeId.Value = HeaderTypeId.value

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

@@ -2,6 +2,7 @@ package org.ergoplatform.modifiers.history.popow
 
 import cats.syntax.either._
 import sigmastate.utils.Helpers._
+
 import cats.Traverse
 import cats.implicits.{catsStdInstancesForEither, catsStdInstancesForList}
 import io.circe.{Decoder, Encoder, Json}

ergo-core/src/main/scala/org/ergoplatform/modifiers/mempool/ErgoTransaction.scala

@@ -3,7 +3,7 @@ package org.ergoplatform.modifiers.mempool
 import io.circe.syntax._
 import org.ergoplatform.{DataInput, ErgoBox, ErgoBoxCandidate, ErgoLikeTransaction, ErgoLikeTransactionSerializer, Input}
 import org.ergoplatform.ErgoBox.BoxId
-import org.ergoplatform.SigmaConstants.{MaxBoxSize, MaxPropositionBytes}
+import org.ergoplatform._
 import org.ergoplatform.http.api.ApiCodecs
 import org.ergoplatform.mining.emission.EmissionRules
 import org.ergoplatform.modifiers.history.header.Header
@@ -27,8 +27,8 @@ import org.ergoplatform.validation.{InvalidModifier, ModifierValidator, Validati
 import scorex.db.ByteArrayUtils
 import scorex.util.serialization.{Reader, Writer}
 import scorex.util.{ModifierId, ScorexLogging, bytesToId}
-import sigmastate.serialization.ConstantStore
-import sigmastate.utils.{SigmaByteReader, SigmaByteWriter}
+import sigma.data.SigmaConstants.{MaxBoxSize, MaxPropositionBytes}
+import sigma.serialization.{ConstantStore, SigmaByteReader, SigmaByteWriter}
 
 import java.util
 import scala.annotation.nowarn
@@ -490,7 +490,7 @@ object ErgoTransactionSerializer extends ErgoSerializer[ErgoTransaction] {
 
   override def serialize(tx: ErgoTransaction, w: Writer): Unit = {
     val elt = new ErgoLikeTransaction(tx.inputs, tx.dataInputs, tx.outputCandidates)
-    ErgoLikeTransactionSerializer.serialize(elt, new SigmaByteWriter(w, None))
+    ErgoLikeTransactionSerializer.serialize(elt, new SigmaByteWriter(w, None, None, None))
   }
 
   override def parse(r: Reader): ErgoTransaction = {

ergo-core/src/main/scala/org/ergoplatform/nodeView/state/ErgoStateContext.scala

@@ -9,19 +9,20 @@ import org.ergoplatform.modifiers.history.header.{Header, HeaderSerializer}
 import org.ergoplatform.modifiers.history.popow.NipopowAlgos
 import org.ergoplatform.nodeView.history.ErgoHistoryUtils
 import org.ergoplatform.nodeView.history.storage.modifierprocessors.ExtensionValidator
-import org.ergoplatform.sdk.wallet.protocol.context.BlockchainStateContext
 import org.ergoplatform.settings.ValidationRules._
 import org.ergoplatform.settings._
 import org.ergoplatform.utils.ScorexEncoding
 import org.ergoplatform.serialization.ErgoSerializer
 import org.ergoplatform.validation.{InvalidModifier, ModifierValidator, ValidationState}
+import org.ergoplatform.wallet.interpreter.VersionedBlockchainStateContext
 import scorex.crypto.authds.ADDigest
 import scorex.util.ScorexLogging
 import scorex.util.serialization.{Reader, Writer}
-import sigmastate.crypto.CryptoConstants.EcPointType
-import sigmastate.eval.Extensions.ArrayOps
-import sigmastate.eval.SigmaDsl
 import sigma.Coll
+import sigma.eval.SigmaDsl
+import sigma.Extensions.ArrayOps
+import sigma.crypto.EcPointType
+import sigma.validation.SigmaValidationSettings
 
 import scala.collection.compat.immutable.ArraySeq
 import scala.util.{Failure, Success, Try}
@@ -68,7 +69,7 @@ class ErgoStateContext(val lastHeaders: Seq[Header],
                        val validationSettings: ErgoValidationSettings,
                        val votingData: VotingData)
                       (implicit val chainSettings: ChainSettings)
-  extends BlockchainStateContext
+  extends VersionedBlockchainStateContext
     with BytesSerializable
     with ScorexEncoding
     with ScorexLogging {
@@ -78,6 +79,8 @@ class ErgoStateContext(val lastHeaders: Seq[Header],
   private val votingSettings = chainSettings.voting
   private val popowAlgos = new NipopowAlgos(chainSettings)
 
+  override val sigmaValidationSettings: SigmaValidationSettings = validationSettings.sigmaSettings
+
   override def sigmaPreHeader: sigma.PreHeader =
     PreHeader.toSigma(lastHeaders.headOption.getOrElse(PreHeader.fake))
 

ergo-core/src/main/scala/org/ergoplatform/settings/Constants.scala

@@ -3,8 +3,9 @@ package org.ergoplatform.settings
 import org.ergoplatform.mining.difficulty.DifficultySerializer
 import org.ergoplatform.nodeView.history.ErgoHistoryUtils.Difficulty
 import scorex.crypto.authds.avltree.batch.AvlTreeParameters
-import sigmastate.Values
-import sigmastate.Values.ErgoTree
+import sigma.ast.{ErgoTree, FalseLeaf, TrueLeaf}
+import sigma.ast.ErgoTree.{HeaderType, ZeroHeader}
+import sigma.ast.syntax.{FalseSigmaProp, TrueSigmaProp}
 
 object Constants {
   /**
@@ -42,9 +43,6 @@ object Constants {
 
   val SoftForkEpochs = 32 //about 45.5 days
 
-  def TrueLeaf: ErgoTree = Values.TrueLeaf.toSigmaProp
-  def FalseLeaf: ErgoTree = Values.FalseLeaf.toSigmaProp
-
   val StringEncoding = "UTF-8"
 
   // Maximum extension size
@@ -59,4 +57,8 @@ object Constants {
     */
   object StateTreeParameters extends AvlTreeParameters(keySize = HashLength, valueSize = None, labelSize = HashLength)
 
+  def FalseTree: ErgoTree = ErgoTree.fromProposition(FalseLeaf.toSigmaProp)
+
+  def TrueTree: ErgoTree = ErgoTree.fromProposition(TrueLeaf.toSigmaProp)
+
 }

ergo-core/src/main/scala/org/ergoplatform/settings/ErgoValidationSettings.scala

@@ -4,10 +4,10 @@ import org.ergoplatform.core.BytesSerializable
 import org.ergoplatform.http.api.ApiCodecs
 import org.ergoplatform.modifiers.history.extension.{Extension, ExtensionCandidate}
 import org.ergoplatform.utils
-import org.ergoplatform.validation.SigmaValidationSettings
 import org.ergoplatform.serialization.ErgoSerializer
 import org.ergoplatform.validation.{InvalidModifier, ModifierValidator, ValidationResult, ValidationSettings}
 import scorex.util.serialization.{Reader, Writer}
+import sigma.validation.SigmaValidationSettings
 
 import scala.util.Try