[v6.0] Accumulate ErgoTree deserialization cost

core/shared/src/main/scala/sigma/VersionContext.scala

@@ -34,7 +34,7 @@ object VersionContext {
     * - in 6.x must be 3
     * etc.
     */
-  val MaxSupportedScriptVersion: Byte = 2 // supported versions 0, 1, 2
+  val MaxSupportedScriptVersion: Byte = 3 // supported versions 0, 1, 2, 3
 
   /** The first version of ErgoTree starting from which the JIT costing interpreter must be used.
     * It must also be used for all subsequent versions (3, 4, etc).

interpreter/shared/src/main/scala/sigmastate/interpreter/Interpreter.scala

@@ -244,7 +244,12 @@ trait Interpreter {
       val currCost = Evaluation.addCostChecked(context.initCost, deserializeSubstitutionCost, context.costLimit)
       val context1 = context.withInitCost(currCost).asInstanceOf[CTX]
       val (propTree, context2) = trySoftForkable[(SigmaPropValue, CTX)](whenSoftFork = (TrueSigmaProp, context1)) {
-        applyDeserializeContextJITC(context, prop)
+        // Before ErgoTree V3 the deserialization cost was not added to the total cost
+        applyDeserializeContextJITC(if (VersionContext.current.activatedVersion >= 3) {
+          context1
+        } else {
+          context
+        }, prop)
       }
 
       // here we assume that when `propTree` is TrueProp then `reduceToCrypto` always succeeds
@@ -593,4 +598,4 @@ object Interpreter {
   /** Helper method to throw errors from Interpreter. */
   def error(msg: String) = throw new InterpreterException(msg)
 
-}
+}