Merge branch 'i958-2' of github.com:ScorexFoundation/sigmastate-inter…

…preter into i958
ergoplatform · Aug 30, 2024 · dfedb4a · dfedb4a
2 parents f347dfd + ea0890b
commit dfedb4a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 32 deletions.
diff --git a/data/shared/src/main/scala/sigma/ast/SMethod.scala b/data/shared/src/main/scala/sigma/ast/SMethod.scala
@@ -75,8 +75,7 @@ case class SMethod(
     irInfo: MethodIRInfo,
     docInfo: Option[OperationInfo],
     costFunc: Option[MethodCostFunc],
-    userDefinedInvoke: Option[SMethod.InvokeHandler],
-    sinceVersion: Byte
+    userDefinedInvoke: Option[SMethod.InvokeHandler]
 ) {
 
   /** Operation descriptor of this method. */
@@ -315,17 +314,7 @@ object SMethod {
   ): SMethod = {
     SMethod(
       objType, name, stype, methodId, costKind, explicitTypeArgs,
-      MethodIRInfo(None, None, None), None, None, None, 0)
-  }
-
-  /** Convenience factory method. */
-  def apply(objType: MethodsContainer, name: String, stype: SFunc,
-            methodId: Byte,
-            costKind: CostKind,
-            sinceVersion: Byte): SMethod = {
-    SMethod(
-      objType, name, stype, methodId, costKind, Nil,
-      MethodIRInfo(None, None, None), None, None, None, sinceVersion)
+      MethodIRInfo(None, None, None), None, None, None)
   }
 
 

diff --git a/data/shared/src/main/scala/sigma/ast/methods.scala b/data/shared/src/main/scala/sigma/ast/methods.scala
@@ -1460,8 +1460,7 @@ case object SHeaderMethods extends MonoTypeMethods {
 
   // cost of checkPoW is 700 as about 2*32 hashes required, and 1 hash (id) over short data costs 10
   lazy val checkPowMethod = SMethod(
-    this, "checkPow", SFunc(Array(SHeader), SBoolean), 16, FixedCost(JitCost(700)),
-    sinceVersion = VersionContext.V6SoftForkVersion)
+    this, "checkPow", SFunc(Array(SHeader), SBoolean), 16, FixedCost(JitCost(700)))
     .withIRInfo(MethodCallIrBuilder)
     .withInfo(MethodCall, "Validate header's proof-of-work")
 

diff --git a/data/shared/src/main/scala/sigma/ast/values.scala b/data/shared/src/main/scala/sigma/ast/values.scala
@@ -1313,9 +1313,6 @@ case class MethodCall(
     addCost(MethodCall.costKind) // MethodCall overhead
     method.costKind match {
       case fixed: FixedCost =>
-        if (method.sinceVersion > 0 && E.context.currentErgoTreeVersion < method.sinceVersion) {
-          syntax.error(s"Method ${method.name} is not supported in tree version ${E.context.currentErgoTreeVersion}")
-        }
         val extra    = method.extraDescriptors
         val extraLen = extra.length
         val len      = args.length

diff --git a/data/shared/src/main/scala/sigma/pow/Autolykos2PowValidation.scala b/data/shared/src/main/scala/sigma/pow/Autolykos2PowValidation.scala
@@ -8,21 +8,28 @@ import sigma.crypto.{BcDlogGroup, BigIntegers, CryptoConstants}
 import sigma.util.NBitsUtils
 
 /**
-  * Functions used to validate Autolykos2 Proof-of-Work
+  * Functions used to validate Autolykos2 Proof-of-Work.
   */
 object Autolykos2PowValidation {
 
   type Height = Int
 
-  val k = 32
-
-  val NStart = 26
+  /**
+    * k value for k-sum problem Autolykos is based on (find k numbers in table on N size)
+    */
+  private val k = 32
 
-  val group: BcDlogGroup = CryptoConstants.dlogGroup
+  /**
+    * Initial size of N  value for k-sum problem Autolykos is based on (find k numbers in table on N size).
+    * It grows from it since predefined block height in Autolykos 2.
+    */
+  private val NStart = 26
 
-  // Group order, used in Autolykos V.1 for non-outsourceability,
-  // and also to obtain target in both Autolykos v1 and v2
-  val q: BigInt = group.order
+  /**
+    * Group order, used in Autolykos V.1 for non-outsourceability,
+    * and also to obtain target in both Autolykos v1 and v2
+    */
+  private val q: BigInt = CryptoConstants.dlogGroup.order
 
   /**
     * Number of elements in a table to find k-sum problem solution on top of

diff --git a/sc/shared/src/test/scala/sigma/SigmaDslTesting.scala b/sc/shared/src/test/scala/sigma/SigmaDslTesting.scala
@@ -872,7 +872,7 @@ class SigmaDslTesting extends AnyPropSpec
     extends Feature[A, B] {
 
     override def isSupportedIn(vc: VersionContext): Boolean =
-      vc.activatedVersion >= sinceVersion && vc.ergoTreeVersion >= sinceVersion
+      vc.activatedVersion >= sinceVersion
 
     override def scalaFunc: A => B = { x =>
       if (isSupportedIn(VersionContext.current)) {

diff --git a/sc/shared/src/test/scala/sigmastate/TestingInterpreterSpecification.scala b/sc/shared/src/test/scala/sigmastate/TestingInterpreterSpecification.scala
@@ -499,11 +499,7 @@ class TestingInterpreterSpecification extends CompilerTestingCommons
     if (activatedVersionInTests < V6SoftForkVersion) {
       an [Exception] should be thrownBy testEval(source)
     } else {
-      if(ergoTreeVersionInTests >= V6SoftForkVersion) {
-        testEval(source)
-      } else {
-        an [Exception] should be thrownBy testEval(source)
-      }
+      testEval(source)
     }
   }