VersionContext added #705
Merged
VersionContext added #705
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # sigmastate/src/main/scala/sigmastate/interpreter/InterpreterContext.scala # sigmastate/src/test/scala/org/ergoplatform/ErgoLikeTransactionSpec.scala
kushti
requested changes
Dec 10, 2020
kushti
requested changes
Dec 15, 2020
| @@ -400,7 +400,8 @@ trait JsonCodecs { | |||
| "extension" -> ctx.extension.asJson, | |||
| "validationSettings" -> ctx.validationSettings.asJson, | |||
| "costLimit" -> ctx.costLimit.asJson, | |||
| "initCost" -> ctx.initCost.asJson | |||
| "initCost" -> ctx.initCost.asJson, | |||
| "activatedVersion" -> ctx.activatedScriptVersion.asJson | |||
There was a problem hiding this comment.
"scriptVersion" is more clean. Also, in particular, this JSON can be provided via /executeWithContext API, where activation is irrelevant
| @@ -417,7 +418,11 @@ trait JsonCodecs { | |||
| validationSettings <- cursor.downField("validationSettings").as[SigmaValidationSettings] | |||
| costLimit <- cursor.downField("costLimit").as[Long] | |||
| initCost <- cursor.downField("initCost").as[Long] | |||
| } yield new ErgoLikeContext(lastBlockUtxoRoot, Colls.fromArray(headers.toArray), preHeader, | |||
| dataBoxes, boxesToSpend, spendingTransaction, selfIndex, extension, validationSettings, costLimit, initCost) | |||
| version <- cursor.downField("activatedVersion").as[Byte] | |||
| * [[sigmastate.Values.ConstantPlaceholder]] | ||
| * @param resolvePlaceholdersToConstants if true then resolved constants will be | ||
| * substituted in the tree instead of the placeholder. | ||
| * @param versionContext optional version context to support soft and |
There was a problem hiding this comment.
Doesn't look like optional parameter (Option[...])
| @@ -1058,6 +1058,13 @@ object Values { | |||
| (header | version).toByte | |||
| } | |||
|
|
|||
| @inline def headerWithVersion(version: Byte): Byte = { | |||
| @inline def headerWithVersion(version: Byte): Byte = { | ||
| var h = updateVersionBits(DefaultHeader, version) | ||
| if (version > 0) | ||
| h = (h | ErgoTree.SizeFlag).toByte |
There was a problem hiding this comment.
logic unclear, please add comments
| object VersionContext { | ||
|
|
||
| /** Descriptor of the max supported versions. */ | ||
| val MaxSupportedVersion = VersionContext( |
There was a problem hiding this comment.
Used in testing code only, let's move to the testing code then ? Or eliminate, as it is used once.
There was a problem hiding this comment.
VersionContext removed entirely
| @@ -79,6 +93,7 @@ abstract class SigmaSerializer[TFamily, T <: TFamily] extends Serializer[TFamily | |||
| val sigmaByteReader = new SigmaByteReader(r, | |||
| new ConstantStore(), | |||
| resolvePlaceholdersToConstants = false, | |||
| versionContext = VersionContext(0), | |||
| @@ -17,29 +18,42 @@ object SigmaSerializer { | |||
| val MaxPropositionSize: Int = SigmaConstants.MaxPropositionBytes.value | |||
| val MaxTreeDepth: Int = SigmaConstants.MaxTreeDepth.value | |||
|
|
|||
| /** Helper function to be use in serializers. | |||
| //TODO v5.0: remove default value of versionContext parameter | |||
| // All usages of this method should pass a version context explicitly. | |||
kushti
approved these changes
Dec 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.