OpenAPI and improvements

build.sbt

@@ -218,7 +218,7 @@ inScope(Global)(
   )
 )
 
-commands += Command.command("packageAll"){ state =>
+commands += Command.command("packageAll") { state =>
   "node / assembly" :: "ride-runner / assembly" :: "buildDebPackages" :: "buildTarballsForDocker" :: state
 }
 

grpc-server/src/test/scala/com/wavesplatform/api/grpc/test/AccountsApiGrpcSpec.scala

@@ -4,23 +4,22 @@ import com.google.protobuf.ByteString
 import com.wavesplatform.TestValues
 import com.wavesplatform.account.{Address, KeyPair}
 import com.wavesplatform.api.grpc.*
-import com.wavesplatform.block.Block
 import com.wavesplatform.common.state.ByteStr
 import com.wavesplatform.crypto.DigestLength
 import com.wavesplatform.db.WithDomain
 import com.wavesplatform.db.WithState.AddrWithBalance
 import com.wavesplatform.history.Domain
 import com.wavesplatform.protobuf.Amount
 import com.wavesplatform.protobuf.transaction.{DataEntry, Recipient}
-import com.wavesplatform.state.{Height, BlockRewardCalculator, EmptyDataEntry, IntegerDataEntry}
+import com.wavesplatform.state.{BlockRewardCalculator, EmptyDataEntry, Height, IntegerDataEntry}
 import com.wavesplatform.test.*
+import com.wavesplatform.test.DomainPresets.*
 import com.wavesplatform.transaction.Asset.Waves
 import com.wavesplatform.transaction.TxHelpers
 import com.wavesplatform.utils.{DiffMatchers, Schedulers}
-import org.scalatest.{Assertion, BeforeAndAfterAll}
-import com.wavesplatform.test.DomainPresets.*
 import monix.execution.ExecutionModel.SynchronousExecution
 import monix.execution.Scheduler
+import org.scalatest.{Assertion, BeforeAndAfterAll}
 
 import scala.concurrent.Await
 import scala.concurrent.duration.{DurationInt, FiniteDuration}
@@ -189,7 +188,10 @@ class AccountsApiGrpcSpec extends FreeSpec with BeforeAndAfterAll with DiffMatch
 
     val sender          = TxHelpers.signer(1)
     val challengedMiner = TxHelpers.signer(2)
-    withDomain(TransactionStateSnapshot.configure(_.copy(lightNodeBlockFieldsAbsenceInterval = 0)), balances = AddrWithBalance.enoughBalances(sender)) { d =>
+    withDomain(
+      TransactionStateSnapshot.configure(_.copy(lightNodeBlockFieldsAbsenceInterval = 0)),
+      balances = AddrWithBalance.enoughBalances(sender)
+    ) { d =>
       val grpcApi = getGrpcApi(d)
 
       val challengingMiner = d.wallet.generateNewAccount().get
@@ -206,8 +208,6 @@ class AccountsApiGrpcSpec extends FreeSpec with BeforeAndAfterAll with DiffMatch
 
       val invalidStateHash = ByteStr.fill(DigestLength)(1)
       val originalBlock = d.createBlock(
-        Block.ProtoBlockVersion,
-        Seq.empty,
         strictTime = true,
         generator = challengedMiner,
         stateHash = Some(Some(invalidStateHash))

grpc-server/src/test/scala/com/wavesplatform/api/grpc/test/AssetsApiGrpcSpec.scala

@@ -3,7 +3,6 @@ package com.wavesplatform.api.grpc.test
 import com.google.protobuf.ByteString
 import com.wavesplatform.account.KeyPair
 import com.wavesplatform.api.grpc.{AssetInfoResponse, AssetsApiGrpcImpl, NFTRequest, NFTResponse}
-import com.wavesplatform.block.Block.ProtoBlockVersion
 import com.wavesplatform.db.WithDomain
 import com.wavesplatform.db.WithState.AddrWithBalance
 import com.wavesplatform.features.BlockchainFeatures
@@ -18,7 +17,7 @@ import org.scalatest.BeforeAndAfterAll
 
 class AssetsApiGrpcSpec extends FreeSpec with BeforeAndAfterAll with DiffMatchers with WithDomain with GrpcApiHelpers {
   private given scheduler: Scheduler = Schedulers.singleThread("grpc", executionModel = SynchronousExecution)
-  val sender: KeyPair = TxHelpers.signer(1)
+  val sender: KeyPair                = TxHelpers.signer(1)
 
   "GetNFTList should work" in withDomain(RideV6.addFeatures(BlockchainFeatures.ReduceNFTFee), AddrWithBalance.enoughBalances(sender)) { d =>
     val grpcApi = getGrpcApi(d)
@@ -75,7 +74,7 @@ class AssetsApiGrpcSpec extends FreeSpec with BeforeAndAfterAll with DiffMatcher
     check()
 
     // liquid afterId
-    d.appendBlock(d.createBlock(ProtoBlockVersion, nftIssues.drop(afterId + 1), Some(mb1)))
+    d.appendBlock(d.createBlock(nftIssues.drop(afterId + 1), Some(mb1)))
     d.rocksDBWriter.containsTransaction(nftIssues(afterId)) shouldBe true
     d.rocksDBWriter.containsTransaction(nftIssues(afterId + 1)) shouldBe false
     check()

grpc-server/src/test/scala/com/wavesplatform/api/grpc/test/BlocksApiGrpcSpec.scala

@@ -269,7 +269,6 @@ class BlocksApiGrpcSpec extends FreeSpec with BeforeAndAfterAll with DiffMatcher
 
       val invalidStateHash = ByteStr.fill(DigestLength)(1)
       val originalBlock = d.createBlock(
-        Block.ProtoBlockVersion,
         Seq(TxHelpers.transfer(sender)),
         strictTime = true,
         stateHash = Some(Some(invalidStateHash))
@@ -323,7 +322,6 @@ class BlocksApiGrpcSpec extends FreeSpec with BeforeAndAfterAll with DiffMatcher
 
       val invalidStateHash = ByteStr.fill(DigestLength)(1)
       val originalBlock = d.createBlock(
-        Block.ProtoBlockVersion,
         Seq(TxHelpers.transfer(sender)),
         strictTime = true,
         stateHash = Some(Some(invalidStateHash))

grpc-server/src/test/scala/com/wavesplatform/api/grpc/test/TransactionsApiGrpcSpec.scala

@@ -2,8 +2,14 @@ package com.wavesplatform.api.grpc.test
 
 import com.google.protobuf.ByteString
 import com.wavesplatform.account.KeyPair
-import com.wavesplatform.api.grpc.{ApplicationStatus, TransactionResponse, TransactionSnapshotResponse, TransactionSnapshotsRequest, TransactionsApiGrpcImpl, TransactionsRequest}
-import com.wavesplatform.block.Block
+import com.wavesplatform.api.grpc.{
+  ApplicationStatus,
+  TransactionResponse,
+  TransactionSnapshotResponse,
+  TransactionSnapshotsRequest,
+  TransactionsApiGrpcImpl,
+  TransactionsRequest
+}
 import com.wavesplatform.common.state.ByteStr
 import com.wavesplatform.common.utils.EitherExt2.*
 import com.wavesplatform.crypto.DigestLength
@@ -13,7 +19,7 @@ import com.wavesplatform.history.Domain
 import com.wavesplatform.protobuf.transaction.{PBTransactions, Recipient}
 import com.wavesplatform.protobuf.{PBSnapshots, toByteString}
 import com.wavesplatform.state.diffs.ENOUGH_AMT
-import com.wavesplatform.state.{StateSnapshot, TxMeta, Height}
+import com.wavesplatform.state.{Height, StateSnapshot, TxMeta}
 import com.wavesplatform.test.*
 import com.wavesplatform.test.DomainPresets.*
 import com.wavesplatform.transaction.Asset.Waves
@@ -229,7 +235,6 @@ class TransactionsApiGrpcSpec extends FreeSpec with BeforeAndAfterAll with DiffM
       val resenderTxs = Seq(TxHelpers.transfer(resender, recipient.toAddress, 1.waves), TxHelpers.transfer(resender, recipient.toAddress, 2.waves))
       val challengedBlockTx = TxHelpers.transfer(challengedMiner, resender.toAddress, 1001.waves)
       val originalBlock = d.createBlock(
-        Block.ProtoBlockVersion,
         challengedBlockTx +: resenderTxs,
         strictTime = true,
         generator = challengedMiner,

grpc-server/src/test/scala/com/wavesplatform/events/BlockchainUpdatesSpec.scala

@@ -4,14 +4,21 @@ import com.google.common.primitives.Longs
 import com.google.protobuf.ByteString
 import com.wavesplatform.TestValues
 import com.wavesplatform.account.{Address, KeyPair}
-import com.wavesplatform.block.Block
 import com.wavesplatform.common.state.ByteStr
 import com.wavesplatform.common.utils.EitherExt2.*
 import com.wavesplatform.crypto.DigestLength
 import com.wavesplatform.db.InterferableDB
 import com.wavesplatform.events.FakeObserver.*
 import com.wavesplatform.events.StateUpdate.LeaseUpdate.LeaseStatus
-import com.wavesplatform.events.StateUpdate.{AssetInfo, AssetStateUpdate, BalanceUpdate, DataEntryUpdate, LeaseUpdate, LeasingBalanceUpdate, ScriptUpdate}
+import com.wavesplatform.events.StateUpdate.{
+  AssetInfo,
+  AssetStateUpdate,
+  BalanceUpdate,
+  DataEntryUpdate,
+  LeaseUpdate,
+  LeasingBalanceUpdate,
+  ScriptUpdate
+}
 import com.wavesplatform.events.api.grpc.protobuf.{GetBlockUpdateRequest, GetBlockUpdatesRangeRequest, SubscribeRequest}
 import com.wavesplatform.events.protobuf.BlockchainUpdated.Rollback.RollbackType
 import com.wavesplatform.events.protobuf.BlockchainUpdated.Update
@@ -56,7 +63,7 @@ import scala.util.Random
 
 class BlockchainUpdatesSpec extends FreeSpec with WithBUDomain with ScalaFutures {
   private given scheduler: Scheduler = Schedulers.singleThread("grpc", executionModel = SynchronousExecution)
-  
+
   val currentSettings: WavesSettings = RideV5
 
   val transfer: TransferTransaction       = TxHelpers.transfer()
@@ -828,7 +835,6 @@ class BlockchainUpdatesSpec extends FreeSpec with WithBUDomain with ScalaFutures
           TxHelpers.transfer(sender, recipient.toAddress, 2.waves, timestamp = txTimestamp + 1)
         )
         val originalBlock = d.createBlock(
-          Block.ProtoBlockVersion,
           txs,
           generator = challengedMiner,
           stateHash = Some(Some(invalidStateHash))
@@ -1100,27 +1106,23 @@ class BlockchainUpdatesSpec extends FreeSpec with WithBUDomain with ScalaFutures
     "should return correct updated_waves_amount when reward boost is active" in {
       val settings = ConsensusImprovements
         .setFeaturesHeight(
-          BlockchainFeatures.BlockReward -> 0,
+          BlockchainFeatures.BlockReward             -> 0,
           BlockchainFeatures.BlockRewardDistribution -> 0,
           BlockchainFeatures.BoostBlockReward        -> 5
         )
-        .configure(fs =>
-          fs.copy(blockRewardBoostPeriod = 10)
-        )
+        .configure(fs => fs.copy(blockRewardBoostPeriod = 10))
 
       withDomainAndRepo(settings) { case (d, repo) =>
         d.appendBlock()
         val subscription = repo.createFakeObserver(SubscribeRequest.of(1, 0))
 
         (1 to 15).foreach(_ => d.appendBlock())
 
-
         subscription
           .fetchAllEvents(d.blockchain)
-        .map(_.getUpdate.getAppend.getBlock.updatedWavesAmount) shouldBe
+          .map(_.getUpdate.getAppend.getBlock.updatedWavesAmount) shouldBe
           (2 to 16).scanLeft(100_000_000.waves) { (total, height) => total + 6.waves * d.blockchain.blockRewardBoost(Height(height)) }
 
-
       }
     }
   }

node-it/src/test/resources/template.conf

@@ -112,7 +112,7 @@ waves {
   rest-api {
     enable = yes
     bind-address = 0.0.0.0
-    api-key-hash = 7L6GpLHhA5KyJTAVc8WFHwEcyTY8fC8rRbyMCiFnM4i
+    api-key-hash = 7L6GpLHhA5KyJTAVc8WFHwEcyTY8fC8rRbyMCiFnM4i # integration-test-rest-api
     minimum-peers = 0
   }
   wallet {

node-it/src/test/scala/com/wavesplatform/it/NodeConfigs.scala

@@ -51,7 +51,11 @@ object NodeConfigs {
       val totalEntities = defaultEntities + specialsConfigs.size
       require(totalEntities <= NonConflictingNodes.size)
 
-      val (defaultNodes: Seq[Config], specialNodes: Seq[Config]) = baseConfigs.zipWithIndex
+      val bc =
+        if (totalEntities > 1) baseConfigs
+        else baseConfigs.map(ConfigFactory.parseString("waves.network.max-outbound-connections = 0").withFallback)
+
+      val (defaultNodes: Seq[Config], specialNodes: Seq[Config]) = bc.zipWithIndex
         .collect { case (x, i) if NonConflictingNodes.contains(i + 1) => x }
         .splitAt(defaultEntities)
 

node-it/src/test/scala/com/wavesplatform/it/sync/AddressApiSuite.scala

@@ -83,7 +83,7 @@ class AddressApiSuite extends BaseTransactionSuite with NTPTime {
     )
   }
 
-  test("requests to the illegal height should be handled correctly ") {
+  test("requests to the illegal height should be handled correctly") {
     val height = miner.height + 100
     assertApiError(
       miner.get(s"/addresses/balance?height=$height&address=$firstKeyPair"),

node-it/src/test/scala/com/wavesplatform/it/sync/finalization/TwoNodesFinalizationTestSuite.scala

@@ -34,13 +34,12 @@ class TwoNodesFinalizationTestSuite extends BaseFreeSpec, OptionValues, ScorexLo
 
     step("Commit to generation")
     val commitTxn1 = node1.sign(CommitToGenerationRequest(sender = Some(miner1Addr)))
+    node1.broadcastRequest(commitTxn1)
+
     val commitTxn2 = node2.sign(CommitToGenerationRequest(sender = Some(miner2Addr)))
-    Seq(node1, node2).foreach { node =>
-      node.broadcastRequest(commitTxn1)
-      node.broadcastRequest(commitTxn2)
-    }
+    node2.broadcastRequest(commitTxn2)
+
     node1.waitForGenerationPeriod(period1)
-    node2.waitForGenerationPeriod(period1)
 
     step("Generators")
     isolated {

node-it/src/test/scala/com/wavesplatform/test/BlockchainGenerator.scala

@@ -127,7 +127,7 @@ class BlockchainGenerator(wavesSettings: WavesSettings) extends ScorexLogging {
       val result = genBlocks.foldLeft[Either[ValidationError, Unit]](Right(())) {
         case (res @ Left(_), _) => res
         case (_, genBlock) =>
-          time.time = miner.nextBlockGenerationTime(blockchain, blockchain.lastBlockHeader.get, genBlock.signer).explicitGet()
+          time.time = miner.nextBlockGenerationTime(blockchain, genBlock.signer).explicitGet()
           val correctedTimeTxs = genBlock.txs.map(correctTxTimestamp(_, time))
 
           miner.forgeBlock(genBlock.signer) match {

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

@@ -14,3 +14,11 @@ body {
     margin: 0;
     background: #fafafa;
 }
+
+.try-out {
+  display: none !important;
+}
+
+.schemes-server-container div {
+    display: none;
+}

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

@@ -1,79 +1,6 @@
 <!doctype html>
 <html lang="en-US">
-<head>
-    <title>Swagger UI: OAuth2 Redirect</title>
-</head>
 <body>
-<script>
-    'use strict';
-    function run () {
-        var oauth2 = window.opener.swaggerUIRedirectOauth2;
-        var sentState = oauth2.state;
-        var redirectUrl = oauth2.redirectUrl;
-        var isValid, qp, arr;
-
-        if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1).replace('?', '&');
-        } else {
-            qp = location.search.substring(1);
-        }
-
-        arr = qp.split("&");
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
-        qp = qp ? JSON.parse('{' + arr.join() + '}',
-                function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value);
-                }
-        ) : {};
-
-        isValid = qp.state === sentState;
-
-        if ((
-          oauth2.auth.schema.get("flow") === "accessCode" ||
-          oauth2.auth.schema.get("flow") === "authorizationCode" ||
-          oauth2.auth.schema.get("flow") === "authorization_code"
-        ) && !oauth2.auth.code) {
-            if (!isValid) {
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
-                });
-            }
-
-            if (qp.code) {
-                delete oauth2.state;
-                oauth2.auth.code = qp.code;
-                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
-            } else {
-                let oauthErrorMsg;
-                if (qp.error) {
-                    oauthErrorMsg = "["+qp.error+"]: " +
-                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
-                        (qp.error_uri ? "More info: "+qp.error_uri : "");
-                }
-
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
-                });
-            }
-        } else {
-            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
-        }
-        window.close();
-    }
-
-    if (document.readyState !== 'loading') {
-        run();
-    } else {
-        document.addEventListener('DOMContentLoaded', function () {
-            run();
-        });
-    }
-</script>
+<script src="oauth2-redirect.js"></script>
 </body>
 </html>