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

Release Candidate v5.0.14 #943

Merged
merged 198 commits into from
Apr 4, 2024
Merged

Release Candidate v5.0.14 #943

merged 198 commits into from
Apr 4, 2024

Conversation

# Conflicts:
#	sdk/js/src/main/scala/org/ergoplatform/sdk/js/Isos.scala
# Conflicts:
#	interpreter/shared/src/main/scala/sigmastate/interpreter/Interpreter.scala
#	sc/shared/src/test/scala/org/ergoplatform/validation/RuleStatusSerializerSpec.scala
#	sdk/js/src/main/scala/org/ergoplatform/sdk/js/Isos.scala
@aslesarenko aslesarenko requested a review from kushti January 10, 2024 10:57
@aslesarenko aslesarenko marked this pull request as ready for review January 10, 2024 10:57
Copy link
Member

@kushti kushti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved, but for release , provide in release notes how users will be affected by updated default VersionContext , how P2S / P2SH addresses affected etc

Copy link
Member

@kushti kushti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tracking issues with P2SH need to be resolved

More tests related to ErgoTree versioning
@@ -3,8 +3,20 @@ package sigma
import debox.cfor
import scorex.util.encode.Base16
import scorex.util.{ModifierId, bytesToId}
import sigma.data.RType

object Extensions {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ScalaDoc for Extensions missed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

import sigma.ast.TypeCodes.LastConstantCode
import supertagged.TaggedType

/** Encoding of sigma proposition nodes.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Opcodes of sigma proposition nodes" ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed ScalaDoc

case BoxRType => SBox
case ContextRType => SContext
case SigmaDslBuilderRType => SGlobal
case HeaderRType => SHeader
case PreHeaderRType => SPreHeader
case SigmaPropRType => SSigmaProp
case SigmaBooleanRType => SSigmaProp
// TODO remove commented code below after full sync test
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is full sync done? merging such code into master does not make sense

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rolled back to clean this PR from suspicious changes, better be done in a separate PR


import java.nio.ByteBuffer

abstract class CoreSerializer[TFamily, T <: TFamily] extends Serializer[TFamily, T, CoreByteReader, CoreByteWriter] {
Copy link
Member

@kushti kushti Apr 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ScalaDoc missed, what does "Core" means ? While for XSeriazier, where X is come entity , a ScalaDoc is not needed, here we have something different than serializer of "Core"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added ScalaDocs for CoreXXX classes.

* When f is obtained as `val f = getVar[Int => Int](id).get` then any application `f(x)` involves size estimation
* using underlying `costF(x)`.
* */
//case class CFunc[A,B](context: sigmastate.interpreter.Context, tree: SValue)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commented out code

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

@@ -174,14 +175,6 @@ object ReflectionData {
mkMethod(clazz, "updateOperations", Array[Class[_]](classOf[Byte])) { (obj, args) =>
obj.asInstanceOf[AvlTree].updateOperations(args(0).asInstanceOf[Byte])
},
mkMethod(clazz, "getMany", Array[Class[_]](classOf[Coll[_]], classOf[Coll[_]])) { (obj, args) =>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why removed?

Where methods from this file are called btw ? ScalaDoc for ReflectionData is obscure

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they removed because those methods of AvlTree never called via reflection. Interpreter calls them via xxx_eval methods. Search for an example mkMethod(clazz, "getMany_eval",

@aslesarenko aslesarenko merged commit 35c2a7f into master Apr 4, 2024
8 checks passed
@aslesarenko aslesarenko deleted the v5.0.14-RC branch May 1, 2024 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants