Merge pull request #575 from ScorexFoundation/i573-ergolikectx-json

Json representation for ErgoLikeContext
ergoplatform · Aug 23, 2019 · 4135eed · 4135eed
2 parents dd1b323 + db1895e
commit 4135eed
Show file tree

Hide file tree

Showing 74 changed files with 1,520 additions and 653 deletions.
diff --git a/build.sbt b/build.sbt
@@ -118,6 +118,13 @@ libraryDependencies ++= Seq(
   "org.spire-math" %% "debox" % "0.8.0"
 ) ++ testingDependencies
 
+val circeVersion = "0.10.0"
+
+libraryDependencies ++= Seq(
+  "io.circe" %% "circe-core",
+  "io.circe" %% "circe-generic",
+  "io.circe" %% "circe-parser"
+).map(_ % circeVersion)
 
 scalacOptions ++= Seq("-feature", "-deprecation")
 
@@ -201,7 +208,7 @@ lazy val sigma = (project in file("."))
     .settings(commonSettings: _*)
 
 def runErgoTask(task: String, sigmastateVersion: String, log: Logger): Unit = {
-  val ergoBranch = "master"
+  val ergoBranch = "ergolikectx-json"
   val sbtEnvVars = Seq("BUILD_ENV" -> "test", "SIGMASTATE_VERSION" -> sigmastateVersion)
 
   log.info(s"Testing current build in Ergo (branch $ergoBranch):")
@@ -255,7 +262,7 @@ commands += Command.command("ergoItTest") { state =>
 }
 
 def runSpamTestTask(task: String, sigmastateVersion: String, log: Logger): Unit = {
-  val spamBranch = "master"
+  val spamBranch = "i4-add-input-hash"
   val envVars = Seq("SIGMASTATE_VERSION" -> sigmastateVersion,
     "SPECIAL_VERSION" -> specialVersion,
     // SSH_SPAM_REPO_KEY should be set (see Jenkins Credentials Binding Plugin)

diff --git a/sigma-impl/src/main/scala/special/sigma/Extensions.scala b/sigma-impl/src/main/scala/special/sigma/Extensions.scala
@@ -16,10 +16,15 @@ class DslSyntaxExtensions(dsl: SigmaDslBuilder) {
 
 object Extensions {
 
-  def showECPoint(p: ECPoint) = {
-    val rawX = p.getRawXCoord.toString.substring(0, 6)
-    val rawY = p.getRawYCoord.toString.substring(0, 6)
-    s"ECPoint($rawX,$rawY,...)"
+  def showECPoint(p: ECPoint): String = {
+    if (p.isInfinity) {
+      "INF"
+    }
+    else {
+      val rawX = p.getRawXCoord.toString.substring(0, 6)
+      val rawY = p.getRawYCoord.toString.substring(0, 6)
+      s"ECPoint($rawX,$rawY,...)"
+    }
   }
 
   implicit class GroupElementOps(val source: GroupElement) extends AnyVal {

diff --git a/src/main/scala/org/ergoplatform/ErgoBox.scala b/src/main/scala/org/ergoplatform/ErgoBox.scala
@@ -2,20 +2,20 @@ package org.ergoplatform
 
 import com.google.common.primitives.Shorts
 import org.ergoplatform.ErgoBox.{NonMandatoryRegisterId, TokenId}
+import org.ergoplatform.settings.ErgoAlgos
 import scorex.crypto.authds.ADKey
-import scorex.util.encode.Base16
-import scorex.crypto.hash.{Digest32, Blake2b256}
+import scorex.crypto.hash.{Blake2b256, Digest32}
 import scorex.util._
-import sigmastate.Values._
+import sigmastate.SCollection.SByteArray
 import sigmastate.SType.AnyOps
+import sigmastate.Values._
 import sigmastate._
+import sigmastate.eval.Extensions._
+import sigmastate.eval._
 import sigmastate.serialization.SigmaSerializer
-import sigmastate.SCollection.SByteArray
-import sigmastate.utils.{SigmaByteReader, SigmaByteWriter, Helpers}
+import sigmastate.utils.{Helpers, SigmaByteReader, SigmaByteWriter}
 import sigmastate.utxo.ExtractCreationInfo
 import special.collection._
-import sigmastate.eval._
-import sigmastate.eval.Extensions._
 
 import scala.runtime.ScalaRunTime
 
@@ -84,8 +84,8 @@ class ErgoBox(
   def toCandidate: ErgoBoxCandidate =
     new ErgoBoxCandidate(value, ergoTree, creationHeight, additionalTokens, additionalRegisters)
 
-  override def toString: Idn = s"ErgoBox(${Base16.encode(id)},$value,$ergoTree," +
-    s"tokens: (${additionalTokens.map(t => Base16.encode(t._1) + ":" + t._2)}), $transactionId, " +
+  override def toString: String = s"ErgoBox(${ErgoAlgos.encode(id)},$value,$ergoTree," +
+    s"tokens: (${additionalTokens.map(t => ErgoAlgos.encode(t._1) + ":" + t._2)}), $transactionId, " +
     s"$index, $additionalRegisters, $creationHeight)"
 }
 
@@ -100,7 +100,7 @@ object ErgoBox {
     val size: Short = 32
   }
 
-  val MaxBoxSize: Int = ErgoConstants.MaxBoxSize.value
+  val MaxBoxSize: Int = SigmaConstants.MaxBoxSize.value
 
   val STokenType = STuple(SByteArray, SLong)
   val STokensRegType = SCollection(STokenType)
@@ -134,9 +134,9 @@ object ErgoBox {
   val TokensRegId: MandatoryRegisterId = R2
   val ReferenceRegId: MandatoryRegisterId = R3
 
-  val MaxTokens: Int = ErgoConstants.MaxTokens.value
+  val MaxTokens: Int = SigmaConstants.MaxTokens.value
 
-  val maxRegisters: Int = ErgoConstants.MaxRegisters.value
+  val maxRegisters: Int = SigmaConstants.MaxRegisters.value
 
   /** @hotspot don't beautify the code in this companion */
   private val _mandatoryRegisters: Array[MandatoryRegisterId] = Array(R0, R1, R2, R3)
@@ -197,5 +197,4 @@ object ErgoBox {
       ergoBoxCandidate.toBox(transactionId, index.toShort)
     }
   }
-
 }
diff --git a/src/main/scala/org/ergoplatform/ErgoBoxCandidate.scala b/src/main/scala/org/ergoplatform/ErgoBoxCandidate.scala
@@ -3,8 +3,8 @@ package org.ergoplatform
 import java.util
 
 import org.ergoplatform.ErgoBox._
+import org.ergoplatform.settings.ErgoAlgos
 import scorex.crypto.hash.Digest32
-import scorex.util.encode.Base16
 import scorex.util.ModifierId
 import sigmastate.Values._
 import sigmastate._
@@ -75,7 +75,7 @@ class ErgoBoxCandidate(val value: Long,
     ScalaRunTime._hashCode((value, ergoTree, additionalTokens, additionalRegisters, creationHeight))
 
   override def toString: Idn = s"ErgoBoxCandidate($value, $ergoTree," +
-    s"tokens: (${additionalTokens.map(t => Base16.encode(t._1) + ":" + t._2).toArray.mkString(", ")}), " +
+    s"tokens: (${additionalTokens.map(t => ErgoAlgos.encode(t._1) + ":" + t._2).toArray.mkString(", ")}), " +
     s"$additionalRegisters, creationHeight: $creationHeight)"
 }