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.

Sign up for GitHub

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

Jump to bottom

Move TypeSerializer and DataSerializer to core module (part 2) #917

Merged
merged 39 commits into from
Oct 21, 2023
Merged

Move TypeSerializer and DataSerializer to core module (part 2) #917

merged 39 commits into from
Oct 21, 2023

Conversation

aslesarenko
Copy link
Member

@aslesarenko aslesarenko commented Sep 20, 2023 •
edited
Loading

@aslesarenko
sigma-ast: TypeSerializer code moved to CoreTypeSerializer
e629124
@aslesarenko
sigma-ast: TypeSerializer code moved to CoreTypeSerializer (fix compi…
142fcc8 
…lation of interpreter)
@aslesarenko
sigma-ast: AvlTreeData moved to core
01190bb
@aslesarenko
sigma-ast: everything compiles
f5d01ff
@aslesarenko
sigma-ast: CryptoContext moved to core
e162665
@aslesarenko
sigma-ast: GroupElementSerializer moved to core
a22282d
@aslesarenko
Merge remote-tracking branch 'origin/sigma-ast' into core-serializers
02f6ad2 
# 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
sigma-ast: fix after merge
0e45513
@aslesarenko
sigma-ast: fix Reflection for SigmaCompiler
1a86c84
@aslesarenko
Merge remote-tracking branch 'origin/sigma-ast' into core-serializers
c6585e1
@aslesarenko
core-serializers: CGroupElement moved to core
61f2bda
@aslesarenko
core-serializers: fix compilation Scala 2.11
0c7e09a
@aslesarenko
core-serializers: removed toBits unfinished method
198e028
@aslesarenko
core-serializers: removed all xxxQ methods from BigInt
5b07d30
@aslesarenko
core-serializers: introduced SPCodes
637ecff
@aslesarenko
core-serializers: SigmaBoolean moved to a separate file
d12e488
@aslesarenko
core-serializers: SigmaBoolean became sealed
e16540d
@aslesarenko
core-serializers: SigmaBoolean moved to core
728895b
@aslesarenko
core-serializers: CSigmaProp moved to core
c8de983
@aslesarenko
core-serializers: CSigmaProp.propBytes implemented without ErgoTree
44d2463
@aslesarenko
core-serializers: toColl extension method moved to core
2d00c56
@aslesarenko
core-serializers: CAvlTree moved to core
d9b6b23
@aslesarenko
core-serializers: CoreDataSerializer introduced
dd91fa3
@aslesarenko
core-serializers: js.Type moved to core.js
c973adb
@aslesarenko
Merge remote-tracking branch 'origin/sigma-ast' into core-serializers
4912a3c 
# Conflicts:
#	core/shared/src/main/scala/sigma/ast/package.scala
#	interpreter/shared/src/main/scala/sigmastate/eval/CostingDataContext.scala
@aslesarenko
core-serializers: fixes after merge
5695687
@aslesarenko
core-serializers: Value moved to core.js
4fcd2a7
@aslesarenko
core-serializers2: renamed CostingBox -> CBox
feebe24
@aslesarenko
core-serializers2: renamed CostingSigmaDslBuilder -> CSigmaDslBuilder
d503dbe
@aslesarenko
core-serializers2: renamed CostingDataContext -> CContext
094beeb
@aslesarenko
core-serializers2: moved CAnyValue to core
3f85433
@aslesarenko
core-serializers2: moved Digest32Coll to core
2ddc80d
@aslesarenko
core-serializers2: ErgoTree moved out of Values object
42541ac
@aslesarenko
core-serializers2: fix Scala 2.11 compilation
731409f
@aslesarenko
Merge remote-tracking branch 'origin/ergotree-version' into core-seri…
9cdcbde 
…alizers

