NODE-2541 Bumped swagger-ui to 4.15.5 (#3791)

Author: phearnot

benchmark/build.sbt

@@ -3,7 +3,7 @@ enablePlugins(JmhPlugin)
 Jmh / version := "1.33"
 
 libraryDependencies ++= Seq(
-  "org.scodec" %% "scodec-core" % "1.11.9"
+  "org.scodec" %% "scodec-core" % "1.11.10"
 ) ++ Dependencies.logDeps
 
 // https://github.com/ktoso/sbt-jmh#adding-to-your-project

benchmark/src/main/scala/com/wavesplatform/state/bench/DataTestData.scala

@@ -5,16 +5,16 @@ import java.nio.charset.StandardCharsets
 import com.wavesplatform.common.state.ByteStr
 import com.wavesplatform.lang.v1.traits.DataType
 import scodec.Codec
-import scodec.bits._
-import scodec.codecs._
+import scodec.bits.*
+import scodec.codecs.*
 
 case class DataTestData(addr: ByteStr, key: String, dataType: DataType)
 
 object DataTestData {
 
   implicit val dt: Discriminated[DataType, Int] = Discriminated[DataType, Int](uint8)
   implicit val dtCodec: Codec[DataType]         = mappedEnum(uint8, DataType.Boolean -> 0, DataType.ByteArray -> 1, DataType.Long -> 2, DataType.String -> 3)
-  implicit val byteStrCodec: Codec[ByteStr]     = bits.contramap[ByteStr](byteStr => BitVector(byteStr.arr)).asInstanceOf
+  implicit val byteStrCodec: Codec[ByteStr]     = bits.contramap[ByteStr](byteStr => BitVector(byteStr.arr)).encodeOnly
 
   val codec: Codec[DataTestData] = {
     ("addr" | variableSizeBytes(uint8, byteStrCodec)) ::

build.sbt

@@ -123,7 +123,7 @@ lazy val `waves-node` = (project in file("."))
 
 inScope(Global)(
   Seq(
-    scalaVersion         := "2.13.8",
+    scalaVersion         := "2.13.10",
     organization         := "com.wavesplatform",
     organizationName     := "Waves Platform",
     organizationHomepage := Some(url("https://wavesplatform.com")),
@@ -144,7 +144,6 @@ inScope(Global)(
       "-Wconf:cat=deprecation&site=com.wavesplatform.state.InvokeScriptResult.*:s"
     ),
     crossPaths := false,
-    dependencyOverrides ++= Dependencies.enforcedVersions.value,
     cancelable        := true,
     parallelExecution := true,
     /* http://www.scalatest.org/user_guide/using_the_runner

lang/shared/src/main/scala/com/wavesplatform/lang/v1/task/TaskMTInstances.scala

@@ -1,14 +1,14 @@
 package com.wavesplatform.lang.v1.task
 
-import cats.mtl.MonadState
+import cats.mtl.Stateful
 import cats.{Monad, MonadError, StackSafeMonad}
 import com.wavesplatform.lang.EvalF
 
 trait TaskMTInstances {
 
   object TF extends TaskMTFunctions
 
-  implicit def monadError[F[_] : Monad, S, E](implicit m: Monad[EvalF[F, *]]): MonadError[TaskMT[F, S, E, *], E] =
+  implicit def monadError[F[_]: Monad, S, E](implicit m: Monad[EvalF[F, *]]): MonadError[TaskMT[F, S, E, *], E] =
     new MonadError[TaskMT[F, S, E, *], E] with StackSafeMonad[TaskMT[F, S, E, *]] {
       override def pure[A](x: A): TaskMT[F, S, E, A] =
         TF.pure(x)
@@ -23,8 +23,8 @@ trait TaskMTInstances {
         fa.handleErrorWith(f)
     }
 
-  implicit def monadState[F[_]: Monad, S, E](implicit m: Monad[EvalF[F, *]]): MonadState[TaskMT[F, S, E, *], S] =
-    new MonadState[TaskMT[F, S, E, *], S] {
+  implicit def monadState[F[_]: Monad, S, E](implicit m: Monad[EvalF[F, *]]): Stateful[TaskMT[F, S, E, *], S] =
+    new Stateful[TaskMT[F, S, E, *], S] {
       override val monad: Monad[TaskMT[F, S, E, *]] = monadError[F, S, E]
 
       override def get: TaskMT[F, S, E, S] = TF.get

lang/tests/src/test/scala/com/wavesplatform/lang/parser/ScriptParserTest.scala

@@ -346,7 +346,7 @@ class ScriptParserTest extends PropSpec with ScriptGenParser {
   List("then", "else", "true").foreach { keyword =>
     property(s"reserved keywords are invalid variable names in block: $keyword") {
       val script =
-        s"""let ${keyword.padTo(4, " ").mkString} = 1
+        s"""let ${keyword.padTo(4, ' ').mkString} = 1
            |true""".stripMargin
       parse(script) shouldBe BLOCK(
         AnyPos,

node-it/src/test/resources/logback-test.xml

@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <target>System.out</target>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>${logback.stdout.level:-DEBUG}</level>
-        </filter>
-        <encoder>
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{26} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
     <appender name="FILE" class="ch.qos.logback.core.FileAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>${logback.file.level:-TRACE}</level>
@@ -25,6 +15,6 @@
     <logger name="io.netty" level="INFO"/>
 
     <root level="TRACE">
-        <appender-ref ref="${waves.it.logging.appender:-STDOUT}"/>
+        <appender-ref ref="FILE"/>
     </root>
 </configuration>

node-it/src/test/scala/com/wavesplatform/it/sync/smartcontract/InvokePaymentsAvailabilitySuite.scala

@@ -94,13 +94,13 @@ class InvokePaymentsAvailabilitySuite extends BaseTransactionSuite {
     sender.assetBalance(callerAddress, assetId).balance shouldBe callerStartBalance - paymentAmount
 
     val expectingProxyDAppBalance = 0
-    List(
+    List[Any](
       sender.assetBalance(proxyDAppAddress, assetId).balance,
       sender.getData(proxyDAppAddress, "balance_self").head.value
     ).foreach(_ shouldBe proxyStartBalance + expectingProxyDAppBalance)
 
     val expectingCallingDAppBalance = paymentAmount
-    List(
+    List[Any](
       sender.assetBalance(callingDAppAddress, assetId).balance,
       sender.getData(proxyDAppAddress, "balance_calling_dApp").head.value
     ).foreach(_ shouldBe callingDAppStartBalance + expectingCallingDAppBalance)

node/src/main/resources/swagger-ui/index.css

@@ -0,0 +1,16 @@
+html {
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: inherit;
+}
+
+body {
+    margin: 0;
+    background: #fafafa;
+}

node/src/main/resources/swagger-ui/index.html

@@ -1,64 +1,19 @@
 <!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
     <meta charset="UTF-8">
     <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="./swagger-ui.css">
-    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32"/>
-    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16"/>
-    <style>
-      html
-      {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
-      }
+    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
+    <link rel="stylesheet" type="text/css" href="index.css" />
+    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+  </head>
 
-      *,
-      *:before,
-      *:after
-      {
-        box-sizing: inherit;
-      }
-
-      body
-      {
-        margin:0;
-        background: #fafafa;
-      }
-
-    </style>
-</head>
-
-<body>
-<div id="swagger-ui"></div>
-
-<script src="./swagger-ui-bundle.js"></script>
-<script src="./swagger-ui-standalone-preset.js"></script>
-<script>
-    window.onload = function() {
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
-        url: "/api-docs/openapi.yaml",
-        dom_id: '#swagger-ui',
-        deepLinking: true,
-        presets: [
-          SwaggerUIBundle.presets.apis,
-          SwaggerUIStandalonePreset
-        ],
-        plugins: [
-          SwaggerUIBundle.plugins.DownloadUrl
-        ],
-        layout: "StandaloneLayout",
-        tagsSorter: "alpha",
-        operationsSorter: "alpha"
-      })
-      // End Swagger UI call region
-
-      window.ui = ui
-    }
-
-</script>
-</body>
+  <body>
+    <div id="swagger-ui"></div>
+    <script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
+    <script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
+    <script src="./swagger-initializer.js" charset="UTF-8"> </script>
+  </body>
 </html>

node/src/main/resources/swagger-ui/oauth2-redirect.html

@@ -13,7 +13,7 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
@@ -38,7 +38,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -58,7 +58,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {
@@ -67,10 +67,13 @@
         window.close();
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
-
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
 </body>
 </html>

node/src/main/resources/swagger-ui/swagger-initializer.js

@@ -0,0 +1,22 @@
+window.onload = function() {
+  //<editor-fold desc="Changeable Configuration Block">
+
+  // the following lines will be replaced by docker/configurator, when it runs in a docker-container
+  window.ui = SwaggerUIBundle({
+    url: "/api-docs/openapi.yaml",
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout",
+    tagsSorter: "alpha",
+    operationsSorter: "alpha"
+  });
+
+  //</editor-fold>
+};

node/src/main/resources/swagger-ui/swagger-ui-bundle.js

@@ -140,20 +140,20 @@ class WavesEnvironment(
   }
 
   override def accountWavesBalanceOf(addressOrAlias: Recipient): Either[String, Environment.BalanceDetails] = {
-    (for {
-      aoa <- addressOrAlias match {
-        case Address(bytes) => AddressOrAlias.fromBytes(bytes.arr)
-        case Alias(name)    => com.wavesplatform.account.Alias.create(name)
-      }
-      address <- blockchain.resolveAlias(aoa)
+    val addressE: Either[ValidationError, account.Address] = addressOrAlias match {
+      case Address(bytes) => account.Address.fromBytes(bytes.arr)
+      case Alias(name)    => account.Alias.create(name).flatMap(a => blockchain.resolveAlias(a))
+    }
+    for {
+      address <- addressE.leftMap(_.toString)
       portfolio = currentBlockchain().wavesPortfolio(address)
       effectiveBalance <- portfolio.effectiveBalance
     } yield Environment.BalanceDetails(
       portfolio.balance - portfolio.lease.out,
       portfolio.balance,
       blockchain.generatingBalance(address),
       effectiveBalance
-    )).left.map(_.toString)
+    )
   }
 
   override def transactionHeightById(id: Array[Byte]): Option[Long] =

node/src/main/resources/swagger-ui/swagger-ui-bundle.js.map

@@ -21,7 +21,7 @@ class TraceResultJsonTest extends PropSpec with JsonMatchers {
     for {
       publicKey <- PublicKey.fromBase58String("9utotH1484Hb1WdAHuAKLjuGAmocPZg7jZDtnc35MuqT")
       address   <- Address.fromString("3MydsP4UeQdGwBq7yDbMvf9MzfB2pxFoUKU")
-      proof     <- ByteStr.decodeBase58("4scXzk4WiKMXG8p7V6J2pmznNZCgMjADbbZPSDGg28YLMKgshBmNFNzgYg2TwfKN3wMtgLiNQB77iQQZkH3roUyJ").toEither
+      proof = ByteStr.decodeBase58("4scXzk4WiKMXG8p7V6J2pmznNZCgMjADbbZPSDGg28YLMKgshBmNFNzgYg2TwfKN3wMtgLiNQB77iQQZkH3roUyJ").get
       tx <- InvokeScriptTransaction.create(
         1.toByte,
         sender = publicKey,

node/src/main/resources/swagger-ui/swagger-ui-standalone-preset.js

@@ -64,7 +64,7 @@ package object http {
         Base58
           .tryDecodeWithLimit(str)
           .toEither
-          .flatMap(AddressOrAlias.fromBytes)
+          .flatMap[Object, AddressOrAlias](AddressOrAlias.fromBytes)
           .map(JsSuccess(_))
           .getOrElse(JsError("Can't read PublicKey"))
 

node/src/main/resources/swagger-ui/swagger-ui-standalone-preset.js.map

@@ -98,7 +98,7 @@ class BlockWithMaxBaseTargetTest extends FreeSpec with WithDB with DBCacheSettin
           }
         })
 
-        val blockAppendTask = BlockAppender(bcu, ntpTime, utxPoolStub, pos, scheduler)(lastBlock).onErrorRecoverWith { case _: SecurityException =>
+        val blockAppendTask = BlockAppender(bcu, ntpTime, utxPoolStub, pos, scheduler)(lastBlock).onErrorRecoverWith[Any] { case _: SecurityException =>
           Task.unit
         }
         Await.result(blockAppendTask.runToFuture(scheduler), Duration.Inf)

node/src/main/resources/swagger-ui/swagger-ui.css

@@ -101,13 +101,13 @@ class InvokePaymentsAvailabilityTest extends PropSpec with Inside with DBCacheSe
       d.blockchain.balance(invoke.senderAddress, asset) shouldBe ENOUGH_AMT - paymentAmount
 
       val expectingProxyDAppBalance = 0
-      List(
+      List[Any](
         d.blockchain.balance(proxyDApp, asset),
         d.blockchain.accountData(proxyDApp, "balance_self").get.value
       ).foreach(_ shouldBe expectingProxyDAppBalance)
 
       val expectingCallingDAppBalance = paymentAmount
-      List(
+      List[Any](
         d.blockchain.balance(callingDApp, asset),
         d.blockchain.accountData(proxyDApp, "balance_calling_dApp").get.value
       ).foreach(_ shouldBe expectingCallingDAppBalance)

node/src/main/resources/swagger-ui/swagger-ui.css.map

@@ -97,7 +97,7 @@ class EthereumInvokeTest extends PropSpec with WithDomain with EthHelpers {
 
   private def hexData(script: Script, assets: Seq[IssuedAsset]) = {
     val signature = ABIConverter(script).funcByMethodId.collectFirst { case (_, f) if f.name == "default" => f }.get
-    val args      = new Tuple(passingArg, Array[Tuple](assets.map(a => new Tuple(a.id.arr, paymentAmount))*))
+    val args      = Tuple.of(passingArg, Array[Tuple](assets.map(a => Tuple.of(a.id.arr, paymentAmount))*))
     val call      = new Function(signature.ethSignature).encodeCall(args).array()
     FastHex.encodeToString(call, 0, call.length)
   }

node/src/main/resources/swagger-ui/swagger-ui.js

@@ -221,7 +221,7 @@ class BlockchainUpdaterTest extends FreeSpec with HistoryTest with WithDomain {
       b.processBlock(getNextTestBlockWithVotes(b, Seq(-1))) should beRight
     }
 
-    Try(b.processBlock(getNextTestBlockWithVotes(b, Seq(-1)))).recover { case _: SecurityException => // NOP
+    Try(b.processBlock(getNextTestBlockWithVotes(b, Seq(-1)))).recover[Any] { case _: SecurityException => // NOP
     }
 
     signal.tryAcquire(10, TimeUnit.SECONDS)