Version 1.3.6 (Mainnet + Testnet + Stagenet) (#3512)

wavesplatform · Jun 21, 2021 · 362eb89 · 362eb89
1 parent 37f1b02
commit 362eb89
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/build.sbt b/build.sbt
@@ -100,7 +100,7 @@ inScope(Global)(
     scalaVersion := "2.13.3",
     organization := "com.wavesplatform",
     organizationName := "Waves Platform",
-    V.fallback := (1, 3, 5),
+    V.fallback := (1, 3, 6),
     organizationHomepage := Some(url("https://wavesplatform.com")),
     scmInfo := Some(ScmInfo(url("https://github.com/wavesplatform/Waves"), "[email protected]:wavesplatform/Waves.git", None)),
     licenses := Seq(("MIT", url("https://github.com/wavesplatform/Waves/blob/master/LICENSE"))),

diff --git a/node/src/main/scala/com/wavesplatform/api/http/TransactionsApiRoute.scala b/node/src/main/scala/com/wavesplatform/api/http/TransactionsApiRoute.scala
@@ -344,7 +344,7 @@ object TransactionsApiRoute {
       Json.obj(
         "dApp"         -> i.dApp,
         "call"         -> i.call,
-        "payments"     -> i.payments,
+        "payment"      -> i.payments,
         "stateChanges" -> invokeScriptResultWrites.writes(i.stateChanges)
       )
 
@@ -366,10 +366,8 @@ object TransactionsApiRoute {
       cancelTransactionId: Option[ByteStr] = None
   )
   private[this] object LeaseRef {
-    implicit val jsonWrites: OWrites[LeaseRef] = {
-      import com.wavesplatform.utils.byteStrFormat
-      implicit val config = JsonConfiguration(optionHandlers = OptionHandlers.WritesNull)
-      Json.writes[LeaseRef]
-    }
+    import com.wavesplatform.utils.byteStrFormat
+    implicit val config                        = JsonConfiguration(optionHandlers = OptionHandlers.WritesNull)
+    implicit val jsonWrites: OWrites[LeaseRef] = Json.writes[LeaseRef]
   }
 }
diff --git a/node/src/test/scala/com/wavesplatform/history/Domain.scala b/node/src/test/scala/com/wavesplatform/history/Domain.scala
@@ -1,15 +1,19 @@
 package com.wavesplatform.history
 
+import scala.concurrent.Future
+import scala.concurrent.duration._
+
 import cats.syntax.option._
+import com.wavesplatform.{database, Application}
 import com.wavesplatform.account.Address
 import com.wavesplatform.api.BlockMeta
-import com.wavesplatform.api.common.CommonTransactionsApi.TransactionMeta
 import com.wavesplatform.api.common.{AddressPortfolio, AddressTransactions, CommonBlocksApi, CommonTransactionsApi}
-import com.wavesplatform.block.Block.BlockId
+import com.wavesplatform.api.common.CommonTransactionsApi.TransactionMeta
 import com.wavesplatform.block.{Block, MicroBlock}
+import com.wavesplatform.block.Block.BlockId
 import com.wavesplatform.common.state.ByteStr
 import com.wavesplatform.common.utils.EitherExt2
-import com.wavesplatform.consensus.PoSSelector
+import com.wavesplatform.consensus.{PoSCalculator, PoSSelector}
 import com.wavesplatform.consensus.nxt.NxtLikeConsensusBlockData
 import com.wavesplatform.database.{DBExt, Keys, LevelDBWriter}
 import com.wavesplatform.events.BlockchainUpdateTriggers
@@ -18,20 +22,16 @@ import com.wavesplatform.lang.ValidationError
 import com.wavesplatform.settings.WavesSettings
 import com.wavesplatform.state._
 import com.wavesplatform.state.diffs.TransactionDiffer
+import com.wavesplatform.transaction.{BlockchainUpdater, _}
 import com.wavesplatform.transaction.Asset.IssuedAsset
 import com.wavesplatform.transaction.smart.script.trace.TracedResult
-import com.wavesplatform.transaction.{BlockchainUpdater, _}
 import com.wavesplatform.utils.SystemTime
 import com.wavesplatform.utx.UtxPoolImpl
 import com.wavesplatform.wallet.Wallet
-import com.wavesplatform.{Application, database}
 import monix.execution.Scheduler.Implicits.global
 import monix.reactive.Observer
 import org.iq80.leveldb.DB
 
-import scala.concurrent.Future
-import scala.concurrent.duration._
-
 case class Domain(db: DB, blockchainUpdater: BlockchainUpdaterImpl, levelDBWriter: LevelDBWriter, settings: WavesSettings) {
   import Domain._
 
@@ -198,7 +198,7 @@ case class Domain(db: DB, blockchainUpdater: BlockchainUpdaterImpl, levelDBWrite
         version = if (consensus.generationSignature.size == 96) Block.ProtoBlockVersion else version,
         timestamp = if (strictTime) timestamp else SystemTime.getTimestamp(),
         reference = reference,
-        baseTarget = consensus.baseTarget,
+        baseTarget = consensus.baseTarget.max(PoSCalculator.MinBaseTarget),
         generationSignature = consensus.generationSignature,
         txs = txs,
         featureVotes = Nil,

diff --git a/node/src/test/scala/com/wavesplatform/http/DebugApiRouteSpec.scala b/node/src/test/scala/com/wavesplatform/http/DebugApiRouteSpec.scala
@@ -816,7 +816,7 @@ class DebugApiRouteSpec
                                                                  |      "function" : "test",
                                                                  |      "args" : [ ]
                                                                  |    },
-                                                                 |    "payments" : [ ],
+                                                                 |    "payment" : [ ],
                                                                  |    "stateChanges" : {
                                                                  |      "data" : [ {
                                                                  |        "key" : "key",