From 5820bd0bf8ab1a9a8afcc392342c2a8c6bd5ab14 Mon Sep 17 00:00:00 2001
From: Alexander Chepurnoy <alex.chepurnoy@iohk.io>
Date: Mon, 20 Jan 2025 19:28:36 +0300
Subject: [PATCH] isV6SoftFork... fixed

---
 data/shared/src/main/scala/sigma/ast/methods.scala            | 2 +-
 .../shared/src/main/scala/sigmastate/eval/Extensions.scala    | 2 +-
 .../scala/sigmastate/interpreter/CErgoTreeEvaluator.scala     | 2 +-
 sc/shared/src/test/scala/sigma/LanguageSpecificationV6.scala  | 4 ++--
 .../test/scala/sigmastate/utxo/BasicOpsSpecification.scala    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/shared/src/main/scala/sigma/ast/methods.scala b/data/shared/src/main/scala/sigma/ast/methods.scala
index 6922a5a7e..e34900bfd 100644
--- a/data/shared/src/main/scala/sigma/ast/methods.scala
+++ b/data/shared/src/main/scala/sigma/ast/methods.scala
@@ -1813,7 +1813,7 @@ case object SAvlTreeMethods extends MonoTypeMethods {
   lazy val v6Methods = v5Methods ++ Seq(insertOrUpdateMethod)
 
   protected override def getMethods(): Seq[SMethod] = {
-    if (VersionContext.current.isV6SoftForkActivated) {
+    if (VersionContext.current.isV6Activated) {
       v6Methods
     } else {
       v5Methods
diff --git a/interpreter/shared/src/main/scala/sigmastate/eval/Extensions.scala b/interpreter/shared/src/main/scala/sigmastate/eval/Extensions.scala
index 98f044af9..2df6fd040 100644
--- a/interpreter/shared/src/main/scala/sigmastate/eval/Extensions.scala
+++ b/interpreter/shared/src/main/scala/sigmastate/eval/Extensions.scala
@@ -91,7 +91,7 @@ object Extensions {
         val bv = CAvlTreeVerifier(tree, proof)
         entries.forall { case (key, value) =>
           val insertRes = bv.performOneOperation(Insert(ADKey @@ key.toArray, ADValue @@ value.toArray))
-          if (insertRes.isFailure && !VersionContext.current.isV6SoftForkActivated) {
+          if (insertRes.isFailure && !VersionContext.current.isV6Activated) {
             syntax.error(s"Incorrect insert for $tree (key: $key, value: $value, digest: ${tree.digest}): ${insertRes.failed.get}}")
           }
           insertRes.isSuccess
diff --git a/interpreter/shared/src/main/scala/sigmastate/interpreter/CErgoTreeEvaluator.scala b/interpreter/shared/src/main/scala/sigmastate/interpreter/CErgoTreeEvaluator.scala
index 809b16270..e1df1a92a 100644
--- a/interpreter/shared/src/main/scala/sigmastate/interpreter/CErgoTreeEvaluator.scala
+++ b/interpreter/shared/src/main/scala/sigmastate/interpreter/CErgoTreeEvaluator.scala
@@ -145,7 +145,7 @@ class CErgoTreeEvaluator(
         addSeqCost(InsertIntoAvlTree_Info, nItems) { () =>
           val insertRes = bv.performInsert(key.toArray, value.toArray)
           // For versioned change details, see see https://github.com/ScorexFoundation/sigmastate-interpreter/issues/908
-          if (insertRes.isFailure && !VersionContext.current.isV6SoftForkActivated) {
+          if (insertRes.isFailure && !VersionContext.current.isV6Activated) {
             syntax.error(s"Incorrect insert for $tree (key: $key, value: $value, digest: ${tree.digest}): ${insertRes.failed.get}}")
           }
           res = insertRes.isSuccess
diff --git a/sc/shared/src/test/scala/sigma/LanguageSpecificationV6.scala b/sc/shared/src/test/scala/sigma/LanguageSpecificationV6.scala
index e5b0635b5..dda2c34bb 100644
--- a/sc/shared/src/test/scala/sigma/LanguageSpecificationV6.scala
+++ b/sc/shared/src/test/scala/sigma/LanguageSpecificationV6.scala
@@ -3040,7 +3040,7 @@ class LanguageSpecificationV6 extends LanguageSpecificationBase { suite =>
         val tree = createTree(preInsertDigest, insertAllowed = true)
         val invalidKvs = Colls.fromItems((key -> value), (key -> value))
         val input = (tree, (invalidKvs, insertProof))
-        if (VersionContext.current.isV6SoftForkActivated) {
+        if (VersionContext.current.isV6Activated) {
           insert.verifyCase(input, new Expected(ExpectedResult(Success(None), Some(2103))))
         } else {
           val res = insert.checkEquality(input)
@@ -3053,7 +3053,7 @@ class LanguageSpecificationV6 extends LanguageSpecificationBase { suite =>
         val tree = createTree(preInsertDigest, insertAllowed = true)
         val invalidProof = insertProof.map(x => (-x).toByte) // any other different from proof
         val input = (tree, (kvs, invalidProof))
-        if (VersionContext.current.isV6SoftForkActivated) {
+        if (VersionContext.current.isV6Activated) {
           insert.verifyCase(input, new Expected(ExpectedResult(Success(None), Some(2103))))
         } else {
           val res = insert.checkEquality(input)
diff --git a/sc/shared/src/test/scala/sigmastate/utxo/BasicOpsSpecification.scala b/sc/shared/src/test/scala/sigmastate/utxo/BasicOpsSpecification.scala
index 0a52b3819..17d57e944 100644
--- a/sc/shared/src/test/scala/sigmastate/utxo/BasicOpsSpecification.scala
+++ b/sc/shared/src/test/scala/sigmastate/utxo/BasicOpsSpecification.scala
@@ -3241,7 +3241,7 @@ class BasicOpsSpecification extends CompilerTestingCommons
       true
     )
 
-    if (VersionContext.current.isV6SoftForkActivated) {
+    if (VersionContext.current.isV6Activated) {
       deserTest()
     } else {
       an[ValidationException] should be thrownBy deserTest()
@@ -3262,7 +3262,7 @@ class BasicOpsSpecification extends CompilerTestingCommons
       )
     }
 
-    if (VersionContext.current.isV6SoftForkActivated) {
+    if (VersionContext.current.isV6Activated) {
       someTest(okValue)
       // on JVM, InvocationTargetException wrapping (ArithmeticException: BigInteger out of 256 bit range) is thrown
       an[Exception] should be thrownBy someTest(invalidValue)