Release Candidate v5.0 #758

aslesarenko · 2021-12-17T15:03:58Z

This PR finalizes v5.0 implementation.

Summary of changes:

AOT costing of ErgoTree will be replaced by JIT costing
introduced new AOT costing of signature verification
fixed bug in xorOf global operation
fixed bug in CONTEXT.selfBoxIndex operation
removed limitations on lambda argument of Coll.flatMap
fixed bug in Coll.append (++ operation)
fixed bug in Coll.zip
fixed bug in substConstants
perfomance optimizations
code cleanups

Ready for testnet

Ready for mainnet

Implement // TODO cover with tests
Finalize v5.0: resolve all TODO mainnet #779
Closes Implement all TODO JITC #662
Closes Make sure this example works with JITC #604 in v5.0-fix-test-for-headers: add new test for headers #780
Closes Example which doesn't work in v4.x #464 in v5.0-test-nested-loops: Test for map inside fold #788
Closes Missing GroupElement.multiply costing #597
Closes Implement JITC Specification tests #665 in Finalize v5.0: add JIT costing tests vectors #785

… - introduced context.currentErgoTreeVersion

…orOf eval

… evaluationMode

…erify

… test vectors)

Re-introduce SigmaCompiler constructor with networkPrefix

…rsions v1, 2, 3, 4

Encapsulate evaluationMode selection (towards v5.0)

set HAS_SECRETS on CI env;

…e and compare with `()`

…ne more test case

[v5.0] Support for registers with Unit value

kushti · 2022-09-04T10:31:15Z

#828 must be resolved before this PR can be accepted

aslesarenko · 2022-09-08T17:32:11Z

@kushti the fix it here #829, however please read the description about why it is better be merged into v5.x (and not here)

…preter into v5.0-finalize

sigma-impl/src/main/scala/special/sigma/SigmaDslOverArrays.scala

sigmastate/src/main/scala/org/ergoplatform/ErgoLikeContext.scala

sigmastate/src/main/scala/org/ergoplatform/ErgoScriptPredef.scala

sigmastate/src/main/scala/sigmastate/lang/Terms.scala

sigmastate/src/main/scala/sigmastate/lang/SigmaPredef.scala

sigmastate/src/main/scala/sigmastate/lang/SigmaCompiler.scala

sigmastate/src/main/scala/sigmastate/lang/exceptions/SigmaSerializerExceptions.scala

sigmastate/src/main/scala/sigmastate/lang/exceptions/Exceptions.scala

kushti · 2022-10-10T21:27:48Z

sigmastate/src/main/scala/sigmastate/lang/exceptions/Exceptions.scala

