Skip to content

[ETCM-205] Add information about checkpoints in tx history #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 3, 2020
Merged

[ETCM-205] Add information about checkpoints in tx history #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
006d7c3
[ETCM-205] Add diffx for improved reporting of failures involving com…
kapke Dec 2, 2020
de5e394
[ETCM-205] Add information about tx being checkpointed to the transac…
kapke Dec 2, 2020
308e8b6
[ETCM-205] Reformat files and update repo.nix files
kapke Dec 3, 2020
4f9e6e4
[ETCM-205] Simplify address generation from keypair
kapke Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ object Dependencies {
"org.scalatest" %% "scalatest" % "3.2.2" % "it,test",
"org.scalamock" %% "scalamock" % "5.0.0" % "test",
"org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
"org.scalacheck" %% "scalacheck" % "1.14.3" % "it,test"
"org.scalacheck" %% "scalacheck" % "1.14.3" % "it,test",
"com.softwaremill.diffx" %% "diffx-core" % "0.3.30" % "test",
"com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % "test"
)

val cats: Seq[ModuleID] = {
Expand Down
128 changes: 128 additions & 0 deletions repo.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,70 @@
url = "https://repo1.maven.org/maven2/com/monovore/decline_2.12/1.3.0/decline_2.12-1.3.0.pom";
sha256 = "8806217334913555CE9E8F844EA4561767CD850457945E552838F1B2F85A9C86";
};
"nix-public/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0-javadoc.jar";
sha256 = "71FABF98DEA887966534B972076E7CEF471081BEC54447E9CE99CD83693A147E";
};
"nix-public/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0-sources.jar" = {
url = "https://repo1.maven.org/maven2/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0-sources.jar";
sha256 = "6668CBFAE9263A2542F6AC78B0AA1DB0D4DA557614ADB4D03973BC44C7DA694C";
};
"nix-public/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0.jar" = {
url = "https://repo1.maven.org/maven2/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0.jar";
sha256 = "7ACCC5F93399FBE99C9D6DC1F4A8A82263D63B7ECB5D98BD3E5C1D0ABB6F0450";
};
"nix-public/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0.pom" = {
url = "https://repo1.maven.org/maven2/com/propensive/magnolia_2.12/0.17.0/magnolia_2.12-0.17.0.pom";
sha256 = "465823AEF5E9EB3C788790AF3899A4A3E59DD8B2D38718A42A679D6286F8905B";
};
"nix-public/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1-javadoc.jar";
sha256 = "A781EB938DAEFE7392F84B69246E5A337044DBED0C3AEDD8B1442847FFF70170";
};
"nix-public/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1-sources.jar" = {
url = "https://repo1.maven.org/maven2/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1-sources.jar";
sha256 = "E5DC8F9E19A9533C8F69AF24A4AC2AB91D09D9799A291E3AD10D55357B7CE9DF";
};
"nix-public/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1.jar" = {
url = "https://repo1.maven.org/maven2/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1.jar";
sha256 = "1DEEF9A53201B3F05DEA6BDD6CD3D355720A7A8423F119C9993AD6A8E12BDA49";
};
"nix-public/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1.pom" = {
url = "https://repo1.maven.org/maven2/com/propensive/mercator_2.12/0.2.1/mercator_2.12-0.2.1.pom";
sha256 = "E4126D50DE1E89EB086787CB28047BC9CDC5136E16BBC8E4D7C72BC8AF028E60";
};
"nix-public/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30-javadoc.jar";
sha256 = "B18F78BFE8970F9CCFD55C174979EFA5C87E0D462C4053B4577F7B7710506A48";
};
"nix-public/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30-sources.jar" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30-sources.jar";
sha256 = "1505A3FF3EAB930B7E4677D89D154FF2E77717759B3C1E4A3777AB7EF4DF21F0";
};
"nix-public/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30.jar" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30.jar";
sha256 = "9A4FFF8A5FA811AB351B7254F85D0410D47B64B0AD975E7736B82BE05F9B51F7";
};
"nix-public/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30.pom" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-core_2.12/0.3.30/diffx-core_2.12-0.3.30.pom";
sha256 = "DFB5DFA65BFA9B4B4762B4427D8905C5D9119D14E851D7C16859717361D1B4AB";
};
"nix-public/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30-javadoc.jar";
sha256 = "CF0F66D18B3DDC84CB958B412FD7CA80CDD494D7BCACE4E34670DC524ABBDBDD";
};
"nix-public/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30-sources.jar" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30-sources.jar";
sha256 = "5F976B5E59C3C52D306DBBF84E6E3E1A739B6CF566B04E74ED9587F90C87AD6D";
};
"nix-public/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30.jar" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30.jar";
sha256 = "8D8AC0AC4F0B51EEC09C6A1F745CEA5CCB70490A446FC2DDA91F5C05C06A59FF";
};
"nix-public/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30.pom" = {
url = "https://repo1.maven.org/maven2/com/softwaremill/diffx/diffx-scalatest_2.12/0.3.30/diffx-scalatest_2.12-0.3.30.pom";
sha256 = "2E03EF44FBB174C847896F073762145847ED458784B41C549033C97E22B5CE43";
};
"nix-public/com/squareup/okhttp3/logging-interceptor/4.3.1/logging-interceptor-4.3.1-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor/4.3.1/logging-interceptor-4.3.1-javadoc.jar";
sha256 = "1FDD287ADDB6301F3D16274ADBDF55C7129E2C675DA61EF087A62740EAB49EAF";
Expand Down Expand Up @@ -2961,6 +3025,22 @@
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.2.2/scalactic_2.12-3.2.2.pom";
sha256 = "E8996A85BA1225FEA69237DEA1ADBFC6A7B47E61BA717273A602F538DBE80191";
};
"nix-public/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3-javadoc.jar";
sha256 = "390B5F46A0748DA214EBD337EE16BDC70866CC89CE0B0D670B6840A9DC61DE38";
};
"nix-public/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3-sources.jar" = {
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3-sources.jar";
sha256 = "E7AC7B33C26C6310CCCC162341E5FA0C09D32AB82387EF1C544A73259071A789";
};
"nix-public/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3.jar" = {
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3.jar";
sha256 = "AE90B144DB41B2947F85C926F218E0F4821CB5C4E896050B05DBDC8D8976A8E9";
};
"nix-public/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3.pom" = {
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.2.3/scalactic_2.12-3.2.3.pom";
sha256 = "A7A9780707C5A8DA98A1E2874FEA5E6FEC72AE01C9AC9703B1C88C948B0C447A";
};
"nix-public/org/scalameta/common_2.12/4.3.20/common_2.12-4.3.20-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalameta/common_2.12/4.3.20/common_2.12-4.3.20-javadoc.jar";
sha256 = "44335923904E3547FEAFDEB1F0FC843159D0AED05769D9C98C78927E180118F4";
Expand Down Expand Up @@ -3089,6 +3169,22 @@
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.2.2/scalatest-compatible-3.2.2.pom";
sha256 = "285E1C62310DF89E3D4EC4A3317812B25E673FA52BDC0E4655EA6940BF2BF4B5";
};
"nix-public/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3-javadoc.jar";
sha256 = "C45E5CCEB24BC0C40D63FBA5B2D43622F376DB0D321C020C0910A64537751342";
};
"nix-public/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3-sources.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3-sources.jar";
sha256 = "0BC33A5EEB862128718005A7A46B29BECFB04D4D6E70E9A52D43E476F4027AF4";
};
"nix-public/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3.jar";
sha256 = "78D08EA4E51ECAF33B66DAEB10342F2794906F46EB0C5E1B0B26FA0F65A50A20";
};
"nix-public/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3.pom" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.2.3/scalatest-compatible-3.2.3.pom";
sha256 = "240C6F5134832ED099B9236CB5C832FA41AA2A82FC716EFB822D41D2C4211CCE";
};
"nix-public/org/scalatest/scalatest-core_2.12/3.2.2/scalatest-core_2.12-3.2.2-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-core_2.12/3.2.2/scalatest-core_2.12-3.2.2-javadoc.jar";
sha256 = "30ED32B545BE24F539576B4CEE444DD32C45AFAD0EEA5CD48338A5FD1C5891F7";
Expand All @@ -3105,6 +3201,22 @@
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-core_2.12/3.2.2/scalatest-core_2.12-3.2.2.pom";
sha256 = "6E85AE78C7460DEFDFCD6904A0C9532417B0818165ABAAC701F9FAFBF19D1306";
};
"nix-public/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3-javadoc.jar";
sha256 = "330D9DA80AD89BED6E78B716278779103B5D6F0FFB62DFD0D22C2860AB61B14A";
};
"nix-public/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3-sources.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3-sources.jar";
sha256 = "48F2A735CF1EEC2B6DD0A01C5626398DACB41998D17BF1F6AE2D1A2699725EC9";
};
"nix-public/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3.jar";
sha256 = "DB7679D95C56922CC30BA86B06AF43BCD124AD5815E861F8D6BE6A456D9EF36C";
};
"nix-public/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3.pom" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-core_2.12/3.2.3/scalatest-core_2.12-3.2.3.pom";
sha256 = "40F996A790BF4DAEEA443957B70EDCF82B3A71012DE669474C7C303A4CC8CA51";
};
"nix-public/org/scalatest/scalatest-diagrams_2.12/3.2.2/scalatest-diagrams_2.12-3.2.2-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-diagrams_2.12/3.2.2/scalatest-diagrams_2.12-3.2.2-javadoc.jar";
sha256 = "15A2C1072E6D0A77B1015B1C81A8F830C0238E17ED05113856ABBDC5B56462D4";
Expand Down Expand Up @@ -3217,6 +3329,22 @@
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-matchers-core_2.12/3.2.2/scalatest-matchers-core_2.12-3.2.2.pom";
sha256 = "1A63C3DF2A738BA37DDCAAC4122660C2B0E8254A0FD96E74BEAC8F576CDB5B48";
};
"nix-public/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3-javadoc.jar";
sha256 = "C279DC1F0FF83A83C0AACE46ED9AE325B72004C93066934A2455646FD2E9AECD";
};
"nix-public/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3-sources.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3-sources.jar";
sha256 = "0326FF5F28C075E6AA2337136EF3AC4E0D26BA824579E156DCBCB5276441BAAF";
};
"nix-public/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3.jar";
sha256 = "0F28CDC645FF00753880E684B017536E3207A5416ECE4AAE6BDCB82B37678182";
};
"nix-public/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3.pom" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-matchers-core_2.12/3.2.3/scalatest-matchers-core_2.12-3.2.3.pom";
sha256 = "061C2E466F362C5337EBA12E954BE5293F1AB8530F1930D97FCF40E6D9216566";
};
"nix-public/org/scalatest/scalatest-mustmatchers_2.12/3.2.2/scalatest-mustmatchers_2.12-3.2.2-javadoc.jar" = {
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-mustmatchers_2.12/3.2.2/scalatest-mustmatchers_2.12-3.2.2-javadoc.jar";
sha256 = "8AB6B6C47EFC9428739FC4CB9E510326CBE2ADA1BB9818896D2DCBF300674EED";
Expand Down
6 changes: 6 additions & 0 deletions src/main/scala/io/iohk/ethereum/domain/Address.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import akka.util.ByteString
import io.iohk.ethereum.crypto
import io.iohk.ethereum.mpt.ByteArrayEncoder
import io.iohk.ethereum.utils.ByteUtils.padLeft
import org.bouncycastle.crypto.AsymmetricCipherKeyPair
import org.bouncycastle.util.encoders.Hex

object Address {
Expand Down Expand Up @@ -33,6 +34,11 @@ object Address {
require(bytes.length <= Length, s"Invalid address: $hexString")
Address(bytes)
}

def apply(keyPair: AsymmetricCipherKeyPair): Address = {
val pub = crypto.pubKeyFromKeyPair(keyPair)
Address(crypto.kec256(pub))
}
Copy link
Contributor

@lemastero lemastero Dec 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

class Address private (val bytes: ByteString) {
Expand Down
13 changes: 4 additions & 9 deletions src/main/scala/io/iohk/ethereum/domain/SignedTransaction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
package io.iohk.ethereum.domain

import java.math.BigInteger
import java.util.concurrent.Executors

import akka.util.ByteString
import com.google.common.cache.{Cache, CacheBuilder}
import io.iohk.ethereum.crypto
import io.iohk.ethereum.crypto.{ECDSASignature, kec256}
import io.iohk.ethereum.mpt.ByteArraySerializable
import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
import io.iohk.ethereum.rlp.RLPImplicitConversions._
import io.iohk.ethereum.rlp.RLPImplicits._
import io.iohk.ethereum.rlp.{encode => rlpEncode, _}
import org.bouncycastle.crypto.AsymmetricCipherKeyPair
import org.bouncycastle.crypto.params.ECPublicKeyParameters
import org.bouncycastle.util.encoders.Hex
import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._

import java.math.BigInteger
import java.util.concurrent.Executors
import scala.concurrent.{ExecutionContext, Future}

import scala.util.Try

object SignedTransaction {
Expand Down Expand Up @@ -74,9 +71,7 @@ object SignedTransaction {
def sign(tx: Transaction, keyPair: AsymmetricCipherKeyPair, chainId: Option[Byte]): SignedTransactionWithSender = {
val bytes = bytesToSign(tx, chainId)
val sig = ECDSASignature.sign(bytes, keyPair, chainId)
//byte 0 of encoded ECC point indicates that it is uncompressed point, it is part of bouncycastle encoding
val pub = keyPair.getPublic.asInstanceOf[ECPublicKeyParameters].getQ.getEncoded(false).tail
val address = Address(crypto.kec256(pub).drop(FirstByteOfAddress))
val address = Address(keyPair)
SignedTransactionWithSender(tx, sig, address)
}

Expand Down
1 change: 1 addition & 0 deletions src/main/scala/io/iohk/ethereum/jsonrpc/MantisJsonMethodImplicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ object MantisJsonMethodImplicits extends JsonMethodsImplicits {
val encodedTxResponse = JsonEncoder.encode(asTxResponse)
val encodedExtension = JObject(
"isOutgoing" -> extendedTxData.isOutgoing.jsonEncoded,
"isCheckpointed" -> extendedTxData.minedTransactionData.map(_.isCheckpointed).jsonEncoded,
"isPending" -> extendedTxData.isPending.jsonEncoded,
"gasUsed" -> extendedTxData.minedTransactionData.map(_.gasUsed).jsonEncoded,
"timestamp" -> extendedTxData.minedTransactionData.map(_.timestamp).jsonEncoded
Expand Down
15 changes: 11 additions & 4 deletions src/main/scala/io/iohk/ethereum/transactions/TransactionHistoryService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class TransactionHistoryService(
account: Address,
fromBlocks: NumericRange[BigInt]
): Task[List[ExtendedTransactionData]] = {
val getLastCheckpoint = Task { blockchain.getLatestCheckpointBlockNumber() }.memoizeOnSuccess
val txnsFromBlocks = Observable
.from(fromBlocks.reverse)
.mapParallelOrdered(10)(blockNr => Task { blockchain.getBlockByNumber(blockNr) })(OverflowStrategy.Unbounded)
Expand All @@ -40,7 +41,9 @@ class TransactionHistoryService(
.from(block.body.transactionList.reverse)
.collect(Function.unlift(MinedTxChecker.checkTx(_, account)))
.mapEval { case (tx, mkExtendedData) =>
getBlockReceipts.map(MinedTxChecker.getMinedTxData(tx, block, _).map(mkExtendedData(_)))
(getBlockReceipts, getLastCheckpoint).mapN(
MinedTxChecker.getMinedTxData(tx, block, _, _).map(mkExtendedData(_))
)
}
.collect { case Some(data) =>
data
Expand Down Expand Up @@ -71,7 +74,8 @@ object TransactionHistoryService {
case class MinedTransactionData(
header: BlockHeader,
transactionIndex: Int,
gasUsed: BigInt
gasUsed: BigInt,
isCheckpointed: Boolean
) {
lazy val timestamp: Long = header.unixTimestamp
}
Expand Down Expand Up @@ -121,7 +125,8 @@ object TransactionHistoryService {
def getMinedTxData(
tx: SignedTransaction,
block: Block,
blockReceipts: Vector[Receipt]
blockReceipts: Vector[Receipt],
lastCheckpointBlockNumber: BigInt
): Option[MinedTransactionData] = {
val maybeIndex = block.body.transactionList.zipWithIndex.collectFirst {
case (someTx, index) if someTx.hash == tx.hash => index
Expand All @@ -137,7 +142,9 @@ object TransactionHistoryService {
txReceipt.cumulativeGasUsed - previousCumulativeGas
}

(Some(block.header), maybeIndex, maybeGasUsed).mapN(MinedTransactionData)
val isCheckpointed = lastCheckpointBlockNumber >= block.number

(Some(block.header), maybeIndex, maybeGasUsed, Some(isCheckpointed)).mapN(MinedTransactionData)
}
}
}
22 changes: 19 additions & 3 deletions src/test/scala/io/iohk/ethereum/BlockHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package io.iohk.ethereum

import akka.util.ByteString
import io.iohk.ethereum.crypto.generateKeyPair
import io.iohk.ethereum.domain.{Address, Block, BlockBody, SignedTransaction, Transaction}
import io.iohk.ethereum.domain.BlockHeader.HeaderExtraFields
import io.iohk.ethereum.domain._
import io.iohk.ethereum.security.SecureRandomBuilder
import org.bouncycastle.crypto.AsymmetricCipherKeyPair
import mouse.all._
import org.bouncycastle.crypto.AsymmetricCipherKeyPair

import scala.util.Random

Expand Down Expand Up @@ -42,12 +43,19 @@ object BlockHelpers extends SecureRandomBuilder {
generated :+ (parent |> generateBlock |> adjustBlock)
}

def resetHeaderExtraFields(hef: BlockHeader.HeaderExtraFields): BlockHeader.HeaderExtraFields = hef match {
case HeaderExtraFields.HefEmpty => HeaderExtraFields.HefEmpty
case HeaderExtraFields.HefPostEcip1098(_) => HeaderExtraFields.HefPostEcip1098(treasuryOptOut = false)
case HeaderExtraFields.HefPostEcip1097(_, _) => HeaderExtraFields.HefPostEcip1097(treasuryOptOut = false, None)
}

def generateBlock(parent: Block): Block = {
val header = parent.header.copy(
extraData = randomHash(),
number = parent.number + 1,
parentHash = parent.hash,
nonce = ByteString(Random.nextLong())
nonce = ByteString(Random.nextLong()),
extraFields = resetHeaderExtraFields(parent.header.extraFields)
)
val ommer = defaultHeader.copy(extraData = randomHash())
val tx = defaultTx.copy(payload = randomHash())
Expand All @@ -56,4 +64,12 @@ object BlockHelpers extends SecureRandomBuilder {
Block(header, BlockBody(List(stx.tx), List(ommer)))
}

def updateHeader(block: Block, updater: BlockHeader => BlockHeader): Block = {
block.copy(header = updater(block.header))
}

def withTransactions(block: Block, transactions: List[SignedTransaction]): Block = {
block.copy(body = block.body.copy(transactionList = transactions))
}

}
Loading