large chain id support for private transactions

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eea/PrivateTransactionBuilder.java

@@ -21,6 +21,7 @@
 import tech.pegasys.pantheon.ethereum.rlp.RLP;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
+import java.math.BigInteger;
 import java.util.List;
 
 public class PrivateTransactionBuilder {
@@ -124,7 +125,7 @@ public String build(final TransactionType type) {
                       .value(Wei.ZERO)
                       .payload(payload)
                       .sender(from)
-                      .chainId(2018)
+                      .chainId(BigInteger.valueOf(2018))
                       .privateFrom(privateFrom)
                       .privateFor(privateFor)
                       .restriction(BytesValue.wrap("restricted".getBytes(UTF_8)))

ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransaction.java

@@ -33,20 +33,22 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.OptionalInt;
 
 /** An operation submitted by an external actor to be applied to the system. */
 public class PrivateTransaction {
 
   // Used for transactions that are not tied to a specific chain
   // (e.g. does not have a chain id associated with it).
-  private static final int REPLAY_UNPROTECTED_V_BASE = 27;
+  private static final BigInteger REPLAY_UNPROTECTED_V_BASE = BigInteger.valueOf(27);
+  private static final BigInteger REPLAY_UNPROTECTED_V_BASE_PLUS_1 = BigInteger.valueOf(28);
 
-  private static final int REPLAY_PROTECTED_V_BASE = 35;
+  private static final BigInteger REPLAY_PROTECTED_V_BASE = BigInteger.valueOf(35);
 
   // The v signature parameter starts at 36 because 1 is the first valid chainId so:
   // chainId > 1 implies that 2 * chainId + V_BASE > 36.
-  private static final int REPLAY_PROTECTED_V_MIN = 36;
+  private static final BigInteger REPLAY_PROTECTED_V_MIN = BigInteger.valueOf(36);
+
+  private static final BigInteger TWO = BigInteger.valueOf(2);
 
   private final long nonce;
 
@@ -62,7 +64,7 @@ public class PrivateTransaction {
 
   private final BytesValue payload;
 
-  private final OptionalInt chainId;
+  private final Optional<BigInteger> chainId;
 
   private final BytesValue privateFrom;
 
@@ -98,14 +100,14 @@ public static PrivateTransaction readFrom(final RLPInput input) throws RLPExcept
             .value(input.readUInt256Scalar(Wei::wrap))
             .payload(input.readBytesValue());
 
-    final int v = input.readIntScalar();
+    final BigInteger v = input.readBigIntegerScalar();
     final byte recId;
-    int chainId = -1;
-    if (v == REPLAY_UNPROTECTED_V_BASE || v == REPLAY_UNPROTECTED_V_BASE + 1) {
-      recId = (byte) (v - REPLAY_UNPROTECTED_V_BASE);
-    } else if (v > REPLAY_PROTECTED_V_MIN) {
-      chainId = (v - REPLAY_PROTECTED_V_BASE) / 2;
-      recId = (byte) (v - (2 * chainId + REPLAY_PROTECTED_V_BASE));
+    Optional<BigInteger> chainId = Optional.empty();
+    if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
+      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
+    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
+      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
+      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
     } else {
       throw new RuntimeException(
           String.format("An unsupported encoded `v` value of %s was found", v));
@@ -119,8 +121,8 @@ public static PrivateTransaction readFrom(final RLPInput input) throws RLPExcept
 
     input.leaveList();
 
+    chainId.ifPresent(builder::chainId);
     return builder
-        .chainId(chainId)
         .signature(signature)
         .privateFrom(privateFrom)
         .privateFor(privateFor)
@@ -158,7 +160,7 @@ protected PrivateTransaction(
       final SECP256K1.Signature signature,
       final BytesValue payload,
       final Address sender,
-      final int chainId,
+      final Optional<BigInteger> chainId,
       final BytesValue privateFrom,
       final List<BytesValue> privateFor,
       final BytesValue restriction) {
@@ -170,7 +172,7 @@ protected PrivateTransaction(
     this.signature = signature;
     this.payload = payload;
     this.sender = sender;
-    this.chainId = chainId > 0 ? OptionalInt.of(chainId) : OptionalInt.empty();
+    this.chainId = chainId;
     this.privateFrom = privateFrom;
     this.privateFor = privateFor;
     this.restriction = restriction;
@@ -250,7 +252,7 @@ public BytesValue getPayload() {
    *
    * @return the transaction chain id if it exists; otherwise {@code OptionalInt.empty()}
    */
-  public OptionalInt getChainId() {
+  public Optional<BigInteger> getChainId() {
     return chainId;
   }
 
@@ -340,7 +342,7 @@ public void writeTo(final RLPOutput out) {
   }
 
   private void writeSignature(final RLPOutput out) {
-    out.writeIntScalar(getV());
+    out.writeBigIntegerScalar(getV());
     out.writeBigIntegerScalar(getSignature().getR());
     out.writeBigIntegerScalar(getSignature().getS());
   }
@@ -353,12 +355,13 @@ public BigInteger getS() {
     return signature.getS();
   }
 
-  public int getV() {
-    final int v;
+  public BigInteger getV() {
+    final BigInteger v;
+    final BigInteger recId = BigInteger.valueOf(signature.getRecId());
     if (!chainId.isPresent()) {
-      v = signature.getRecId() + REPLAY_UNPROTECTED_V_BASE;
+      v = recId.add(REPLAY_UNPROTECTED_V_BASE);
     } else {
-      v = (getSignature().getRecId() + REPLAY_PROTECTED_V_BASE + 2 * chainId.getAsInt());
+      v = recId.add(REPLAY_PROTECTED_V_BASE).add(TWO.multiply(chainId.get()));
     }
     return v;
   }
@@ -414,7 +417,7 @@ private static Bytes32 computeSenderRecoveryHash(
       final Address to,
       final Wei value,
       final BytesValue payload,
-      final OptionalInt chainId,
+      final Optional<BigInteger> chainId,
       final BytesValue privateFrom,
       final List<BytesValue> privateFor,
       final BytesValue restriction) {
@@ -429,7 +432,7 @@ private static Bytes32 computeSenderRecoveryHash(
               out.writeUInt256Scalar(value);
               out.writeBytesValue(payload);
               if (chainId.isPresent()) {
-                out.writeIntScalar(chainId.getAsInt());
+                out.writeBigIntegerScalar(chainId.get());
                 out.writeUInt256Scalar(UInt256.ZERO);
                 out.writeUInt256Scalar(UInt256.ZERO);
               }
@@ -485,7 +488,7 @@ public String toString() {
     if (getTo().isPresent()) sb.append("to=").append(getTo().get()).append(", ");
     sb.append("value=").append(getValue()).append(", ");
     sb.append("sig=").append(getSignature()).append(", ");
-    if (chainId.isPresent()) sb.append("chainId=").append(getChainId().getAsInt()).append(", ");
+    if (chainId.isPresent()) sb.append("chainId=").append(getChainId().get()).append(", ");
     sb.append("payload=").append(getPayload());
     sb.append("privateFrom=").append(getPrivateFrom());
     sb.append("privateFor=").append(Arrays.toString(getPrivateFor().toArray()));
@@ -518,16 +521,16 @@ public static class Builder {
 
     protected Address sender;
 
-    protected int chainId = -1;
+    protected Optional<BigInteger> chainId = Optional.empty();
 
     protected BytesValue privateFrom;
 
     protected List<BytesValue> privateFor;
 
     protected BytesValue restriction;
 
-    public Builder chainId(final int chainId) {
-      this.chainId = chainId;
+    public Builder chainId(final BigInteger chainId) {
+      this.chainId = Optional.of(chainId);
       return this;
     }
 
@@ -611,8 +614,6 @@ public PrivateTransaction signAndBuild(final SECP256K1.KeyPair keys) {
     }
 
     protected SECP256K1.Signature computeSignature(final SECP256K1.KeyPair keys) {
-      final OptionalInt optionalChainId =
-          chainId > 0 ? OptionalInt.of(chainId) : OptionalInt.empty();
       final Bytes32 hash =
           computeSenderRecoveryHash(
               nonce,
@@ -621,7 +622,7 @@ protected SECP256K1.Signature computeSignature(final SECP256K1.KeyPair keys) {
               to,
               value,
               payload,
-              optionalChainId,
+              chainId,
               privateFrom,
               privateFor,
               restriction);

ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionHandlerTest.java

@@ -60,7 +60,7 @@ public class PrivateTransactionHandlerTest {
           .value(Wei.ZERO)
           .payload(BytesValue.fromHexString("0x"))
           .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
-          .chainId(2018)
+          .chainId(BigInteger.valueOf(2018))
           .privateFrom(
               BytesValue.wrap("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=".getBytes(UTF_8)))
           .privateFor(

ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionTest.java

@@ -85,7 +85,7 @@ public class PrivateTransactionTest {
               Byte.valueOf("0")),
           BytesValue.fromHexString("0x"),
           Address.wrap(BytesValue.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
-          0,
+          Optional.empty(),
           BytesValue.wrap("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=".getBytes(UTF_8)),
           Lists.newArrayList(
               BytesValue.wrap("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=".getBytes(UTF_8)),
@@ -113,7 +113,7 @@ public class PrivateTransactionTest {
                       + "0029"))
           .sender(
               Address.wrap(BytesValue.fromHexString("0x1c9a6e1ee3b7ac6028e786d9519ae3d24ee31e79")))
-          .chainId(4)
+          .chainId(BigInteger.valueOf(4))
           .privateFrom(
               BytesValue.wrap("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=".getBytes(UTF_8)))
           .privateFor(

ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/privacy/EeaGetTransactionReceiptTest.java

@@ -91,7 +91,7 @@ public class EeaGetTransactionReceiptTest {
                       + "5820cb1d0935d14b589300b12fcd0ab849a7e9019c81da24d6"
                       + "daa4f6b2f003d1b0180029"))
           .sender(sender)
-          .chainId(2018)
+          .chainId(BigInteger.valueOf(2018))
           .privateFrom(
               BytesValue.wrap("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=".getBytes(UTF_8)))
           .privateFor(