From 660d59032951986cf7039bf824b805352ca78a05 Mon Sep 17 00:00:00 2001 From: capdev Date: Wed, 16 Oct 2019 13:17:44 +0500 Subject: [PATCH 01/31] fix log name --- conf/logback.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/logback.xml b/conf/logback.xml index 7f272f4..efa89ac 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -1,7 +1,7 @@ - ${application.home:-.}/logs/Application.log + ${application.home:-.}/logs/application.log [%d{HH:mm:ss}] [%level] - %message%n%xException From ba9b71fb946ad0712138c42261f1ece2e21844dc Mon Sep 17 00:00:00 2001 From: capdev Date: Wed, 16 Oct 2019 16:12:36 +0500 Subject: [PATCH 02/31] akka remote ReceiverActor --- app/actors/ReceiverActor.scala | 24 ++++++++++++++++++++++++ app/controllers/SearchController.scala | 2 -- app/modules/AkkaModule.scala | 15 +++++++++++++++ app/settings/Utils.scala | 4 ++-- build.sbt | 6 +++++- conf/application.conf | 13 +++++++++++++ 6 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 app/actors/ReceiverActor.scala create mode 100644 app/modules/AkkaModule.scala diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala new file mode 100644 index 0000000..c64e47f --- /dev/null +++ b/app/actors/ReceiverActor.scala @@ -0,0 +1,24 @@ +package actors + +import actors.ModifierMessages._ +import akka.actor.Actor +import com.typesafe.scalalogging.StrictLogging +import org.encryfoundation.common.modifiers.history.{Header, Payload} +import org.encryfoundation.common.modifiers.mempool.transaction.Transaction + +class ReceiverActor extends Actor with StrictLogging { + + logger.debug("ExplorerActor started") + + def receive: Receive = { + case ModifierTx(tx: Transaction) => println(s"tx: $tx") + case ModifierHeader(header: Header) => println(s"header: $header") + case ModifierPayload(payload: Payload) => println(s"payload: txs ${payload.txs.size}") + } +} + +object ModifierMessages { + case class ModifierTx(tx: Transaction) + case class ModifierHeader(header: Header) + case class ModifierPayload(payload: Payload) +} diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index 76be16a..06995ab 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -2,10 +2,8 @@ package controllers import models._ import javax.inject.{Inject, Singleton} -import org.encryfoundation.common.transaction.{EncryAddress, Pay2ContractHashAddress, Pay2PubKeyAddress, PubKeyLockedContract} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents, Result} -import scorex.crypto.encode.Base16 import settings.Utils import scala.concurrent.{ExecutionContext, Future} diff --git a/app/modules/AkkaModule.scala b/app/modules/AkkaModule.scala new file mode 100644 index 0000000..9d4c80d --- /dev/null +++ b/app/modules/AkkaModule.scala @@ -0,0 +1,15 @@ +package modules + +import actors.ReceiverActor +import play.api.mvc._ +import akka.actor._ +import javax.inject._ + +@Singleton +class Application @Inject()(system: ActorSystem, cc: ControllerComponents) extends AbstractController(cc) { + + println(s"actorSystem ${system.name} created") + println("receiver created") + val receiver = system.actorOf(Props(new ReceiverActor()), "receiver") + +} \ No newline at end of file diff --git a/app/settings/Utils.scala b/app/settings/Utils.scala index c60b8d7..bf824d4 100644 --- a/app/settings/Utils.scala +++ b/app/settings/Utils.scala @@ -1,7 +1,7 @@ package settings -import org.encryfoundation.common.Algos -import org.encryfoundation.common.transaction.{EncryAddress, Pay2ContractHashAddress, Pay2PubKeyAddress, PubKeyLockedContract} +import org.encryfoundation.common.modifiers.mempool.transaction.{EncryAddress, Pay2ContractHashAddress, Pay2PubKeyAddress, PubKeyLockedContract} +import org.encryfoundation.common.utils.Algos import scorex.crypto.encode.Base16 object Utils { diff --git a/build.sbt b/build.sbt index 83d93b8..819c98a 100644 --- a/build.sbt +++ b/build.sbt @@ -16,6 +16,7 @@ resolvers ++= Seq("Sonatype Releases" at "https://oss.sonatype.org/content/repos "Typesafe maven releases" at "http://repo.typesafe.com/typesafe/maven-releases/", "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/") +val akkaVersion = "2.5.13" val akkaHttpVersion = "10.1.3" val circeVersion = "0.9.3" val doobieVersion = "0.5.2" @@ -50,7 +51,7 @@ libraryDependencies ++= (Seq( "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % Test, "com.google.guava" % "guava" % "21.+", "com.iheart" %% "ficus" % "1.4.2", - "org.encry" %% "encry-common" % "0.8.6", + "org.encry" %% "encry-common" % "0.9.0", //"0.8.6" "org.bouncycastle" % "bcprov-jdk15on" % "1.58", "org.whispersystems" % "curve25519-java" % "+", "org.rudogma" %% "supertagged" % "1.+", @@ -58,6 +59,9 @@ libraryDependencies ++= (Seq( "org.encry" %% "prism" % "0.2.3", "com.adrianhurt" %% "play-bootstrap" % "1.4-P26-B4-SNAPSHOT", "de.heikoseeberger" %% "akka-http-circe" % "1.20.1", + "com.typesafe.akka" %% "akka-actor" % akkaVersion, + "com.typesafe.akka" %% "akka-stream" % akkaVersion, + "com.typesafe.akka" %% "akka-remote" % akkaVersion ) ++ databaseDependencies ++ apiDependencies ++ loggingDependencies) .map(_ exclude("ch.qos.logback", "*") exclude("ch.qos.logback", "*")) diff --git a/conf/application.conf b/conf/application.conf index e856c89..2c7e8a5 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -19,3 +19,16 @@ play.assets { path = "/public" urlPrefix = "/assets" } + +akka { + actor { + provider = remote + } + remote { + enabled-transports = ["akka.remote.netty.tcp"] + netty.tcp { + hostname = "localhost" + port = 46619 + } + } +} From a25eff1d4d80c5d98bd7f41e5ddd2b6da3a8c95a Mon Sep 17 00:00:00 2001 From: capdev Date: Wed, 16 Oct 2019 18:34:17 +0500 Subject: [PATCH 03/31] Uncommited transactions - dao, web receiver inject --- app/actors/ReceiverActor.scala | 19 +- app/controllers/TransactionsController.scala | 10 +- app/models/TransactionsDao.scala | 7 +- app/models/database/DataService.scala | 22 ++ app/modules/ActorModule.scala | 11 + app/modules/AkkaModule.scala | 15 -- app/modules/ReceiverModule.scala | 10 + app/views/index.scala.html | 5 + app/views/uncomtransInfo.scala.html | 246 +++++++++++++++++++ conf/application.conf | 1 + conf/routes | 1 + 11 files changed, 327 insertions(+), 20 deletions(-) create mode 100644 app/models/database/DataService.scala create mode 100644 app/modules/ActorModule.scala delete mode 100644 app/modules/AkkaModule.scala create mode 100644 app/modules/ReceiverModule.scala create mode 100644 app/views/uncomtransInfo.scala.html diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index c64e47f..b8902b2 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -1,24 +1,39 @@ package actors import actors.ModifierMessages._ -import akka.actor.Actor +import akka.actor.{Actor, Props} import com.typesafe.scalalogging.StrictLogging import org.encryfoundation.common.modifiers.history.{Header, Payload} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction +import scala.collection.mutable + class ReceiverActor extends Actor with StrictLogging { - logger.debug("ExplorerActor started") + //logger.debug("ExplorerActor started") + + var transcactions: mutable.Map[String, models.Transaction] = mutable.Map( + "qwe" -> models.Transaction("qwe", 3, "dsfdsffdsf", true, System.currentTimeMillis(), Some("Proof")) + ) def receive: Receive = { case ModifierTx(tx: Transaction) => println(s"tx: $tx") case ModifierHeader(header: Header) => println(s"header: $header") case ModifierPayload(payload: Payload) => println(s"payload: txs ${payload.txs.size}") + + case TransactionsQ() => sender ! TransactionsA(transcactions.values.toList) } } +object ReceiverActor { + def props = Props[ReceiverActor] +} + object ModifierMessages { case class ModifierTx(tx: Transaction) case class ModifierHeader(header: Header) case class ModifierPayload(payload: Payload) + + case class TransactionsQ() + case class TransactionsA(txs: List[models.Transaction]) } diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 98cd4fe..05f9a7b 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -1,6 +1,6 @@ package controllers -import models.{Contract, FullFilledTransaction, Input, Output, TransactionsDao} +import models.{Contract, FullFilledTransaction, Input, Output, Transaction, TransactionsDao} import javax.inject.{Inject, Singleton} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} @@ -33,4 +33,12 @@ class TransactionsController @Inject()(cc: ControllerComponents, case None => NotFound } } + + def getUncomTransactions: Action[AnyContent] = Action.async { + transactionsDao.uncommittedTransactions().map { + case Nil => NotFound + case txs: List[Transaction] => Ok(views.html.uncomtransInfo(txs)) + } + } + } \ No newline at end of file diff --git a/app/models/TransactionsDao.scala b/app/models/TransactionsDao.scala index b7d2fdd..4831bbf 100644 --- a/app/models/TransactionsDao.scala +++ b/app/models/TransactionsDao.scala @@ -1,11 +1,12 @@ package models import javax.inject.Inject -import models.database.DBService +import models.database.{DBService, DataService} import models.database.TransactionsQueries._ + import scala.concurrent.{ExecutionContext, Future} -class TransactionsDao @Inject()(dBService: DBService)(implicit ec: ExecutionContext) { +class TransactionsDao @Inject()(dBService: DBService, dataService: DataService)(implicit ec: ExecutionContext) { def transactionsByBlock(id: String): Future[List[Transaction]] = dBService.runAsync(getTransactionsByBlockId(id)) @@ -18,4 +19,6 @@ class TransactionsDao @Inject()(dBService: DBService)(implicit ec: ExecutionCont def outputById(id: String): Future[Option[Output]] = dBService.runAsync(getOutput(id)) def contractByTransaction(id: String): Future[List[Contract]] = dBService.runAsync(getContract(id)) + + def uncommittedTransactions(): Future[List[Transaction]] = dataService.getUncommittedTransactions } diff --git a/app/models/database/DataService.scala b/app/models/database/DataService.scala new file mode 100644 index 0000000..3154d7b --- /dev/null +++ b/app/models/database/DataService.scala @@ -0,0 +1,22 @@ +package models.database + +import actors.ModifierMessages.{TransactionsA, TransactionsQ} +import akka.actor.ActorRef +import akka.util.Timeout +import javax.inject._ +import play.api.Configuration +import play.api.mvc._ +import settings.ExplorerSettings +import akka.pattern.ask + +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.Future +import scala.concurrent.duration._ + +class DataService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("receiver") receiver: ActorRef, components: ControllerComponents) { + implicit val timeout: Timeout = 5 seconds + + def getUncommittedTransactions: Future[List[models.Transaction]] = + (receiver ? TransactionsQ()).mapTo[TransactionsA].map(_.txs) + +} diff --git a/app/modules/ActorModule.scala b/app/modules/ActorModule.scala new file mode 100644 index 0000000..8cb3b15 --- /dev/null +++ b/app/modules/ActorModule.scala @@ -0,0 +1,11 @@ +package modules + +import actors.ReceiverActor +import play.api.mvc._ +import akka.actor._ +import javax.inject._ + +@Singleton +class ActorModule @Inject()(system: ActorSystem, cc: ControllerComponents) extends AbstractController(cc) { + //val receiver = system.actorOf(ReceiverActor.props, "receiver") +} \ No newline at end of file diff --git a/app/modules/AkkaModule.scala b/app/modules/AkkaModule.scala deleted file mode 100644 index 9d4c80d..0000000 --- a/app/modules/AkkaModule.scala +++ /dev/null @@ -1,15 +0,0 @@ -package modules - -import actors.ReceiverActor -import play.api.mvc._ -import akka.actor._ -import javax.inject._ - -@Singleton -class Application @Inject()(system: ActorSystem, cc: ControllerComponents) extends AbstractController(cc) { - - println(s"actorSystem ${system.name} created") - println("receiver created") - val receiver = system.actorOf(Props(new ReceiverActor()), "receiver") - -} \ No newline at end of file diff --git a/app/modules/ReceiverModule.scala b/app/modules/ReceiverModule.scala new file mode 100644 index 0000000..c963901 --- /dev/null +++ b/app/modules/ReceiverModule.scala @@ -0,0 +1,10 @@ +package modules +import actors.ReceiverActor +import com.google.inject.AbstractModule +import play.api.libs.concurrent.AkkaGuiceSupport + +class ReceiverModule extends AbstractModule with AkkaGuiceSupport { + override def configure = { + bindActor[ReceiverActor]("receiver") + } +} diff --git a/app/views/index.scala.html b/app/views/index.scala.html index ac67b63..b5b7662 100644 --- a/app/views/index.scala.html +++ b/app/views/index.scala.html @@ -91,6 +91,11 @@
    +
  • + + Uncommited + +
  • Blocks diff --git a/app/views/uncomtransInfo.scala.html b/app/views/uncomtransInfo.scala.html new file mode 100644 index 0000000..774619c --- /dev/null +++ b/app/views/uncomtransInfo.scala.html @@ -0,0 +1,246 @@ +@import java.util.Date +@(txs: List[Transaction]) + + + + + + + + + Encry Explorer + + + + + + + + + + + + + + + +
    + + + +
    + +
    + +
    +
    +
    +
    +

    MemPool Transactions

    +
    +
    + + + + + + + + + + + @for(tx <- txs) { + + + + + + + } + +
    Transaction idTransaction timestampTransaction feeis CoinBase
    + + @tx.id + + + @{ + new Date(tx.timestamp).format("yyyy-MM-dd HH:mm:ss") + } + + + + @tx.fee + + + + @{ + if(tx.isCoinbase) "Yes" else None + } + +
    +
    +
    +
    +
    + + +
    +
    + + + + + + + + + \ No newline at end of file diff --git a/conf/application.conf b/conf/application.conf index 2c7e8a5..0156733 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -8,6 +8,7 @@ encry { play.modules { enabled += modules.MainModule + enabled += modules.ReceiverModule } play.filters { enabled += loggingSystem.LoggingFilter diff --git a/conf/routes b/conf/routes index f3061df..e3caf0c 100644 --- a/conf/routes +++ b/conf/routes @@ -6,4 +6,5 @@ GET /wallet/:contractHash/boxes/:from/:to controllers.WalletContro GET /search/:search controllers.SearchController.search(search:String) GET /wallet/:contractHash controllers.WalletController.getWalletByAddress(contractHash: String) GET /node controllers.NodeController.nodes() +GET /uncom_trans controllers.TransactionsController.getUncomTransactions() GET /:to controllers.HomeController.listHeadersByHeightRangeApi(to: Int) \ No newline at end of file From fbe95c0dcd2b4641a958a55f550850115117f5fc Mon Sep 17 00:00:00 2001 From: capdev Date: Thu, 17 Oct 2019 10:02:20 +0500 Subject: [PATCH 04/31] rename Transaction add Transaction to DBTransaction --- app/actors/ReceiverActor.scala | 19 ++++++---- app/controllers/BlockController.scala | 2 +- app/controllers/SearchController.scala | 4 +-- app/controllers/TransactionsController.scala | 4 +-- app/controllers/WalletController.scala | 2 +- app/models/Block.scala | 2 +- app/models/BoxesDao.scala | 2 +- app/models/DBTransaction.scala | 36 +++++++++++++++++++ app/models/Transaction.scala | 10 ------ app/models/TransactionsDao.scala | 6 ++-- app/models/database/DataService.scala | 2 +- app/models/database/TransactionsQueries.scala | 10 +++--- app/models/database/WalletQueries.scala | 6 ++-- 13 files changed, 69 insertions(+), 36 deletions(-) create mode 100644 app/models/DBTransaction.scala delete mode 100644 app/models/Transaction.scala diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index b8902b2..1ecb8de 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -3,21 +3,28 @@ package actors import actors.ModifierMessages._ import akka.actor.{Actor, Props} import com.typesafe.scalalogging.StrictLogging +import models.DBTransaction import org.encryfoundation.common.modifiers.history.{Header, Payload} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction +import org.encryfoundation.common.utils.Algos import scala.collection.mutable class ReceiverActor extends Actor with StrictLogging { - //logger.debug("ExplorerActor started") - - var transcactions: mutable.Map[String, models.Transaction] = mutable.Map( - "qwe" -> models.Transaction("qwe", 3, "dsfdsffdsf", true, System.currentTimeMillis(), Some("Proof")) + var transcactions: mutable.Map[String, models.DBTransaction] = mutable.Map( + "qwe" -> DBTransaction("qwe", 3, "blockId", true, System.currentTimeMillis(), None) ) def receive: Receive = { - case ModifierTx(tx: Transaction) => println(s"tx: $tx") + case ModifierTx(tx: Transaction) => +// val trans = models.Transaction( +// Algos.encode(tx.id), +// tx.fee, +// "blockId", +// tx. +// ) +// transcactions += case ModifierHeader(header: Header) => println(s"header: $header") case ModifierPayload(payload: Payload) => println(s"payload: txs ${payload.txs.size}") @@ -35,5 +42,5 @@ object ModifierMessages { case class ModifierPayload(payload: Payload) case class TransactionsQ() - case class TransactionsA(txs: List[models.Transaction]) + case class TransactionsA(txs: List[models.DBTransaction]) } diff --git a/app/controllers/BlockController.scala b/app/controllers/BlockController.scala index 47d6fba..5b11154 100644 --- a/app/controllers/BlockController.scala +++ b/app/controllers/BlockController.scala @@ -21,7 +21,7 @@ class BlockController @Inject()(cc: ControllerComponents, def getBlock(id: String): Future[Option[Block]] = { val headerF: Future[Option[Header]] = historyDao.findHeader(id) - val payloadF: Future[List[Transaction]] = transactionsDao.transactionsByBlock(id) + val payloadF: Future[List[DBTransaction]] = transactionsDao.transactionsByBlock(id) for { headerOpt <- headerF payload <- payloadF diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index 06995ab..928b6fb 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -16,7 +16,7 @@ class SearchController @Inject()(cc: ControllerComponents, def getBlock(id: String): Future[Option[Block]] = { val headerF: Future[Option[Header]] = historyDao.findHeader(id) - val payloadF: Future[List[Transaction]] = transactionsDao.transactionsByBlock(id) + val payloadF: Future[List[DBTransaction]] = transactionsDao.transactionsByBlock(id) for { headerOpt <- headerF payload <- payloadF @@ -48,7 +48,7 @@ class SearchController @Inject()(cc: ControllerComponents, val outputF: Future[Option[Output]] = transactionsDao.outputById(id) val walletF: Future[List[Wallet]] = boxesDao.getWalletByHash(Utils.contractHashByAddress(id)) val txIdF: Future[List[String]] = boxesDao.getTxsIdByHash(Utils.contractHashByAddress(id)) - val txsF: Future[List[Transaction]] = txIdF.flatMap(x => Future.sequence(x.map(id => boxesDao.getLastTxById(id)))) + val txsF: Future[List[DBTransaction]] = txIdF.flatMap(x => Future.sequence(x.map(id => boxesDao.getLastTxById(id)))) val result = for { blockOpt <- blockF diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 05f9a7b..bc34bc1 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -1,6 +1,6 @@ package controllers -import models.{Contract, FullFilledTransaction, Input, Output, Transaction, TransactionsDao} +import models.{Contract, FullFilledTransaction, Input, Output, DBTransaction, TransactionsDao} import javax.inject.{Inject, Singleton} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} @@ -37,7 +37,7 @@ class TransactionsController @Inject()(cc: ControllerComponents, def getUncomTransactions: Action[AnyContent] = Action.async { transactionsDao.uncommittedTransactions().map { case Nil => NotFound - case txs: List[Transaction] => Ok(views.html.uncomtransInfo(txs)) + case txs: List[DBTransaction] => Ok(views.html.uncomtransInfo(txs)) } } diff --git a/app/controllers/WalletController.scala b/app/controllers/WalletController.scala index 4c18a19..4205aec 100644 --- a/app/controllers/WalletController.scala +++ b/app/controllers/WalletController.scala @@ -27,7 +27,7 @@ class WalletController @Inject()(cc: ControllerComponents, val walletF: Future[List[Wallet]] = boxesDao.getWalletByHash(Utils.contractHashByAddress(contractHash)) val txIdF = boxesDao.getTxsIdByHash(Utils.contractHashByAddress(contractHash)).flatMap(x => Future.sequence(x.map(id => boxesDao.getLastTxById(id)))) - val result: Future[(List[Wallet], List[Transaction])] = for { + val result: Future[(List[Wallet], List[DBTransaction])] = for { wallet <- walletF txs <- txIdF } yield (wallet, txs) diff --git a/app/models/Block.scala b/app/models/Block.scala index cae3bac..94dd268 100644 --- a/app/models/Block.scala +++ b/app/models/Block.scala @@ -1,3 +1,3 @@ package models -case class Block(header: Header, payload: List[Transaction]) \ No newline at end of file +case class Block(header: Header, payload: List[DBTransaction]) \ No newline at end of file diff --git a/app/models/BoxesDao.scala b/app/models/BoxesDao.scala index 549f94a..e8f190b 100644 --- a/app/models/BoxesDao.scala +++ b/app/models/BoxesDao.scala @@ -16,7 +16,7 @@ class BoxesDao @Inject()(dBService: DBService)(implicit ec: ExecutionContext){ def getTxsIdByHash(contractHash: String): Future[List[String]] = dBService.runAsync(WalletQueries.getTxsIdByHash(contractHash)) - def getLastTxById(Id: String): Future[Transaction] = + def getLastTxById(Id: String): Future[DBTransaction] = dBService.runAsync(WalletQueries.getLastTxsByHash(Id)) } diff --git a/app/models/DBTransaction.scala b/app/models/DBTransaction.scala new file mode 100644 index 0000000..5d3a871 --- /dev/null +++ b/app/models/DBTransaction.scala @@ -0,0 +1,36 @@ +package models + +import org.encryfoundation.common.modifiers.mempool.transaction.{Proof, Transaction} +import org.encryfoundation.common.utils.Algos +import org.encryfoundation.prismlang.core.wrapped.BoxedValue.{BoolValue, ByteCollectionValue, ByteValue, IntValue, MultiSignatureValue, Signature25519Value, StringValue} + +case class DBTransaction(id: String, + fee: Long, + blockId: String, + isCoinbase: Boolean, + timestamp: Long, + defaultProofOpt: Option[String]) + +object DBTransaction { + + def apply(tx: Transaction, blockId: String): DBTransaction = + DBTransaction( + Algos.encode(tx.id), + tx.fee, + blockId, + tx.inputs.isEmpty, + tx.timestamp, + tx.defaultProofOpt.map { + case Proof(IntValue(value), _) => s"IntValue - ${value.toString}" + case Proof(ByteValue(value), _) => s"ByteValue - ${value.toString}" + case Proof(BoolValue(value), _) => s"BoolValue - ${value.toString}" + case Proof(StringValue(value), _) => s"StringValue - ${value.toString}" + case Proof(ByteCollectionValue(value), _) => s"ByteCollectionValue - ${Algos.encode(value.toArray)}" + case Proof(Signature25519Value(value), _) => s"Signature25519Value - ${Algos.encode(value.toArray)}" + case Proof(MultiSignatureValue(value), _) => s"MultiSignatureValue - ${Algos.encode(value.flatten.toArray)}" + } + ) +} + +case class FullFilledTransaction(transaction: DBTransaction, inputs: List[Input], output: List[Output], contract: List[Contract]) + diff --git a/app/models/Transaction.scala b/app/models/Transaction.scala deleted file mode 100644 index a459654..0000000 --- a/app/models/Transaction.scala +++ /dev/null @@ -1,10 +0,0 @@ -package models - -case class Transaction(id: String, - fee: Long, - blockId: String, - isCoinbase: Boolean, - timestamp: Long, - defaultProofOpt: Option[String]) - -case class FullFilledTransaction(transaction: Transaction, inputs: List[Input], output: List[Output], contract: List[Contract]) \ No newline at end of file diff --git a/app/models/TransactionsDao.scala b/app/models/TransactionsDao.scala index 4831bbf..1433db0 100644 --- a/app/models/TransactionsDao.scala +++ b/app/models/TransactionsDao.scala @@ -8,17 +8,17 @@ import scala.concurrent.{ExecutionContext, Future} class TransactionsDao @Inject()(dBService: DBService, dataService: DataService)(implicit ec: ExecutionContext) { - def transactionsByBlock(id: String): Future[List[Transaction]] = dBService.runAsync(getTransactionsByBlockId(id)) + def transactionsByBlock(id: String): Future[List[DBTransaction]] = dBService.runAsync(getTransactionsByBlockId(id)) def inputsByTransaction(id: String): Future[List[Input]] = dBService.runAsync(getTransactionInputs(id)) def outputsByTransaction(id: String): Future[List[Output]] = dBService.runAsync(getTransactionOutputs(id)) - def transactionById(id: String): Future[Option[Transaction]] = dBService.runAsync(getTransactionById(id)) + def transactionById(id: String): Future[Option[DBTransaction]] = dBService.runAsync(getTransactionById(id)) def outputById(id: String): Future[Option[Output]] = dBService.runAsync(getOutput(id)) def contractByTransaction(id: String): Future[List[Contract]] = dBService.runAsync(getContract(id)) - def uncommittedTransactions(): Future[List[Transaction]] = dataService.getUncommittedTransactions + def uncommittedTransactions(): Future[List[DBTransaction]] = dataService.getUncommittedTransactions } diff --git a/app/models/database/DataService.scala b/app/models/database/DataService.scala index 3154d7b..b1dffb9 100644 --- a/app/models/database/DataService.scala +++ b/app/models/database/DataService.scala @@ -16,7 +16,7 @@ import scala.concurrent.duration._ class DataService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("receiver") receiver: ActorRef, components: ControllerComponents) { implicit val timeout: Timeout = 5 seconds - def getUncommittedTransactions: Future[List[models.Transaction]] = + def getUncommittedTransactions: Future[List[models.DBTransaction]] = (receiver ? TransactionsQ()).mapTo[TransactionsA].map(_.txs) } diff --git a/app/models/database/TransactionsQueries.scala b/app/models/database/TransactionsQueries.scala index d265eb0..c2af4a0 100644 --- a/app/models/database/TransactionsQueries.scala +++ b/app/models/database/TransactionsQueries.scala @@ -1,12 +1,12 @@ package models.database import doobie.implicits._ -import models.{Contract, Input, Output, Transaction} +import models.{Contract, Input, Output, DBTransaction} object TransactionsQueries { - def getTransactionsByBlockId(blockId: String): doobie.ConnectionIO[List[Transaction]] = - sql"SELECT * FROM transactions WHERE blockId = $blockId".query[Transaction].to[List] + def getTransactionsByBlockId(blockId: String): doobie.ConnectionIO[List[DBTransaction]] = + sql"SELECT * FROM transactions WHERE blockId = $blockId".query[DBTransaction].to[List] def getTransactionInputs(transactionId: String): doobie.ConnectionIO[List[Input]] = sql"SELECT * FROM inputs WHERE txId = $transactionId".query[Input].to[List] @@ -14,8 +14,8 @@ object TransactionsQueries { def getTransactionOutputs(transactionId: String): doobie.ConnectionIO[List[Output]] = sql"SELECT * FROM outputs WHERE txId = $transactionId".query[Output].to[List] - def getTransactionById(transactionId: String): doobie.ConnectionIO[Option[Transaction]] = - sql"SELECT * FROM transactions WHERE id = $transactionId".query[Transaction].to[List].map(_.headOption) + def getTransactionById(transactionId: String): doobie.ConnectionIO[Option[DBTransaction]] = + sql"SELECT * FROM transactions WHERE id = $transactionId".query[DBTransaction].to[List].map(_.headOption) def getOutput(id: String): doobie.ConnectionIO[Option[Output]] = sql"SELECT * FROM outputs WHERE id = $id".query[Output].to[List].map(_.headOption) diff --git a/app/models/database/WalletQueries.scala b/app/models/database/WalletQueries.scala index 013a081..0bfb16c 100644 --- a/app/models/database/WalletQueries.scala +++ b/app/models/database/WalletQueries.scala @@ -2,7 +2,7 @@ package models.database import doobie._ import doobie.implicits._ -import models.{Transaction, Wallet} +import models.{DBTransaction, Wallet} object WalletQueries { @@ -13,7 +13,7 @@ object WalletQueries { def getTxsIdByHash(address: String): ConnectionIO[List[String]] = sql"SELECT txId FROM outputs WHERE contractHash = $address order by idx DESC LIMIT 50".query[String].to[List] - def getLastTxsByHash(txId: String): ConnectionIO[Transaction] = - sql"SELECT * FROM transactions WHERE id = $txId ORDER BY timestamp DESC LIMIT 50".query[Transaction].unique + def getLastTxsByHash(txId: String): ConnectionIO[DBTransaction] = + sql"SELECT * FROM transactions WHERE id = $txId ORDER BY timestamp DESC LIMIT 50".query[DBTransaction].unique } From 08c7cab7f2ab580945342132dd05a601b334d0af Mon Sep 17 00:00:00 2001 From: capdev Date: Thu, 17 Oct 2019 12:42:31 +0500 Subject: [PATCH 05/31] remove commited transactions logic --- app/actors/ReceiverActor.scala | 37 ++++++++++++++++++++-------------- app/models/DBTransaction.scala | 2 +- conf/application.conf | 21 ++++++++++--------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index 1ecb8de..c42a094 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -6,37 +6,44 @@ import com.typesafe.scalalogging.StrictLogging import models.DBTransaction import org.encryfoundation.common.modifiers.history.{Header, Payload} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction -import org.encryfoundation.common.utils.Algos +import org.encryfoundation.common.utils.TaggedTypes.ModifierId import scala.collection.mutable class ReceiverActor extends Actor with StrictLogging { - var transcactions: mutable.Map[String, models.DBTransaction] = mutable.Map( + var transcactions: mutable.Map[String, DBTransaction] = mutable.Map( "qwe" -> DBTransaction("qwe", 3, "blockId", true, System.currentTimeMillis(), None) ) def receive: Receive = { - case ModifierTx(tx: Transaction) => -// val trans = models.Transaction( -// Algos.encode(tx.id), -// tx.fee, -// "blockId", -// tx. -// ) -// transcactions += - case ModifierHeader(header: Header) => println(s"header: $header") - case ModifierPayload(payload: Payload) => println(s"payload: txs ${payload.txs.size}") - - case TransactionsQ() => sender ! TransactionsA(transcactions.values.toList) + case tx: Transaction => + val trans = DBTransaction(tx, "") + transcactions += trans.id -> trans + + case header: Header => + logger.debug(s"header: ${header.encodedId}") + + case payload: Payload => + logger.debug(s"payload: ${payload.encodedId} txs ${payload.txs.size}") + removeCommitedTrans(payload.txs) + + case TransactionsQ() => + sender ! TransactionsA(transcactions.values.toList) + } + + def removeCommitedTrans(txs: Seq[Transaction]) { + txs.foreach(tx => transcactions.remove(tx.encodedId)) } } object ReceiverActor { - def props = Props[ReceiverActor] + def props: Props = Props[ReceiverActor] } object ModifierMessages { + + case class EmptyMsg() case class ModifierTx(tx: Transaction) case class ModifierHeader(header: Header) case class ModifierPayload(payload: Payload) diff --git a/app/models/DBTransaction.scala b/app/models/DBTransaction.scala index 5d3a871..a78f58e 100644 --- a/app/models/DBTransaction.scala +++ b/app/models/DBTransaction.scala @@ -15,7 +15,7 @@ object DBTransaction { def apply(tx: Transaction, blockId: String): DBTransaction = DBTransaction( - Algos.encode(tx.id), + tx.encodedId, tx.fee, blockId, tx.inputs.isEmpty, diff --git a/conf/application.conf b/conf/application.conf index 0156733..61c00af 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -22,14 +22,17 @@ play.assets { } akka { - actor { - provider = remote - } - remote { - enabled-transports = ["akka.remote.netty.tcp"] - netty.tcp { - hostname = "localhost" - port = 46619 - } + loglevel = "INFO" + actor { + provider = "akka.remote.RemoteActorRefProvider" + } + remote { + enabled-transports = ["akka.remote.netty.tcp"] + netty.tcp { + hostname = "127.0.0.1" + port = 5150 } + log-sent-messages = on + log-received-messages = on + } } From 108911865451cca7b0fbffb0e9dd3d194d8be26a Mon Sep 17 00:00:00 2001 From: capdev Date: Thu, 17 Oct 2019 15:46:11 +0500 Subject: [PATCH 06/31] rename module --- app/actors/ReceiverActor.scala | 5 +---- app/controllers/TransactionsController.scala | 5 +---- app/modules/{ReceiverModule.scala => ActorsBindModule.scala} | 2 +- conf/application.conf | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) rename app/modules/{ReceiverModule.scala => ActorsBindModule.scala} (75%) diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index c42a094..2a17dd9 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -12,9 +12,7 @@ import scala.collection.mutable class ReceiverActor extends Actor with StrictLogging { - var transcactions: mutable.Map[String, DBTransaction] = mutable.Map( - "qwe" -> DBTransaction("qwe", 3, "blockId", true, System.currentTimeMillis(), None) - ) + var transcactions: mutable.Map[String, DBTransaction] = mutable.Map() def receive: Receive = { case tx: Transaction => @@ -43,7 +41,6 @@ object ReceiverActor { object ModifierMessages { - case class EmptyMsg() case class ModifierTx(tx: Transaction) case class ModifierHeader(header: Header) case class ModifierPayload(payload: Payload) diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index bc34bc1..81a346b 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -35,10 +35,7 @@ class TransactionsController @Inject()(cc: ControllerComponents, } def getUncomTransactions: Action[AnyContent] = Action.async { - transactionsDao.uncommittedTransactions().map { - case Nil => NotFound - case txs: List[DBTransaction] => Ok(views.html.uncomtransInfo(txs)) - } + transactionsDao.uncommittedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs))) } } \ No newline at end of file diff --git a/app/modules/ReceiverModule.scala b/app/modules/ActorsBindModule.scala similarity index 75% rename from app/modules/ReceiverModule.scala rename to app/modules/ActorsBindModule.scala index c963901..d96ae4f 100644 --- a/app/modules/ReceiverModule.scala +++ b/app/modules/ActorsBindModule.scala @@ -3,7 +3,7 @@ import actors.ReceiverActor import com.google.inject.AbstractModule import play.api.libs.concurrent.AkkaGuiceSupport -class ReceiverModule extends AbstractModule with AkkaGuiceSupport { +class ActorsBindModule extends AbstractModule with AkkaGuiceSupport { override def configure = { bindActor[ReceiverActor]("receiver") } diff --git a/conf/application.conf b/conf/application.conf index 61c00af..0a6c073 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -8,7 +8,7 @@ encry { play.modules { enabled += modules.MainModule - enabled += modules.ReceiverModule + enabled += modules.ActorsBindModule } play.filters { enabled += loggingSystem.LoggingFilter From 3c741cdd73b6da89d87239788213283ec79f83cb Mon Sep 17 00:00:00 2001 From: capdev Date: Thu, 17 Oct 2019 18:57:55 +0500 Subject: [PATCH 07/31] separate main and content html --- app/views/main.scala.html | 172 ++++++++++++++++ app/views/search.scala.html | 50 +++++ app/views/uncomtransInfo.scala.html | 306 ++++++++-------------------- 3 files changed, 303 insertions(+), 225 deletions(-) create mode 100644 app/views/main.scala.html create mode 100644 app/views/search.scala.html diff --git a/app/views/main.scala.html b/app/views/main.scala.html new file mode 100644 index 0000000..a74985f --- /dev/null +++ b/app/views/main.scala.html @@ -0,0 +1,172 @@ +@(content: Html) + + + + + + + + + Encry Explorer + + + + + + + + + + + + + + + + + + + + @content + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/search.scala.html b/app/views/search.scala.html new file mode 100644 index 0000000..8404cc4 --- /dev/null +++ b/app/views/search.scala.html @@ -0,0 +1,50 @@ + + + + diff --git a/app/views/uncomtransInfo.scala.html b/app/views/uncomtransInfo.scala.html index 774619c..5605ad7 100644 --- a/app/views/uncomtransInfo.scala.html +++ b/app/views/uncomtransInfo.scala.html @@ -1,246 +1,102 @@ @import java.util.Date -@(txs: List[Transaction]) +@(txs: List[DBTransaction]) +@main { - - - - - - - - Encry Explorer - - - - - - - - - - - - - - - -
    - - - -
    - -
    - -
    -
    -
    -
    -

    MemPool Transactions

    -
    -
    - - - - - - - - - - - @for(tx <- txs) { - - - + + } + +
    Transaction idTransaction timestampTransaction feeis CoinBase
    - - @tx.id - +
    + + + + + + + + + + + @for(tx <- txs) { + + + - + - + - - } - -
    Transaction idTransaction timestampTransaction feeis CoinBase
    + + @tx.id + @{ new Date(tx.timestamp).format("yyyy-MM-dd HH:mm:ss") } - + @tx.fee - + @{ if(tx.isCoinbase) "Yes" else None } -
    -
    - +
    - -
    - - - - - - - + + +
    +
    - \ No newline at end of file +} \ No newline at end of file From 5ab1100d9e3f6d4d38fa03957ad85674bf3cd0c5 Mon Sep 17 00:00:00 2001 From: capdev Date: Fri, 18 Oct 2019 10:50:02 +0500 Subject: [PATCH 08/31] add cache actor --- app/actors/CacheActor.scala | 34 ++++++++++++++++++++ app/actors/ReceiverActor.scala | 27 ++++------------ app/controllers/TransactionsController.scala | 2 +- app/models/TransactionsDao.scala | 2 +- app/models/database/DataService.scala | 8 ++--- app/modules/ActorsBindModule.scala | 3 +- app/views/index.scala.html | 2 +- app/views/main.scala.html | 2 +- app/views/uncomtransInfo.scala.html | 4 +-- 9 files changed, 53 insertions(+), 31 deletions(-) create mode 100644 app/actors/CacheActor.scala diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala new file mode 100644 index 0000000..7d85b34 --- /dev/null +++ b/app/actors/CacheActor.scala @@ -0,0 +1,34 @@ +package actors + +import actors.CacheActor.{RemoveConfirmedTransactions, TransactionsA, TransactionsQ} +import akka.actor.{Actor, Props} +import com.typesafe.scalalogging.StrictLogging +import models.DBTransaction + +import scala.collection.mutable + +class CacheActor extends Actor with StrictLogging { + + var transcactions: mutable.Map[String, DBTransaction] = mutable.Map() + + def receive: Receive = { + case tx: DBTransaction => + transcactions += tx.id -> tx + + case TransactionsQ() => + sender ! TransactionsA(transcactions.values.toSeq) + + case RemoveConfirmedTransactions(txIds) => + txIds.foreach(id => transcactions.remove(id)) + } + +} + +object CacheActor { + case class TransactionsQ() + case class TransactionsA(txs: Seq[DBTransaction]) + + case class RemoveConfirmedTransactions(txIds: Seq[String]) + + def props: Props = Props[ReceiverActor] +} diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index 2a17dd9..f42e1a0 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -1,50 +1,37 @@ package actors -import actors.ModifierMessages._ -import akka.actor.{Actor, Props} +import actors.CacheActor.RemoveConfirmedTransactions +import akka.actor.{Actor, ActorRef, Props} import com.typesafe.scalalogging.StrictLogging +import javax.inject.{Inject, Named} import models.DBTransaction import org.encryfoundation.common.modifiers.history.{Header, Payload} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction -import org.encryfoundation.common.utils.TaggedTypes.ModifierId -import scala.collection.mutable - -class ReceiverActor extends Actor with StrictLogging { - - var transcactions: mutable.Map[String, DBTransaction] = mutable.Map() +class ReceiverActor @Inject()(@Named("cache") cache: ActorRef) extends Actor with StrictLogging { def receive: Receive = { case tx: Transaction => val trans = DBTransaction(tx, "") - transcactions += trans.id -> trans + cache ! trans case header: Header => logger.debug(s"header: ${header.encodedId}") case payload: Payload => logger.debug(s"payload: ${payload.encodedId} txs ${payload.txs.size}") - removeCommitedTrans(payload.txs) + cache ! RemoveConfirmedTransactions(payload.txs.map(_.encodedId)) - case TransactionsQ() => - sender ! TransactionsA(transcactions.values.toList) } - def removeCommitedTrans(txs: Seq[Transaction]) { - txs.foreach(tx => transcactions.remove(tx.encodedId)) - } } object ReceiverActor { - def props: Props = Props[ReceiverActor] + def props(cache: ActorRef): Props = Props(new ReceiverActor(cache)) } object ModifierMessages { - case class ModifierTx(tx: Transaction) case class ModifierHeader(header: Header) case class ModifierPayload(payload: Payload) - - case class TransactionsQ() - case class TransactionsA(txs: List[models.DBTransaction]) } diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 81a346b..81a9aed 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -35,7 +35,7 @@ class TransactionsController @Inject()(cc: ControllerComponents, } def getUncomTransactions: Action[AnyContent] = Action.async { - transactionsDao.uncommittedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs))) + transactionsDao.uncommittedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs.toList))) } } \ No newline at end of file diff --git a/app/models/TransactionsDao.scala b/app/models/TransactionsDao.scala index 1433db0..673a5af 100644 --- a/app/models/TransactionsDao.scala +++ b/app/models/TransactionsDao.scala @@ -20,5 +20,5 @@ class TransactionsDao @Inject()(dBService: DBService, dataService: DataService)( def contractByTransaction(id: String): Future[List[Contract]] = dBService.runAsync(getContract(id)) - def uncommittedTransactions(): Future[List[DBTransaction]] = dataService.getUncommittedTransactions + def uncommittedTransactions(): Future[Seq[DBTransaction]] = dataService.getUncommittedTransactions } diff --git a/app/models/database/DataService.scala b/app/models/database/DataService.scala index b1dffb9..279bba0 100644 --- a/app/models/database/DataService.scala +++ b/app/models/database/DataService.scala @@ -1,6 +1,6 @@ package models.database -import actors.ModifierMessages.{TransactionsA, TransactionsQ} +import actors.CacheActor.{TransactionsA, TransactionsQ} import akka.actor.ActorRef import akka.util.Timeout import javax.inject._ @@ -13,10 +13,10 @@ import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import scala.concurrent.duration._ -class DataService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("receiver") receiver: ActorRef, components: ControllerComponents) { +class DataService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("cache") cache: ActorRef, components: ControllerComponents) { implicit val timeout: Timeout = 5 seconds - def getUncommittedTransactions: Future[List[models.DBTransaction]] = - (receiver ? TransactionsQ()).mapTo[TransactionsA].map(_.txs) + def getUncommittedTransactions: Future[Seq[models.DBTransaction]] = + (cache ? TransactionsQ()).mapTo[TransactionsA].map(_.txs) } diff --git a/app/modules/ActorsBindModule.scala b/app/modules/ActorsBindModule.scala index d96ae4f..5dd9a89 100644 --- a/app/modules/ActorsBindModule.scala +++ b/app/modules/ActorsBindModule.scala @@ -1,10 +1,11 @@ package modules -import actors.ReceiverActor +import actors.{CacheActor, ReceiverActor} import com.google.inject.AbstractModule import play.api.libs.concurrent.AkkaGuiceSupport class ActorsBindModule extends AbstractModule with AkkaGuiceSupport { override def configure = { + bindActor[CacheActor]("cache") bindActor[ReceiverActor]("receiver") } } diff --git a/app/views/index.scala.html b/app/views/index.scala.html index b5b7662..fcfd737 100644 --- a/app/views/index.scala.html +++ b/app/views/index.scala.html @@ -93,7 +93,7 @@
    • - Uncommited + Unconfirmed
    • diff --git a/app/views/main.scala.html b/app/views/main.scala.html index a74985f..c5b64a0 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -92,7 +92,7 @@
      • - Uncommited + Unconfirmed
      • diff --git a/app/views/uncomtransInfo.scala.html b/app/views/uncomtransInfo.scala.html index 5605ad7..1c733d3 100644 --- a/app/views/uncomtransInfo.scala.html +++ b/app/views/uncomtransInfo.scala.html @@ -8,7 +8,7 @@
        - MemPool Transactions + Encry Explorer
        @@ -20,7 +20,7 @@
        -

        MemPool Transactions

        +

        Unconfirmed transactions

        From e3b1ce9343bebb438c839dd3e860bffe444e2fc8 Mon Sep 17 00:00:00 2001 From: capdev Date: Fri, 18 Oct 2019 14:26:16 +0500 Subject: [PATCH 09/31] switch to FullFilledTransaction --- app/actors/CacheActor.scala | 34 +++++++++++++------ app/actors/ReceiverActor.scala | 2 +- app/controllers/SearchController.scala | 2 +- app/controllers/TransactionsController.scala | 20 +++++------ app/models/DBInput.scala | 23 +++++++++++++ app/models/DBTransaction.scala | 2 +- app/models/Input.scala | 3 -- app/models/Output.scala | 20 +++++++++++ app/models/TransactionsDao.scala | 23 ++++++++----- app/models/database/CacheService.scala | 26 ++++++++++++++ app/models/database/DataService.scala | 22 ------------ app/models/database/TransactionsQueries.scala | 6 ++-- 12 files changed, 122 insertions(+), 61 deletions(-) create mode 100644 app/models/DBInput.scala delete mode 100644 app/models/Input.scala create mode 100644 app/models/database/CacheService.scala delete mode 100644 app/models/database/DataService.scala diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala index 7d85b34..030ea00 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/CacheActor.scala @@ -1,34 +1,46 @@ package actors -import actors.CacheActor.{RemoveConfirmedTransactions, TransactionsA, TransactionsQ} +import actors.CacheActor.{RemoveConfirmedTransactions, TransactionByIdA, TransactionByIdQ, UnconfTransactionsA, UnconfTransactionsQ} import akka.actor.{Actor, Props} import com.typesafe.scalalogging.StrictLogging -import models.DBTransaction +import models.{Contract, DBInput, DBTransaction, FullFilledTransaction, Output} +import org.encryfoundation.common.modifiers.mempool.transaction.Transaction import scala.collection.mutable class CacheActor extends Actor with StrictLogging { - var transcactions: mutable.Map[String, DBTransaction] = mutable.Map() + var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map() def receive: Receive = { - case tx: DBTransaction => - transcactions += tx.id -> tx + case tx: Transaction => + val dbTransaction = DBTransaction(tx, "") + val dbInputs = tx.inputs.map(input => DBInput(input, tx.encodedId)).toList + val dbOutputs = Output.getOutputs(tx, "minerAddress") + val contracts = dbInputs.map(input => Contract(input.contractHash, input.contract)).distinct + val unconfTranscaction = FullFilledTransaction(dbTransaction, dbInputs, dbOutputs, contracts) + unconfTranscactions += tx.encodedId -> unconfTranscaction - case TransactionsQ() => - sender ! TransactionsA(transcactions.values.toSeq) + case UnconfTransactionsQ() => + sender ! UnconfTransactionsA(unconfTranscactions.values.toList) + + case TransactionByIdQ(id) => + sender ! TransactionByIdA(unconfTranscactions.get(id)) case RemoveConfirmedTransactions(txIds) => - txIds.foreach(id => transcactions.remove(id)) + txIds.foreach(id => unconfTranscactions.remove(id)) } } object CacheActor { - case class TransactionsQ() - case class TransactionsA(txs: Seq[DBTransaction]) + case class UnconfTransactionsQ() + case class UnconfTransactionsA(txs: List[FullFilledTransaction]) + + case class TransactionByIdQ(id: String) + case class TransactionByIdA(tx: Option[FullFilledTransaction]) - case class RemoveConfirmedTransactions(txIds: Seq[String]) + case class RemoveConfirmedTransactions(txIds: List[String]) def props: Props = Props[ReceiverActor] } diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index f42e1a0..e77ca80 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -20,7 +20,7 @@ class ReceiverActor @Inject()(@Named("cache") cache: ActorRef) extends Actor wit case payload: Payload => logger.debug(s"payload: ${payload.encodedId} txs ${payload.txs.size}") - cache ! RemoveConfirmedTransactions(payload.txs.map(_.encodedId)) + cache ! RemoveConfirmedTransactions(payload.txs.map(_.encodedId).toList) } diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index 928b6fb..3a37159 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -30,7 +30,7 @@ class SearchController @Inject()(cc: ControllerComponents, transactionsDao.transactionById(id).flatMap { case Some(tx) => val outputsF: Future[List[Output]] = transactionsDao.outputsByTransaction(tx.id) - val inputsF: Future[List[Input]] = transactionsDao.inputsByTransaction(tx.id) + val inputsF: Future[List[DBInput]] = transactionsDao.inputsByTransaction(tx.id) val contractF: Future[List[Contract]] = transactionsDao.contractByTransaction(tx.id) for { outputs <- outputsF diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 81a9aed..763d090 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -1,6 +1,6 @@ package controllers -import models.{Contract, FullFilledTransaction, Input, Output, DBTransaction, TransactionsDao} +import models.{Contract, FullFilledTransaction, DBInput, Output, TransactionsDao} import javax.inject.{Inject, Singleton} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} @@ -9,20 +9,20 @@ import scala.concurrent.{ExecutionContext, Future} @Singleton class TransactionsController @Inject()(cc: ControllerComponents, - transactionsDao: TransactionsDao) - (implicit ex: ExecutionContext) extends AbstractController(cc) with Circe { + transactionsDao: TransactionsDao) + (implicit ex: ExecutionContext) extends AbstractController(cc) with Circe { def getFullTransaction(id: String): Future[Option[FullFilledTransaction]] = - transactionsDao.transactionById(id).flatMap { + transactionsDao.transactionById(id).flatMap { case Some(tx) => val outputsF: Future[List[Output]] = transactionsDao.outputsByTransaction(tx.id) - val inputsF: Future[List[Input]] = transactionsDao.inputsByTransaction(tx.id) + val inputsF: Future[List[DBInput]] = transactionsDao.inputsByTransaction(tx.id) val contractF: Future[List[Contract]] = transactionsDao.contractByTransaction(tx.id) for { - outputs <- outputsF - inputs <- inputsF + outputs <- outputsF + inputs <- inputsF contract <- contractF - } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) + } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) case _ => Future(Option.empty[FullFilledTransaction]) } @@ -30,12 +30,12 @@ class TransactionsController @Inject()(cc: ControllerComponents, def getTransaction(txId: String): Action[AnyContent] = Action.async { getFullTransaction(txId).map { case Some(tx) => Ok(views.html.transactionInfo(tx)) - case None => NotFound + case None => NotFound } } def getUncomTransactions: Action[AnyContent] = Action.async { - transactionsDao.uncommittedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs.toList))) + transactionsDao.uncommittedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs))) } } \ No newline at end of file diff --git a/app/models/DBInput.scala b/app/models/DBInput.scala new file mode 100644 index 0000000..0056c7c --- /dev/null +++ b/app/models/DBInput.scala @@ -0,0 +1,23 @@ +package models + +import org.encryfoundation.common.modifiers.mempool.transaction.Input +import org.encryfoundation.common.utils.Algos + +case class DBInput(bxId: String, txId: String, contract: String, contractHash: String, proofs: String) + +object DBInput { + //todo: remove input.contract.toString + def apply(input: Input, txId: String): DBInput = + new DBInput( + Algos.encode(input.boxId), + txId, + input.contract match { + case i if i.isRight => s"RegularContract - ${i.map(_.contract.script).toString}" + case i => s"CompiledContract - ${i.left.map(_.script).toString}" + }, + input.contract.fold(c => Algos.encode(c.hash), c => Algos.encode(c.contract.hash)), + input.proofs.map(_.toString).mkString(",") + ) + + def apply(bxId: String, txId: String, contract: String, contractHash: String, proofs: String): DBInput = new DBInput(bxId, txId, contract, contractHash, proofs) +} \ No newline at end of file diff --git a/app/models/DBTransaction.scala b/app/models/DBTransaction.scala index a78f58e..e5d96cd 100644 --- a/app/models/DBTransaction.scala +++ b/app/models/DBTransaction.scala @@ -32,5 +32,5 @@ object DBTransaction { ) } -case class FullFilledTransaction(transaction: DBTransaction, inputs: List[Input], output: List[Output], contract: List[Contract]) +case class FullFilledTransaction(transaction: DBTransaction, inputs: List[DBInput], output: List[Output], contract: List[Contract]) diff --git a/app/models/Input.scala b/app/models/Input.scala deleted file mode 100644 index f16cdb9..0000000 --- a/app/models/Input.scala +++ /dev/null @@ -1,3 +0,0 @@ -package models - -case class Input(bxId: String, txId: String, contract: String, proofs: String) \ No newline at end of file diff --git a/app/models/Output.scala b/app/models/Output.scala index 2e77638..b38a62c 100644 --- a/app/models/Output.scala +++ b/app/models/Output.scala @@ -4,6 +4,12 @@ import io.circe.generic.auto._ import io.circe.Encoder import io.circe.syntax._ import models.Output.Proposition +import org.encryfoundation.common.modifiers.mempool.transaction.EncryAddress.Address +import org.encryfoundation.common.modifiers.mempool.transaction.{EncryAddress, Transaction} +import org.encryfoundation.common.modifiers.state.box.AssetBox +import org.encryfoundation.common.utils.Algos +import org.encryfoundation.prismlang.core.Constants +import settings.Utils case class Output(idx: Int, id: String, @@ -32,4 +38,18 @@ object Output{ data: String, isActive: Boolean, minerAddress: String): Output = new Output(idx, id, `type`, txId, value, nonce, tokenId, Proposition(proposition), data, isActive, minerAddress) + + def getOutputs(tx: Transaction, minerAddress: Address): List[Output] = { + //val box: EncryBaseBox = directive.boxes(Digest32 @@ Algos.decode(tx.id).getOrElse(Array.emptyByteArray), idx) + tx.newBoxes.toList.zipWithIndex.map { case(box, idx) => + val (amount, tokenId) = box match { + case box: AssetBox => + (box.amount, Algos.encode(box.tokenIdOpt.getOrElse(Utils.IntrinsicTokenId))) + case _ => (0L, "") + } + new Output(idx, tx.encodedId, box.typeId, tx.encodedId, amount, box.nonce, tokenId, + Proposition(Algos.encode(box.proposition.contractHash)), + "box.data", true, minerAddress) + } + } } \ No newline at end of file diff --git a/app/models/TransactionsDao.scala b/app/models/TransactionsDao.scala index 673a5af..6711fae 100644 --- a/app/models/TransactionsDao.scala +++ b/app/models/TransactionsDao.scala @@ -1,24 +1,29 @@ package models import javax.inject.Inject -import models.database.{DBService, DataService} +import models.database.{CacheService, DBService} import models.database.TransactionsQueries._ import scala.concurrent.{ExecutionContext, Future} +import scala.util.{Failure, Success} -class TransactionsDao @Inject()(dBService: DBService, dataService: DataService)(implicit ec: ExecutionContext) { +class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService)(implicit ec: ExecutionContext) { - def transactionsByBlock(id: String): Future[List[DBTransaction]] = dBService.runAsync(getTransactionsByBlockId(id)) + def transactionsByBlock(id: String): Future[List[DBTransaction]] = dbService.runAsync(getTransactionsByBlockId(id)) - def inputsByTransaction(id: String): Future[List[Input]] = dBService.runAsync(getTransactionInputs(id)) + def inputsByTransaction(id: String): Future[List[DBInput]] = dbService.runAsync(getTransactionInputs(id)) - def outputsByTransaction(id: String): Future[List[Output]] = dBService.runAsync(getTransactionOutputs(id)) + def outputsByTransaction(id: String): Future[List[Output]] = dbService.runAsync(getTransactionOutputs(id)) - def transactionById(id: String): Future[Option[DBTransaction]] = dBService.runAsync(getTransactionById(id)) + def transactionById(id: String): Future[Option[DBTransaction]] = { + cacheService.getTransactionById(id) andThen { + case Success(None) => dbService.runAsync(getTransactionById(id)) + } + } - def outputById(id: String): Future[Option[Output]] = dBService.runAsync(getOutput(id)) + def outputById(id: String): Future[Option[Output]] = dbService.runAsync(getOutput(id)) - def contractByTransaction(id: String): Future[List[Contract]] = dBService.runAsync(getContract(id)) + def contractByTransaction(id: String): Future[List[Contract]] = dbService.runAsync(getContract(id)) - def uncommittedTransactions(): Future[Seq[DBTransaction]] = dataService.getUncommittedTransactions + def uncommittedTransactions(): Future[List[DBTransaction]] = cacheService.getUncommittedTransactions } diff --git a/app/models/database/CacheService.scala b/app/models/database/CacheService.scala new file mode 100644 index 0000000..574ba76 --- /dev/null +++ b/app/models/database/CacheService.scala @@ -0,0 +1,26 @@ +package models.database + +import actors.CacheActor.{TransactionByIdA, TransactionByIdQ, UnconfTransactionsA, UnconfTransactionsQ} +import akka.actor.ActorRef +import akka.util.Timeout +import javax.inject._ +import play.api.Configuration +import play.api.mvc._ +import settings.ExplorerSettings +import akka.pattern.ask +import models.DBTransaction + +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.Future +import scala.concurrent.duration._ + +class CacheService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("cache") cache: ActorRef) { + implicit val timeout: Timeout = 5 seconds + + def getUncommittedTransactions: Future[List[DBTransaction]] = + (cache ? UnconfTransactionsQ()).mapTo[UnconfTransactionsA].map(_.txs.map(_.transaction)) + + def getTransactionById(id: String): Future[Option[DBTransaction]] = + (cache ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx.map(_.transaction)) + +} diff --git a/app/models/database/DataService.scala b/app/models/database/DataService.scala deleted file mode 100644 index 279bba0..0000000 --- a/app/models/database/DataService.scala +++ /dev/null @@ -1,22 +0,0 @@ -package models.database - -import actors.CacheActor.{TransactionsA, TransactionsQ} -import akka.actor.ActorRef -import akka.util.Timeout -import javax.inject._ -import play.api.Configuration -import play.api.mvc._ -import settings.ExplorerSettings -import akka.pattern.ask - -import scala.concurrent.ExecutionContext.Implicits.global -import scala.concurrent.Future -import scala.concurrent.duration._ - -class DataService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("cache") cache: ActorRef, components: ControllerComponents) { - implicit val timeout: Timeout = 5 seconds - - def getUncommittedTransactions: Future[Seq[models.DBTransaction]] = - (cache ? TransactionsQ()).mapTo[TransactionsA].map(_.txs) - -} diff --git a/app/models/database/TransactionsQueries.scala b/app/models/database/TransactionsQueries.scala index c2af4a0..4d4268a 100644 --- a/app/models/database/TransactionsQueries.scala +++ b/app/models/database/TransactionsQueries.scala @@ -1,15 +1,15 @@ package models.database import doobie.implicits._ -import models.{Contract, Input, Output, DBTransaction} +import models.{Contract, DBInput, Output, DBTransaction} object TransactionsQueries { def getTransactionsByBlockId(blockId: String): doobie.ConnectionIO[List[DBTransaction]] = sql"SELECT * FROM transactions WHERE blockId = $blockId".query[DBTransaction].to[List] - def getTransactionInputs(transactionId: String): doobie.ConnectionIO[List[Input]] = - sql"SELECT * FROM inputs WHERE txId = $transactionId".query[Input].to[List] + def getTransactionInputs(transactionId: String): doobie.ConnectionIO[List[DBInput]] = + sql"SELECT * FROM inputs WHERE txId = $transactionId".query[DBInput].to[List] def getTransactionOutputs(transactionId: String): doobie.ConnectionIO[List[Output]] = sql"SELECT * FROM outputs WHERE txId = $transactionId".query[Output].to[List] From 9b2f0599041f15d923a20c88e1a2866ba49e1236 Mon Sep 17 00:00:00 2001 From: capdev Date: Fri, 18 Oct 2019 17:08:56 +0500 Subject: [PATCH 10/31] open FullTransaction by link --- app/actors/CacheActor.scala | 4 +-- app/actors/ReceiverActor.scala | 5 +--- app/controllers/TransactionsController.scala | 28 +++++++++++--------- app/models/TransactionsDao.scala | 4 +++ app/models/database/CacheService.scala | 4 ++- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala index 030ea00..3db36dc 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/CacheActor.scala @@ -8,7 +8,7 @@ import org.encryfoundation.common.modifiers.mempool.transaction.Transaction import scala.collection.mutable -class CacheActor extends Actor with StrictLogging { +class CacheActor extends Actor { var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map() @@ -42,5 +42,5 @@ object CacheActor { case class RemoveConfirmedTransactions(txIds: List[String]) - def props: Props = Props[ReceiverActor] + def props: Props = Props(new CacheActor) } diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index e77ca80..bbd6439 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -12,16 +12,13 @@ class ReceiverActor @Inject()(@Named("cache") cache: ActorRef) extends Actor wit def receive: Receive = { case tx: Transaction => - val trans = DBTransaction(tx, "") - cache ! trans + cache ! tx case header: Header => logger.debug(s"header: ${header.encodedId}") case payload: Payload => - logger.debug(s"payload: ${payload.encodedId} txs ${payload.txs.size}") cache ! RemoveConfirmedTransactions(payload.txs.map(_.encodedId).toList) - } } diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 763d090..b49a93b 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -13,19 +13,21 @@ class TransactionsController @Inject()(cc: ControllerComponents, (implicit ex: ExecutionContext) extends AbstractController(cc) with Circe { def getFullTransaction(id: String): Future[Option[FullFilledTransaction]] = - transactionsDao.transactionById(id).flatMap { - case Some(tx) => - val outputsF: Future[List[Output]] = transactionsDao.outputsByTransaction(tx.id) - val inputsF: Future[List[DBInput]] = transactionsDao.inputsByTransaction(tx.id) - val contractF: Future[List[Contract]] = transactionsDao.contractByTransaction(tx.id) - for { - outputs <- outputsF - inputs <- inputsF - contract <- contractF - } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) - - case _ => Future(Option.empty[FullFilledTransaction]) - } + transactionsDao.fullTransactionById(id) + +// transactionsDao.transactionById(id).flatMap { +// case Some(tx) => +// val outputsF: Future[List[Output]] = transactionsDao.outputsByTransaction(tx.id) +// val inputsF: Future[List[DBInput]] = transactionsDao.inputsByTransaction(tx.id) +// val contractF: Future[List[Contract]] = transactionsDao.contractByTransaction(tx.id) +// for { +// outputs <- outputsF +// inputs <- inputsF +// contract <- contractF +// } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) +// +// case _ => Future(Option.empty[FullFilledTransaction]) +// } def getTransaction(txId: String): Action[AnyContent] = Action.async { getFullTransaction(txId).map { diff --git a/app/models/TransactionsDao.scala b/app/models/TransactionsDao.scala index 6711fae..368bf7d 100644 --- a/app/models/TransactionsDao.scala +++ b/app/models/TransactionsDao.scala @@ -21,6 +21,10 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService } } + def fullTransactionById(id: String): Future[Option[FullFilledTransaction]] = { + cacheService.getFullTransactionById(id) + } + def outputById(id: String): Future[Option[Output]] = dbService.runAsync(getOutput(id)) def contractByTransaction(id: String): Future[List[Contract]] = dbService.runAsync(getContract(id)) diff --git a/app/models/database/CacheService.scala b/app/models/database/CacheService.scala index 574ba76..7d2b6f4 100644 --- a/app/models/database/CacheService.scala +++ b/app/models/database/CacheService.scala @@ -8,7 +8,7 @@ import play.api.Configuration import play.api.mvc._ import settings.ExplorerSettings import akka.pattern.ask -import models.DBTransaction +import models.{DBTransaction, FullFilledTransaction} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future @@ -23,4 +23,6 @@ class CacheService @Inject()(config: Configuration, settings: ExplorerSettings, def getTransactionById(id: String): Future[Option[DBTransaction]] = (cache ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx.map(_.transaction)) + def getFullTransactionById(id: String): Future[Option[FullFilledTransaction]] = + (cache ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx) } From 85b31699395078f0c06ace458edb7b210908a09c Mon Sep 17 00:00:00 2001 From: capdev Date: Mon, 21 Oct 2019 16:06:59 +0500 Subject: [PATCH 11/31] get transaction from cache/db --- app/actors/CacheActor.scala | 10 +++---- app/actors/ReceiverActor.scala | 20 ++++--------- app/controllers/TransactionsController.scala | 21 ++------------ app/models/Output.scala | 6 +--- app/models/TransactionsDao.scala | 30 ++++++++++++++++---- app/models/database/CacheService.scala | 14 +++++---- 6 files changed, 46 insertions(+), 55 deletions(-) diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala index 3db36dc..90ed795 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/CacheActor.scala @@ -1,6 +1,6 @@ package actors -import actors.CacheActor.{RemoveConfirmedTransactions, TransactionByIdA, TransactionByIdQ, UnconfTransactionsA, UnconfTransactionsQ} +import actors.CacheActor.{RemoveConfirmedTransactions, TransactionByIdA, TransactionByIdQ, TransactionsA, TransactionsQ} import akka.actor.{Actor, Props} import com.typesafe.scalalogging.StrictLogging import models.{Contract, DBInput, DBTransaction, FullFilledTransaction, Output} @@ -21,8 +21,8 @@ class CacheActor extends Actor { val unconfTranscaction = FullFilledTransaction(dbTransaction, dbInputs, dbOutputs, contracts) unconfTranscactions += tx.encodedId -> unconfTranscaction - case UnconfTransactionsQ() => - sender ! UnconfTransactionsA(unconfTranscactions.values.toList) + case TransactionsQ() => + sender ! TransactionsA(unconfTranscactions.values.toList) case TransactionByIdQ(id) => sender ! TransactionByIdA(unconfTranscactions.get(id)) @@ -34,8 +34,8 @@ class CacheActor extends Actor { } object CacheActor { - case class UnconfTransactionsQ() - case class UnconfTransactionsA(txs: List[FullFilledTransaction]) + case class TransactionsQ() + case class TransactionsA(txs: List[FullFilledTransaction]) case class TransactionByIdQ(id: String) case class TransactionByIdA(tx: Option[FullFilledTransaction]) diff --git a/app/actors/ReceiverActor.scala b/app/actors/ReceiverActor.scala index bbd6439..78fe049 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/ReceiverActor.scala @@ -4,31 +4,21 @@ import actors.CacheActor.RemoveConfirmedTransactions import akka.actor.{Actor, ActorRef, Props} import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} -import models.DBTransaction import org.encryfoundation.common.modifiers.history.{Header, Payload} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction class ReceiverActor @Inject()(@Named("cache") cache: ActorRef) extends Actor with StrictLogging { def receive: Receive = { - case tx: Transaction => - cache ! tx + case transaction: Transaction => + cache ! transaction - case header: Header => - logger.debug(s"header: ${header.encodedId}") - - case payload: Payload => - cache ! RemoveConfirmedTransactions(payload.txs.map(_.encodedId).toList) + case confirmedTransactionIds: List[String] => + cache ! RemoveConfirmedTransactions(confirmedTransactionIds) } } object ReceiverActor { def props(cache: ActorRef): Props = Props(new ReceiverActor(cache)) -} - -object ModifierMessages { - case class ModifierTx(tx: Transaction) - case class ModifierHeader(header: Header) - case class ModifierPayload(payload: Payload) -} +} \ No newline at end of file diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index b49a93b..4290e6d 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -12,32 +12,15 @@ class TransactionsController @Inject()(cc: ControllerComponents, transactionsDao: TransactionsDao) (implicit ex: ExecutionContext) extends AbstractController(cc) with Circe { - def getFullTransaction(id: String): Future[Option[FullFilledTransaction]] = - transactionsDao.fullTransactionById(id) - -// transactionsDao.transactionById(id).flatMap { -// case Some(tx) => -// val outputsF: Future[List[Output]] = transactionsDao.outputsByTransaction(tx.id) -// val inputsF: Future[List[DBInput]] = transactionsDao.inputsByTransaction(tx.id) -// val contractF: Future[List[Contract]] = transactionsDao.contractByTransaction(tx.id) -// for { -// outputs <- outputsF -// inputs <- inputsF -// contract <- contractF -// } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) -// -// case _ => Future(Option.empty[FullFilledTransaction]) -// } - def getTransaction(txId: String): Action[AnyContent] = Action.async { - getFullTransaction(txId).map { + transactionsDao.fullTransactionById(txId).map { case Some(tx) => Ok(views.html.transactionInfo(tx)) case None => NotFound } } def getUncomTransactions: Action[AnyContent] = Action.async { - transactionsDao.uncommittedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs))) + transactionsDao.unconfirmedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs))) } } \ No newline at end of file diff --git a/app/models/Output.scala b/app/models/Output.scala index b38a62c..91e59c4 100644 --- a/app/models/Output.scala +++ b/app/models/Output.scala @@ -1,14 +1,10 @@ package models -import io.circe.generic.auto._ -import io.circe.Encoder -import io.circe.syntax._ import models.Output.Proposition import org.encryfoundation.common.modifiers.mempool.transaction.EncryAddress.Address -import org.encryfoundation.common.modifiers.mempool.transaction.{EncryAddress, Transaction} +import org.encryfoundation.common.modifiers.mempool.transaction.Transaction import org.encryfoundation.common.modifiers.state.box.AssetBox import org.encryfoundation.common.utils.Algos -import org.encryfoundation.prismlang.core.Constants import settings.Utils case class Output(idx: Int, diff --git a/app/models/TransactionsDao.scala b/app/models/TransactionsDao.scala index 368bf7d..ec0ccc2 100644 --- a/app/models/TransactionsDao.scala +++ b/app/models/TransactionsDao.scala @@ -1,11 +1,10 @@ package models import javax.inject.Inject -import models.database.{CacheService, DBService} import models.database.TransactionsQueries._ +import models.database.{CacheService, DBService} import scala.concurrent.{ExecutionContext, Future} -import scala.util.{Failure, Success} class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService)(implicit ec: ExecutionContext) { @@ -16,18 +15,37 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService def outputsByTransaction(id: String): Future[List[Output]] = dbService.runAsync(getTransactionOutputs(id)) def transactionById(id: String): Future[Option[DBTransaction]] = { - cacheService.getTransactionById(id) andThen { - case Success(None) => dbService.runAsync(getTransactionById(id)) + cacheService.getTransactionById(id).flatMap { txOpt => + if(txOpt.isEmpty) dbService.runAsync(getTransactionById(id)) + else Future(txOpt) } } + private def getFullTransaction(id: String): Future[Option[FullFilledTransaction]] = + transactionById(id).flatMap { + case Some(tx) => + val outputsF: Future[List[Output]] = outputsByTransaction(tx.id) + val inputsF: Future[List[DBInput]] = inputsByTransaction(tx.id) + val contractF: Future[List[Contract]] = contractByTransaction(tx.id) + for { + outputs <- outputsF + inputs <- inputsF + contract <- contractF + } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) + + case _ => Future(Option.empty[FullFilledTransaction]) + } + def fullTransactionById(id: String): Future[Option[FullFilledTransaction]] = { - cacheService.getFullTransactionById(id) + cacheService.getFullTransactionById(id).flatMap { txOpt => + if(txOpt.isEmpty) getFullTransaction(id) + else Future(txOpt) + } } def outputById(id: String): Future[Option[Output]] = dbService.runAsync(getOutput(id)) def contractByTransaction(id: String): Future[List[Contract]] = dbService.runAsync(getContract(id)) - def uncommittedTransactions(): Future[List[DBTransaction]] = cacheService.getUncommittedTransactions + def unconfirmedTransactions(): Future[List[DBTransaction]] = cacheService.getUnconfirmedTransactions } diff --git a/app/models/database/CacheService.scala b/app/models/database/CacheService.scala index 7d2b6f4..fb3106f 100644 --- a/app/models/database/CacheService.scala +++ b/app/models/database/CacheService.scala @@ -1,6 +1,6 @@ package models.database -import actors.CacheActor.{TransactionByIdA, TransactionByIdQ, UnconfTransactionsA, UnconfTransactionsQ} +import actors.CacheActor.{TransactionByIdA, TransactionByIdQ, TransactionsA, TransactionsQ} import akka.actor.ActorRef import akka.util.Timeout import javax.inject._ @@ -17,12 +17,16 @@ import scala.concurrent.duration._ class CacheService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("cache") cache: ActorRef) { implicit val timeout: Timeout = 5 seconds - def getUncommittedTransactions: Future[List[DBTransaction]] = - (cache ? UnconfTransactionsQ()).mapTo[UnconfTransactionsA].map(_.txs.map(_.transaction)) + def getUnconfirmedTransactions: Future[List[DBTransaction]] = + (cache ? TransactionsQ()).mapTo[TransactionsA].map(_.txs.map(_.transaction)) + + + def transById(id: String): Future[Option[FullFilledTransaction]] = + (cache ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx) def getTransactionById(id: String): Future[Option[DBTransaction]] = - (cache ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx.map(_.transaction)) + transById(id).map(_.map(_.transaction)) def getFullTransactionById(id: String): Future[Option[FullFilledTransaction]] = - (cache ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx) + transById(id) } From 3d9186bd2d6a13f78a2127827a1d6e40b16b852f Mon Sep 17 00:00:00 2001 From: capdev Date: Mon, 21 Oct 2019 16:54:33 +0500 Subject: [PATCH 12/31] add expired interval for unconfirmed transactions --- app/actors/CacheActor.scala | 27 ++++++++++++++++++++------ app/models/database/CacheService.scala | 2 +- app/settings/ExplorerSettings.scala | 10 +++++++++- app/settings/PostgresSettings.scala | 5 ----- conf/application.conf | 4 ++++ 5 files changed, 35 insertions(+), 13 deletions(-) delete mode 100644 app/settings/PostgresSettings.scala diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala index 90ed795..f3b3163 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/CacheActor.scala @@ -1,17 +1,24 @@ package actors -import actors.CacheActor.{RemoveConfirmedTransactions, TransactionByIdA, TransactionByIdQ, TransactionsA, TransactionsQ} -import akka.actor.{Actor, Props} -import com.typesafe.scalalogging.StrictLogging -import models.{Contract, DBInput, DBTransaction, FullFilledTransaction, Output} +import actors.CacheActor._ +import akka.actor.{Actor, Props, Timers} +import javax.inject.Inject +import models._ import org.encryfoundation.common.modifiers.mempool.transaction.Transaction +import settings.ExplorerSettings import scala.collection.mutable +import scala.concurrent.duration._ -class CacheActor extends Actor { +class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers { var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map() + object Timer + object Tick + + timers.startPeriodicTimer(Timer, Tick, 20 seconds) + def receive: Receive = { case tx: Transaction => val dbTransaction = DBTransaction(tx, "") @@ -29,6 +36,14 @@ class CacheActor extends Actor { case RemoveConfirmedTransactions(txIds) => txIds.foreach(id => unconfTranscactions.remove(id)) + + case Tick => + val timestamp = System.currentTimeMillis() + val expiredTxIds = unconfTranscactions.values + .filter(tx => timestamp - tx.transaction.timestamp > settings.cache.unconfirmedTransactionExpiredInterval.toMillis) + .map(_.transaction.id) + expiredTxIds.foreach(unconfTranscactions.remove(_)) + } } @@ -42,5 +57,5 @@ object CacheActor { case class RemoveConfirmedTransactions(txIds: List[String]) - def props: Props = Props(new CacheActor) + //def props(unconfirmedTransactionExpiredInterval: FiniteDuration): Props = Props(new CacheActor(unconfirmedTransactionExpiredInterval)) } diff --git a/app/models/database/CacheService.scala b/app/models/database/CacheService.scala index fb3106f..1c9c910 100644 --- a/app/models/database/CacheService.scala +++ b/app/models/database/CacheService.scala @@ -14,7 +14,7 @@ import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import scala.concurrent.duration._ -class CacheService @Inject()(config: Configuration, settings: ExplorerSettings, @Named("cache") cache: ActorRef) { +class CacheService @Inject()(@Named("cache") cache: ActorRef) { implicit val timeout: Timeout = 5 seconds def getUnconfirmedTransactions: Future[List[DBTransaction]] = diff --git a/app/settings/ExplorerSettings.scala b/app/settings/ExplorerSettings.scala index 74202b8..1595dd7 100644 --- a/app/settings/ExplorerSettings.scala +++ b/app/settings/ExplorerSettings.scala @@ -1,3 +1,11 @@ package settings -case class ExplorerSettings(postgres: PostgresSettings) +import scala.concurrent.duration.FiniteDuration + +case class PostgresSettings(host: String, + user: String, + password: String) + +case class CacheSettings(unconfirmedTransactionExpiredInterval: FiniteDuration) + +case class ExplorerSettings(postgres: PostgresSettings, cache: CacheSettings) diff --git a/app/settings/PostgresSettings.scala b/app/settings/PostgresSettings.scala deleted file mode 100644 index 8036a1e..0000000 --- a/app/settings/PostgresSettings.scala +++ /dev/null @@ -1,5 +0,0 @@ -package settings - -case class PostgresSettings(host: String, - user: String, - password: String) \ No newline at end of file diff --git a/conf/application.conf b/conf/application.conf index 0a6c073..1056f25 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -4,6 +4,10 @@ encry { username = "" password = "" } + + cache { + unconfirmedTransactionExpiredInterval = 15m + } } play.modules { From 10868e535aa76ed8f649986fcd077f33e3334faf Mon Sep 17 00:00:00 2001 From: capdev Date: Mon, 21 Oct 2019 17:40:13 +0500 Subject: [PATCH 13/31] sort transaction rename --- app/actors/CacheActor.scala | 7 +++---- app/controllers/TransactionsController.scala | 2 +- app/views/index.scala.html | 2 +- app/views/main.scala.html | 2 +- ...ncomtransInfo.scala.html => unconftransInfo.scala.html} | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) rename app/views/{uncomtransInfo.scala.html => unconftransInfo.scala.html} (96%) diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala index f3b3163..01a5276 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/CacheActor.scala @@ -12,12 +12,13 @@ import scala.concurrent.duration._ class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers { + //TODO: store in sorted list, iterate until cond var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map() object Timer object Tick - timers.startPeriodicTimer(Timer, Tick, 20 seconds) + timers.startPeriodicTimer(Timer, Tick, 10 seconds) def receive: Receive = { case tx: Transaction => @@ -29,7 +30,7 @@ class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers unconfTranscactions += tx.encodedId -> unconfTranscaction case TransactionsQ() => - sender ! TransactionsA(unconfTranscactions.values.toList) + sender ! TransactionsA(unconfTranscactions.values.toList.sortBy(-_.transaction.timestamp)) case TransactionByIdQ(id) => sender ! TransactionByIdA(unconfTranscactions.get(id)) @@ -56,6 +57,4 @@ object CacheActor { case class TransactionByIdA(tx: Option[FullFilledTransaction]) case class RemoveConfirmedTransactions(txIds: List[String]) - - //def props(unconfirmedTransactionExpiredInterval: FiniteDuration): Props = Props(new CacheActor(unconfirmedTransactionExpiredInterval)) } diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 4290e6d..870f2d9 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -20,7 +20,7 @@ class TransactionsController @Inject()(cc: ControllerComponents, } def getUncomTransactions: Action[AnyContent] = Action.async { - transactionsDao.unconfirmedTransactions().map(txs => Ok(views.html.uncomtransInfo(txs))) + transactionsDao.unconfirmedTransactions().map(txs => Ok(views.html.unconftransInfo(txs))) } } \ No newline at end of file diff --git a/app/views/index.scala.html b/app/views/index.scala.html index fcfd737..64bc7cf 100644 --- a/app/views/index.scala.html +++ b/app/views/index.scala.html @@ -93,7 +93,7 @@
        • - Unconfirmed + Transactions
        • diff --git a/app/views/main.scala.html b/app/views/main.scala.html index c5b64a0..44b41c8 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -92,7 +92,7 @@
          • - Unconfirmed + Transactions
          • diff --git a/app/views/uncomtransInfo.scala.html b/app/views/unconftransInfo.scala.html similarity index 96% rename from app/views/uncomtransInfo.scala.html rename to app/views/unconftransInfo.scala.html index 1c733d3..60e85ec 100644 --- a/app/views/uncomtransInfo.scala.html +++ b/app/views/unconftransInfo.scala.html @@ -27,8 +27,8 @@

            Unconfirmed transactions

         - - + + From 455de9eba101c84e89e02f88f82067822e96b3f8 Mon Sep 17 00:00:00 2001 From: capdev Date: Mon, 21 Oct 2019 19:03:20 +0500 Subject: [PATCH 14/31] transactions pagination web --- app/controllers/TransactionsController.scala | 25 +++++++++++++++++-- app/views/index.scala.html | 2 +- app/views/main.scala.html | 2 +- ...nfo.scala.html => transactions.scala.html} | 24 ++++++++++++++++-- app/views/wallet.scala.html | 2 +- conf/routes | 5 ++-- 6 files changed, 51 insertions(+), 9 deletions(-) rename app/views/{unconftransInfo.scala.html => transactions.scala.html} (78%) diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 870f2d9..3ed17b6 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -1,6 +1,6 @@ package controllers -import models.{Contract, FullFilledTransaction, DBInput, Output, TransactionsDao} +import models.{Contract, DBInput, DBTransaction, FullFilledTransaction, Header, Output, TransactionsDao} import javax.inject.{Inject, Singleton} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} @@ -20,7 +20,28 @@ class TransactionsController @Inject()(cc: ControllerComponents, } def getUncomTransactions: Action[AnyContent] = Action.async { - transactionsDao.unconfirmedTransactions().map(txs => Ok(views.html.unconftransInfo(txs))) + transactionsDao.unconfirmedTransactions().map(txs => Ok(views.html.transactions(txs))) } + def indByTxId(txId: String): Int = { + 0 + } + + def transactionsPage(txId: String): Action[AnyContent] = Action.async { +// val range: Future[List[Header]] = historyDao.listHeadersByHeightRange(to) +// val height: Future[Option[Int]] = historyDao.lastHeights() +// +// val result: Future[(List[Header], Option[Int])] = for { +// rangeOpt <- range +// heightOpt <- height +// } yield (rangeOpt, heightOpt) +// +// result.map { +// case (rangeOpt, heightOpt) => Ok(views.html.index(rangeOpt, heightOpt.getOrElse(0))) +// case _ => NotFound +// } + Future(Ok(views.html.transactions(List[DBTransaction]()))) + } + + } \ No newline at end of file diff --git a/app/views/index.scala.html b/app/views/index.scala.html index 64bc7cf..1808bec 100644 --- a/app/views/index.scala.html +++ b/app/views/index.scala.html @@ -92,7 +92,7 @@
        • - + Transactions
          • diff --git a/app/views/main.scala.html b/app/views/main.scala.html index 44b41c8..ae0bdf2 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -91,7 +91,7 @@
          • - + Transactions
            • diff --git a/app/views/unconftransInfo.scala.html b/app/views/transactions.scala.html similarity index 78% rename from app/views/unconftransInfo.scala.html rename to app/views/transactions.scala.html index 60e85ec..9f03e11 100644 --- a/app/views/unconftransInfo.scala.html +++ b/app/views/transactions.scala.html @@ -15,13 +15,33 @@
            -
            -

            Unconfirmed transactions

            +
            +
            +

            Transactions

            +
            + +
            +
        Transaction idTransaction timestampTransaction feetimestampfee is CoinBase
        diff --git a/app/views/wallet.scala.html b/app/views/wallet.scala.html index 32e849f..887d98e 100644 --- a/app/views/wallet.scala.html +++ b/app/views/wallet.scala.html @@ -1,5 +1,5 @@ @import java.util.Date -@(wallet: List[Wallet], transaction: List[Transaction]) +@(wallet: List[Wallet], transaction: List[DBTransaction]) diff --git a/conf/routes b/conf/routes index e3caf0c..7884a11 100644 --- a/conf/routes +++ b/conf/routes @@ -6,5 +6,6 @@ GET /wallet/:contractHash/boxes/:from/:to controllers.WalletContro GET /search/:search controllers.SearchController.search(search:String) GET /wallet/:contractHash controllers.WalletController.getWalletByAddress(contractHash: String) GET /node controllers.NodeController.nodes() -GET /uncom_trans controllers.TransactionsController.getUncomTransactions() -GET /:to controllers.HomeController.listHeadersByHeightRangeApi(to: Int) \ No newline at end of file +GET /transactions controllers.TransactionsController.getUncomTransactions() +GET /:to controllers.HomeController.listHeadersByHeightRangeApi(to: Int) +GET /transactions/:txId controllers.TransactionsController.transactionsPage(txId: String) \ No newline at end of file From d3d533b9889d5242cf92e9d2aa41f9f4dc587023 Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 09:36:54 +0500 Subject: [PATCH 15/31] move dao to package --- app/controllers/BlockController.scala | 2 ++ app/controllers/HomeController.scala | 4 +++- app/controllers/NodeController.scala | 4 +++- app/controllers/SearchController.scala | 2 ++ app/controllers/TransactionsController.scala | 3 ++- app/controllers/WalletController.scala | 2 ++ app/models/{ => dao}/BoxesDao.scala | 2 +- app/models/{ => dao}/HistoryDao.scala | 5 +++-- app/models/{ => dao}/TransactionsDao.scala | 3 ++- 9 files changed, 20 insertions(+), 7 deletions(-) rename app/models/{ => dao}/BoxesDao.scala (97%) rename app/models/{ => dao}/HistoryDao.scala (93%) rename app/models/{ => dao}/TransactionsDao.scala (98%) diff --git a/app/controllers/BlockController.scala b/app/controllers/BlockController.scala index 5b11154..bba24d3 100644 --- a/app/controllers/BlockController.scala +++ b/app/controllers/BlockController.scala @@ -2,8 +2,10 @@ package controllers import javax.inject.{Inject, Singleton} import models._ +import models.dao.{HistoryDao, TransactionsDao} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} + import scala.concurrent.{ExecutionContext, Future} @Singleton diff --git a/app/controllers/HomeController.scala b/app/controllers/HomeController.scala index 6c0e73a..fbf9bec 100644 --- a/app/controllers/HomeController.scala +++ b/app/controllers/HomeController.scala @@ -2,8 +2,10 @@ package controllers import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, _} -import models.{Header, HistoryDao} +import models.Header +import models.dao.HistoryDao import play.api.mvc.{Action, _} + import scala.concurrent.{ExecutionContext, Future} @Singleton diff --git a/app/controllers/NodeController.scala b/app/controllers/NodeController.scala index 73acbd6..bed2bf8 100644 --- a/app/controllers/NodeController.scala +++ b/app/controllers/NodeController.scala @@ -1,8 +1,10 @@ package controllers import javax.inject.{Inject, _} -import models.{HistoryDao, Node} +import models.Node +import models.dao.HistoryDao import play.api.mvc._ + import scala.concurrent.ExecutionContext @Singleton diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index 3a37159..e6c0c3d 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -2,9 +2,11 @@ package controllers import models._ import javax.inject.{Inject, Singleton} +import models.dao.{BoxesDao, HistoryDao, TransactionsDao} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents, Result} import settings.Utils + import scala.concurrent.{ExecutionContext, Future} @Singleton diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 3ed17b6..38073e4 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -1,7 +1,8 @@ package controllers -import models.{Contract, DBInput, DBTransaction, FullFilledTransaction, Header, Output, TransactionsDao} +import models.{Contract, DBInput, DBTransaction, FullFilledTransaction, Header, Output} import javax.inject.{Inject, Singleton} +import models.dao.TransactionsDao import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} diff --git a/app/controllers/WalletController.scala b/app/controllers/WalletController.scala index 4205aec..a601446 100644 --- a/app/controllers/WalletController.scala +++ b/app/controllers/WalletController.scala @@ -4,9 +4,11 @@ import com.typesafe.scalalogging.StrictLogging import javax.inject.Inject import models._ import play.api.libs.circe.Circe + import scala.concurrent._ import io.circe.generic.auto._ import io.circe.syntax._ +import models.dao.{BoxesDao, TransactionsDao} import play.api.mvc._ import settings.Utils diff --git a/app/models/BoxesDao.scala b/app/models/dao/BoxesDao.scala similarity index 97% rename from app/models/BoxesDao.scala rename to app/models/dao/BoxesDao.scala index e8f190b..6b4ebb9 100644 --- a/app/models/BoxesDao.scala +++ b/app/models/dao/BoxesDao.scala @@ -1,4 +1,4 @@ -package models +package models.dao import javax.inject.Inject import models.database.{BoxesQueries, DBService, WalletQueries} diff --git a/app/models/HistoryDao.scala b/app/models/dao/HistoryDao.scala similarity index 93% rename from app/models/HistoryDao.scala rename to app/models/dao/HistoryDao.scala index 7602aac..a172061 100644 --- a/app/models/HistoryDao.scala +++ b/app/models/dao/HistoryDao.scala @@ -1,8 +1,9 @@ -package models +package models.dao import javax.inject.Inject -import models.database.{DBService, NodeQueries} import models.database.HeaderQueries._ +import models.database.{DBService, NodeQueries} +import models.{Header, Node} import scala.concurrent.{ExecutionContext, Future} diff --git a/app/models/TransactionsDao.scala b/app/models/dao/TransactionsDao.scala similarity index 98% rename from app/models/TransactionsDao.scala rename to app/models/dao/TransactionsDao.scala index ec0ccc2..f456149 100644 --- a/app/models/TransactionsDao.scala +++ b/app/models/dao/TransactionsDao.scala @@ -1,8 +1,9 @@ -package models +package models.dao import javax.inject.Inject import models.database.TransactionsQueries._ import models.database.{CacheService, DBService} +import models._ import scala.concurrent.{ExecutionContext, Future} From afd07dccc381bb6e26694cf9b908fd1c5448f5e5 Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 11:32:40 +0500 Subject: [PATCH 16/31] transactions pagination test transactions gen --- app/actors/CacheActor.scala | 19 ++++++++---- app/controllers/TransactionsController.scala | 31 +++++--------------- app/models/dao/BoxesDao.scala | 1 + app/models/dao/TransactionsDao.scala | 2 +- app/models/database/CacheService.scala | 4 +-- app/views/index.scala.html | 2 +- app/views/main.scala.html | 2 +- app/views/transactions.scala.html | 9 ++++-- conf/routes | 5 ++-- 9 files changed, 36 insertions(+), 39 deletions(-) diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala index 01a5276..b862dad 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/CacheActor.scala @@ -13,7 +13,11 @@ import scala.concurrent.duration._ class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers { //TODO: store in sorted list, iterate until cond - var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map() + var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map[String, FullFilledTransaction]( +// (0 until 120).foldLeft(List[FullFilledTransaction]()) { (acc, n) => +// acc :+ FullFilledTransaction(DBTransaction(s"id$n", 3, "qweqwe", false, System.currentTimeMillis(), None), List(), List(), List()) +// }.map(t => t.transaction.id -> t): _* + ) object Timer object Tick @@ -29,8 +33,14 @@ class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers val unconfTranscaction = FullFilledTransaction(dbTransaction, dbInputs, dbOutputs, contracts) unconfTranscactions += tx.encodedId -> unconfTranscaction - case TransactionsQ() => - sender ! TransactionsA(unconfTranscactions.values.toList.sortBy(-_.transaction.timestamp)) + case TransactionsQ(from, to) => + val fromBound = if (from >= 0) from else 0 + val toBound = if (to <= unconfTranscactions.size) to else unconfTranscactions.size + + val txs = unconfTranscactions.values.toList + .sortBy(-_.transaction.timestamp) + .slice(if (fromBound <= toBound) fromBound else toBound, toBound) + sender ! TransactionsA(txs) case TransactionByIdQ(id) => sender ! TransactionByIdA(unconfTranscactions.get(id)) @@ -44,13 +54,12 @@ class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers .filter(tx => timestamp - tx.transaction.timestamp > settings.cache.unconfirmedTransactionExpiredInterval.toMillis) .map(_.transaction.id) expiredTxIds.foreach(unconfTranscactions.remove(_)) - } } object CacheActor { - case class TransactionsQ() + case class TransactionsQ(from: Int, to: Int) case class TransactionsA(txs: List[FullFilledTransaction]) case class TransactionByIdQ(id: String) diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 38073e4..a7b6cfd 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -13,6 +13,8 @@ class TransactionsController @Inject()(cc: ControllerComponents, transactionsDao: TransactionsDao) (implicit ex: ExecutionContext) extends AbstractController(cc) with Circe { + val TRANSACTION_PER_PAGE = 50 + def getTransaction(txId: String): Action[AnyContent] = Action.async { transactionsDao.fullTransactionById(txId).map { case Some(tx) => Ok(views.html.transactionInfo(tx)) @@ -20,29 +22,12 @@ class TransactionsController @Inject()(cc: ControllerComponents, } } - def getUncomTransactions: Action[AnyContent] = Action.async { - transactionsDao.unconfirmedTransactions().map(txs => Ok(views.html.transactions(txs))) - } - - def indByTxId(txId: String): Int = { - 0 - } - - def transactionsPage(txId: String): Action[AnyContent] = Action.async { -// val range: Future[List[Header]] = historyDao.listHeadersByHeightRange(to) -// val height: Future[Option[Int]] = historyDao.lastHeights() -// -// val result: Future[(List[Header], Option[Int])] = for { -// rangeOpt <- range -// heightOpt <- height -// } yield (rangeOpt, heightOpt) -// -// result.map { -// case (rangeOpt, heightOpt) => Ok(views.html.index(rangeOpt, heightOpt.getOrElse(0))) -// case _ => NotFound -// } - Future(Ok(views.html.transactions(List[DBTransaction]()))) + def getUnconfirmedTransactions(page: Int): Action[AnyContent] = Action.async { + val from = page * TRANSACTION_PER_PAGE + val to = (page + 1) * TRANSACTION_PER_PAGE + transactionsDao.unconfirmedTransactions(from, to).map { txs => + Ok(views.html.transactions(txs, page)) + } } - } \ No newline at end of file diff --git a/app/models/dao/BoxesDao.scala b/app/models/dao/BoxesDao.scala index 6b4ebb9..5071f29 100644 --- a/app/models/dao/BoxesDao.scala +++ b/app/models/dao/BoxesDao.scala @@ -1,6 +1,7 @@ package models.dao import javax.inject.Inject +import models.{DBTransaction, Output, Wallet} import models.database.{BoxesQueries, DBService, WalletQueries} import scala.concurrent.{ExecutionContext, Future} diff --git a/app/models/dao/TransactionsDao.scala b/app/models/dao/TransactionsDao.scala index f456149..dbc77e0 100644 --- a/app/models/dao/TransactionsDao.scala +++ b/app/models/dao/TransactionsDao.scala @@ -48,5 +48,5 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService def contractByTransaction(id: String): Future[List[Contract]] = dbService.runAsync(getContract(id)) - def unconfirmedTransactions(): Future[List[DBTransaction]] = cacheService.getUnconfirmedTransactions + def unconfirmedTransactions(from: Int, to: Int): Future[List[DBTransaction]] = cacheService.getUnconfirmedTransactions(from, to) } diff --git a/app/models/database/CacheService.scala b/app/models/database/CacheService.scala index 1c9c910..6dab542 100644 --- a/app/models/database/CacheService.scala +++ b/app/models/database/CacheService.scala @@ -17,8 +17,8 @@ import scala.concurrent.duration._ class CacheService @Inject()(@Named("cache") cache: ActorRef) { implicit val timeout: Timeout = 5 seconds - def getUnconfirmedTransactions: Future[List[DBTransaction]] = - (cache ? TransactionsQ()).mapTo[TransactionsA].map(_.txs.map(_.transaction)) + def getUnconfirmedTransactions(from: Int, to: Int): Future[List[DBTransaction]] = + (cache ? TransactionsQ(from, to)).mapTo[TransactionsA].map(_.txs.map(_.transaction)) def transById(id: String): Future[Option[FullFilledTransaction]] = diff --git a/app/views/index.scala.html b/app/views/index.scala.html index 1808bec..a843041 100644 --- a/app/views/index.scala.html +++ b/app/views/index.scala.html @@ -92,7 +92,7 @@
        • - + Transactions
          • diff --git a/app/views/main.scala.html b/app/views/main.scala.html index ae0bdf2..b86cecd 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -91,7 +91,7 @@
          • - + Transactions
            • diff --git a/app/views/transactions.scala.html b/app/views/transactions.scala.html index 9f03e11..445e9a8 100644 --- a/app/views/transactions.scala.html +++ b/app/views/transactions.scala.html @@ -1,5 +1,5 @@ @import java.util.Date -@(txs: List[DBTransaction]) +@(txs: List[DBTransaction], page: Int) @main {
            @@ -26,13 +26,16 @@

            Transactions

         diff --git a/app/views/transactionInfo.scala.html b/app/views/transactionInfo.scala.html index 071ab41..95a3aaf 100644 --- a/app/views/transactionInfo.scala.html +++ b/app/views/transactionInfo.scala.html @@ -272,7 +272,7 @@

        Transaction Inputs

        - + @@ -286,7 +286,7 @@

        Transaction Inputs

        @@ -208,7 +208,7 @@

        Transaction Info

        @@ -232,7 +232,7 @@

        Transaction Info

        @@ -246,7 +246,7 @@

        Transaction Info

        diff --git a/app/views/transactions.scala.html b/app/views/transactions.scala.html index 445e9a8..7bc2a18 100644 --- a/app/views/transactions.scala.html +++ b/app/views/transactions.scala.html @@ -52,7 +52,6 @@

        Transactions

        - @@ -74,13 +73,6 @@

        Transactions

        @tx.fee - } From ea63595092ce9d53053e3040213bff9379982d28 Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 16:06:50 +0500 Subject: [PATCH 19/31] rename Output --- app/controllers/NodeController.scala | 2 +- app/controllers/SearchController.scala | 4 +-- app/controllers/TransactionsController.scala | 3 +- app/controllers/WalletController.scala | 2 +- app/models/{Output.scala => DBOutput.scala} | 32 +++++++++---------- app/models/DBTransaction.scala | 4 +-- app/models/dao/BoxesDao.scala | 4 +-- app/models/dao/TransactionsDao.scala | 6 ++-- app/models/database/BoxesQueries.scala | 14 ++++---- app/models/database/TransactionsQueries.scala | 10 +++--- 10 files changed, 40 insertions(+), 41 deletions(-) rename app/models/{Output.scala => DBOutput.scala} (65%) diff --git a/app/controllers/NodeController.scala b/app/controllers/NodeController.scala index bed2bf8..52091b7 100644 --- a/app/controllers/NodeController.scala +++ b/app/controllers/NodeController.scala @@ -15,7 +15,7 @@ class NodeController @Inject()(cc: ControllerComponents, def nodes(): Action[AnyContent] = Action.async { historyDao.getAllNodes.map { case Nil => NotFound - case node: List[Node] => Ok(views.html.nodeInfo(node)) + case node: List[Node] => Ok(views.html.nodes(node)) } } } diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index e6c0c3d..9f1bee0 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -31,7 +31,7 @@ class SearchController @Inject()(cc: ControllerComponents, def getFullTransaction(id: String): Future[Option[FullFilledTransaction]] = transactionsDao.transactionById(id).flatMap { case Some(tx) => - val outputsF: Future[List[Output]] = transactionsDao.outputsByTransaction(tx.id) + val outputsF: Future[List[DBOutput]] = transactionsDao.outputsByTransaction(tx.id) val inputsF: Future[List[DBInput]] = transactionsDao.inputsByTransaction(tx.id) val contractF: Future[List[Contract]] = transactionsDao.contractByTransaction(tx.id) for { @@ -47,7 +47,7 @@ class SearchController @Inject()(cc: ControllerComponents, val blockF: Future[Option[Block]] = getBlock(id) val transactionF: Future[Option[FullFilledTransaction]] = getFullTransaction(id) - val outputF: Future[Option[Output]] = transactionsDao.outputById(id) + val outputF: Future[Option[DBOutput]] = transactionsDao.outputById(id) val walletF: Future[List[Wallet]] = boxesDao.getWalletByHash(Utils.contractHashByAddress(id)) val txIdF: Future[List[String]] = boxesDao.getTxsIdByHash(Utils.contractHashByAddress(id)) val txsF: Future[List[DBTransaction]] = txIdF.flatMap(x => Future.sequence(x.map(id => boxesDao.getLastTxById(id)))) diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 8a7a3b5..2e92ccf 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -1,12 +1,11 @@ package controllers -import models.{Contract, DBInput, DBTransaction, FullFilledTransaction, Header, Output} import javax.inject.{Inject, Singleton} import models.dao.TransactionsDao import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} -import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.ExecutionContext @Singleton class TransactionsController @Inject()(cc: ControllerComponents, diff --git a/app/controllers/WalletController.scala b/app/controllers/WalletController.scala index a601446..91340d2 100644 --- a/app/controllers/WalletController.scala +++ b/app/controllers/WalletController.scala @@ -20,7 +20,7 @@ class WalletController @Inject()(cc: ControllerComponents, def info(contractHash: String, from: Int, to: Int): Action[AnyContent] = Action.async { boxesDao.getBoxesByContractHash(contractHash, from: Int, to: Int).map { case Nil => NotFound - case list: List[Output] => Ok(list.asJson) + case list: List[DBOutput] => Ok(list.asJson) } } diff --git a/app/models/Output.scala b/app/models/DBOutput.scala similarity index 65% rename from app/models/Output.scala rename to app/models/DBOutput.scala index 29fc215..4a594bd 100644 --- a/app/models/Output.scala +++ b/app/models/DBOutput.scala @@ -1,6 +1,6 @@ package models -import models.Output.Proposition +import models.DBOutput.Proposition import org.encryfoundation.common.modifiers.mempool.directive.TransferDirective import org.encryfoundation.common.modifiers.mempool.transaction.EncryAddress.Address import org.encryfoundation.common.modifiers.mempool.transaction.Transaction @@ -8,19 +8,19 @@ import org.encryfoundation.common.modifiers.state.box.{AssetBox, DataBox} import org.encryfoundation.common.utils.Algos import settings.Utils -case class Output(idx: Int, - id: String, - `type`: Long, - txId: String, - value: Long, - nonce: Long, - tokenId: String, - proposition: Proposition, - data: String, - isActive: Boolean, - minerAddress: String) +case class DBOutput(idx: Int, + id: String, + `type`: Long, + txId: String, + value: Long, + nonce: Long, + tokenId: String, + proposition: Proposition, + data: String, + isActive: Boolean, + minerAddress: String) -object Output { +object DBOutput { case class Proposition(contractHash: String) @@ -34,9 +34,9 @@ object Output { proposition: String, data: String, isActive: Boolean, - minerAddress: String): Output = new Output(idx, id, `type`, txId, value, nonce, tokenId, Proposition(proposition), data, isActive, minerAddress) + minerAddress: String): DBOutput = new DBOutput(idx, id, `type`, txId, value, nonce, tokenId, Proposition(proposition), data, isActive, minerAddress) - def apply(tx: Transaction): List[Output] = { + def apply(tx: Transaction): List[DBOutput] = { tx.directives.toList.collect { case TransferDirective(address, amount, tokenIdOpt) => address } @@ -54,7 +54,7 @@ object Output { case _ => None } - new Output(idx, Algos.encode(box.id), box.typeId, tx.encodedId, amount, box.nonce, tokenId, + new DBOutput(idx, Algos.encode(box.id), box.typeId, tx.encodedId, amount, box.nonce, tokenId, Proposition(Algos.encode(box.proposition.contractHash)), data, true, address.getOrElse("")) } } diff --git a/app/models/DBTransaction.scala b/app/models/DBTransaction.scala index 1a6aa9f..35408c1 100644 --- a/app/models/DBTransaction.scala +++ b/app/models/DBTransaction.scala @@ -32,14 +32,14 @@ object DBTransaction { ) } -case class FullFilledTransaction(transaction: DBTransaction, inputs: List[DBInput], output: List[Output], contract: List[Contract]) +case class FullFilledTransaction(transaction: DBTransaction, inputs: List[DBInput], output: List[DBOutput], contract: List[Contract]) object FullFilledTransaction { def apply(tx: Transaction): FullFilledTransaction = { val dbTransaction = DBTransaction(tx, "") val dbInputs = tx.inputs.map(input => DBInput(input, tx.encodedId)).toList - val dbOutputs = Output(tx) + val dbOutputs = DBOutput(tx) val contracts = dbInputs.map(input => Contract(input.contractHash)).distinct FullFilledTransaction(dbTransaction, dbInputs, dbOutputs, contracts) } diff --git a/app/models/dao/BoxesDao.scala b/app/models/dao/BoxesDao.scala index 5071f29..136b025 100644 --- a/app/models/dao/BoxesDao.scala +++ b/app/models/dao/BoxesDao.scala @@ -1,14 +1,14 @@ package models.dao import javax.inject.Inject -import models.{DBTransaction, Output, Wallet} +import models.{DBTransaction, DBOutput, Wallet} import models.database.{BoxesQueries, DBService, WalletQueries} import scala.concurrent.{ExecutionContext, Future} class BoxesDao @Inject()(dBService: DBService)(implicit ec: ExecutionContext){ - def getBoxesByContractHash(contractHash: String, from: Int, to: Int): Future[List[Output]] = + def getBoxesByContractHash(contractHash: String, from: Int, to: Int): Future[List[DBOutput]] = dBService.runAsync(BoxesQueries.getBoxesByContractHash(contractHash, from, to)) def getWalletByHash(contractHash: String): Future[List[Wallet]] = diff --git a/app/models/dao/TransactionsDao.scala b/app/models/dao/TransactionsDao.scala index dbc77e0..0eaf13e 100644 --- a/app/models/dao/TransactionsDao.scala +++ b/app/models/dao/TransactionsDao.scala @@ -13,7 +13,7 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService def inputsByTransaction(id: String): Future[List[DBInput]] = dbService.runAsync(getTransactionInputs(id)) - def outputsByTransaction(id: String): Future[List[Output]] = dbService.runAsync(getTransactionOutputs(id)) + def outputsByTransaction(id: String): Future[List[DBOutput]] = dbService.runAsync(getTransactionOutputs(id)) def transactionById(id: String): Future[Option[DBTransaction]] = { cacheService.getTransactionById(id).flatMap { txOpt => @@ -25,7 +25,7 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService private def getFullTransaction(id: String): Future[Option[FullFilledTransaction]] = transactionById(id).flatMap { case Some(tx) => - val outputsF: Future[List[Output]] = outputsByTransaction(tx.id) + val outputsF: Future[List[DBOutput]] = outputsByTransaction(tx.id) val inputsF: Future[List[DBInput]] = inputsByTransaction(tx.id) val contractF: Future[List[Contract]] = contractByTransaction(tx.id) for { @@ -44,7 +44,7 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService } } - def outputById(id: String): Future[Option[Output]] = dbService.runAsync(getOutput(id)) + def outputById(id: String): Future[Option[DBOutput]] = dbService.runAsync(getOutput(id)) def contractByTransaction(id: String): Future[List[Contract]] = dbService.runAsync(getContract(id)) diff --git a/app/models/database/BoxesQueries.scala b/app/models/database/BoxesQueries.scala index ec97ffa..1d5a587 100644 --- a/app/models/database/BoxesQueries.scala +++ b/app/models/database/BoxesQueries.scala @@ -2,7 +2,7 @@ package models.database import doobie._ import doobie.implicits._ -import models.Output +import models.DBOutput object BoxesQueries { @@ -12,12 +12,12 @@ object BoxesQueries { def a(nodeIp: String) = sql"SELECT * FROM outputs WHERE outputsToNodes.nodeIp = $nodeIp AND outputsToNodes.outputId = outputs.id" - def getAvailableBoxByBoxId(boxId: String): ConnectionIO[Option[Output]] = - sql"SELECT * FROM outputs WHERE id = $boxId AND outputs.isActive = true".query[Output].to[List].map(_.headOption) + def getAvailableBoxByBoxId(boxId: String): ConnectionIO[Option[DBOutput]] = + sql"SELECT * FROM outputs WHERE id = $boxId AND outputs.isActive = true".query[DBOutput].to[List].map(_.headOption) - def getNumberOfAvailableBoxesByBoxId(boxId: String, numberOf: Int): ConnectionIO[Option[Output]] = - sql"SELECT * FROM outputs WHERE id = $boxId AND outputs.isActive = true".query[Output].to[List].map(_.headOption) + def getNumberOfAvailableBoxesByBoxId(boxId: String, numberOf: Int): ConnectionIO[Option[DBOutput]] = + sql"SELECT * FROM outputs WHERE id = $boxId AND outputs.isActive = true".query[DBOutput].to[List].map(_.headOption) - def getBoxesByContractHash(contractHash: String, from: Int, to: Int): ConnectionIO[List[Output]] = - sql"SELECT * FROM outputs WHERE contractHash = $contractHash AND outputs.isActive = true limit ${to - from} offset $from".query[Output].to[List] + def getBoxesByContractHash(contractHash: String, from: Int, to: Int): ConnectionIO[List[DBOutput]] = + sql"SELECT * FROM outputs WHERE contractHash = $contractHash AND outputs.isActive = true limit ${to - from} offset $from".query[DBOutput].to[List] } diff --git a/app/models/database/TransactionsQueries.scala b/app/models/database/TransactionsQueries.scala index 4d4268a..3d699cc 100644 --- a/app/models/database/TransactionsQueries.scala +++ b/app/models/database/TransactionsQueries.scala @@ -1,7 +1,7 @@ package models.database import doobie.implicits._ -import models.{Contract, DBInput, Output, DBTransaction} +import models.{Contract, DBInput, DBOutput, DBTransaction} object TransactionsQueries { @@ -11,14 +11,14 @@ object TransactionsQueries { def getTransactionInputs(transactionId: String): doobie.ConnectionIO[List[DBInput]] = sql"SELECT * FROM inputs WHERE txId = $transactionId".query[DBInput].to[List] - def getTransactionOutputs(transactionId: String): doobie.ConnectionIO[List[Output]] = - sql"SELECT * FROM outputs WHERE txId = $transactionId".query[Output].to[List] + def getTransactionOutputs(transactionId: String): doobie.ConnectionIO[List[DBOutput]] = + sql"SELECT * FROM outputs WHERE txId = $transactionId".query[DBOutput].to[List] def getTransactionById(transactionId: String): doobie.ConnectionIO[Option[DBTransaction]] = sql"SELECT * FROM transactions WHERE id = $transactionId".query[DBTransaction].to[List].map(_.headOption) - def getOutput(id: String): doobie.ConnectionIO[Option[Output]] = - sql"SELECT * FROM outputs WHERE id = $id".query[Output].to[List].map(_.headOption) + def getOutput(id: String): doobie.ConnectionIO[Option[DBOutput]] = + sql"SELECT * FROM outputs WHERE id = $id".query[DBOutput].to[List].map(_.headOption) def getContract(transactionId: String): doobie.ConnectionIO[List[Contract]] = sql"select * from contracts where hash IN (select contract from inputs where txId = $transactionId)".query[Contract].to[List] From 35f4ec3437f69f17c10c7f0bfb199755d0902886 Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 16:07:16 +0500 Subject: [PATCH 20/31] fix layouts --- app/views/blockInfo.scala.html | 631 ++++++++++----------------- app/views/content_main.scala.html | 192 ++++++++ app/views/index.scala.html | 175 +------- app/views/main.scala.html | 1 - app/views/nodeInfo.scala.html | 237 ---------- app/views/nodes.scala.html | 90 ++++ app/views/outputInfo.scala.html | 2 +- app/views/transactionInfo.scala.html | 556 ++++++++--------------- 8 files changed, 704 insertions(+), 1180 deletions(-) create mode 100644 app/views/content_main.scala.html delete mode 100644 app/views/nodeInfo.scala.html create mode 100644 app/views/nodes.scala.html diff --git a/app/views/blockInfo.scala.html b/app/views/blockInfo.scala.html index c233f0d..6c38855 100644 --- a/app/views/blockInfo.scala.html +++ b/app/views/blockInfo.scala.html @@ -1,429 +1,254 @@ @import java.util.Date @(block: Block) +@content_main { - - - - - - - - Encry Explorer - - - - - - - - - - - - - - - -
        - - - -
        - -
        - -
        -
        -
        -
        -

        Block

        -
        -
        -
        - @output.proposition + @output.proposition.contractHash
        Input IDInput contractInput contract hash Input proofs
        - @tx.contract.map(_.contract) + @tx.contract.map(_.hash).mkString(",") @@ -344,7 +344,7 @@

        Transaction Outputs

        		 - @output.proposition + @output.proposition.contractHash From 33615353faea5d94e7e11b4ca1695d7a0ccf25ae Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 14:08:23 +0500 Subject: [PATCH 18/31] fix Output fix titles --- app/actors/CacheActor.scala | 6 +----- app/models/DBTransaction.scala | 2 +- app/models/Output.scala | 30 ++++++++++++++++++---------- app/views/transactionInfo.scala.html | 8 ++++---- app/views/transactions.scala.html | 8 -------- 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/app/actors/CacheActor.scala b/app/actors/CacheActor.scala index f77b87e..94d7b36 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/CacheActor.scala @@ -13,11 +13,7 @@ import scala.concurrent.duration._ class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers { //TODO: store in sorted list, iterate until cond - var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map[String, FullFilledTransaction]( -// (0 until 120).foldLeft(List[FullFilledTransaction]()) { (acc, n) => -// acc :+ FullFilledTransaction(DBTransaction(s"id$n", 3, "qweqwe", false, System.currentTimeMillis(), None), List(), List(), List()) -// }.map(t => t.transaction.id -> t): _* - ) + var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map[String, FullFilledTransaction]() object Timer object Tick diff --git a/app/models/DBTransaction.scala b/app/models/DBTransaction.scala index c0ee055..1a6aa9f 100644 --- a/app/models/DBTransaction.scala +++ b/app/models/DBTransaction.scala @@ -39,7 +39,7 @@ object FullFilledTransaction { def apply(tx: Transaction): FullFilledTransaction = { val dbTransaction = DBTransaction(tx, "") val dbInputs = tx.inputs.map(input => DBInput(input, tx.encodedId)).toList - val dbOutputs = Output.getOutputs(tx, "minerAddress") + val dbOutputs = Output(tx) val contracts = dbInputs.map(input => Contract(input.contractHash)).distinct FullFilledTransaction(dbTransaction, dbInputs, dbOutputs, contracts) } diff --git a/app/models/Output.scala b/app/models/Output.scala index 91e59c4..29fc215 100644 --- a/app/models/Output.scala +++ b/app/models/Output.scala @@ -1,9 +1,10 @@ package models import models.Output.Proposition +import org.encryfoundation.common.modifiers.mempool.directive.TransferDirective import org.encryfoundation.common.modifiers.mempool.transaction.EncryAddress.Address import org.encryfoundation.common.modifiers.mempool.transaction.Transaction -import org.encryfoundation.common.modifiers.state.box.AssetBox +import org.encryfoundation.common.modifiers.state.box.{AssetBox, DataBox} import org.encryfoundation.common.utils.Algos import settings.Utils @@ -19,7 +20,7 @@ case class Output(idx: Int, isActive: Boolean, minerAddress: String) -object Output{ +object Output { case class Proposition(contractHash: String) @@ -35,17 +36,26 @@ object Output{ isActive: Boolean, minerAddress: String): Output = new Output(idx, id, `type`, txId, value, nonce, tokenId, Proposition(proposition), data, isActive, minerAddress) - def getOutputs(tx: Transaction, minerAddress: Address): List[Output] = { - //val box: EncryBaseBox = directive.boxes(Digest32 @@ Algos.decode(tx.id).getOrElse(Array.emptyByteArray), idx) + def apply(tx: Transaction): List[Output] = { + tx.directives.toList.collect { + case TransferDirective(address, amount, tokenIdOpt) => address + } + tx.newBoxes.toList.zipWithIndex.map { case(box, idx) => - val (amount, tokenId) = box match { + val (amount, tokenId, data) = box match { case box: AssetBox => - (box.amount, Algos.encode(box.tokenIdOpt.getOrElse(Utils.IntrinsicTokenId))) - case _ => (0L, "") + (box.amount, Algos.encode(box.tokenIdOpt.getOrElse(Utils.IntrinsicTokenId)), "") + case box: DataBox => + (0L, "", Algos.encode(box.data)) + case _ => (0L, "", "") } - new Output(idx, tx.encodedId, box.typeId, tx.encodedId, amount, box.nonce, tokenId, - Proposition(Algos.encode(box.proposition.contractHash)), - "box.data", true, minerAddress) + val address: Option[Address] = tx.directives(idx) match { + case d: TransferDirective => Some(d.address) + case _ => None + } + + new Output(idx, Algos.encode(box.id), box.typeId, tx.encodedId, amount, box.nonce, tokenId, + Proposition(Algos.encode(box.proposition.contractHash)), data, true, address.getOrElse("")) } } } \ No newline at end of file diff --git a/app/views/transactionInfo.scala.html b/app/views/transactionInfo.scala.html index 95a3aaf..925525a 100644 --- a/app/views/transactionInfo.scala.html +++ b/app/views/transactionInfo.scala.html @@ -196,7 +196,7 @@

        Transaction Info
        - Transaction id + ID
        - Transaction fee + fee
        - Transaction timestamp + Timestamp
        - Transaction defaultProofOpt + Proof
        		Transaction id timestamp feeis CoinBase
        - - @{ - if(tx.isCoinbase) "Yes" else None - } - -
        - - - - - - - - - - - - - - - + + + + + + + + +
        -
        -
        - Block ID -
        -
        -         		- @block.header.id -
        -
        -
        - Version -
        -
        -         		- @block.header.version -
        -
        -
        - Parent ID -
        -
        -         		- @block.header.parentId -
        -
        -
        - Transactions Root +
        + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - -
        +
        +
        + Block ID +
        +
        +         		+ @block.header.id +
        +
        +
        + Version +
        +
        +         		+ @block.header.version +
        +
        +
        + Parent ID +
        +
        +         		+ @block.header.parentId +
        +
        +
        + Transactions Root -
        -
        -         		- @block.header.transactionsRoot -
        -
        -
        - Timestamp -
        -
        -         		- @{ - new Date(block.header.timestamp).format("yyyy-MM-dd HH:mm:ss") - } -
        -
        -
        - Height -
        -
        -         		- @block.header.height -
        -
        -
        - Nonce -
        -
        -         		- @block.header.nonce -
        -
        -
        - Difficulty -
        -
        -         		- @block.header.difficulty -
        -
        -
        - EquihashSolution -
        -
        -         		- @block.header.equihashSolution -
        + @block.header.transactionsRoot +
        +
        +
        + Timestamp +
        +
        +         		+ @{ + new Date(block.header.timestamp).format("yyyy-MM-dd HH:mm:ss") + } +
        +
        +
        + Height +
        +
        +         		+ @block.header.height +
        +
        +
        + Nonce +
        +
        +         		+ @block.header.nonce +
        +
        +
        + Difficulty +
        +
        +         		+ @block.header.difficulty +
        +
        +
        + EquihashSolution +
        +
        +         		+ @block.header.equihashSolution +
        -
        -
        - Miner Address -
        -
        -         		- @block.header.minerAddress -
        -
        -
        - Miner Reward -
        -
        -         		- @block.header.minerReward -
        -
        -
        +
        +
        +
        + Miner Address +
        +
        +         		+ @block.header.minerAddress +
        +
        +
        + Miner Reward +
        +
        +         		+ @block.header.minerReward +
        - -
        -
        -
        -
        -

        Block Transactions

        -
        -
        - - - - - - - - - - - @for(tx <- block.payload) { - - - + + } + +
        Transaction idTransaction timestampTransaction feeis CoinBase
        - - @tx.id - + + + +
        +
        +
        +
        +

        Block Transactions

        +
        +
        + + + + + + + + + + + @for(tx <- block.payload) { + + + - + - + - - } - -
        Transaction idTransaction timestampTransaction feeis CoinBase
        + + @tx.id + @{ new Date(tx.timestamp).format("yyyy-MM-dd HH:mm:ss") } - + @tx.fee - + @{ if(tx.isCoinbase) "Yes" else None } -
        -
        -
        +
        - -
        - - - - - - - - - \ No newline at end of file + + +
        + +} \ No newline at end of file diff --git a/app/views/content_main.scala.html b/app/views/content_main.scala.html new file mode 100644 index 0000000..b965e79 --- /dev/null +++ b/app/views/content_main.scala.html @@ -0,0 +1,192 @@ +@(content: Html) + + + + + + + + + + Encry Explorer + + + + + + + + + + + + + + + + @content + + + + + + + + + + \ No newline at end of file diff --git a/app/views/index.scala.html b/app/views/index.scala.html index a843041..6b10c65 100644 --- a/app/views/index.scala.html +++ b/app/views/index.scala.html @@ -1,163 +1,6 @@ @import java.util.Date @(lastBlocks: List[Header], bestHeight: Int) - - - - - - - - - Encry Explorer - - - - - - - - - - - - - - - - - - - - +@main {
        - - - - - - - - - - - - - \ No newline at end of file +} \ No newline at end of file diff --git a/app/views/main.scala.html b/app/views/main.scala.html index b86cecd..f42b66c 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -21,7 +21,6 @@ - diff --git a/app/views/nodeInfo.scala.html b/app/views/nodeInfo.scala.html deleted file mode 100644 index d6f3139..0000000 --- a/app/views/nodeInfo.scala.html +++ /dev/null @@ -1,237 +0,0 @@ -@import java.util.Date -@(nodes: List[Node]) - - - - - - - - - Encry Explorer - - - - - - - - - - - - - - - -
        - - - -
        - -
        - -
        -
        -
        -
        -

        Node Info

        -
        -
        - - - - - - - - - - - @for(n <- nodes) { - - - - - - - } - -
        IpStatusLast Block IdLast Block Height
        - @n.ip - - @{ - if (n.status) "Online" else "Offline" - } - - @n.lastFullBlock - - @n.lastFullHeight -
        -
        -
        -
        -
        - - -
        -
        - - - - - - - - - \ No newline at end of file diff --git a/app/views/nodes.scala.html b/app/views/nodes.scala.html new file mode 100644 index 0000000..c568f34 --- /dev/null +++ b/app/views/nodes.scala.html @@ -0,0 +1,90 @@ +@import java.util.Date +@(nodes: List[Node]) +@main { +
        + + + +
        + +
        + +
        +
        +
        +
        +

        Node Info

        +
        +
        + + + + + + + + + + + @for(n <- nodes) { + + + + + + + } + +
        IpStatusLast Block IdLast Block Height
        + @n.ip + + @{ + if (n.status) "Online" else "Offline" + } + + @n.lastFullBlock + + @n.lastFullHeight +
        +
        +
        +
        +
        + + +
        +
        +} \ No newline at end of file diff --git a/app/views/outputInfo.scala.html b/app/views/outputInfo.scala.html index 47a25ee..33d6e69 100644 --- a/app/views/outputInfo.scala.html +++ b/app/views/outputInfo.scala.html @@ -1,5 +1,5 @@ @import java.util.Date -@(output: Output) +@(output: DBOutput) diff --git a/app/views/transactionInfo.scala.html b/app/views/transactionInfo.scala.html index 925525a..876997b 100644 --- a/app/views/transactionInfo.scala.html +++ b/app/views/transactionInfo.scala.html @@ -1,408 +1,232 @@ @import java.util.Date @(tx: FullFilledTransaction) - - - - - - - - - Encry Explorer - - - - - - - - - - - - - - - -
        - - - -
        - -
        - -
        -
        -
        -
        -

        Transaction Info

        -
        -
        - - - - - - - - - - - - - - - - - - - - - - - -
        -
        -
        - ID -
        -
        -         		- @tx.transaction.id -
        -
        -
        - fee -
        -
        -         		- @tx.transaction.fee -
        -
        -
        - Is CoinBase -
        -
        -         		- @tx.transaction.isCoinbase -
        -
        -
        - Timestamp -
        -
        -         		- @{ - new Date(tx.transaction.timestamp).format("yyyy-MM-dd HH:mm:ss") - } -
        -
        -
        - Proof -
        -
        -         		- @tx.transaction.defaultProofOpt -
        -
        -
        +
        + +
        +
        +
        +
        +

        Transaction Inputs

        -
        - -
        -
        -
        -
        -

        Transaction Inputs

        -
        -
        - - - - - - - - - - @for(input <- tx.inputs) { - - + + } + +
        Input IDInput contract hashInput proofs
        +
        + + + + + + + + + + @for(input <- tx.inputs) { + + - + - + - - } - -
        Input IDInput contract hashInput proofs
        @input.bxId - + @tx.contract.map(_.hash).mkString(",") - + @input.proofs -
        -
        - +
        - -
        -
        -
        -
        -

        Transaction Outputs

        -
        -
        - - - - - - - - - - - - - @for(output <- tx.output) { - - + + } + +
        Output IDOutput valueOutput coinOutput contract hashRecipient addressOutput data
        + + + +
        +
        +
        +
        +

        Transaction Outputs

        +
        +
        + + + + + + + + + + + + + @for(output <- tx.output) { + + - + - + - + - + - + - - } - -
        Output IDOutput valueOutput coinOutput contract hashRecipient addressOutput data
        @output.id - + @output.value - + @{ if(output.tokenId == "487291c237b68dd2ab213be6b5d1174666074a5afab772b600ea14e8285affab") "Encry Coin" else output.tokenId } - + @output.proposition.contractHash - + @output.minerAddress - + @output.data -
        -
        -
        +
        - -
        - - - - - - - - - \ No newline at end of file + + +
        +
        +} \ No newline at end of file From e5ab0a481eaace5c243a274b8c275553e94ce8cb Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 16:12:33 +0500 Subject: [PATCH 21/31] github link open in new window --- app/views/blockInfo.scala.html | 2 +- app/views/content_main.scala.html | 2 +- app/views/main.scala.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/blockInfo.scala.html b/app/views/blockInfo.scala.html index 6c38855..67fdf05 100644 --- a/app/views/blockInfo.scala.html +++ b/app/views/blockInfo.scala.html @@ -189,7 +189,7 @@

        Block Transactions

        @for(tx <- block.payload) { - + @tx.id diff --git a/app/views/content_main.scala.html b/app/views/content_main.scala.html index b965e79..0714e46 100644 --- a/app/views/content_main.scala.html +++ b/app/views/content_main.scala.html @@ -170,7 +170,7 @@
        Links
        • - + Github
          • diff --git a/app/views/main.scala.html b/app/views/main.scala.html index f42b66c..52c1b96 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -147,7 +147,7 @@
          Links
          • - + Github
            • From 2bdf264b05e1a0c7109fa9765a87633ceb030b4b Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 16:29:49 +0500 Subject: [PATCH 22/31] main -> walletInfo --- app/views/wallet.scala.html | 399 ++++++++++-------------------------- 1 file changed, 112 insertions(+), 287 deletions(-) diff --git a/app/views/wallet.scala.html b/app/views/wallet.scala.html index 887d98e..7fabf4e 100644 --- a/app/views/wallet.scala.html +++ b/app/views/wallet.scala.html @@ -1,318 +1,143 @@ @import java.util.Date @(wallet: List[Wallet], transaction: List[DBTransaction]) - - - - - - - - - Encry Explorer - - - - - - - - - - - - - - - -
            - - - -
            - -
            - -
            -
            -
            -
            -

            Contract Hash / @for(wal <- wallet){ +@content_main { +
            + + + +
            + +
            + +
            +
            +
            +
            +

            Contract Hash / @for(wal <- wallet){ + @wal.hash - - } -

            -
            -
            - - - - - - - - - @for(wal <- wallet) { - - + } + + +
            +
            TokenBalance
            +
            + + + + + + + + @for(wal <- wallet) { + + - + - - } + + + } - -
            TokenBalance
            @wal.tokenId - + @wal.amount -
            -
            -
            + +
            -
            -
            -
            -
            -

            Last 50 blocks

            -
            -
            - - - - - - - - - - - @for(tx <- transaction) { - - - + + } + +
            Transaction idTransaction timestampTransaction feeis CoinBase
            - - @tx.id - + + +
            +
            +
            +
            +

            Last 50 blocks

            +
            +
            + + + + + + + + + + + @for(tx <- transaction) { + + + - + - + - - } - -
            Transaction idTransaction timestampTransaction feeis CoinBase
            + + @tx.id + @{ new Date(tx.timestamp).format("yyyy-MM-dd HH:mm:ss") } - + @tx.fee - + @{ if(tx.isCoinbase) "Yes" else None } -
            -
            -
            +
            - -
            - - - - - - - - - \ No newline at end of file + + +
            +
            +} \ No newline at end of file From e150378977a92637f061369bcec6b439fc2a291a Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 17:11:11 +0500 Subject: [PATCH 23/31] refactoring --- app/actors/{ReceiverActor.scala => Receiver.scala} | 8 ++++---- app/actors/{CacheActor.scala => TransStorage.scala} | 8 ++++---- app/controllers/BlockController.scala | 4 ++-- app/controllers/SearchController.scala | 6 +++--- app/{loggingSystem => logging}/LoggingFilter.scala | 2 +- app/models/Block.scala | 2 +- app/models/DBTransaction.scala | 2 +- app/models/dao/BoxesDao.scala | 5 +++-- app/models/dao/HistoryDao.scala | 5 +++-- app/models/dao/TransactionsDao.scala | 6 +++--- app/models/database/WalletQueries.scala | 1 - app/models/{database => service}/DBService.scala | 5 +++-- .../CacheService.scala => service/TransService.scala} | 11 ++++------- app/modules/ActorModule.scala | 2 +- app/modules/ActorsBindModule.scala | 6 +++--- conf/application.conf | 2 +- 16 files changed, 37 insertions(+), 38 deletions(-) rename app/actors/{ReceiverActor.scala => Receiver.scala} (67%) rename app/actors/{CacheActor.scala => TransStorage.scala} (91%) rename app/{loggingSystem => logging}/LoggingFilter.scala (97%) rename app/models/{database => service}/DBService.scala (96%) rename app/models/{database/CacheService.scala => service/TransService.scala} (76%) diff --git a/app/actors/ReceiverActor.scala b/app/actors/Receiver.scala similarity index 67% rename from app/actors/ReceiverActor.scala rename to app/actors/Receiver.scala index 78fe049..aa04237 100644 --- a/app/actors/ReceiverActor.scala +++ b/app/actors/Receiver.scala @@ -1,13 +1,13 @@ package actors -import actors.CacheActor.RemoveConfirmedTransactions +import actors.TransStorage.RemoveConfirmedTransactions import akka.actor.{Actor, ActorRef, Props} import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import org.encryfoundation.common.modifiers.history.{Header, Payload} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction -class ReceiverActor @Inject()(@Named("cache") cache: ActorRef) extends Actor with StrictLogging { +class Receiver @Inject()(@Named("transStorage") cache: ActorRef) extends Actor with StrictLogging { def receive: Receive = { case transaction: Transaction => @@ -19,6 +19,6 @@ class ReceiverActor @Inject()(@Named("cache") cache: ActorRef) extends Actor wit } -object ReceiverActor { - def props(cache: ActorRef): Props = Props(new ReceiverActor(cache)) +object Receiver { + def props(cache: ActorRef): Props = Props(new Receiver(cache)) } \ No newline at end of file diff --git a/app/actors/CacheActor.scala b/app/actors/TransStorage.scala similarity index 91% rename from app/actors/CacheActor.scala rename to app/actors/TransStorage.scala index 94d7b36..35e6ad7 100644 --- a/app/actors/CacheActor.scala +++ b/app/actors/TransStorage.scala @@ -1,16 +1,16 @@ package actors -import actors.CacheActor._ +import actors.TransStorage._ import akka.actor.{Actor, Props, Timers} import javax.inject.Inject -import models._ +import models.{FullFilledTransaction, _} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction import settings.ExplorerSettings import scala.collection.mutable import scala.concurrent.duration._ -class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers { +class TransStorage @Inject()(settings: ExplorerSettings) extends Actor with Timers { //TODO: store in sorted list, iterate until cond var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map[String, FullFilledTransaction]() @@ -49,7 +49,7 @@ class CacheActor @Inject()(settings: ExplorerSettings) extends Actor with Timers } -object CacheActor { +object TransStorage { case class TransactionsQ(from: Int, to: Int) case class TransactionsA(txs: List[FullFilledTransaction]) diff --git a/app/controllers/BlockController.scala b/app/controllers/BlockController.scala index bba24d3..3e5dd0a 100644 --- a/app/controllers/BlockController.scala +++ b/app/controllers/BlockController.scala @@ -1,7 +1,7 @@ package controllers import javax.inject.{Inject, Singleton} -import models._ +import models.{Block, DBTransaction, Header} import models.dao.{HistoryDao, TransactionsDao} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} @@ -28,7 +28,7 @@ class BlockController @Inject()(cc: ControllerComponents, headerOpt <- headerF payload <- payloadF } yield headerOpt match { - case Some(header) => Some(Block(header, payload)) + case Some(header) => Some(models.Block(header, payload)) case _ => None } } diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index 9f1bee0..a1e876f 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -1,8 +1,8 @@ package controllers -import models._ import javax.inject.{Inject, Singleton} import models.dao.{BoxesDao, HistoryDao, TransactionsDao} +import models.{Block, Contract, DBInput, DBOutput, DBTransaction, FullFilledTransaction, Header, Wallet} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents, Result} import settings.Utils @@ -23,7 +23,7 @@ class SearchController @Inject()(cc: ControllerComponents, headerOpt <- headerF payload <- payloadF } yield headerOpt match { - case Some(header) => Some(Block(header, payload)) + case Some(header) => Some(models.Block(header, payload)) case _ => None } } @@ -38,7 +38,7 @@ class SearchController @Inject()(cc: ControllerComponents, outputs <- outputsF inputs <- inputsF contract <- contractF - } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) + } yield Some(models.FullFilledTransaction(tx, inputs, outputs, contract)) case _ => Future(Option.empty[FullFilledTransaction]) } diff --git a/app/loggingSystem/LoggingFilter.scala b/app/logging/LoggingFilter.scala similarity index 97% rename from app/loggingSystem/LoggingFilter.scala rename to app/logging/LoggingFilter.scala index 3c1c7f0..bc28aba 100644 --- a/app/loggingSystem/LoggingFilter.scala +++ b/app/logging/LoggingFilter.scala @@ -1,4 +1,4 @@ -package loggingSystem +package logging import akka.stream.Materializer import javax.inject.Inject diff --git a/app/models/Block.scala b/app/models/Block.scala index 94dd268..a61f6a1 100644 --- a/app/models/Block.scala +++ b/app/models/Block.scala @@ -1,3 +1,3 @@ package models -case class Block(header: Header, payload: List[DBTransaction]) \ No newline at end of file +case class Block(header: Header, payload: List[DBTransaction]) diff --git a/app/models/DBTransaction.scala b/app/models/DBTransaction.scala index 35408c1..301708e 100644 --- a/app/models/DBTransaction.scala +++ b/app/models/DBTransaction.scala @@ -2,7 +2,7 @@ package models import org.encryfoundation.common.modifiers.mempool.transaction.{Proof, Transaction} import org.encryfoundation.common.utils.Algos -import org.encryfoundation.prismlang.core.wrapped.BoxedValue.{BoolValue, ByteCollectionValue, ByteValue, IntValue, MultiSignatureValue, Signature25519Value, StringValue} +import org.encryfoundation.prismlang.core.wrapped.BoxedValue._ case class DBTransaction(id: String, fee: Long, diff --git a/app/models/dao/BoxesDao.scala b/app/models/dao/BoxesDao.scala index 136b025..a5fb57c 100644 --- a/app/models/dao/BoxesDao.scala +++ b/app/models/dao/BoxesDao.scala @@ -1,8 +1,9 @@ package models.dao import javax.inject.Inject -import models.{DBTransaction, DBOutput, Wallet} -import models.database.{BoxesQueries, DBService, WalletQueries} +import models.{DBOutput, DBTransaction, Wallet} +import models.database.{BoxesQueries, WalletQueries} +import models.service.DBService import scala.concurrent.{ExecutionContext, Future} diff --git a/app/models/dao/HistoryDao.scala b/app/models/dao/HistoryDao.scala index a172061..14eccc1 100644 --- a/app/models/dao/HistoryDao.scala +++ b/app/models/dao/HistoryDao.scala @@ -1,9 +1,10 @@ package models.dao import javax.inject.Inject -import models.database.HeaderQueries._ -import models.database.{DBService, NodeQueries} import models.{Header, Node} +import models.database.HeaderQueries._ +import models.database.NodeQueries +import models.service.DBService import scala.concurrent.{ExecutionContext, Future} diff --git a/app/models/dao/TransactionsDao.scala b/app/models/dao/TransactionsDao.scala index 0eaf13e..13d5fe0 100644 --- a/app/models/dao/TransactionsDao.scala +++ b/app/models/dao/TransactionsDao.scala @@ -1,13 +1,13 @@ package models.dao import javax.inject.Inject +import models.{Contract, DBInput, DBOutput, DBTransaction, FullFilledTransaction} import models.database.TransactionsQueries._ -import models.database.{CacheService, DBService} -import models._ +import models.service.{DBService, TransService} import scala.concurrent.{ExecutionContext, Future} -class TransactionsDao @Inject()(dbService: DBService, cacheService: CacheService)(implicit ec: ExecutionContext) { +class TransactionsDao @Inject()(dbService: DBService, cacheService: TransService)(implicit ec: ExecutionContext) { def transactionsByBlock(id: String): Future[List[DBTransaction]] = dbService.runAsync(getTransactionsByBlockId(id)) diff --git a/app/models/database/WalletQueries.scala b/app/models/database/WalletQueries.scala index 0bfb16c..e365489 100644 --- a/app/models/database/WalletQueries.scala +++ b/app/models/database/WalletQueries.scala @@ -4,7 +4,6 @@ import doobie._ import doobie.implicits._ import models.{DBTransaction, Wallet} - object WalletQueries { def getWallet(address: String): ConnectionIO[List[Wallet]] = diff --git a/app/models/database/DBService.scala b/app/models/service/DBService.scala similarity index 96% rename from app/models/database/DBService.scala rename to app/models/service/DBService.scala index ecc37db..596a49b 100644 --- a/app/models/database/DBService.scala +++ b/app/models/service/DBService.scala @@ -1,13 +1,14 @@ -package models.database +package models.service import cats.effect.IO import doobie.free.connection.ConnectionIO import doobie.hikari.HikariTransactor.newHikariTransactor +import doobie.hikari.implicits._ import doobie.implicits._ import javax.inject.Inject import play.api.Configuration -import doobie.hikari.implicits._ import settings.ExplorerSettings + import scala.concurrent.Future class DBService @Inject()(config: Configuration, settings: ExplorerSettings) { diff --git a/app/models/database/CacheService.scala b/app/models/service/TransService.scala similarity index 76% rename from app/models/database/CacheService.scala rename to app/models/service/TransService.scala index 90e42ef..e0d1d68 100644 --- a/app/models/database/CacheService.scala +++ b/app/models/service/TransService.scala @@ -1,20 +1,17 @@ -package models.database +package models.service -import actors.CacheActor.{TransactionByIdA, TransactionByIdQ, TransactionsA, TransactionsQ} +import actors.TransStorage.{TransactionByIdA, TransactionByIdQ, TransactionsA, TransactionsQ} import akka.actor.ActorRef +import akka.pattern.ask import akka.util.Timeout import javax.inject._ -import play.api.Configuration -import play.api.mvc._ -import settings.ExplorerSettings -import akka.pattern.ask import models.{DBTransaction, FullFilledTransaction} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import scala.concurrent.duration._ -class CacheService @Inject()(@Named("cache") cache: ActorRef) { +class TransService @Inject()(@Named("transStorage") cache: ActorRef) { implicit val timeout: Timeout = 5 seconds def getUnconfirmedTransactions(from: Int, to: Int): Future[List[DBTransaction]] = diff --git a/app/modules/ActorModule.scala b/app/modules/ActorModule.scala index 8cb3b15..3348510 100644 --- a/app/modules/ActorModule.scala +++ b/app/modules/ActorModule.scala @@ -1,6 +1,6 @@ package modules -import actors.ReceiverActor +import actors.Receiver import play.api.mvc._ import akka.actor._ import javax.inject._ diff --git a/app/modules/ActorsBindModule.scala b/app/modules/ActorsBindModule.scala index 5dd9a89..f01475d 100644 --- a/app/modules/ActorsBindModule.scala +++ b/app/modules/ActorsBindModule.scala @@ -1,11 +1,11 @@ package modules -import actors.{CacheActor, ReceiverActor} +import actors.{TransStorage, Receiver} import com.google.inject.AbstractModule import play.api.libs.concurrent.AkkaGuiceSupport class ActorsBindModule extends AbstractModule with AkkaGuiceSupport { override def configure = { - bindActor[CacheActor]("cache") - bindActor[ReceiverActor]("receiver") + bindActor[TransStorage]("transStorage") + bindActor[Receiver]("receiver") } } diff --git a/conf/application.conf b/conf/application.conf index 1056f25..9651f5c 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -15,7 +15,7 @@ play.modules { enabled += modules.ActorsBindModule } play.filters { - enabled += loggingSystem.LoggingFilter + enabled += logging.LoggingFilter hosts { allowed = ["."] } From ed3ee447f570338f0e9fa9241d737234ab631c56 Mon Sep 17 00:00:00 2001 From: capdev Date: Tue, 22 Oct 2019 18:48:03 +0500 Subject: [PATCH 24/31] actor create logs --- app/actors/Receiver.scala | 6 +++--- app/actors/TransStorage.scala | 3 +++ app/controllers/HomeController.scala | 3 +-- app/controllers/WalletController.scala | 3 +-- app/modules/ActorModule.scala | 11 ----------- app/modules/ActorsBindModule.scala | 6 +++++- app/modules/MainModule.scala | 6 ++++-- app/views/transactions.scala.html | 2 +- 8 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 app/modules/ActorModule.scala diff --git a/app/actors/Receiver.scala b/app/actors/Receiver.scala index aa04237..80744c7 100644 --- a/app/actors/Receiver.scala +++ b/app/actors/Receiver.scala @@ -2,12 +2,12 @@ package actors import actors.TransStorage.RemoveConfirmedTransactions import akka.actor.{Actor, ActorRef, Props} -import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} -import org.encryfoundation.common.modifiers.history.{Header, Payload} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction +import play.api.Logger -class Receiver @Inject()(@Named("transStorage") cache: ActorRef) extends Actor with StrictLogging { +class Receiver @Inject()(@Named("transStorage") cache: ActorRef) extends Actor { + Logger.info("Receiver") def receive: Receive = { case transaction: Transaction => diff --git a/app/actors/TransStorage.scala b/app/actors/TransStorage.scala index 35e6ad7..2e45935 100644 --- a/app/actors/TransStorage.scala +++ b/app/actors/TransStorage.scala @@ -5,6 +5,7 @@ import akka.actor.{Actor, Props, Timers} import javax.inject.Inject import models.{FullFilledTransaction, _} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction +import play.api.Logger import settings.ExplorerSettings import scala.collection.mutable @@ -12,6 +13,8 @@ import scala.concurrent.duration._ class TransStorage @Inject()(settings: ExplorerSettings) extends Actor with Timers { + Logger.info("TransStorage") + //TODO: store in sorted list, iterate until cond var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map[String, FullFilledTransaction]() diff --git a/app/controllers/HomeController.scala b/app/controllers/HomeController.scala index fbf9bec..9a14d35 100644 --- a/app/controllers/HomeController.scala +++ b/app/controllers/HomeController.scala @@ -1,6 +1,5 @@ package controllers -import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, _} import models.Header import models.dao.HistoryDao @@ -11,7 +10,7 @@ import scala.concurrent.{ExecutionContext, Future} @Singleton class HomeController @Inject()(cc: ControllerComponents, historyDao: HistoryDao) - (implicit ex: ExecutionContext) extends AbstractController(cc) with ControllerHelpers with StrictLogging { + (implicit ex: ExecutionContext) extends AbstractController(cc) with ControllerHelpers { def index(): Action[AnyContent] = Action.async { val headers: Future[List[Header]] = historyDao.lastHeaders() diff --git a/app/controllers/WalletController.scala b/app/controllers/WalletController.scala index 91340d2..64f3c58 100644 --- a/app/controllers/WalletController.scala +++ b/app/controllers/WalletController.scala @@ -1,6 +1,5 @@ package controllers -import com.typesafe.scalalogging.StrictLogging import javax.inject.Inject import models._ import play.api.libs.circe.Circe @@ -15,7 +14,7 @@ import settings.Utils class WalletController @Inject()(cc: ControllerComponents, boxesDao: BoxesDao, transactionsDao: TransactionsDao) - (implicit ex: ExecutionContext) extends AbstractController(cc) with ControllerHelpers with Circe with StrictLogging { + (implicit ex: ExecutionContext) extends AbstractController(cc) with ControllerHelpers with Circe { def info(contractHash: String, from: Int, to: Int): Action[AnyContent] = Action.async { boxesDao.getBoxesByContractHash(contractHash, from: Int, to: Int).map { diff --git a/app/modules/ActorModule.scala b/app/modules/ActorModule.scala deleted file mode 100644 index 3348510..0000000 --- a/app/modules/ActorModule.scala +++ /dev/null @@ -1,11 +0,0 @@ -package modules - -import actors.Receiver -import play.api.mvc._ -import akka.actor._ -import javax.inject._ - -@Singleton -class ActorModule @Inject()(system: ActorSystem, cc: ControllerComponents) extends AbstractController(cc) { - //val receiver = system.actorOf(ReceiverActor.props, "receiver") -} \ No newline at end of file diff --git a/app/modules/ActorsBindModule.scala b/app/modules/ActorsBindModule.scala index f01475d..df44134 100644 --- a/app/modules/ActorsBindModule.scala +++ b/app/modules/ActorsBindModule.scala @@ -1,10 +1,14 @@ package modules -import actors.{TransStorage, Receiver} +import actors.{Receiver, TransStorage} import com.google.inject.AbstractModule +import javax.inject.Singleton +import play.api.Logger import play.api.libs.concurrent.AkkaGuiceSupport +@Singleton class ActorsBindModule extends AbstractModule with AkkaGuiceSupport { override def configure = { + Logger.info("ActorsBindModule") bindActor[TransStorage]("transStorage") bindActor[Receiver]("receiver") } diff --git a/app/modules/MainModule.scala b/app/modules/MainModule.scala index 83a9cb1..9503971 100644 --- a/app/modules/MainModule.scala +++ b/app/modules/MainModule.scala @@ -2,7 +2,7 @@ package modules import com.google.inject.{AbstractModule, Provides} import com.typesafe.config.ConfigFactory -import play.api.Configuration +import play.api.{Configuration, Logger} import net.ceedubs.ficus.Ficus._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import net.codingwell.scalaguice.ScalaModule @@ -11,7 +11,9 @@ import settings.ExplorerSettings class MainModule extends AbstractModule with ScalaModule { @Provides - def provideExplorerAppSettings(configuration: Configuration): ExplorerSettings = + def provideExplorerAppSettings(configuration: Configuration): ExplorerSettings = { + Logger.info("MainModule") ConfigFactory.load("local.conf") .withFallback(configuration.underlying).as[ExplorerSettings]("encry") + } } diff --git a/app/views/transactions.scala.html b/app/views/transactions.scala.html index 7bc2a18..375ed6a 100644 --- a/app/views/transactions.scala.html +++ b/app/views/transactions.scala.html @@ -58,7 +58,7 @@

            Transactions

            @for(tx <- txs) { - + @tx.id From d67c9f7bbb2ce77e14f7109a9e6ccfe145765a8d Mon Sep 17 00:00:00 2001 From: capdev Date: Wed, 23 Oct 2019 10:25:49 +0500 Subject: [PATCH 25/31] settings --- app/controllers/TransactionsController.scala | 11 +++++------ app/settings/ExplorerSettings.scala | 5 +---- conf/application.conf | 10 ++++++++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/controllers/TransactionsController.scala b/app/controllers/TransactionsController.scala index 2e92ccf..150a539 100644 --- a/app/controllers/TransactionsController.scala +++ b/app/controllers/TransactionsController.scala @@ -8,11 +8,10 @@ import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponent import scala.concurrent.ExecutionContext @Singleton -class TransactionsController @Inject()(cc: ControllerComponents, - transactionsDao: TransactionsDao) - (implicit ex: ExecutionContext) extends AbstractController(cc) with Circe { +class TransactionsController @Inject()(cc: ControllerComponents, transactionsDao: TransactionsDao)(implicit ex: ExecutionContext) + extends AbstractController(cc) with Circe { - val TRANSACTION_PER_PAGE = 10 + val TRANSACTIONS_PER_PAGE = 50 def getTransaction(txId: String): Action[AnyContent] = Action.async { transactionsDao.fullTransactionById(txId).map { @@ -22,8 +21,8 @@ class TransactionsController @Inject()(cc: ControllerComponents, } def getUnconfirmedTransactions(page: Int): Action[AnyContent] = Action.async { - val from = page * TRANSACTION_PER_PAGE - val to = (page + 1) * TRANSACTION_PER_PAGE + val from = page * TRANSACTIONS_PER_PAGE + val to = (page + 1) * TRANSACTIONS_PER_PAGE transactionsDao.unconfirmedTransactions(from, to).map { txs => Ok(views.html.transactions(txs, page)) } diff --git a/app/settings/ExplorerSettings.scala b/app/settings/ExplorerSettings.scala index 1595dd7..9781c87 100644 --- a/app/settings/ExplorerSettings.scala +++ b/app/settings/ExplorerSettings.scala @@ -2,10 +2,7 @@ package settings import scala.concurrent.duration.FiniteDuration -case class PostgresSettings(host: String, - user: String, - password: String) - +case class PostgresSettings(host: String, user: String, password: String) case class CacheSettings(unconfirmedTransactionExpiredInterval: FiniteDuration) case class ExplorerSettings(postgres: PostgresSettings, cache: CacheSettings) diff --git a/conf/application.conf b/conf/application.conf index 9651f5c..7391175 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -8,6 +8,12 @@ encry { cache { unconfirmedTransactionExpiredInterval = 15m } + + remote { + host = "127.0.0.1" + port = 5150 + } + } play.modules { @@ -33,8 +39,8 @@ akka { remote { enabled-transports = ["akka.remote.netty.tcp"] netty.tcp { - hostname = "127.0.0.1" - port = 5150 + hostname = ${encry.remote.host} + port = ${encry.remote.port} } log-sent-messages = on log-received-messages = on From 797c9cba3605fd5dcc3370a0b7be48b9e5335e8e Mon Sep 17 00:00:00 2001 From: capdev Date: Wed, 23 Oct 2019 11:34:36 +0500 Subject: [PATCH 26/31] settings --- conf/application.conf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/conf/application.conf b/conf/application.conf index 7391175..9651f5c 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -8,12 +8,6 @@ encry { cache { unconfirmedTransactionExpiredInterval = 15m } - - remote { - host = "127.0.0.1" - port = 5150 - } - } play.modules { @@ -39,8 +33,8 @@ akka { remote { enabled-transports = ["akka.remote.netty.tcp"] netty.tcp { - hostname = ${encry.remote.host} - port = ${encry.remote.port} + hostname = "127.0.0.1" + port = 5150 } log-sent-messages = on log-received-messages = on From 60ee817a9afd1bcde3669c6868a0c025e530507a Mon Sep 17 00:00:00 2001 From: capdev Date: Wed, 23 Oct 2019 12:25:01 +0500 Subject: [PATCH 27/31] refactoring --- app/actors/Receiver.scala | 10 ++++------ app/actors/TransStorage.scala | 9 +++------ app/controllers/BlockController.scala | 3 +-- app/controllers/HomeController.scala | 1 - app/controllers/NodeController.scala | 1 - app/controllers/SearchController.scala | 5 ++--- app/controllers/WalletController.scala | 6 ++---- app/models/Block.scala | 2 +- app/models/DBTransaction.scala | 3 +-- app/models/dao/TransactionsDao.scala | 8 ++++---- app/models/service/DBService.scala | 7 +++---- app/models/service/TransService.scala | 6 +++--- app/modules/ActorsBindModule.scala | 4 +--- app/modules/MainModule.scala | 10 ++++------ .../{ExplorerSettings.scala => Settings.scala} | 4 ++-- conf/application.conf | 2 +- 16 files changed, 32 insertions(+), 49 deletions(-) rename app/settings/{ExplorerSettings.scala => Settings.scala} (52%) diff --git a/app/actors/Receiver.scala b/app/actors/Receiver.scala index 80744c7..e5a1c45 100644 --- a/app/actors/Receiver.scala +++ b/app/actors/Receiver.scala @@ -6,19 +6,17 @@ import javax.inject.{Inject, Named} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction import play.api.Logger -class Receiver @Inject()(@Named("transStorage") cache: ActorRef) extends Actor { - Logger.info("Receiver") +class Receiver @Inject()(@Named("transStorage") transStorage: ActorRef) extends Actor { def receive: Receive = { case transaction: Transaction => - cache ! transaction + transStorage ! transaction case confirmedTransactionIds: List[String] => - cache ! RemoveConfirmedTransactions(confirmedTransactionIds) + transStorage ! RemoveConfirmedTransactions(confirmedTransactionIds) } - } object Receiver { - def props(cache: ActorRef): Props = Props(new Receiver(cache)) + def props(transStorage: ActorRef): Props = Props(new Receiver(transStorage)) } \ No newline at end of file diff --git a/app/actors/TransStorage.scala b/app/actors/TransStorage.scala index 2e45935..fd1b146 100644 --- a/app/actors/TransStorage.scala +++ b/app/actors/TransStorage.scala @@ -6,16 +6,13 @@ import javax.inject.Inject import models.{FullFilledTransaction, _} import org.encryfoundation.common.modifiers.mempool.transaction.Transaction import play.api.Logger -import settings.ExplorerSettings +import settings.Settings import scala.collection.mutable import scala.concurrent.duration._ -class TransStorage @Inject()(settings: ExplorerSettings) extends Actor with Timers { +class TransStorage @Inject()(settings: Settings) extends Actor with Timers { - Logger.info("TransStorage") - - //TODO: store in sorted list, iterate until cond var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map[String, FullFilledTransaction]() object Timer @@ -45,7 +42,7 @@ class TransStorage @Inject()(settings: ExplorerSettings) extends Actor with Time case Tick => val timestamp = System.currentTimeMillis() val expiredTxIds = unconfTranscactions.values - .filter(tx => timestamp - tx.transaction.timestamp > settings.cache.unconfirmedTransactionExpiredInterval.toMillis) + .filter(tx => timestamp - tx.transaction.timestamp > settings.trans.unconfirmedTransactionExpiredInterval.toMillis) .map(_.transaction.id) expiredTxIds.foreach(unconfTranscactions.remove(_)) } diff --git a/app/controllers/BlockController.scala b/app/controllers/BlockController.scala index 3e5dd0a..2ce2527 100644 --- a/app/controllers/BlockController.scala +++ b/app/controllers/BlockController.scala @@ -5,7 +5,6 @@ import models.{Block, DBTransaction, Header} import models.dao.{HistoryDao, TransactionsDao} import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents} - import scala.concurrent.{ExecutionContext, Future} @Singleton @@ -28,7 +27,7 @@ class BlockController @Inject()(cc: ControllerComponents, headerOpt <- headerF payload <- payloadF } yield headerOpt match { - case Some(header) => Some(models.Block(header, payload)) + case Some(header) => Some(Block(header, payload)) case _ => None } } diff --git a/app/controllers/HomeController.scala b/app/controllers/HomeController.scala index 9a14d35..7ef6490 100644 --- a/app/controllers/HomeController.scala +++ b/app/controllers/HomeController.scala @@ -4,7 +4,6 @@ import javax.inject.{Inject, _} import models.Header import models.dao.HistoryDao import play.api.mvc.{Action, _} - import scala.concurrent.{ExecutionContext, Future} @Singleton diff --git a/app/controllers/NodeController.scala b/app/controllers/NodeController.scala index 52091b7..e90afc3 100644 --- a/app/controllers/NodeController.scala +++ b/app/controllers/NodeController.scala @@ -4,7 +4,6 @@ import javax.inject.{Inject, _} import models.Node import models.dao.HistoryDao import play.api.mvc._ - import scala.concurrent.ExecutionContext @Singleton diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index a1e876f..9b6719b 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -6,7 +6,6 @@ import models.{Block, Contract, DBInput, DBOutput, DBTransaction, FullFilledTran import play.api.libs.circe.Circe import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents, Result} import settings.Utils - import scala.concurrent.{ExecutionContext, Future} @Singleton @@ -23,7 +22,7 @@ class SearchController @Inject()(cc: ControllerComponents, headerOpt <- headerF payload <- payloadF } yield headerOpt match { - case Some(header) => Some(models.Block(header, payload)) + case Some(header) => Some(Block(header, payload)) case _ => None } } @@ -38,7 +37,7 @@ class SearchController @Inject()(cc: ControllerComponents, outputs <- outputsF inputs <- inputsF contract <- contractF - } yield Some(models.FullFilledTransaction(tx, inputs, outputs, contract)) + } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) case _ => Future(Option.empty[FullFilledTransaction]) } diff --git a/app/controllers/WalletController.scala b/app/controllers/WalletController.scala index 64f3c58..16b52bc 100644 --- a/app/controllers/WalletController.scala +++ b/app/controllers/WalletController.scala @@ -3,17 +3,15 @@ package controllers import javax.inject.Inject import models._ import play.api.libs.circe.Circe - import scala.concurrent._ import io.circe.generic.auto._ import io.circe.syntax._ -import models.dao.{BoxesDao, TransactionsDao} +import models.dao.BoxesDao import play.api.mvc._ import settings.Utils class WalletController @Inject()(cc: ControllerComponents, - boxesDao: BoxesDao, - transactionsDao: TransactionsDao) + boxesDao: BoxesDao) (implicit ex: ExecutionContext) extends AbstractController(cc) with ControllerHelpers with Circe { def info(contractHash: String, from: Int, to: Int): Action[AnyContent] = Action.async { diff --git a/app/models/Block.scala b/app/models/Block.scala index a61f6a1..94dd268 100644 --- a/app/models/Block.scala +++ b/app/models/Block.scala @@ -1,3 +1,3 @@ package models -case class Block(header: Header, payload: List[DBTransaction]) +case class Block(header: Header, payload: List[DBTransaction]) \ No newline at end of file diff --git a/app/models/DBTransaction.scala b/app/models/DBTransaction.scala index 301708e..5baaca6 100644 --- a/app/models/DBTransaction.scala +++ b/app/models/DBTransaction.scala @@ -43,5 +43,4 @@ object FullFilledTransaction { val contracts = dbInputs.map(input => Contract(input.contractHash)).distinct FullFilledTransaction(dbTransaction, dbInputs, dbOutputs, contracts) } -} - +} \ No newline at end of file diff --git a/app/models/dao/TransactionsDao.scala b/app/models/dao/TransactionsDao.scala index 13d5fe0..fe2c852 100644 --- a/app/models/dao/TransactionsDao.scala +++ b/app/models/dao/TransactionsDao.scala @@ -7,7 +7,7 @@ import models.service.{DBService, TransService} import scala.concurrent.{ExecutionContext, Future} -class TransactionsDao @Inject()(dbService: DBService, cacheService: TransService)(implicit ec: ExecutionContext) { +class TransactionsDao @Inject()(dbService: DBService, transService: TransService)(implicit ec: ExecutionContext) { def transactionsByBlock(id: String): Future[List[DBTransaction]] = dbService.runAsync(getTransactionsByBlockId(id)) @@ -16,7 +16,7 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: TransService def outputsByTransaction(id: String): Future[List[DBOutput]] = dbService.runAsync(getTransactionOutputs(id)) def transactionById(id: String): Future[Option[DBTransaction]] = { - cacheService.getTransactionById(id).flatMap { txOpt => + transService.getTransactionById(id).flatMap { txOpt => if(txOpt.isEmpty) dbService.runAsync(getTransactionById(id)) else Future(txOpt) } @@ -38,7 +38,7 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: TransService } def fullTransactionById(id: String): Future[Option[FullFilledTransaction]] = { - cacheService.getFullTransactionById(id).flatMap { txOpt => + transService.getFullTransactionById(id).flatMap { txOpt => if(txOpt.isEmpty) getFullTransaction(id) else Future(txOpt) } @@ -48,5 +48,5 @@ class TransactionsDao @Inject()(dbService: DBService, cacheService: TransService def contractByTransaction(id: String): Future[List[Contract]] = dbService.runAsync(getContract(id)) - def unconfirmedTransactions(from: Int, to: Int): Future[List[DBTransaction]] = cacheService.getUnconfirmedTransactions(from, to) + def unconfirmedTransactions(from: Int, to: Int): Future[List[DBTransaction]] = transService.getUnconfirmedTransactions(from, to) } diff --git a/app/models/service/DBService.scala b/app/models/service/DBService.scala index 596a49b..5a1f54d 100644 --- a/app/models/service/DBService.scala +++ b/app/models/service/DBService.scala @@ -3,15 +3,14 @@ package models.service import cats.effect.IO import doobie.free.connection.ConnectionIO import doobie.hikari.HikariTransactor.newHikariTransactor -import doobie.hikari.implicits._ import doobie.implicits._ import javax.inject.Inject import play.api.Configuration -import settings.ExplorerSettings - +import doobie.hikari.implicits._ +import settings.Settings import scala.concurrent.Future -class DBService @Inject()(config: Configuration, settings: ExplorerSettings) { +class DBService @Inject()(config: Configuration, settings: Settings) { def runAsync[T](io: ConnectionIO[T]): Future[T] = (for { pool <- newHikariTransactor[IO]( diff --git a/app/models/service/TransService.scala b/app/models/service/TransService.scala index e0d1d68..90ce873 100644 --- a/app/models/service/TransService.scala +++ b/app/models/service/TransService.scala @@ -11,14 +11,14 @@ import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import scala.concurrent.duration._ -class TransService @Inject()(@Named("transStorage") cache: ActorRef) { +class TransService @Inject()(@Named("transStorage") transStorage: ActorRef) { implicit val timeout: Timeout = 5 seconds def getUnconfirmedTransactions(from: Int, to: Int): Future[List[DBTransaction]] = - (cache ? TransactionsQ(from, to)).mapTo[TransactionsA].map(_.txs.map(_.transaction)) + (transStorage ? TransactionsQ(from, to)).mapTo[TransactionsA].map(_.txs.map(_.transaction)) def transById(id: String): Future[Option[FullFilledTransaction]] = - (cache ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx) + (transStorage ? TransactionByIdQ(id)).mapTo[TransactionByIdA].map(_.tx) def getTransactionById(id: String): Future[Option[DBTransaction]] = transById(id).map(_.map(_.transaction)) diff --git a/app/modules/ActorsBindModule.scala b/app/modules/ActorsBindModule.scala index df44134..2087d92 100644 --- a/app/modules/ActorsBindModule.scala +++ b/app/modules/ActorsBindModule.scala @@ -2,14 +2,12 @@ package modules import actors.{Receiver, TransStorage} import com.google.inject.AbstractModule import javax.inject.Singleton -import play.api.Logger import play.api.libs.concurrent.AkkaGuiceSupport @Singleton class ActorsBindModule extends AbstractModule with AkkaGuiceSupport { override def configure = { - Logger.info("ActorsBindModule") bindActor[TransStorage]("transStorage") bindActor[Receiver]("receiver") } -} +} \ No newline at end of file diff --git a/app/modules/MainModule.scala b/app/modules/MainModule.scala index 9503971..34db795 100644 --- a/app/modules/MainModule.scala +++ b/app/modules/MainModule.scala @@ -2,18 +2,16 @@ package modules import com.google.inject.{AbstractModule, Provides} import com.typesafe.config.ConfigFactory -import play.api.{Configuration, Logger} +import play.api.Configuration import net.ceedubs.ficus.Ficus._ import net.ceedubs.ficus.readers.ArbitraryTypeReader._ import net.codingwell.scalaguice.ScalaModule -import settings.ExplorerSettings +import settings.Settings class MainModule extends AbstractModule with ScalaModule { @Provides - def provideExplorerAppSettings(configuration: Configuration): ExplorerSettings = { - Logger.info("MainModule") + def provideExplorerAppSettings(configuration: Configuration): Settings = ConfigFactory.load("local.conf") - .withFallback(configuration.underlying).as[ExplorerSettings]("encry") - } + .withFallback(configuration.underlying).as[Settings]("encry") } diff --git a/app/settings/ExplorerSettings.scala b/app/settings/Settings.scala similarity index 52% rename from app/settings/ExplorerSettings.scala rename to app/settings/Settings.scala index 9781c87..62782ab 100644 --- a/app/settings/ExplorerSettings.scala +++ b/app/settings/Settings.scala @@ -3,6 +3,6 @@ package settings import scala.concurrent.duration.FiniteDuration case class PostgresSettings(host: String, user: String, password: String) -case class CacheSettings(unconfirmedTransactionExpiredInterval: FiniteDuration) +case class TransSettings(unconfirmedTransactionExpiredInterval: FiniteDuration) -case class ExplorerSettings(postgres: PostgresSettings, cache: CacheSettings) +case class Settings(postgres: PostgresSettings, trans: TransSettings) diff --git a/conf/application.conf b/conf/application.conf index 9651f5c..2434379 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -5,7 +5,7 @@ encry { password = "" } - cache { + trans { unconfirmedTransactionExpiredInterval = 15m } } From cfc578516affa6805d805f5398ae01ea45a76640 Mon Sep 17 00:00:00 2001 From: SunFrost Date: Thu, 24 Oct 2019 18:41:10 +0500 Subject: [PATCH 28/31] PR fixes --- app/actors/TransStorage.scala | 19 ++++++++++--------- app/models/dao/TransactionsDao.scala | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/actors/TransStorage.scala b/app/actors/TransStorage.scala index fd1b146..d136e42 100644 --- a/app/actors/TransStorage.scala +++ b/app/actors/TransStorage.scala @@ -13,43 +13,44 @@ import scala.concurrent.duration._ class TransStorage @Inject()(settings: Settings) extends Actor with Timers { - var unconfTranscactions: mutable.Map[String, FullFilledTransaction] = mutable.Map[String, FullFilledTransaction]() + val transactions: mutable.Map[String, FullFilledTransaction] = mutable.Map.empty[String, FullFilledTransaction] object Timer - object Tick timers.startPeriodicTimer(Timer, Tick, 10 seconds) def receive: Receive = { case tx: Transaction => - unconfTranscactions += tx.encodedId -> FullFilledTransaction(tx) + transactions += tx.encodedId -> FullFilledTransaction(tx) case TransactionsQ(from, to) => val fromBound = if (from >= 0) from else 0 - val toBound = if (to <= unconfTranscactions.size) to else unconfTranscactions.size + val toBound = if (to <= transactions.size) to else transactions.size - val txs = unconfTranscactions.values.toList + val txs = transactions.values.toList .sortBy(-_.transaction.timestamp) .slice(if (fromBound <= toBound) fromBound else toBound, toBound) sender ! TransactionsA(txs) case TransactionByIdQ(id) => - sender ! TransactionByIdA(unconfTranscactions.get(id)) + sender ! TransactionByIdA(transactions.get(id)) case RemoveConfirmedTransactions(txIds) => - txIds.foreach(id => unconfTranscactions.remove(id)) + txIds.foreach(id => transactions.remove(id)) case Tick => val timestamp = System.currentTimeMillis() - val expiredTxIds = unconfTranscactions.values + val expiredTxIds = transactions.values .filter(tx => timestamp - tx.transaction.timestamp > settings.trans.unconfirmedTransactionExpiredInterval.toMillis) .map(_.transaction.id) - expiredTxIds.foreach(unconfTranscactions.remove(_)) + expiredTxIds.foreach(transactions.remove(_)) } } object TransStorage { + case object Tick + case class TransactionsQ(from: Int, to: Int) case class TransactionsA(txs: List[FullFilledTransaction]) diff --git a/app/models/dao/TransactionsDao.scala b/app/models/dao/TransactionsDao.scala index fe2c852..56c60ae 100644 --- a/app/models/dao/TransactionsDao.scala +++ b/app/models/dao/TransactionsDao.scala @@ -18,7 +18,7 @@ class TransactionsDao @Inject()(dbService: DBService, transService: TransService def transactionById(id: String): Future[Option[DBTransaction]] = { transService.getTransactionById(id).flatMap { txOpt => if(txOpt.isEmpty) dbService.runAsync(getTransactionById(id)) - else Future(txOpt) + else Future.successful(txOpt) } } @@ -34,13 +34,13 @@ class TransactionsDao @Inject()(dbService: DBService, transService: TransService contract <- contractF } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) - case _ => Future(Option.empty[FullFilledTransaction]) + case _ => Future.successful(Option.empty[FullFilledTransaction]) } def fullTransactionById(id: String): Future[Option[FullFilledTransaction]] = { transService.getFullTransactionById(id).flatMap { txOpt => if(txOpt.isEmpty) getFullTransaction(id) - else Future(txOpt) + else Future.successful(txOpt) } } From 8ee17bf1931828009474cfbf7e6aaf0b70bf1db7 Mon Sep 17 00:00:00 2001 From: SunFrost Date: Fri, 25 Oct 2019 11:38:45 +0500 Subject: [PATCH 29/31] optimized for fast reading in TransactionsQ(from, to) remove sortBy(timestamp) --- app/actors/TransStorage.scala | 37 +++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/app/actors/TransStorage.scala b/app/actors/TransStorage.scala index d136e42..a714045 100644 --- a/app/actors/TransStorage.scala +++ b/app/actors/TransStorage.scala @@ -1,11 +1,10 @@ package actors import actors.TransStorage._ -import akka.actor.{Actor, Props, Timers} +import akka.actor.{Actor, Timers} import javax.inject.Inject -import models.{FullFilledTransaction, _} +import models.FullFilledTransaction import org.encryfoundation.common.modifiers.mempool.transaction.Transaction -import play.api.Logger import settings.Settings import scala.collection.mutable @@ -13,7 +12,8 @@ import scala.concurrent.duration._ class TransStorage @Inject()(settings: Settings) extends Actor with Timers { - val transactions: mutable.Map[String, FullFilledTransaction] = mutable.Map.empty[String, FullFilledTransaction] + val transTs: mutable.TreeMap[Long, FullFilledTransaction] = mutable.TreeMap.empty[Long, FullFilledTransaction] + val transIds: mutable.TreeMap[String, Long] = mutable.TreeMap.empty[String, Long] object Timer @@ -21,29 +21,36 @@ class TransStorage @Inject()(settings: Settings) extends Actor with Timers { def receive: Receive = { case tx: Transaction => - transactions += tx.encodedId -> FullFilledTransaction(tx) + transTs += tx.timestamp -> FullFilledTransaction(tx) + transIds += tx.encodedId -> tx.timestamp case TransactionsQ(from, to) => val fromBound = if (from >= 0) from else 0 - val toBound = if (to <= transactions.size) to else transactions.size + val toBound = if (to <= transTs.size) to else transTs.size + val fromBoundR = transTs.size - toBound + val toBoundR = transTs.size - (if (fromBound <= toBound) fromBound else toBound) - val txs = transactions.values.toList - .sortBy(-_.transaction.timestamp) - .slice(if (fromBound <= toBound) fromBound else toBound, toBound) + val txs = transTs.values.slice(fromBoundR, toBoundR).toList.reverse sender ! TransactionsA(txs) case TransactionByIdQ(id) => - sender ! TransactionByIdA(transactions.get(id)) + val tx = transIds.get(id).flatMap(transTs.get) + sender ! TransactionByIdA(tx) case RemoveConfirmedTransactions(txIds) => - txIds.foreach(id => transactions.remove(id)) + val tsList = txIds.flatMap(transIds.get) + tsList.foreach(ts => transTs.remove(ts)) + txIds.foreach(id => transIds.remove(id)) case Tick => val timestamp = System.currentTimeMillis() - val expiredTxIds = transactions.values - .filter(tx => timestamp - tx.transaction.timestamp > settings.trans.unconfirmedTransactionExpiredInterval.toMillis) - .map(_.transaction.id) - expiredTxIds.foreach(transactions.remove(_)) + + transTs.takeWhile { case (ts, _) => + timestamp - ts > settings.trans.unconfirmedTransactionExpiredInterval.toMillis + }.foreach { case (ts, tx) => + transIds.remove(tx.transaction.id) + transTs.remove(ts) + } } } From 5369037a0b435e3aebcc3ceddb97e7d5cf814202 Mon Sep 17 00:00:00 2001 From: SunFrost Date: Fri, 25 Oct 2019 13:45:01 +0500 Subject: [PATCH 30/31] use Map with preserve order --- app/actors/TransStorage.scala | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/app/actors/TransStorage.scala b/app/actors/TransStorage.scala index a714045..2c53b73 100644 --- a/app/actors/TransStorage.scala +++ b/app/actors/TransStorage.scala @@ -12,8 +12,7 @@ import scala.concurrent.duration._ class TransStorage @Inject()(settings: Settings) extends Actor with Timers { - val transTs: mutable.TreeMap[Long, FullFilledTransaction] = mutable.TreeMap.empty[Long, FullFilledTransaction] - val transIds: mutable.TreeMap[String, Long] = mutable.TreeMap.empty[String, Long] + val transactions: mutable.LinkedHashMap[String, FullFilledTransaction] = mutable.LinkedHashMap.empty[String, FullFilledTransaction] object Timer @@ -21,38 +20,31 @@ class TransStorage @Inject()(settings: Settings) extends Actor with Timers { def receive: Receive = { case tx: Transaction => - transTs += tx.timestamp -> FullFilledTransaction(tx) - transIds += tx.encodedId -> tx.timestamp + transactions += tx.encodedId -> FullFilledTransaction(tx) case TransactionsQ(from, to) => val fromBound = if (from >= 0) from else 0 - val toBound = if (to <= transTs.size) to else transTs.size - val fromBoundR = transTs.size - toBound - val toBoundR = transTs.size - (if (fromBound <= toBound) fromBound else toBound) - - val txs = transTs.values.slice(fromBoundR, toBoundR).toList.reverse + val toBound = if (to <= transactions.size) to else transactions.size + val fromBoundR = transactions.size - toBound + val toBoundR = transactions.size - (if (fromBound <= toBound) fromBound else toBound) + val txs = transactions.values.slice(fromBoundR, toBoundR).toList.reverse sender ! TransactionsA(txs) case TransactionByIdQ(id) => - val tx = transIds.get(id).flatMap(transTs.get) - sender ! TransactionByIdA(tx) + sender ! TransactionByIdA(transactions.get(id)) case RemoveConfirmedTransactions(txIds) => - val tsList = txIds.flatMap(transIds.get) - tsList.foreach(ts => transTs.remove(ts)) - txIds.foreach(id => transIds.remove(id)) + txIds.foreach(id => transactions.remove(id)) case Tick => val timestamp = System.currentTimeMillis() - transTs.takeWhile { case (ts, _) => - timestamp - ts > settings.trans.unconfirmedTransactionExpiredInterval.toMillis - }.foreach { case (ts, tx) => - transIds.remove(tx.transaction.id) - transTs.remove(ts) + transactions.takeWhile { case (_, tx) => + timestamp - tx.transaction.timestamp > settings.trans.unconfirmedTransactionExpiredInterval.toMillis + }.foreach { case (_, tx) => + transactions.remove(tx.transaction.id) } } - } object TransStorage { From 85ea781f912f9bc8e2557e690216de90dfa756fb Mon Sep 17 00:00:00 2001 From: SunFrost Date: Mon, 28 Oct 2019 16:51:34 +0500 Subject: [PATCH 31/31] redundancy --- app/controllers/SearchController.scala | 27 -------------------------- 1 file changed, 27 deletions(-) diff --git a/app/controllers/SearchController.scala b/app/controllers/SearchController.scala index 9b6719b..581f4b3 100644 --- a/app/controllers/SearchController.scala +++ b/app/controllers/SearchController.scala @@ -15,33 +15,6 @@ class SearchController @Inject()(cc: ControllerComponents, boxesDao: BoxesDao) (implicit ex: ExecutionContext) extends AbstractController(cc) with Circe { - def getBlock(id: String): Future[Option[Block]] = { - val headerF: Future[Option[Header]] = historyDao.findHeader(id) - val payloadF: Future[List[DBTransaction]] = transactionsDao.transactionsByBlock(id) - for { - headerOpt <- headerF - payload <- payloadF - } yield headerOpt match { - case Some(header) => Some(Block(header, payload)) - case _ => None - } - } - - def getFullTransaction(id: String): Future[Option[FullFilledTransaction]] = - transactionsDao.transactionById(id).flatMap { - case Some(tx) => - val outputsF: Future[List[DBOutput]] = transactionsDao.outputsByTransaction(tx.id) - val inputsF: Future[List[DBInput]] = transactionsDao.inputsByTransaction(tx.id) - val contractF: Future[List[Contract]] = transactionsDao.contractByTransaction(tx.id) - for { - outputs <- outputsF - inputs <- inputsF - contract <- contractF - } yield Some(FullFilledTransaction(tx, inputs, outputs, contract)) - - case _ => Future(Option.empty[FullFilledTransaction]) - } - def search(id: String): Action[AnyContent] = Action.async { val blockF: Future[Option[Block]] = getBlock(id)