final polishing

Author: kushti

core/shared/src/main/scala/sigma/ast/SType.scala

@@ -775,7 +775,7 @@ object SCollection extends STypeCompanion {
   override val reprClass: RClass[_] = RClass(classOf[Coll[_]])
   override def typeId = SCollectionType.CollectionTypeCode
 
-  /** Costructs a collection type with the given type of elements. */
+  /** Constructs a collection type with the given type of elements. */
   implicit def typeCollection[V <: SType](implicit tV: V): SCollection[V] = SCollection[V](tV)
 
   /** Helper descriptors reused across different method descriptors. */

data/shared/src/main/scala/sigma/ast/CostKind.scala

@@ -60,6 +60,7 @@ case object DynamicCost extends CostKind
 object NumericCastCostKind extends TypeBasedCost {
   override def costFunc(targetTpe: SType): JitCost = targetTpe match {
     case SBigInt => JitCost(30)
+    case SUnsignedBigInt => JitCost(30)
     case _ => JitCost(10)
   }
 }
@@ -78,7 +79,7 @@ object PowHitCostKind extends CostKind {
   def cost(k: Int, msg: Coll[Byte], nonce: Coll[Byte], h: Coll[Byte]): JitCost = {
     val chunkSize = CalcBlake2b256.costKind.chunkSize
     val perChunkCost = CalcBlake2b256.costKind.perChunkCost
-    val baseCost = 300
+    val baseCost = 500
 
     // the heaviest part inside is k + 1 Blake2b256 invocations
     val c = baseCost + (k + 1) * ((msg.length + nonce.length + h.length) / chunkSize + 1) * perChunkCost.value

data/shared/src/main/scala/sigma/ast/methods.scala

@@ -482,7 +482,6 @@ object SNumericTypeMethods extends MethodsContainer {
   }
 
   /** Collection of names of numeric casting methods (like `toByte`, `toInt`, etc). */
-  // todo: add unsigned big int
   val castMethods: Array[String] =
     Array(ToByteMethod, ToShortMethod, ToIntMethod, ToLongMethod, ToBigIntMethod)
         .map(_.name)
@@ -1240,7 +1239,6 @@ object STupleMethods extends MethodsContainer {
   /** A list of Coll methods inherited from Coll type and available as method of tuple. */
   lazy val colMethods: Seq[SMethod] = {
     val subst = Map(SType.tIV -> SAny)
-    // TODO: implement other methods
     val activeMethods = Set(1.toByte /*Coll.size*/, 10.toByte /*Coll.apply*/)
     SCollectionMethods.methods.filter(m => activeMethods.contains(m.methodId)).map { m =>
       m.copy(stype = applySubst(m.stype, subst).asFunc)

data/shared/src/main/scala/sigma/data/CHeader.scala

@@ -1,6 +1,6 @@
 package sigma.data
 
-import org.ergoplatform.{AutolykosSolution, ErgoHeader, HeaderWithoutPow, HeaderWithoutPowSerializer}
+import org.ergoplatform.{AutolykosSolution, ErgoHeader, HeaderWithoutPowSerializer}
 import scorex.crypto.authds.ADDigest
 import scorex.crypto.hash.Digest32
 import scorex.util.{bytesToId, idToBytes}

data/shared/src/main/scala/sigma/data/UnsignedBigIntegerOps.scala

@@ -3,7 +3,6 @@ package sigma.data
 import debox.cfor
 import scorex.util.encode.Base16
 import sigma._
-import sigma.crypto.BigIntegers
 import sigma.data.UnsignedBigIntOrderingOps.UnsignedBigIntOrdering
 import sigma.eval.Extensions.IntExt
 

data/shared/src/main/scala/sigma/serialization/OpCodes.scala

@@ -179,10 +179,12 @@ object OpCodes {
   val BitShiftLeftCode     : OpCode = newOpCode(135)
   val BitShiftRightZeroedCode     : OpCode = newOpCode(136)
 
+  // todo: not used, remove
   val CollShiftRightCode    : OpCode = newOpCode(137)
   val CollShiftLeftCode     : OpCode = newOpCode(138)
   val CollShiftRightZeroedCode     : OpCode = newOpCode(139)
 
+  // todo: not used, remove
   val CollRotateLeftCode     : OpCode = newOpCode(140)
   val CollRotateRightCode     : OpCode = newOpCode(141)
 

data/shared/src/main/scala/sigma/serialization/SigmaSerializer.scala

@@ -3,7 +3,6 @@ package sigma.serialization
 import java.nio.ByteBuffer
 import scorex.util.ByteArrayBuilder
 import scorex.util.serialization._
-import sigma.ast.{Constant, EvaluatedCollection, EvaluatedValue, GroupGenerator, SHeader, SType, SUnsignedBigInt}
 import sigma.data.SigmaConstants
 import sigma.serialization.SigmaByteWriter.{FixedCostCallback, PerItemCostCallback}
 import sigma.serialization.ValueCodes.OpCode

docs/LangSpec.md

@@ -4,7 +4,7 @@
 
 ErgoScript is a language to write contracts for [Ergo
 blockchain](https://ergoplatform.org). ErgoScript contracts can be compiled to
-[ErgoTrees](https://ergoplatform.org/docs/ErgoTree.pdf), typed abstract serialized and stored
+[ErgoTrees](https://ergoplatform.org/docs/ErgoTree.pdf), typed abstract syntax treeы which are serialized and stored
 in UTXOs.
 
 A good starting point to writing contracts is to use [ErgoScript by
@@ -221,7 +221,7 @@ class Numeric {
 
 The only exception for conversions is about BigInt to and from UnsignedBigInt. To convert from signed big int to unsigned, use
 `.toUnsigned` method to convert signed big integer to unsigned, or `.toUnsignedMod(m)` to convert modulo `m` (and modulo
- operation is cryptographic, ie always returns positive number modulo `m`). To convert from unsigned big int to signed,
+ operation is cryptographic, i.e. always returns positive number modulo `m`). To convert from unsigned big int to signed,
  use `.toSigned`.
 
 All the predefined numeric types inherit Numeric class and its methods.
@@ -1017,12 +1017,11 @@ satisfying some predicate (condition)
 val ok = OUTPUTS.exists { (box: Box) => box.value > 1000 }
 ``` 
 
-### Predefined global functions
+### Global functions
 
 There are some functions which do not belong to other types, thus they put under `Global` type. Those functions are:
 
 
-
 ```
 {
   /** The generator g of the group is an element of the group such that, when written
@@ -1084,7 +1083,7 @@ src == restored
 ```
 
 
-### Predefined global functions
+### Predefined functions
 <a name="PredefinedFunctions"></a>
 
 ErgoScript standard library include predefined functions that can be called