# Conflicts:
#	interpreter/shared/src/main/scala/org/ergoplatform/ErgoAddress.scala
#	interpreter/shared/src/main/scala/org/ergoplatform/validation/ValidationRules.scala
#	interpreter/shared/src/main/scala/sigmastate/UnprovenTree.scala
#	interpreter/shared/src/main/scala/sigmastate/Values.scala
#	interpreter/shared/src/main/scala/sigmastate/eval/CostingDataContext.scala
#	interpreter/shared/src/test/scala/sigmastate/TestsBase.scala
#	interpreter/shared/src/test/scala/sigmastate/crypto/SigningSpecification.scala
#	interpreter/shared/src/test/scala/sigmastate/serialization/generators/ObjectGenerators.scala
#	interpreter/shared/src/test/scala/special/sigma/SigmaTestingData.scala
#	sc/js/src/main/scala/sigmastate/lang/js/SigmaCompiler.scala
#	sc/jvm/src/test/scala/sigmastate/helpers/SigmaPPrintSpec.scala
#	sc/shared/src/test/scala/org/ergoplatform/dsl/TestContractSpec.scala
#	sc/shared/src/test/scala/sigma/SigmaDslSpecification.scala
#	sc/shared/src/test/scala/sigmastate/SoftForkabilitySpecification.scala
#	sc/shared/src/test/scala/sigmastate/serialization/ErgoTreeSerializerSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/DistributedSigSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/blockchain/BlockchainSimulationTestingCommons.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/ColdWalletAdvContractExampleSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/ColdWalletContractExampleSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/CoopExampleSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/MixExampleSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/RPSGameExampleSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/ReversibleTxExampleSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/TimedPaymentExampleSpecification.scala
#	sdk/js/src/main/scala/org/ergoplatform/sdk/js/Isos.scala
#	sdk/js/src/test/scala/org/ergoplatform/sdk/js/IsosSpec.scala
#	sdk/shared/src/test/scala/org/ergoplatform/sdk/wallet/utils/Generators.scala
@aslesarenko
core-serializers: fixes after merge
a8ba147
@aslesarenko
Merge remote-tracking branch 'origin/core-serializers' into core-seri…
9617c12 
…alizers2

# Conflicts:
#	interpreter/shared/src/main/scala/org/ergoplatform/ErgoTreePredef.scala
#	interpreter/shared/src/main/scala/org/ergoplatform/validation/ValidationRules.scala
#	interpreter/shared/src/main/scala/sigmastate/Values.scala
#	interpreter/shared/src/main/scala/sigmastate/serialization/ErgoTreeSerializer.scala
#	sc/js/src/main/scala/sigmastate/lang/js/SigmaCompiler.scala
#	sc/jvm/src/test/scala/sigmastate/helpers/SigmaPPrintSpec.scala
#	sc/shared/src/test/scala/org/ergoplatform/dsl/TestContractSpec.scala
#	sc/shared/src/test/scala/sigmastate/ScriptVersionSwitchSpecification.scala
#	sc/shared/src/test/scala/sigmastate/SoftForkabilitySpecification.scala
#	sc/shared/src/test/scala/sigmastate/serialization/ErgoTreeSerializerSpecification.scala
#	sc/shared/src/test/scala/sigmastate/utxo/examples/CoopExampleSpecification.scala
#	sdk/shared/src/main/scala/org/ergoplatform/sdk/ContractTemplate.scala
@aslesarenko
core-serializers2: fixes after merge
69a9148
@aslesarenko aslesarenko changed the base branch from core-serializers to ergotree-version October 5, 2023 18:12
@aslesarenko aslesarenko changed the title Move TypeSerializer and DataSerializer to core module (part 3) Move TypeSerializer and DataSerializer to core module (part 2) Oct 5, 2023
@aslesarenko aslesarenko mentioned this pull request Oct 5, 2023
Closed
12 tasks
@aslesarenko aslesarenko marked this pull request as ready for review October 5, 2023 18:18
@aslesarenko aslesarenko changed the base branch from ergotree-version to v5.0.13-RC October 21, 2023 10:47
@aslesarenko aslesarenko mentioned this pull request Oct 21, 2023
Closed
@aslesarenko aslesarenko merged commit 3435531 into v5.0.13-RC Oct 21, 2023
4 checks passed
@aslesarenko aslesarenko mentioned this pull request Nov 29, 2023
Merged
@aslesarenko aslesarenko deleted the core-serializers2 branch May 1, 2024 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kushti kushti kushti approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aslesarenko @kushti