Merge pull request #622 from ScorexFoundation/serializer-opt

Optimization of serialization

build.sbt

@@ -299,7 +299,7 @@ lazy val rootSettings = Seq(
 )
 
 def runErgoTask(task: String, sigmastateVersion: String, log: Logger): Unit = {
-  val ergoBranch = "sigma-core-opt"
+  val ergoBranch = "master"
   val sbtEnvVars = Seq("BUILD_ENV" -> "test", "SIGMASTATE_VERSION" -> sigmastateVersion)
 
   log.info(s"Testing current build in Ergo (branch $ergoBranch):")
@@ -353,7 +353,7 @@ commands += Command.command("ergoItTest") { state =>
 }
 
 def runSpamTestTask(task: String, sigmastateVersion: String, log: Logger): Unit = {
-  val spamBranch = "master"
+  val spamBranch = "revert-23-revert-22-serialize-opt"
   val envVars = Seq("SIGMASTATE_VERSION" -> sigmastateVersion,
     "SPECIAL_VERSION" -> specialVersion,
     // SSH_SPAM_REPO_KEY should be set (see Jenkins Credentials Binding Plugin)

sigmastate/src/main/scala/org/ergoplatform/ErgoAddress.scala

@@ -84,7 +84,7 @@ class P2PKAddress(val pubkey: ProveDlog,
   override val script: ErgoTree = {
     // NOTE: we don't segregate constants because the whole tree is single constant
     // and we want different addreses of this type to have different `script` values
-    ErgoTree(ErgoTree.DefaultHeader, IndexedSeq.empty, SigmaPropConstant(pubkey))
+    ErgoTree(ErgoTree.DefaultHeader, ErgoTree.EmptyConstants, SigmaPropConstant(pubkey))
   }
 
   override def equals(obj: Any): Boolean = obj match {

sigmastate/src/main/scala/org/ergoplatform/ErgoBoxCandidate.scala

@@ -81,6 +81,8 @@ class ErgoBoxCandidate(val value: Long,
 
 object ErgoBoxCandidate {
   val UndefinedBoxRef: Coll[Byte] = Array.fill(34)(0: Byte).toColl
+
+  /** @hotspot don't beautify the code */
   object serializer extends SigmaSerializer[ErgoBoxCandidate, ErgoBoxCandidate] {
 
     def serializeBodyWithIndexedDigests(obj: ErgoBoxCandidate,
@@ -90,7 +92,14 @@ object ErgoBoxCandidate {
       w.putBytes(DefaultSerializer.serializeErgoTree(obj.ergoTree))
       w.putUInt(obj.creationHeight)
       w.putUByte(obj.additionalTokens.size)
-      obj.additionalTokens.foreach { case (id, amount) =>
+
+      val unzipped = Colls.unzip(obj.additionalTokens)
+      val ids = unzipped._1
+      val amounts = unzipped._2
+      val limit = ids.length
+      cfor(0)(_ < limit, _ + 1) { i =>
+        val id = ids(i)
+        val amount = amounts(i)
         if (tokensInTx.isDefined) {
           val tokenIndex = tokensInTx.get.indexWhere(v => util.Arrays.equals(v, id), 0)
           if (tokenIndex == -1) sys.error(s"failed to find token id ($id) in tx's digest index")
@@ -100,6 +109,7 @@ object ErgoBoxCandidate {
         }
         w.putULong(amount)
       }
+
       val nRegs = obj.additionalRegisters.keys.size
       if (nRegs + ErgoBox.startingNonMandatoryIndex > 255)
         sys.error(s"The number of non-mandatory indexes $nRegs exceeds ${255 - ErgoBox.startingNonMandatoryIndex} limit.")
@@ -108,7 +118,7 @@ object ErgoBoxCandidate {
       // this convention allows to save 1 bite for each register
       val startReg = ErgoBox.startingNonMandatoryIndex
       val endReg = ErgoBox.startingNonMandatoryIndex + nRegs - 1
-      for (regId <- startReg to endReg) {
+      cfor(startReg: Int)(_ <= endReg, _ + 1) { regId =>
         val reg = ErgoBox.findRegisterByIndex(regId.toByte).get
         obj.get(reg) match {
           case Some(v) =>
@@ -124,7 +134,6 @@ object ErgoBoxCandidate {
       serializeBodyWithIndexedDigests(obj, None, w)
     }
 
-    /** @hotspot don't beautify the code */
     def parseBodyWithIndexedDigests(digestsInTx: Option[Coll[TokenId]], r: SigmaByteReader): ErgoBoxCandidate = {
       val previousPositionLimit = r.positionLimit
       r.positionLimit = r.position + ErgoBox.MaxBoxSize

sigmastate/src/main/scala/org/ergoplatform/ErgoScriptPredef.scala

@@ -41,7 +41,7 @@ object ErgoScriptPredef {
     // first segregated constant is delta, so key is second constant
     val positions = IntArrayConstant(Array[Int](1))
     val minerPubkeySigmaProp = CreateProveDlog(DecodePoint(minerPkBytesVal))
-    val newVals = Values.ConcreteCollection(Vector[SigmaPropValue](minerPubkeySigmaProp), SSigmaProp)
+    val newVals = Values.ConcreteCollection(Array[SigmaPropValue](minerPubkeySigmaProp), SSigmaProp)
     SubstConstants(genericMinerPropBytes, positions, newVals)
   }