[ETCM-921] read chainId from rlp transaction instead of config

Author: strauss-m

src/main/scala/io/iohk/ethereum/domain/SignedTransaction.scala

@@ -22,6 +22,7 @@ import io.iohk.ethereum.network.p2p.messages.BaseETH6XMessages.SignedTransaction
 import io.iohk.ethereum.rlp.RLPImplicitConversions._
 import io.iohk.ethereum.rlp.RLPImplicits._
 import io.iohk.ethereum.rlp.{encode => rlpEncode, _}
+import io.iohk.ethereum.utils.Config
 
 object SignedTransaction {
 
@@ -86,13 +87,14 @@ object SignedTransaction {
 
   private def calculateSender(tx: SignedTransaction): Option[Address] = Try {
     val ECDSASignature(_, _, v) = tx.signature
-    val bytesToSign: Array[Byte] = if (v == ECDSASignature.negativePointSign || v == ECDSASignature.positivePointSign) {
-      generalTransactionBytes(tx.tx)
-    } else {
-      chainSpecificTransactionBytes(tx.tx, chainId)
+    // chainId specific code that will be refactored with the Signer feature (ETCM-1096)
+    val chainIdOpt = extractChainId(tx)
+    val bytesToSign: Array[Byte] = chainIdOpt match {
+      case None          => generalTransactionBytes(tx.tx)
+      case Some(chainId) => chainSpecificTransactionBytes(tx.tx, chainId)
     }
 
-    val recoveredPublicKey: Option[Array[Byte]] = tx.signature.publicKey(bytesToSign, Some(chainId))
+    val recoveredPublicKey: Option[Array[Byte]] = tx.signature.publicKey(bytesToSign, chainIdOpt)
 
     for {
       key <- recoveredPublicKey
@@ -142,6 +144,17 @@ object SignedTransaction {
     )
   }
 
+  private def extractChainId(stx: SignedTransaction): Option[Byte] = {
+    val chainIdOpt: Option[BigInt] = stx.tx match {
+      case _: LegacyTransaction
+          if stx.signature.v == ECDSASignature.negativePointSign || stx.signature.v == ECDSASignature.positivePointSign =>
+        None
+      case _: LegacyTransaction            => Some(Config.blockchains.blockchainConfig.chainId)
+      case twal: TransactionWithAccessList => Some(twal.chainId)
+    }
+    chainIdOpt.map(_.toByte)
+  }
+
   val byteArraySerializable: ByteArraySerializable[SignedTransaction] = new ByteArraySerializable[SignedTransaction] {
 
     override def fromBytes(bytes: Array[Byte]): SignedTransaction = bytes.toSignedTransaction

src/main/scala/io/iohk/ethereum/domain/Transaction.scala

@@ -71,6 +71,7 @@ case class LegacyTransaction(
 
 object TransactionWithAccessList {
   def apply(
+      chainId: BigInt,
       nonce: BigInt,
       gasPrice: BigInt,
       gasLimit: BigInt,
@@ -79,10 +80,11 @@ object TransactionWithAccessList {
       payload: ByteString,
       accessList: List[AccessListItem]
   ): TransactionWithAccessList =
-    TransactionWithAccessList(nonce, gasPrice, gasLimit, Some(receivingAddress), value, payload, accessList)
+    TransactionWithAccessList(chainId, nonce, gasPrice, gasLimit, Some(receivingAddress), value, payload, accessList)
 }
 
 case class TransactionWithAccessList(
+    chainId: BigInt,
     nonce: BigInt,
     gasPrice: BigInt,
     gasLimit: BigInt,

src/main/scala/io/iohk/ethereum/network/p2p/messages/BaseETH6XMessages.scala

@@ -155,8 +155,6 @@ object BaseETH6XMessages {
 
   object SignedTransactions {
 
-    lazy val chainId: Byte = Config.blockchains.blockchainConfig.chainId
-
     implicit class SignedTransactionEnc(val signedTx: SignedTransaction) extends RLPSerializable {
 
       override def toBytes: Array[Byte] =
@@ -171,9 +169,9 @@ object BaseETH6XMessages {
           .map(_.toArray)
           .getOrElse(Array.emptyByteArray)
         signedTx.tx match {
-          case TransactionWithAccessList(nonce, gasPrice, gasLimit, _, value, payload, accessList) =>
+          case TransactionWithAccessList(chainId, nonce, gasPrice, gasLimit, _, value, payload, accessList) =>
             RLPList(
-              chainId, // TODO improve how chainid is preserved in transactions (ETCM-1096)
+              chainId,
               nonce,
               gasPrice,
               gasLimit,
@@ -220,7 +218,7 @@ object BaseETH6XMessages {
 
       def toSignedTransaction: SignedTransaction = rlpEncodeable match {
         case RLPList(
-              _, // TODO improve how chainid is preserved in transactions (ETCM-1096)
+              chainId,
               nonce,
               gasPrice,
               gasLimit,
@@ -235,6 +233,7 @@ object BaseETH6XMessages {
           val receivingAddressOpt = if (receivingAddress.bytes.isEmpty) None else Some(Address(receivingAddress.bytes))
           SignedTransaction(
             TransactionWithAccessList(
+              chainId,
               nonce,
               gasPrice,
               gasLimit,

src/test/scala/io/iohk/ethereum/ObjectGenerators.scala

@@ -107,6 +107,7 @@ trait ObjectGenerators {
   )
 
   def typedTransactionGen(): Gen[TransactionWithAccessList] = for {
+    chainId <- bigIntGen
     nonce <- bigIntGen
     gasPrice <- bigIntGen
     gasLimit <- bigIntGen
@@ -115,6 +116,7 @@ trait ObjectGenerators {
     payload <- byteStringOfLengthNGen(256)
     accessList <- Gen.listOf(accessListItemGen())
   } yield TransactionWithAccessList(
+    chainId,
     nonce,
     gasPrice,
     gasLimit,

src/test/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSpec.scala

@@ -631,6 +631,7 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
     )
 
     val typedTransaction: TypedTransaction = TransactionWithAccessList(
+      chainId = 61, // ethereum classic mainnet
       nonce = 0,
       gasPrice = 1,
       gasLimit = txGasLimit,

src/test/scala/io/iohk/ethereum/domain/TransactionSpec.scala

@@ -11,6 +11,7 @@ import io.iohk.ethereum.ObjectGenerators
 import io.iohk.ethereum.crypto.ECDSASignature
 import io.iohk.ethereum.network.p2p.messages.BaseETH6XMessages.SignedTransactions
 import io.iohk.ethereum.security.SecureRandomBuilder
+import io.iohk.ethereum.utils.Config
 import io.iohk.ethereum.utils.Hex
 import io.iohk.ethereum.vm.utils.MockVmInput
 
@@ -43,6 +44,7 @@ class TransactionSpec
 
     val toAddr: Address = Address.apply("b94f5374fce5edbc8e2a8697c15331677e6ebf0b")
     val tx: TransactionWithAccessList = TransactionWithAccessList(
+      1, // ethereum mainnet, used by the core-geth test
       3,
       1,
       25000,