Merge branch 'master' into createGroupTest

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java

@@ -18,6 +18,7 @@
 import tech.pegasys.orion.testutil.OrionTestHarness;
 import tech.pegasys.pantheon.enclave.Enclave;
 import tech.pegasys.pantheon.enclave.types.SendRequest;
+import tech.pegasys.pantheon.enclave.types.SendRequestLegacy;
 import tech.pegasys.pantheon.ethereum.core.MiningParameters;
 import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
 import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration;
@@ -100,7 +101,7 @@ public void testOrionConnection(final PrivacyNode... otherNodes) {
                 Arrays.stream(otherNodes).map(node -> node.orion.nodeUrl()).toArray())));
     Enclave orionEnclave = new Enclave(orion.clientUrl());
     SendRequest sendRequest1 =
-        new SendRequest(
+        new SendRequestLegacy(
             "SGVsbG8sIFdvcmxkIQ==",
             orion.getPublicKeys().get(0),
             Arrays.stream(otherNodes)

crypto/src/main/java/tech/pegasys/pantheon/crypto/SECP256K1.java

@@ -69,9 +69,9 @@
  */
 public class SECP256K1 {
 
-  private static final String ALGORITHM = "ECDSA";
-  private static final String CURVE_NAME = "secp256k1";
-  private static final String PROVIDER = "BC";
+  public static final String ALGORITHM = "ECDSA";
+  public static final String CURVE_NAME = "secp256k1";
+  public static final String PROVIDER = "BC";
 
   public static final ECDomainParameters CURVE;
   public static final BigInteger HALF_CURVE_ORDER;

enclave/src/integration-test/java/tech/pegasys/pantheon/enclave/EnclaveTest.java

@@ -25,6 +25,8 @@
 import tech.pegasys.pantheon.enclave.types.ReceiveRequest;
 import tech.pegasys.pantheon.enclave.types.ReceiveResponse;
 import tech.pegasys.pantheon.enclave.types.SendRequest;
+import tech.pegasys.pantheon.enclave.types.SendRequestLegacy;
+import tech.pegasys.pantheon.enclave.types.SendRequestPantheon;
 import tech.pegasys.pantheon.enclave.types.SendResponse;
 
 import java.io.IOException;
@@ -73,7 +75,28 @@ public void testSendAndReceive() throws Exception {
     List<String> publicKeys = testHarness.getPublicKeys();
 
     SendRequest sc =
-        new SendRequest(PAYLOAD, publicKeys.get(0), Lists.newArrayList(publicKeys.get(0)));
+        new SendRequestLegacy(PAYLOAD, publicKeys.get(0), Lists.newArrayList(publicKeys.get(0)));
+    SendResponse sr = enclave.send(sc);
+
+    ReceiveRequest rc = new ReceiveRequest(sr.getKey(), publicKeys.get(0));
+    ReceiveResponse rr = enclave.receive(rc);
+
+    assertEquals(PAYLOAD, new String(rr.getPayload(), UTF_8));
+    assertNotNull(rr.getPrivacyGroupId());
+  }
+
+  @Test
+  public void testSendWithPrivacyGroupAndReceive() throws Exception {
+    List<String> publicKeys = testHarness.getPublicKeys();
+
+    CreatePrivacyGroupRequest privacyGroupRequest =
+        new CreatePrivacyGroupRequest(publicKeys.toArray(new String[0]), publicKeys.get(0), "", "");
+
+    PrivacyGroup privacyGroupResponse = enclave.createPrivacyGroup(privacyGroupRequest);
+
+    SendRequest sc =
+        new SendRequestPantheon(
+            PAYLOAD, publicKeys.get(0), privacyGroupResponse.getPrivacyGroupId());
     SendResponse sr = enclave.send(sc);
 
     ReceiveRequest rc = new ReceiveRequest(sr.getKey(), publicKeys.get(0));

enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequest.java

@@ -14,24 +14,13 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonPropertyOrder({"payload", "from", "to"})
-public class SendRequest {
+public abstract class SendRequest {
   private byte[] payload;
   private String from;
-  private List<String> to;
 
-  public SendRequest(
-      @JsonProperty(value = "payload") final String payload,
-      @JsonProperty(value = "from") final String from,
-      @JsonProperty(value = "to") final List<String> to) {
+  public SendRequest(final String payload, final String from) {
     this.payload = payload.getBytes(UTF_8);
     this.from = from;
-    this.to = to;
   }
 
   public byte[] getPayload() {
@@ -41,8 +30,4 @@ public byte[] getPayload() {
   public String getFrom() {
     return from;
   }
-
-  public List<String> getTo() {
-    return to;
-  }
 }

enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestLegacy.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.pantheon.enclave.types;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"payload", "from", "to"})
+public class SendRequestLegacy extends SendRequest {
+  private List<String> to;
+
+  public SendRequestLegacy(
+      @JsonProperty(value = "payload") final String payload,
+      @JsonProperty(value = "from") final String from,
+      @JsonProperty(value = "to") final List<String> to) {
+    super(payload, from);
+    this.to = to;
+  }
+
+  public List<String> getTo() {
+    return to;
+  }
+}

enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestPantheon.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.pantheon.enclave.types;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"payload", "from", "privacyGroupId"})
+public class SendRequestPantheon extends SendRequest {
+  private String privacyGroupId;
+
+  public SendRequestPantheon(
+      @JsonProperty(value = "payload") final String payload,
+      @JsonProperty(value = "from") final String from,
+      @JsonProperty(value = "to") final String privacyGroupId) {
+    super(payload, from);
+
+    this.privacyGroupId = privacyGroupId;
+  }
+
+  public String getPrivacyGroupId() {
+    return privacyGroupId;
+  }
+}

ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java

@@ -25,6 +25,7 @@
 import tech.pegasys.orion.testutil.OrionTestHarnessFactory;
 import tech.pegasys.pantheon.enclave.Enclave;
 import tech.pegasys.pantheon.enclave.types.SendRequest;
+import tech.pegasys.pantheon.enclave.types.SendRequestLegacy;
 import tech.pegasys.pantheon.enclave.types.SendResponse;
 import tech.pegasys.pantheon.ethereum.chain.Blockchain;
 import tech.pegasys.pantheon.ethereum.core.Address;
@@ -151,7 +152,8 @@ public void testSendAndReceive() throws Exception {
     List<String> publicKeys = testHarness.getPublicKeys();
 
     String s = new String(VALID_PRIVATE_TRANSACTION_RLP_BASE64, UTF_8);
-    SendRequest sc = new SendRequest(s, publicKeys.get(0), Lists.newArrayList(publicKeys.get(0)));
+    SendRequest sc =
+        new SendRequestLegacy(s, publicKeys.get(0), Lists.newArrayList(publicKeys.get(0)));
     SendResponse sr = enclave.send(sc);
 
     PrivacyPrecompiledContract privacyPrecompiledContract =
@@ -178,7 +180,7 @@ public void testNoPrivateKeyError() throws RuntimeException {
     publicKeys.add("noPrivateKey");
 
     String s = new String(VALID_PRIVATE_TRANSACTION_RLP_BASE64, UTF_8);
-    SendRequest sc = new SendRequest(s, publicKeys.get(0), publicKeys);
+    SendRequest sc = new SendRequestLegacy(s, publicKeys.get(0), publicKeys);
 
     final Throwable thrown = catchThrowable(() -> enclave.send(sc));
 
@@ -191,7 +193,7 @@ public void testWrongPrivateKeyError() throws RuntimeException {
     publicKeys.add("noPrivateKenoPrivateKenoPrivateKenoPrivateK");
 
     String s = new String(VALID_PRIVATE_TRANSACTION_RLP_BASE64, UTF_8);
-    SendRequest sc = new SendRequest(s, publicKeys.get(0), publicKeys);
+    SendRequest sc = new SendRequestLegacy(s, publicKeys.get(0), publicKeys);
 
     final Throwable thrown = catchThrowable(() -> enclave.send(sc));