New TVM features

app/org/tronscan/actions/ActionRunner.scala

@@ -7,6 +7,7 @@ import javax.inject.Inject
 import play.api.Logger
 import play.api.cache.NamedCache
 import play.api.cache.redis.CacheAsyncApi
+import play.api.inject.ConfigurationProvider
 
 import scala.concurrent.duration._
 
@@ -15,7 +16,8 @@ class ActionRunner @Inject()(
   representativeListReader: RepresentativeListReader,
   statsOverview: StatsOverview,
   voteList: VoteList,
-  voteScraper: VoteScraper) extends Actor {
+  voteScraper: VoteScraper,
+  configurationProvider: ConfigurationProvider) extends Actor {
 
   val decider: Supervision.Decider = { exc =>
     Logger.error("CACHE WARMER ERROR", exc)
@@ -57,10 +59,12 @@ class ActionRunner @Inject()(
   }
 
   override def preStart(): Unit = {
-    startWitnessReader()
-    startVoteListWarmer()
-    startVoteScraper()
-    startStatsOverview()
+    if (configurationProvider.get.get[Boolean]("cache.warmer")) {
+      startWitnessReader()
+      startVoteListWarmer()
+      startVoteScraper()
+      startStatsOverview()
+    }
   }
 
   def receive = {

app/org/tronscan/actions/StatsOverview.scala

@@ -5,6 +5,9 @@ import org.tron.common.repositories.StatsRepository
 
 import scala.concurrent.ExecutionContext
 
+/**
+  * Reads the total stats
+  */
 class StatsOverview @Inject()(
   statsRepository: StatsRepository) {
 

app/org/tronscan/api/AccountApi.scala

@@ -34,6 +34,7 @@ import scala.async.Async._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.concurrent.duration._
+import org.tronscan.Extensions._
 
 @Api(
   value = "Accounts",
@@ -55,6 +56,10 @@ class AccountApi @Inject()(
 
   val key = configurationProvider.get.get[String]("play.http.secret.key")
 
+  /**
+    * Query accounts
+    * @return
+    */
   @ApiResponses(Array(
     new ApiResponse(
       code = 200,
@@ -112,6 +117,9 @@ class AccountApi @Inject()(
     }
   }
 
+  /**
+    * Find account by the given address
+    */
   @ApiOperation(
     value = "Find account by address",
     response = classOf[AccountModel])
@@ -149,7 +157,7 @@ class AccountApi @Inject()(
           "allowance" -> account.allowance,
           "url" -> witness.map(_.url),
         ),
-        "name" -> new String(account.accountName.toByteArray).toString,
+        "name" -> account.accountName.decodeString,
         "address" -> address,
         "bandwidth" -> Json.obj(
           "freeNetUsed" -> accountBandwidth.freeNetUsed,
@@ -166,6 +174,7 @@ class AccountApi @Inject()(
         ),
         "balances" -> Json.toJson(balances),
         "balance" -> account.balance,
+        "allowance" -> account.allowance,
         "tokenBalances" -> Json.toJson(balances),
         "frozen" -> Json.obj(
           "total" -> account.frozen.map(_.frozenBalance).sum,
@@ -180,6 +189,9 @@ class AccountApi @Inject()(
     }
   }
 
+  /**
+    * Retrieves the balances for the given address
+    */
   @ApiOperation(
     value = "",
     hidden = true
@@ -218,6 +230,9 @@ class AccountApi @Inject()(
     }
   }
 
+  /**
+    * Votes cast by the given address
+    */
   @ApiOperation(
     value = "",
     hidden = true
@@ -226,7 +241,7 @@ class AccountApi @Inject()(
     for {
       wallet <- walletClient.full
       account <- wallet.getAccount(Account(
-        address = ByteString.copyFrom(Base58.decode58Check(address))
+        address = address.decodeAddress,
       ))
     } yield {
 
@@ -248,6 +263,11 @@ class AccountApi @Inject()(
     }
   }
 
+  /**
+    * Retrieve the Super Representative github link
+    * @param address address of the SR
+    * @return
+    */
   @ApiOperation(
     value = "",
     hidden = true
@@ -267,6 +287,9 @@ class AccountApi @Inject()(
     }
   }
 
+  /**
+    * Update the super representative pages
+    */
   @ApiOperation(
     value = "",
     hidden = true)
@@ -308,70 +331,9 @@ class AccountApi @Inject()(
     }
   }
 
-  @ApiOperation(
-    value = "",
-    hidden = true
-  )
-  def resync = Action.async { req =>
-
-    throw new Exception("DISABLED")
-
-    val decider: Supervision.Decider = {
-      case exc =>
-        println("SOLIDITY STREAM ERROR", exc, ExceptionUtils.getStackTrace(exc))
-        Supervision.Resume
-    }
-
-    implicit val materializer = ActorMaterializer(
-      ActorMaterializerSettings(system)
-        .withSupervisionStrategy(decider))(system)
-
-    async {
-
-      val accounts = await(repo.findAll).toList
-
-      val source = Source(accounts)
-        .mapAsync(8) { existingAccount =>
-          async {
-
-            val walletSolidity = await(walletClient.full)
-
-            val account = await(walletSolidity.getAccount(Account(
-              address = ByteString.copyFrom(Base58.decode58Check(existingAccount.address))
-            )))
-
-            if (account != null) {
-
-              val accountModel = AccountModel(
-                address = existingAccount.address,
-                name = new String(account.accountName.toByteArray),
-                balance = account.balance,
-                power = account.frozen.map(_.frozenBalance).sum,
-                tokenBalances = Json.toJson(account.asset),
-                dateUpdated = DateTime.now,
-              )
-
-              List(repo.buildInsertOrUpdate(accountModel)) ++ addressBalanceModelRepository.buildUpdateBalance(accountModel)
-            } else {
-              List.empty
-            }
-
-          }
-        }
-        .flatMapConcat(queries => Source(queries))
-        .groupedWithin(150, 10.seconds)
-        .mapAsync(1) { queries =>
-          blockModelRepository.executeQueries(queries)
-        }
-        .toMat(Sink.ignore)(Keep.right)
-        .run
-
-      await(source)
-
-      Ok("Done")
-    }
-  }
-
+  /**
+    * Synchronises the given account to the database
+    */
   @ApiOperation(
     value = "",
     hidden = true)
@@ -484,7 +446,8 @@ class AccountApi @Inject()(
   }
 
   /**
-    * Generates a new private key
+    * Generates a new account with private key
+    *
     * @return
     */
   def create = Action {

app/org/tronscan/api/BaseApi.scala

@@ -11,6 +11,9 @@ trait BaseApi extends InjectedController {
     "count",
   )
 
+  /**
+    * Strip query parameters which are related to paging and navigation of the results
+    */
   def stripNav(params: Map[String, String], sortParams: List[String] = List.empty) = {
     val navs = navParams ++ sortParams
     params.filterKeys(x => !navs.contains(x))

app/org/tronscan/api/BlockApi.scala

@@ -73,7 +73,7 @@ class BlockApi @Inject() (
     val queryParams = request.queryString.map(x => x._1.toLowerCase -> x._2.mkString)
     val queryHash = queryParams.map(x => x._1 + "-" + x._2).mkString
     val filterHash = stripNav(queryParams).map(x => x._1 + "-" + x._2).mkString
-    val includeCount = request.getQueryString("count").exists(x => true)
+    val includeCount = request.getQueryString("count").isDefined
 
     def getBlocks = {
 
@@ -146,10 +146,10 @@ class BlockApi @Inject() (
         size = block.toByteArray.length,
         hash = block.hash,
         timestamp = new DateTime(header.timestamp),
-        txTrieRoot = Base58.encode58Check(header.txTrieRoot.toByteArray),
+        txTrieRoot = ByteUtil.toHexString(header.txTrieRoot.toByteArray),
         parentHash = ByteUtil.toHexString(header.parentHash.toByteArray),
         witnessId = header.witnessId,
-        witnessAddress = Base58.encode58Check(header.witnessAddress.toByteArray),
+        witnessAddress = header.witnessAddress.encodeAddress,
         nrOfTrx = block.transactions.size,
       ).asJson)
     }