Merge pull request #1127 from wavesplatform/NODE-771-Provide-sponsors…

…hip-info-to-balance NODE-771
wavesplatform · May 25, 2018 · e200499 · e200499
2 parents 6272814 + 1f5ce9e
commit e200499
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/it/src/main/scala/com/wavesplatform/it/api/model.scala b/it/src/main/scala/com/wavesplatform/it/api/model.scala
@@ -37,7 +37,12 @@ object CompiledScript {
   implicit val compiledScriptFormat: Format[CompiledScript] = Json.format
 }
 
-case class FullAssetInfo(assetId: String, balance: Long, reissuable: Boolean, quantity: Long)
+case class FullAssetInfo(assetId: String,
+                         balance: Long,
+                         reissuable: Boolean,
+                         minSponsoredAssetFee: Option[Long],
+                         sponsorBalance: Option[Long],
+                         quantity: Long)
 object FullAssetInfo {
   implicit val fullAssetInfoFormat: Format[FullAssetInfo] = Json.format
 }

diff --git a/it/src/test/scala/com/wavesplatform/it/sync/transactions/SponsorshipSuite.scala b/it/src/test/scala/com/wavesplatform/it/sync/transactions/SponsorshipSuite.scala
@@ -77,6 +77,9 @@ class SponsorshipSuite extends FreeSpec with NodesFromDocker with Matchers with
       miner.assertBalances(sponsor.address, sponsorWavesBalance - 2.waves - minWavesFee)
       miner.assertAssetBalance(alice.address, sponsorAssetId, sponsorAssetTotal / 2)
 
+      val assetInfo = alice.assetsBalance(alice.address).balances.filter(_.assetId == sponsorAssetId).head
+      assetInfo.minSponsoredAssetFee shouldBe Some(Token)
+      assetInfo.sponsorBalance shouldBe Some(sponsor.accountBalances(sponsor.address)._2)
     }
 
     "invalid tx if fee less then minimal" in {
@@ -120,6 +123,11 @@ class SponsorshipSuite extends FreeSpec with NodesFromDocker with Matchers with
     "cancel sponsorship, cannot pay fees in non sponsored assets " in {
       val cancelSponsorshipTxId = sponsor.cancelSponsorship(sponsor.address, sponsorAssetId, fee = 1.waves).id
       nodes.waitForHeightAriseAndTxPresent(cancelSponsorshipTxId)
+
+      val assetInfo = alice.assetsBalance(alice.address).balances.filter(_.assetId == sponsorAssetId).head
+      assetInfo.minSponsoredAssetFee shouldBe None
+      assetInfo.sponsorBalance shouldBe None
+
       assert(!cancelSponsorshipTxId.isEmpty)
       assertSponsorship(sponsorAssetId, 0L)
       assertBadRequestAndResponse(

diff --git a/src/main/scala/scorex/api/http/assets/AssetsApiRoute.scala b/src/main/scala/scorex/api/http/assets/AssetsApiRoute.scala
@@ -237,15 +237,25 @@ case class AssetsApiRoute(settings: RestAPISettings, wallet: Wallet, utx: UtxPoo
           (for {
             (assetId, balance) <- blockchain.portfolio(acc).assets
             if balance > 0
-            assetInfo        <- blockchain.assetDescription(assetId)
-            issueTransaction <- blockchain.transactionInfo(assetId)
+            assetInfo                                 <- blockchain.assetDescription(assetId)
+            (_, (issueTransaction: IssueTransaction)) <- blockchain.transactionInfo(assetId)
+            sponsorBalance = if (assetInfo.sponsorship != 0) {
+              Some(blockchain.portfolio(issueTransaction.sender).balance)
+            } else {
+              None
+            }
           } yield
             Json.obj(
-              "assetId"          -> assetId.base58,
-              "balance"          -> balance,
-              "reissuable"       -> assetInfo.reissuable,
+              "assetId"    -> assetId.base58,
+              "balance"    -> balance,
+              "reissuable" -> assetInfo.reissuable,
+              "minSponsoredAssetFee" -> (assetInfo.sponsorship match {
+                case 0           => JsNull
+                case sponsorship => JsNumber(sponsorship)
+              }),
+              "sponsorBalance"   -> sponsorBalance,
               "quantity"         -> JsNumber(BigDecimal(assetInfo.totalVolume)),
-              "issueTransaction" -> issueTransaction._2.json()
+              "issueTransaction" -> issueTransaction.json()
             )).toSeq)
       )
     }).left.map(ApiError.fromValidationError)