From 6e3f49eb21e472716f69eabc3688943622580d93 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Fri, 1 Mar 2024 11:53:21 +0300 Subject: [PATCH] fixed json responses --- .../api/http/TransactionJsonSerializer.scala | 5 ++++- .../scala/com/wavesplatform/database/DBResource.scala | 2 +- .../main/scala/com/wavesplatform/state/DataEntry.scala | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/node/src/main/scala/com/wavesplatform/api/http/TransactionJsonSerializer.scala b/node/src/main/scala/com/wavesplatform/api/http/TransactionJsonSerializer.scala index 5993641b37..95ac4f7011 100644 --- a/node/src/main/scala/com/wavesplatform/api/http/TransactionJsonSerializer.scala +++ b/node/src/main/scala/com/wavesplatform/api/http/TransactionJsonSerializer.scala @@ -258,7 +258,10 @@ final case class TransactionJsonSerializer(blockchain: Blockchain) { gen.writeNumberField("type", tx.tpe.id, numbersAsString) gen.writeStringField("id", tx.id().toString) gen.writeNumberField("fee", tx.assetFee._2, numbersAsString) - tx.assetFee._1.maybeBase58Repr.foreach(gen.writeStringField("feeAssetId", _)) + tx.feeAssetId match { + case IssuedAsset(id) => gen.writeStringField("feeAssetId", id.toString) + case Asset.Waves => gen.writeNullField("feeAssetId") + } gen.writeNumberField("timestamp", tx.timestamp, numbersAsString) gen.writeNumberField("version", tx.version, numbersAsString) if (PBSince.affects(tx)) gen.writeNumberField("chainId", tx.chainId, numbersAsString) diff --git a/node/src/main/scala/com/wavesplatform/database/DBResource.scala b/node/src/main/scala/com/wavesplatform/database/DBResource.scala index 7d3f17515b..aa4d1c3832 100644 --- a/node/src/main/scala/com/wavesplatform/database/DBResource.scala +++ b/node/src/main/scala/com/wavesplatform/database/DBResource.scala @@ -20,7 +20,7 @@ trait DBResource extends AutoCloseable { object DBResource { def apply(db: RocksDB, iteratorCfHandle: Option[ColumnFamilyHandle] = None): DBResource = new DBResource { private[this] val snapshot = db.getSnapshot - private[this] val readOptions = new ReadOptions().setSnapshot(snapshot) + private[this] val readOptions = new ReadOptions().setSnapshot(snapshot).setVerifyChecksums(false) override def get[V](key: Key[V]): V = key.parse(db.get(key.columnFamilyHandle.getOrElse(db.getDefaultColumnFamily), readOptions, key.keyBytes)) diff --git a/node/src/main/scala/com/wavesplatform/state/DataEntry.scala b/node/src/main/scala/com/wavesplatform/state/DataEntry.scala index d4c4558fd5..d827c4d176 100644 --- a/node/src/main/scala/com/wavesplatform/state/DataEntry.scala +++ b/node/src/main/scala/com/wavesplatform/state/DataEntry.scala @@ -89,20 +89,20 @@ object DataEntry { gen.writeStartObject() value match { case BinaryDataEntry(key, value) => - gen.writeStringField("type", "binary") gen.writeStringField("key", key) + gen.writeStringField("type", "binary") gen.writeStringField("value", value.base64) case IntegerDataEntry(key, value) => - gen.writeStringField("type", "integer") gen.writeStringField("key", key) + gen.writeStringField("type", "integer") gen.writeNumberField("value", value, numberAsString) case BooleanDataEntry(key, value) => - gen.writeStringField("type", "boolean") gen.writeStringField("key", key) + gen.writeStringField("type", "boolean") gen.writeBooleanField("value", value) case StringDataEntry(key, value) => - gen.writeStringField("type", "string") gen.writeStringField("key", key) + gen.writeStringField("type", "string") gen.writeStringField("value", value) case EmptyDataEntry(key) => gen.writeStringField("key", key)