Fix PrivateTransaction signature calculation

PegaSysEng · Jan 21, 2019 · 6b0c58a · 6b0c58a
1 parent 87f169b
commit 6b0c58a
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransaction.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransaction.java
@@ -303,7 +303,16 @@ private Bytes32 getOrComputeSenderRecoveryHash() {
     if (hashNoSignature == null) {
       hashNoSignature =
           computeSenderRecoveryHash(
-              nonce, gasPrice, gasLimit, to.orElse(null), value, payload, chainId);
+              nonce,
+              gasPrice,
+              gasLimit,
+              to.orElse(null),
+              value,
+              payload,
+              chainId,
+              privateFrom,
+              privateFor,
+              restriction);
     }
     return hashNoSignature;
   }
@@ -405,7 +414,10 @@ private static Bytes32 computeSenderRecoveryHash(
       final Address to,
       final Wei value,
       final BytesValue payload,
-      final OptionalInt chainId) {
+      final OptionalInt chainId,
+      final BytesValue privateFrom,
+      final List<BytesValue> privateFor,
+      final BytesValue restriction) {
     return keccak256(
         RLP.encode(
             out -> {
@@ -421,6 +433,9 @@ private static Bytes32 computeSenderRecoveryHash(
                 out.writeUInt256Scalar(UInt256.ZERO);
                 out.writeUInt256Scalar(UInt256.ZERO);
               }
+              out.writeBytesValue(privateFrom);
+              out.writeList(privateFor, (bv, rlpO) -> rlpO.writeBytesValue(bv));
+              out.writeBytesValue(restriction);
               out.endList();
             }));
   }
@@ -599,7 +614,17 @@ protected SECP256K1.Signature computeSignature(final SECP256K1.KeyPair keys) {
       final OptionalInt optionalChainId =
           chainId > 0 ? OptionalInt.of(chainId) : OptionalInt.empty();
       final Bytes32 hash =
-          computeSenderRecoveryHash(nonce, gasPrice, gasLimit, to, value, payload, optionalChainId);
+          computeSenderRecoveryHash(
+              nonce,
+              gasPrice,
+              gasLimit,
+              to,
+              value,
+              payload,
+              optionalChainId,
+              privateFrom,
+              privateFor,
+              restriction);
       return SECP256K1.sign(hash, keys);
     }
   }