@@ -37,5 +41,5 @@ class CostLimitException(val estimatedCost: Long, message: String, cause: Option
    extends SigmaException(message, None, cause)

 object CostLimitException {


ScalaDoc missed

Added ScalaDoc for CostLimitException. Don't think we should require ScalaDocs for companions. Added ScalaDoc for the method, don't think it is valuable tough.

kushti · 2022-10-10T21:52:44Z

sigmastate/src/main/scala/sigmastate/serialization/ModQSerializer.scala

@@ -5,7 +5,7 @@ import sigmastate.lang.Terms._
 import sigmastate.utils.{SigmaByteReader, SigmaByteWriter}
 import sigmastate.{ModQ, SType}

-// TODO HF (2h): make sure it is covered with tests
+// TODO v6.0 (2h): make sure it is covered with tests


Unlikely need for tests is tied with 6.0. Better to make an issue, not todo.

This class doesn't make sense before v6.0. It cannot be removed however, because this serializer was erroneously registered in ValueSerializer's global map. See comment here
There are already issues regarding ModQ operations with v6.0 milestone.
Don't think anything needs to be changed in this code in this PR.

kushti · 2022-10-10T21:55:30Z

sigmastate/src/main/scala/sigmastate/serialization/ModQArithOpSerializer.scala

@@ -6,7 +6,7 @@ import sigmastate.utils.SigmaByteWriter.DataInfo
 import sigmastate.utils.{SigmaByteReader, SigmaByteWriter}
 import sigmastate.{ModQArithOpCompanion, SType, ModQArithOp}

-// TODO HF (2h): make sure it is covered with tests
+// TODO v6.0 (2h): make sure it is covered with tests


Unlikely need for tests is tied with 6.0. Better to make an issue, not todo.

see my comment above.

sigmastate/src/main/scala/sigmastate/serialization/TupleSerializer.scala

kushti · 2022-10-10T21:58:41Z

sigmastate/src/main/scala/sigmastate/serialization/ValueSerializer.scala

@@ -347,6 +347,7 @@ object ValueSerializer extends SigmaSerializerCompanion[Value[SType]] {
    }
  }

+  // TODO v5.x: control maxTreeDepth same as in deserialize


What does this comment mean ?

Add ScalaDoc for the class

clarified comment, added ScalaDoc

sigmastate/src/main/scala/sigmastate/SigSerializer.scala

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

aslesarenko and others added 30 commits November 10, 2021 18:51

prepare-v5.0-tests: run both aot and jit modes

1ba1c8e

prepare-v5.0-tests: move check methods to CostingUtils

b78a8ee

Merge remote-tracking branch 'origin/develop' into prepare-v5.0-tests

0fca9ea

prepare-v5.0-tests: fixes after merge

daf7e3a

prepare-v5.0-tests: use evaluationMode in fullReduction

efb9668

v5.0-increase-script-version: - increased MaxSupportedScript version;…

83c4281

… - introduced context.currentErgoTreeVersion

v5.0-increase-script-version: updateMany added to CollecitonUtil

09a96d0

v5.0-increase-script-version: use context.currentErgoTreeVersion in X…

07362e3

…orOf eval

v5.0-increase-script-version: generalize Expected

658ce45

v5.0-increase-script-version: refactor ProverInterpreter.prove to use…

c31525a

… evaluationMode

v5.0-increase-script-version: set evaluationMode for prover in checkV…

2067b91

…erify

v5.0-increase-script-version: refactor Expected data descriptors (aka…

ac0b654

… test vectors)

jitcost-type: added JitCost class with tests

901bf32

activation: making evaluationMode optional

c0c7999

activation: implemented getEvaluationMode method

2605168

activation: BasicOpsSpecification: remove evaluationMode setting

c0cabda

activation: rootCauseLike method added

1ee6fe9

activation: fix tests to work with hibrid (v4 or v5) Interpreter

34d0c85

simple constructor for SigmaCompiler

dbcf554

Merge pull request #755 from ScorexFoundation/compiler-settings

de47a25

Re-introduce SigmaCompiler constructor with networkPrefix

activation: cleanup code

0cfb020

activation: refactor CrossVersionProps.scala

e31de08

activation: update ScriptVersionSwitchSpecification to cover Block ve…

ba14e53

…rsions v1, 2, 3, 4

activation: Rules 21,22,23,24

5cee2c6

activation: update aot-jit-switch.md

93a240e

activation: Interpreter.JitActivationVersion introduced

8239cc7

jitcost-type: refactoring to use JitCost type

388d4f2

Merge pull request #753 from ScorexFoundation/activation

4e2c130

Encapsulate evaluationMode selection (towards v5.0)

jitcost-type: fix tests

2ad642a

jitcost-type: fix tests (part 2)

4db92b6

aslesarenko and others added 12 commits June 13, 2022 22:33

Merge remote-tracking branch 'origin/v5.0-finalize' into v5.0-finalize

e5e6e76

set HAS_SECRETS on CI env;

12610cf

Merge pull request #813 from ScorexFoundation/ci-add-has-secrets

6392cbc

set HAS_SECRETS on CI env;

Merge remote-tracking branch 'origin/develop' into v5.0-finalize

85336ec

v5.0-unit-register-test: added test for Unit registers

4f2579b

v5.0-unit-register-test: added test which accesses Unit register valu…

d6033c6

…e and compare with `()`

v5.0-unit-register-test: fixes for Scala 2.11

5a3690a

v5.0-unit-register-test: versioned SUnit -> UnitElement conversion, o…

d22386c

…ne more test case

v5.0-unit-register-test: added testcase for UnitConstant serialization

da43b85

v5.0-unit-register-test: removed changes in RuntimeCosting

7582170

v5.0-unit-register-test: more ScalaDocs + issue reference

52492dc

Merge pull request #817 from ScorexFoundation/v5.0-unit-register-test

d254cad

[v5.0] Support for registers with Unit value

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

89c722c

…preter into v5.0-finalize

kushti reviewed Oct 7, 2022

View reviewed changes

sigma-impl/src/main/scala/special/sigma/SigmaDslOverArrays.scala Outdated Show resolved Hide resolved

sigmastate/src/main/scala/org/ergoplatform/ErgoLikeContext.scala Outdated Show resolved Hide resolved

sigmastate/src/main/scala/org/ergoplatform/ErgoScriptPredef.scala Show resolved Hide resolved

v5.0-finalize: remove unused imports

c89bfae

aslesarenko requested a review from kushti October 10, 2022 13:27

kushti reviewed Oct 10, 2022

View reviewed changes

sigmastate/src/main/scala/sigmastate/lang/Terms.scala Show resolved Hide resolved

kushti reviewed Oct 10, 2022

View reviewed changes

sigmastate/src/main/scala/sigmastate/lang/SigmaPredef.scala Show resolved Hide resolved

kushti requested changes Oct 10, 2022

View reviewed changes

kushti reviewed Oct 11, 2022

View reviewed changes

sigmastate/src/main/scala/sigmastate/SigSerializer.scala Show resolved Hide resolved

sigmastate/src/main/scala/sigmastate/interpreter/Interpreter.scala Show resolved Hide resolved

sigmastate/src/main/scala/sigmastate/interpreter/Interpreter.scala Outdated Show resolved Hide resolved

aslesarenko added 3 commits October 11, 2022 15:14

v5.0-finalize: comment for Apply.eval

b55ec75

v5.0-finalize: descriptions for fromBase** predefined operations

ac86fcb

v5.0-finalize: more ScalaDocs, cleanups and clarifying comments

f100992

aslesarenko requested a review from kushti October 11, 2022 15:45

kushti approved these changes Oct 11, 2022

View reviewed changes

aslesarenko merged commit 79c6f6f into master Oct 12, 2022

aslesarenko deleted the v5.0-finalize branch May 1, 2024 15:51

aslesarenko restored the v5.0-finalize branch May 1, 2024 23:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release Candidate v5.0 #758

Release Candidate v5.0 #758

aslesarenko commented Dec 17, 2021 •

edited

Loading

kushti commented Sep 4, 2022

aslesarenko commented Sep 8, 2022 •

edited

Loading

kushti Oct 10, 2022

aslesarenko Oct 11, 2022

kushti Oct 10, 2022

aslesarenko Oct 11, 2022 •

edited

Loading

kushti Oct 10, 2022

aslesarenko Oct 11, 2022

kushti Oct 10, 2022

aslesarenko Oct 11, 2022

		@@ -37,5 +41,5 @@ class CostLimitException(val estimatedCost: Long, message: String, cause: Option
		extends SigmaException(message, None, cause)

		object CostLimitException {

Release Candidate v5.0 #758

Release Candidate v5.0 #758

Conversation

aslesarenko commented Dec 17, 2021 • edited Loading

kushti commented Sep 4, 2022

aslesarenko commented Sep 8, 2022 • edited Loading

kushti Oct 10, 2022

Choose a reason for hiding this comment

aslesarenko Oct 11, 2022

Choose a reason for hiding this comment

kushti Oct 10, 2022

Choose a reason for hiding this comment

aslesarenko Oct 11, 2022 • edited Loading

Choose a reason for hiding this comment

kushti Oct 10, 2022

Choose a reason for hiding this comment

aslesarenko Oct 11, 2022

Choose a reason for hiding this comment

kushti Oct 10, 2022

Choose a reason for hiding this comment

aslesarenko Oct 11, 2022

Choose a reason for hiding this comment

aslesarenko commented Dec 17, 2021 •

edited

Loading

aslesarenko commented Sep 8, 2022 •

edited

Loading

aslesarenko Oct 11, 2022 •

edited

Loading