Merge pull request #264 from virtualeconomy/tokenIndex

update last token index api
virtualeconomy · Feb 1, 2021 · a3d7852 · a3d7852
2 parents 923f523 + 1c5f96a
commit a3d7852
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/main/scala/vsys/api/http/contract/ContractApiRoute.scala b/src/main/scala/vsys/api/http/contract/ContractApiRoute.scala
@@ -77,11 +77,18 @@ case class ContractApiRoute (settings: RestAPISettings, wallet: Wallet, utx: Utx
   ))
   def lastToken: Route = (get & path("lastTokenIndex" / Segment)) { contractId =>
     ByteStr.decodeBase58(contractId) match {
-      case Success(id) => complete(Json.obj(
-        "contractId" -> contractId,
-        "lastTokenIndex" -> state.contractTokens(id)
-      ))
-      case _ => complete(InvalidAddress)
+      case Success(id) if ContractAccount.fromString(contractId).isRight => {
+        val lastTokenIndex = state.contractTokens(id) - 1
+        if (lastTokenIndex == -1) {
+          complete(CustomValidationError("No token generated in this contract"))
+        } else {
+          complete(Json.obj(
+            "contractId" -> contractId,
+            "lastTokenIndex" -> lastTokenIndex
+          ))
+        }
+      }
+      case _ => complete(InvalidContractAddress)
     }
   }