Release candidate v5.0.1 (please ignore)

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

@@ -259,7 +259,7 @@ case object MinerPubkey extends NotReadyValueByteArray with ValueCompanion {
 }
 
 /** When interpreted evaluates to a IntConstant built from Context.currentHeight */
-case object Height extends NotReadyValueInt with ValueCompanion {
+case object Height extends NotReadyValueInt with FixedCostValueCompanion {
   override def companion = this
   override def opCode: OpCode = OpCodes.HeightCode
   /** Cost of: 1) Calling Context.HEIGHT Scala method. */
@@ -272,7 +272,7 @@ case object Height extends NotReadyValueInt with ValueCompanion {
 }
 
 /** When interpreted evaluates to a collection of BoxConstant built from Context.boxesToSpend */
-case object Inputs extends LazyCollection[SBox.type] with ValueCompanion {
+case object Inputs extends LazyCollection[SBox.type] with FixedCostValueCompanion {
   override def companion = this
   override def opCode: OpCode = OpCodes.InputsCode
   /** Cost of: 1) Calling Context.INPUTS Scala method. */
@@ -286,7 +286,7 @@ case object Inputs extends LazyCollection[SBox.type] with ValueCompanion {
 }
 
 /** When interpreted evaluates to a collection of BoxConstant built from Context.spendingTransaction.outputs */
-case object Outputs extends LazyCollection[SBox.type] with ValueCompanion {
+case object Outputs extends LazyCollection[SBox.type] with FixedCostValueCompanion {
   override def companion = this
   override def opCode: OpCode = OpCodes.OutputsCode
   /** Cost of: 1) Calling Context.OUTPUTS Scala method. */
@@ -316,7 +316,7 @@ case object LastBlockUtxoRootHash extends NotReadyValueAvlTree with ValueCompani
 
 
 /** When interpreted evaluates to a BoxConstant built from context.boxesToSpend(context.selfIndex) */
-case object Self extends NotReadyValueBox with ValueCompanion {
+case object Self extends NotReadyValueBox with FixedCostValueCompanion {
   override def companion = this
   override def opCode: OpCode = OpCodes.SelfCode
   /** Cost of: 1) Calling Context.SELF Scala method. */
@@ -349,7 +349,7 @@ case object Context extends NotReadyValue[SContext.type] with ValueCompanion {
 /** When interpreted evaluates to the singleton instance of [[special.sigma.SigmaDslBuilder]].
   * Corresponds to `Global` variable in ErgoScript which can be used like `Global.groupGenerator`.
   */
-case object Global extends NotReadyValue[SGlobal.type] with ValueCompanion {
+case object Global extends NotReadyValue[SGlobal.type] with FixedCostValueCompanion {
   override def companion = this
   override def opCode: OpCode = OpCodes.GlobalCode
   /** Cost of: 1) accessing Global instance. */

sigmastate/src/main/scala/sigmastate/Values.scala

@@ -998,7 +998,7 @@ object Values {
       Colls.fromArray(is)
     }
   }
-  object ConcreteCollection extends ValueCompanion {
+  object ConcreteCollection extends FixedCostValueCompanion {
     override def opCode: OpCode = ConcreteCollectionCode
     /** Cost of: allocating new collection
       * @see ConcreteCollection_PerItem */

sigmastate/src/main/scala/sigmastate/lang/Terms.scala

@@ -248,7 +248,7 @@ object Terms {
     }
   }
 
-  object MethodCall extends ValueCompanion {
+  object MethodCall extends FixedCostValueCompanion {
     override def opCode: OpCode = OpCodes.MethodCallCode
     /** Cost of: 1) packing args into Array 2) java.lang.reflect.Method.invoke */
     override val costKind = FixedCost(JitCost(4))

sigmastate/src/main/scala/sigmastate/trees.scala

@@ -168,7 +168,7 @@ case class BoolToSigmaProp(value: BoolValue) extends SigmaPropValue {
     SigmaDsl.sigmaProp(v)
   }
 }
-object BoolToSigmaProp extends ValueCompanion {
+object BoolToSigmaProp extends FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.BoolToSigmaPropCode
   override val costKind = FixedCost(JitCost(15))
   val OpType = SFunc(SBoolean, SSigmaProp)
@@ -186,7 +186,7 @@ case class CreateProveDlog(value: Value[SGroupElement.type]) extends SigmaPropVa
     SigmaDsl.proveDlog(v)
   }
 }
-object CreateProveDlog extends ValueCompanion {
+object CreateProveDlog extends FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.ProveDlogCode
   override val costKind = FixedCost(JitCost(10))
   val OpType = SFunc(SGroupElement, SSigmaProp)
@@ -227,7 +227,7 @@ case class CreateProveDHTuple(gv: Value[SGroupElement.type],
     SigmaDsl.proveDHTuple(g, h, u, v)
   }
 }
-object CreateProveDHTuple extends ValueCompanion {
+object CreateProveDHTuple extends FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.ProveDiffieHellmanTupleCode
   override val costKind = FixedCost(JitCost(20))
 }
@@ -1019,7 +1019,7 @@ case class Negation[T <: SType](input: Value[T]) extends OneArgumentOperation[T,
     i.negate(inputV)
   }
 }
-object Negation extends OneArgumentOperationCompanion {
+object Negation extends OneArgumentOperationCompanion with FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.NegationCode
   override val costKind = FixedCost(JitCost(30))
   override def argInfos: Seq[ArgInfo] = NegationInfo.argInfos
@@ -1498,7 +1498,7 @@ case class If[T <: SType](condition: Value[SBoolean.type], trueBranch: Value[T],
     }
   }
 }
-object If extends QuadrupleCompanion {
+object If extends QuadrupleCompanion with FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.IfCode
   /** Cost of: conditional switching to the right branch (excluding the cost both
     * condition itself and the branches) */

sigmastate/src/main/scala/sigmastate/types.scala

@@ -1688,9 +1688,6 @@ object SCollection extends STypeCompanion with MethodByNameUnapply {
     */
   def flatMap_eval[A, B](mc: MethodCall, xs: Coll[A], f: A => Coll[B])
                         (implicit E: ErgoTreeEvaluator): Coll[B] = {
-    if (!VersionContext.current.isJitActivated) {
-      checkValidFlatmap(mc)
-    }
     val m = mc.method
     var res: Coll[B] = null
     E.addSeqCost(m.costKind.asInstanceOf[PerItemCost], m.opDesc) { () =>

sigmastate/src/main/scala/sigmastate/utxo/transformers.scala

@@ -280,7 +280,7 @@ case class ByIndex[V <: SType](input: Value[SCollection[V]],
     }
   }
 }
-object ByIndex extends ValueCompanion {
+object ByIndex extends FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.ByIndexCode
   override val costKind = FixedCost(JitCost(30))
 }
@@ -364,7 +364,7 @@ case class SizeOf[V <: SType](input: Value[SCollection[V]])
     inputV.length
   }
 }
-object SizeOf extends SimpleTransformerCompanion {
+object SizeOf extends SimpleTransformerCompanion with FixedCostValueCompanion {
   val OpType = SFunc(SCollection(SType.tIV), SInt)
   override def opCode: OpCode = OpCodes.SizeOfCode
   /** Cost of: 1) calling Coll.length method (guaranteed to be O(1))
@@ -387,7 +387,7 @@ case class ExtractAmount(input: Value[SBox.type]) extends Extract[SLong.type] wi
     inputV.value
   }
 }
-object ExtractAmount extends SimpleTransformerCompanion {
+object ExtractAmount extends SimpleTransformerCompanion with FixedCostValueCompanion {
   val OpType = SFunc(SBox, SLong)
   override def opCode: OpCode = OpCodes.ExtractAmountCode
   /** Cost of: 1) access `value` property of a [[special.sigma.Box]] */
@@ -408,7 +408,7 @@ case class ExtractScriptBytes(input: Value[SBox.type]) extends Extract[SByteArra
     inputV.propositionBytes
   }
 }
-object ExtractScriptBytes extends SimpleTransformerCompanion {
+object ExtractScriptBytes extends SimpleTransformerCompanion with FixedCostValueCompanion {
   val OpType = SFunc(SBox, SByteArray)
   override def opCode: OpCode = OpCodes.ExtractScriptBytesCode
 
@@ -495,7 +495,7 @@ case class ExtractRegisterAs[V <: SType]( input: Value[SBox.type],
     inputV.getReg(registerId.number)(tV)
   }
 }
-object ExtractRegisterAs extends ValueCompanion {
+object ExtractRegisterAs extends FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.ExtractRegisterAs
   /** CostOf: 1) accessing `registers` collection 2) comparing types 3) allocating Some()*/
   override val costKind = FixedCost(JitCost(50))
@@ -625,7 +625,7 @@ case class OptionGetOrElse[V <: SType](input: Value[SOption[V]], default: Value[
     inputV.getOrElse(dV)
   }
 }
-object OptionGetOrElse extends ValueCompanion {
+object OptionGetOrElse extends ValueCompanion with FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.OptionGetOrElseCode
   /** Cost of: 1) Calling Option.getOrElse Scala method. */
   override val costKind = FixedCost(JitCost(20))
@@ -643,7 +643,7 @@ case class OptionIsDefined[V <: SType](input: Value[SOption[V]])
     inputV.isDefined
   }
 }
-object OptionIsDefined extends SimpleTransformerCompanion {
+object OptionIsDefined extends SimpleTransformerCompanion with FixedCostValueCompanion {
   override def opCode: OpCode = OpCodes.OptionIsDefinedCode
   /** Cost of: 1) Calling Option.isDefined Scala method. */
   override val costKind = FixedCost(JitCost(10))