NODE-2449 Run Ride on any environment

.gitignore

@@ -36,6 +36,7 @@ docker/temp
 
 package
 !src/package
+!ride-runner/src/package
 native
 
 !lang/jvm/lib/*.jar

benchmark/src/main/scala/com/wavesplatform/state/DBState.scala

@@ -1,7 +1,5 @@
 package com.wavesplatform.state
 
-import java.io.File
-
 import com.wavesplatform.Application
 import com.wavesplatform.account.AddressScheme
 import com.wavesplatform.common.state.ByteStr
@@ -14,6 +12,8 @@ import monix.eval.Coeval
 import org.iq80.leveldb.DB
 import org.openjdk.jmh.annotations.{Param, Scope, State, TearDown}
 
+import java.io.File
+
 @State(Scope.Benchmark)
 abstract class DBState extends ScorexLogging {
   @Param(Array("waves.conf"))
@@ -31,7 +31,7 @@ abstract class DBState extends ScorexLogging {
 
   AddressScheme.current = new AddressScheme { override val chainId: Byte = 'W' }
 
-  lazy val environment = new WavesEnvironment(
+  lazy val environment = WavesEnvironment(
     AddressScheme.current.chainId,
     Coeval.raiseError(new NotImplementedError("`tx` is not implemented")),
     Coeval(levelDBWriter.height),

benchmark/src/test/scala/com/wavesplatform/state/WavesEnvironmentBenchmark.scala

@@ -1,8 +1,5 @@
 package com.wavesplatform.state
 
-import java.io.File
-import java.util.concurrent.{ThreadLocalRandom, TimeUnit}
-
 import cats.Id
 import com.typesafe.config.ConfigFactory
 import com.wavesplatform.account.{AddressOrAlias, AddressScheme, Alias}
@@ -13,15 +10,17 @@ import com.wavesplatform.lang.directives.DirectiveSet
 import com.wavesplatform.lang.v1.traits.Environment
 import com.wavesplatform.lang.v1.traits.domain.Recipient
 import com.wavesplatform.settings.{WavesSettings, loadConfig}
-import com.wavesplatform.state.WavesEnvironmentBenchmark._
+import com.wavesplatform.state.WavesEnvironmentBenchmark.*
 import com.wavesplatform.state.bench.DataTestData
 import com.wavesplatform.transaction.smart.WavesEnvironment
 import monix.eval.Coeval
 import org.iq80.leveldb.{DB, Options}
-import org.openjdk.jmh.annotations._
+import org.openjdk.jmh.annotations.*
 import org.openjdk.jmh.infra.Blackhole
 import scodec.bits.BitVector
 
+import java.io.File
+import java.util.concurrent.{ThreadLocalRandom, TimeUnit}
 import scala.io.Codec
 
 /**
@@ -141,7 +140,7 @@ object WavesEnvironmentBenchmark {
 
     val environment: Environment[Id] = {
       val state = LevelDBWriter.readOnly(db, wavesSettings)
-      new WavesEnvironment(
+      WavesEnvironment(
         AddressScheme.current.chainId,
         Coeval.raiseError(new NotImplementedError("`tx` is not implemented")),
         Coeval(state.height),

build.sbt

@@ -65,6 +65,7 @@ lazy val `lang-tests-js` = project
 lazy val node = project.dependsOn(`lang-jvm`, `lang-testkit` % "test;test->test")
 
 lazy val `grpc-server`    = project.dependsOn(node % "compile;test->test;runtime->provided")
+lazy val `ride-runner`    = project.dependsOn(node % "compile;test->test", `grpc-server`)
 lazy val `node-it`        = project.dependsOn(node % "compile;test->test", `lang-testkit`, `repl-jvm`, `grpc-server`)
 lazy val `node-generator` = project.dependsOn(node % "compile->test")
 lazy val benchmark        = project.dependsOn(node % "compile;test->test")
@@ -158,7 +159,8 @@ inScope(Global)(
     testOptions += Tests.Setup(_ => sys.props("sbt-testing") = "true"),
     network         := Network.default(),
     instrumentation := false,
-    resolvers ++= Resolver.sonatypeOssRepos("snapshots") ++ Seq(Resolver.mavenLocal),
+    resolvers ++= Resolver.sonatypeOssRepos("snapshots") ++ Seq(Resolver.mavenLocal) ++
+      Seq(MavenRepository("wvservices-releases", "https://nexus.wvservices.com/repository/maven-releases/")),
     Compile / doc / sources                := Seq.empty,
     Compile / packageDoc / publishArtifact := false,
     concurrentRestrictions                 := Seq(Tags.limit(Tags.Test, math.min(EvaluateTask.SystemProcessors, 8))),
@@ -177,6 +179,7 @@ git.uncommittedSignifier := Some("DIRTY")
 lazy val packageAll = taskKey[Unit]("Package all artifacts")
 packageAll := {
   (node / assembly).value
+  (`ride-runner` / assembly).value
   buildDebPackages.value
   buildTarballsForDocker.value
 }
@@ -185,6 +188,10 @@ lazy val buildTarballsForDocker = taskKey[Unit]("Package node and grpc-server ta
 buildTarballsForDocker := {
   IO.copyFile((node / Universal / packageZipTarball).value, new File(baseDirectory.value, "docker/target/waves.tgz"))
   IO.copyFile((`grpc-server` / Universal / packageZipTarball).value, new File(baseDirectory.value, "docker/target/waves-grpc-server.tgz"))
+  IO.copyFile(
+    (`ride-runner` / Universal / packageZipTarball).value,
+    (`ride-runner` / baseDirectory).value / "docker" / "target" / s"${(`ride-runner` / name).value}.tgz"
+  )
 }
 
 lazy val checkPRRaw = taskKey[Unit]("Build a project and run unit tests")
@@ -232,6 +239,7 @@ lazy val buildDebPackages = taskKey[Unit]("Build debian packages")
 buildDebPackages := {
   (`grpc-server` / Debian / packageBin).value
   (node / Debian / packageBin).value
+  (`ride-runner` / Debian / packageBin).value
 }
 
 def buildPackages: Command = Command("buildPackages")(_ => Network.networkParser) { (state, args) =>

grpc-server/src/main/scala/com/wavesplatform/api/grpc/AccountsApiGrpcImpl.scala

@@ -39,7 +39,7 @@ class AccountsApiGrpcImpl(commonApi: CommonAccountsApi)(implicit sc: Scheduler)
     BalanceResponse().withAsset(fromAssetIdAndAmount(v))
 
   override def getBalances(request: BalancesRequest, responseObserver: StreamObserver[BalanceResponse]): Unit = responseObserver.interceptErrors {
-    val addressOption: Option[Address] = if (request.address.isEmpty) None else Some(request.address.toAddress)
+    val addressOption: Option[Address] = if (request.address.isEmpty) None else Some(request.address.toAddress())
     val assetIds: Seq[Asset]           = request.assets.map(id => if (id.isEmpty) Asset.Waves else Asset.IssuedAsset(id.toByteStr))
 
     val responseStream = (addressOption, assetIds) match {
@@ -65,7 +65,7 @@ class AccountsApiGrpcImpl(commonApi: CommonAccountsApi)(implicit sc: Scheduler)
   }
 
   override def getScript(request: AccountRequest): Future[ScriptResponse] = Future {
-    commonApi.script(request.address.toAddress) match {
+    commonApi.script(request.address.toAddress()) match {
       case Some(desc) => ScriptResponse(PBTransactions.toPBScript(Some(desc.script)), desc.script.expr.toString, desc.verifierComplexity, desc.publicKey.toByteString)
       case None       => ScriptResponse()
     }
@@ -77,7 +77,7 @@ class AccountsApiGrpcImpl(commonApi: CommonAccountsApi)(implicit sc: Scheduler)
       val result =
         Observable.fromIterator(
           commonApi
-            .activeLeases(request.address.toAddress)
+            .activeLeases(request.address.toAddress())
             .map { case LeaseInfo(leaseId, originTransactionId, sender, recipient, amount, height, status, _, _) =>
               assert(status == LeaseInfo.Status.Active)
               LeaseResponse(
@@ -98,10 +98,10 @@ class AccountsApiGrpcImpl(commonApi: CommonAccountsApi)(implicit sc: Scheduler)
 
   override def getDataEntries(request: DataRequest, responseObserver: StreamObserver[DataEntryResponse]): Unit = responseObserver.interceptErrors {
     val stream = if (request.key.nonEmpty) {
-      Observable.fromIterable(commonApi.data(request.address.toAddress, request.key))
+      Observable.fromIterable(commonApi.data(request.address.toAddress(), request.key))
     } else {
       // FIXME: Strict loading because of segfault in leveldb
-      Observable.fromIterator(commonApi.dataStream(request.address.toAddress, Option(request.key).filter(_.nonEmpty)).toListL.map(_.iterator))
+      Observable.fromIterator(commonApi.dataStream(request.address.toAddress(), Option(request.key).filter(_.nonEmpty)).toListL.map(_.iterator))
     }
 
     responseObserver.completeWith(stream.map(de => DataEntryResponse(request.address, Some(PBTransactions.toPBDataEntry(de)))))

grpc-server/src/main/scala/com/wavesplatform/api/grpc/AssetsApiGrpcImpl.scala

@@ -25,7 +25,7 @@ class AssetsApiGrpcImpl(assetsApi: CommonAssetsApi, accountsApi: CommonAccountsA
   }
 
   override def getNFTList(request: NFTRequest, responseObserver: StreamObserver[NFTResponse]): Unit = responseObserver.interceptErrors {
-    val addressOption: Option[Address]    = if (request.address.isEmpty) None else Some(request.address.toAddress)
+    val addressOption: Option[Address]    = if (request.address.isEmpty) None else Some(request.address.toAddress())
     val afterAssetId: Option[IssuedAsset] = if (request.afterAssetId.isEmpty) None else Some(IssuedAsset(request.afterAssetId.toByteStr))
 
     val responseStream = addressOption match {

grpc-server/src/main/scala/com/wavesplatform/api/grpc/BlocksApiGrpcImpl.scala

@@ -41,7 +41,7 @@ class BlocksApiGrpcImpl(commonApi: CommonBlocksApi)(implicit sc: Scheduler) exte
 
     responseObserver.completeWith(request.filter match {
       case Filter.GeneratorPublicKey(publicKey) => stream.filter(_.getBlock.getHeader.generator.toPublicKey == publicKey.toPublicKey)
-      case Filter.GeneratorAddress(address)     => stream.filter(_.getBlock.getHeader.generator.toAddress == address.toAddress)
+      case Filter.GeneratorAddress(address)     => stream.filter(_.getBlock.getHeader.generator.toAddress() == address.toAddress())
       case Filter.Empty                         => stream
     })
   }

grpc-server/src/main/scala/com/wavesplatform/api/grpc/TransactionsApiGrpcImpl.scala

@@ -30,7 +30,7 @@ class TransactionsApiGrpcImpl(blockchain: Blockchain, commonApi: CommonTransacti
             .fold(e => throw new IllegalArgumentException(e.toString), identity)
 
           val maybeSender = Option(request.sender)
-            .collect { case s if !s.isEmpty => s.toAddress }
+            .collect { case s if !s.isEmpty => s.toAddress() }
 
           Observable.fromIterator(
             commonApi
@@ -46,7 +46,7 @@ class TransactionsApiGrpcImpl(blockchain: Blockchain, commonApi: CommonTransacti
 
         // By sender
         case None if !request.sender.isEmpty =>
-          val senderAddress = request.sender.toAddress
+          val senderAddress = request.sender.toAddress()
           Observable.fromIterator(
             commonApi
               .transactionsByAddress(
@@ -77,7 +77,7 @@ class TransactionsApiGrpcImpl(blockchain: Blockchain, commonApi: CommonTransacti
   override def getUnconfirmed(request: TransactionsRequest, responseObserver: StreamObserver[TransactionResponse]): Unit =
     responseObserver.interceptErrors {
       val unconfirmedTransactions = if (!request.sender.isEmpty) {
-        val senderAddress = request.sender.toAddress
+        val senderAddress = request.sender.toAddress()
         commonApi.unconfirmedTransactions.collect {
           case a: Authorized if a.sender.toAddress == senderAddress => a
         }

grpc-server/src/main/scala/com/wavesplatform/events/events.scala

@@ -61,7 +61,7 @@ object StateUpdate {
     def fromPB(v: PBBalanceUpdate): BalanceUpdate = {
       val (asset, after) = PBAmounts.toAssetAndAmount(v.getAmountAfter)
       val before         = v.amountBefore
-      BalanceUpdate(v.address.toAddress, asset, before, after)
+      BalanceUpdate(v.address.toAddress(), asset, before, after)
     }
 
     def toPB(v: BalanceUpdate): PBBalanceUpdate = {
@@ -82,7 +82,7 @@ object StateUpdate {
 
     def fromPB(v: PBDataEntryUpdate): DataEntryUpdate = {
       DataEntryUpdate(
-        v.address.toAddress,
+        v.address.toAddress(),
         PBTransactions.toVanillaDataEntry(v.getDataEntryBefore),
         PBTransactions.toVanillaDataEntry(v.getDataEntry)
       )
@@ -106,7 +106,7 @@ object StateUpdate {
 
     def fromPB(v: PBLeasingUpdate): LeasingBalanceUpdate = {
       LeasingBalanceUpdate(
-        v.address.toAddress,
+        v.address.toAddress(),
         LeaseBalance(v.inBefore, v.outBefore),
         LeaseBalance(v.inAfter, v.outAfter)
       )
@@ -158,7 +158,7 @@ object StateUpdate {
         },
         v.amount,
         v.sender.toPublicKey,
-        v.recipient.toAddress,
+        v.recipient.toAddress(),
         v.originTransactionId.toByteStr
       )
     }

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

@@ -466,13 +466,13 @@ class BlockchainUpdatesSpec extends FreeSpec with WithBUDomain with ScalaFutures
       val reward        = 600000000
       val genesisAmount = Constants.TotalWaves * Constants.UnitsInWave + reward
       val genesis       = results.head.getAppend.transactionStateUpdates.head.balances.head
-      genesis.address.toAddress shouldBe TxHelpers.defaultAddress
+      genesis.address.toAddress() shouldBe TxHelpers.defaultAddress
       genesis.getAmountAfter.amount shouldBe genesisAmount
       genesis.amountBefore shouldBe reward
       genesis.getAmountAfter.assetId shouldBe empty
 
       val payment = results.last.getAppend.transactionStateUpdates.last.balances.find { bu =>
-        bu.address.toAddress == TxHelpers.secondAddress
+        bu.address.toAddress() == TxHelpers.secondAddress
       }.get
 
       payment.getAmountAfter.amount shouldBe 100

lang/shared/src/main/scala/com/wavesplatform/lang/directives/values/StdLibVersion.scala

@@ -19,5 +19,6 @@ object StdLibVersion {
   implicit object VersionDic extends DirectiveDictionary[StdLibVersion] {
     override val default: StdLibVersion       = V3
     override val all: Iterable[StdLibVersion] = Seq(V1, V2, V3, V4, V5, V6, V7)
+    val latest                                = all.last
   }
 }

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

@@ -21,7 +21,8 @@ import org.scalatest.{Assertion, CancelAfterFailure}
 class InvokeExpressionGrpcSuite extends GrpcBaseTransactionSuite with CancelAfterFailure {
   override protected def nodeConfigs: Seq[Config] =
     NodeConfigs
-      .Builder(Default, 2, Seq.empty)
+      .Builder(Default, 1, Seq.empty)
+      .overrideBase(_.quorum(0))
       .overrideBase(_.preactivatedFeatures((ContinuationTransaction.id, 1)))
       .buildNonConflicting()
 

node/src/main/resources/swagger-ui/openapi.yaml

@@ -5225,7 +5225,7 @@ components:
         - dApp
         - payment
         - call
-        - stateCahnges
+        - stateChanges
       properties:
         error:
           type: object
@@ -5237,7 +5237,7 @@ components:
         - dApp
         - payment
         - call
-        - stateCahnges
+        - stateChanges
       properties:
         error:
           type: object

node/src/main/scala/com/wavesplatform/Application.scala

@@ -529,7 +529,7 @@ class Application(val actorSystem: ActorSystem, val settings: WavesSettings, con
 }
 
 object Application extends ScorexLogging {
-  private[wavesplatform] def loadApplicationConfig(external: Option[File] = None): WavesSettings = {
+  def loadApplicationConfig(external: Option[File] = None): WavesSettings = {
     import com.wavesplatform.settings.*
 
     val maybeExternalConfig = Try(external.map(f => ConfigFactory.parseFile(f.getAbsoluteFile, ConfigParseOptions.defaults().setAllowMissing(false))))

node/src/main/scala/com/wavesplatform/api/http/requests/InvokeScriptRequest.scala

@@ -14,7 +14,7 @@ import play.api.libs.json.*
 
 object InvokeScriptRequest {
 
-  case class FunctionCallPart(function: String, args: List[EVALUATED])
+  case class FunctionCallPart(function: String, args: List[EVALUATED] = Nil)
 
   implicit val EvaluatedReads: Reads[EVALUATED] = (jv: JsValue) => {
     jv \ "type" match {