Merge pull request #2067 from ergoplatform/v5.0.17

Candidate for 5.0.17 release
ergoplatform · Dec 19, 2023 · f48d3d5 · f48d3d5
2 parents 5c713f8 + 87fb49a
commit f48d3d5
Show file tree

Hide file tree

Showing 356 changed files with 4,470 additions and 3,624 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,9 +36,16 @@ jobs:
         env:
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
 
-      - name: Publish release 
+      - name: Publish ergo-wallet
         run: sbt +ergoWallet/publishSigned sonatypeBundleRelease
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+
+      - name: Publish ergo-core
+        run: sbt +ergoCore/publishSigned sonatypeBundleRelease
+        env:
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
diff --git a/Dockerfile b/Dockerfile
@@ -4,9 +4,10 @@ COPY build.sbt findbugs-exclude.xml ./
 COPY project/ project/
 COPY avldb/build.sbt avldb/build.sbt
 COPY avldb/project/ avldb/project/
+COPY ergo-core/build.sbt ergo-core/build.sbt
+COPY ergo-core/project/ ergo-core/project/
 COPY ergo-wallet/build.sbt ergo-wallet/build.sbt
 COPY ergo-wallet/project/ ergo-wallet/project/
-COPY benchmarks/build.sbt benchmarks/build.sbt
 RUN sbt update
 COPY . ./
 RUN sbt assembly

diff --git a/avldb/project/build.properties b/avldb/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.2.8
diff --git a/avldb/project/plugins.sbt b/avldb/project/plugins.sbt
@@ -2,8 +2,6 @@ logLevel := Level.Warn
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
 
-addSbtPlugin("com.github.tkawachi" % "sbt-lock" % "0.4.0")
-
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")

diff --git a/...x/core/serialization/ErgoSerializer.scala → ...atform/serialization/ErgoSerializer.scala b/...x/core/serialization/ErgoSerializer.scala → ...atform/serialization/ErgoSerializer.scala
@@ -1,4 +1,4 @@
-package scorex.core.serialization
+package org.ergoplatform.serialization
 
 import java.nio.ByteBuffer
 import scorex.util.ByteArrayBuilder

diff --git a/...re/serialization/ManifestSerializer.scala → ...rm/serialization/ManifestSerializer.scala b/...re/serialization/ManifestSerializer.scala → ...rm/serialization/ManifestSerializer.scala
@@ -1,4 +1,4 @@
-package scorex.core.serialization
+package org.ergoplatform.serialization
 
 import scorex.crypto.authds.avltree.batch.Constants.DigestType
 import scorex.crypto.authds.avltree.batch.serialization.{BatchAVLProverManifest, ProxyInternalNode}

diff --git a/...ore/serialization/SubtreeSerializer.scala → ...orm/serialization/SubtreeSerializer.scala b/...ore/serialization/SubtreeSerializer.scala → ...orm/serialization/SubtreeSerializer.scala
@@ -1,4 +1,4 @@
-package scorex.core.serialization
+package org.ergoplatform.serialization
 
 import scorex.crypto.authds.avltree.batch.Constants.DigestType
 import scorex.crypto.authds.avltree.batch.{InternalProverNode, ProverLeaf, ProverNodes, VersionedLDBAVLStorage}

diff --git a/avldb/src/main/scala/scorex/crypto/authds/avltree/batch/ProverNodeSerializer.scala b/avldb/src/main/scala/scorex/crypto/authds/avltree/batch/ProverNodeSerializer.scala
@@ -1,7 +1,7 @@
 package scorex.crypto.authds.avltree.batch
 
 import com.google.common.primitives.Ints
-import scorex.core.serialization.ErgoSerializer
+import org.ergoplatform.serialization.ErgoSerializer
 import scorex.crypto.authds.{ADKey, ADValue, Balance}
 import scorex.crypto.authds.avltree.batch.Constants.{DigestType, hashFn}
 import scorex.crypto.authds.avltree.batch.serialization.ProxyInternalNode

diff --git a/...c/test/scala/scorex/crypto/authds/avltree/batch/VersionedLDBAVLStorageSpecification.scala b/...c/test/scala/scorex/crypto/authds/avltree/batch/VersionedLDBAVLStorageSpecification.scala
@@ -6,7 +6,7 @@ import org.scalatest.Assertion
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.propspec.AnyPropSpec
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
-import scorex.core.serialization.{ManifestSerializer, SubtreeSerializer}
+import org.ergoplatform.serialization.{ManifestSerializer, SubtreeSerializer}
 import scorex.crypto.authds.avltree.batch.helpers.TestHelper
 import scorex.crypto.authds.{ADDigest, ADKey, ADValue, SerializedAdProof}
 import scorex.util.encode.Base16

diff --git a/benchmarks/Jenkinsfile b/benchmarks/Jenkinsfile
diff --git a/benchmarks/build.sbt b/benchmarks/build.sbt
diff --git a/benchmarks/src/test/resources/logback-bench.xml b/benchmarks/src/test/resources/logback-bench.xml
diff --git a/benchmarks/src/test/scala/org/ergoplatform/ModifiersApplicationBench.scala b/benchmarks/src/test/scala/org/ergoplatform/ModifiersApplicationBench.scala
diff --git a/benchmarks/src/test/scala/org/ergoplatform/Utils.scala b/benchmarks/src/test/scala/org/ergoplatform/Utils.scala
diff --git a/benchmarks/src/test/scala/org/ergoplatform/bench/BenchActor.scala b/benchmarks/src/test/scala/org/ergoplatform/bench/BenchActor.scala