NODE-2604 New zwaves library (#3895)

wavesplatform · Oct 17, 2023 · 2da7fe2 · 2da7fe2
1 parent 9c49518
commit 2da7fe2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/build.sbt b/build.sbt
@@ -159,8 +159,7 @@ inScope(Global)(
     testOptions += Tests.Setup(_ => sys.props("sbt-testing") = "true"),
     network         := Network.default(),
     instrumentation := false,
-    resolvers ++= Resolver.sonatypeOssRepos("snapshots") ++ Seq(Resolver.mavenLocal) ++
-      Seq(MavenRepository("wvservices-releases", "https://nexus.wvservices.com/repository/maven-releases/")),
+    resolvers ++= Resolver.sonatypeOssRepos("releases") ++ Resolver.sonatypeOssRepos("snapshots") ++ Seq(Resolver.mavenLocal),
     Compile / doc / sources                := Seq.empty,
     Compile / packageDoc / publishArtifact := false,
     concurrentRestrictions                 := Seq(Tags.limit(Tags.Test, math.min(EvaluateTask.SystemProcessors, 8))),

diff --git a/lang/jvm/src/main/scala/com/wavesplatform/crypto/Curve25519.scala b/lang/jvm/src/main/scala/com/wavesplatform/crypto/Curve25519.scala
@@ -1,16 +1,9 @@
 package com.wavesplatform.crypto
 
-import java.lang.reflect.Constructor
-
 import org.whispersystems.curve25519.OpportunisticCurve25519Provider
 
 object Curve25519 {
-  private lazy val provider: OpportunisticCurve25519Provider = {
-    val constructor = classOf[OpportunisticCurve25519Provider].getDeclaredConstructors.head
-      .asInstanceOf[Constructor[OpportunisticCurve25519Provider]]
-    constructor.setAccessible(true)
-    constructor.newInstance()
-  }
+  private lazy val provider = new OpportunisticCurve25519Provider()
 
   val KeyLength: Int = 32
 

diff --git a/node/src/test/scala/com/wavesplatform/http/UtilsRouteSpec.scala b/node/src/test/scala/com/wavesplatform/http/UtilsRouteSpec.scala
@@ -576,10 +576,13 @@ class UtilsRouteSpec extends RouteSpec("/utils") with RestAPISettingsHelper with
     }
 
     Post(routePath("/script/compileCode?compact=true"), bigSizeDApp) ~> route ~> check {
-      (responseAs[JsValue] \ "script").toOption shouldBe defined
-      (responseAs[JsValue] \ "complexity").as[Long] shouldBe 0
-      (responseAs[JsValue] \ "verifierComplexity").as[Long] shouldBe 0
-      (responseAs[JsValue] \ "extraFee").as[Long] shouldBe 400000
+      val r = responseAs[JsValue]
+      withClue(s"json=$r ") {
+        (r \ "script").toOption shouldBe defined
+        (r \ "complexity").as[Long] shouldBe 0
+        (r \ "verifierComplexity").as[Long] shouldBe 0
+        (r \ "extraFee").as[Long] shouldBe 400000
+      }
     }
 
     Post(routePath("/script/compileCode"), "{-# STDLIB_VERSION 2 #-}\n(1 == 2)") ~> route ~> check {

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -31,7 +31,7 @@ object Dependencies {
   val logback            = "ch.qos.logback"      % "logback-classic"   % "1.3.11" // 1.4.x and later is built for Java 11
   val janino             = "org.codehaus.janino" % "janino"            % "3.1.10"
   val asyncHttpClient    = "org.asynchttpclient" % "async-http-client" % "2.12.3"
-  val curve25519         = "com.wavesplatform"   % "curve25519-java"   % "0.6.5"
+  val curve25519         = "com.wavesplatform"   % "curve25519-java"   % "0.6.6"
   val nettyHandler       = "io.netty"            % "netty-handler"     % "4.1.94.Final"
 
   val catsCore  = catsModule("core", "2.9.0")
@@ -66,10 +66,10 @@ object Dependencies {
       shapeless.value,
       "org.typelevel" %%% "cats-mtl" % "1.3.1",
       "ch.obermuhlner"  % "big-math" % "2.3.2",
+      googleGuava,
       curve25519,
       bouncyCastleProvider,
-      "com.wavesplatform" % "zwaves"       % "0.1.0-SNAPSHOT",
-      "com.wavesplatform" % "zwaves-bn256" % "0.1.5-SNAPSHOT",
+      "com.wavesplatform" % "zwaves" % "0.2.1",
       web3jModule("crypto")
     ) ++ langCompilerPlugins.value ++ scalapbRuntime.value ++ protobuf.value
   )