Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.0] Fix semantics of AvlTree.insert & new AvlTree.insertOrUpdate method #1038

Merged
merged 9 commits into from
Jan 9, 2025
Prev Previous commit
Next Next commit
merging w. 6.0.0
kushti committed Dec 4, 2024
commit a506be8d9cd8737396ceb60910ae3def12f81038
1 change: 1 addition & 0 deletions data/shared/src/main/scala/sigma/ast/values.scala
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ import sigma.ast.TypeCodes.ConstantCode
import sigma.ast.syntax._
import sigma.crypto.{CryptoConstants, EcPointType}
import sigma.data.OverloadHack.Overloaded1
import sigma.data.{CSigmaDslBuilder, CSigmaProp, CUnsignedBigInt, Nullable, RType, SigmaBoolean}
import sigma.data.{AvlTreeData, CAvlTree, CSigmaDslBuilder, CSigmaProp, Nullable, RType, SigmaBoolean}
import sigma.eval.ErgoTreeEvaluator.DataEnv
import sigma.eval.{ErgoTreeEvaluator, SigmaDsl}
Original file line number Diff line number Diff line change
@@ -23,6 +23,10 @@ import sigma.VersionContext.V6SoftForkVersion
import sigma.ast.SCollection.SByteArray
import sigma.ast.SType.{AnyOps, tD}
import sigma.data.{AvlTreeData, AvlTreeFlags, CAND, CAnyValue, CAvlTree, CHeader, CSigmaDslBuilder, CSigmaProp}
import sigma.ast.SType.AnyOps
import sigma.data.{AvlTreeData, CAnyValue, CBigInt, CGroupElement, CSigmaDslBuilder}
import sigma.data.{AvlTreeData, CAnyValue, CHeader, CSigmaDslBuilder}
import sigma.data.{AvlTreeData, AvlTreeFlags, CAND, CAnyValue, CHeader, CSigmaDslBuilder, CSigmaProp}
import sigma.util.StringUtil._
import sigma.ast._
import sigma.ast.syntax._
@@ -36,6 +40,7 @@ import sigmastate.interpreter.Interpreter._
import sigma.ast.Apply
import sigma.eval.EvalSettings
import sigma.exceptions.InvalidType
import sigma.serialization.{ErgoTreeSerializer, SerializerException}
import sigma.serialization.{DataSerializer, ErgoTreeSerializer, SigmaByteWriter, SigmaSerializer, ValueSerializer}
import sigma.interpreter.{ContextExtension, ProverResult}
import sigma.validation.ValidationException
You are viewing a condensed version of this merge commit. You can view the full changes here.