[PRIV-54] Use default enclave public key to generate eea_getTransacti…

…onReceipt (PegaSysEng#1280) * Use default enclave public key to generate eea_getTransactionReceipt * Update the docs to reflect the changes
notlesh · Apr 24, 2019 · 41fce79 · 41fce79
1 parent af8345e
commit 41fce79
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 67 deletions.
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/jsonrpc/Eea.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/jsonrpc/Eea.java
@@ -24,9 +24,8 @@ public Eea(final EeaTransactions transactions) {
     this.transactions = transactions;
   }
 
-  public Condition expectSuccessfulTransactionReceipt(
-      final String transactionHash, final String publicKey) {
+  public Condition expectSuccessfulTransactionReceipt(final String transactionHash) {
     return new ExpectSuccessfulEeaGetTransactionReceipt(
-        transactions.getTransactionReceipt(transactionHash, publicKey));
+        transactions.getTransactionReceipt(transactionHash));
   }
 }
diff --git a/...pegasys/pantheon/tests/acceptance/dsl/privacy/ExpectNoPrivateContractDeployedReceipt.java b/...pegasys/pantheon/tests/acceptance/dsl/privacy/ExpectNoPrivateContractDeployedReceipt.java
@@ -25,10 +25,9 @@ public ExpectNoPrivateContractDeployedReceipt(final Eea eea, final Transactions
     super(eea, transactions);
   }
 
-  public void verify(
-      final PantheonNode node, final String transactionHash, final String publicKey) {
+  public void verify(final PantheonNode node, final String transactionHash) {
     ResponseTypes.PrivateTransactionReceipt privateTxReceipt =
-        getPrivateTransactionReceipt(node, transactionHash, publicKey);
+        getPrivateTransactionReceipt(node, transactionHash);
 
     assertNull(privateTxReceipt.getContractAddress());
   }

diff --git a/...sys/pantheon/tests/acceptance/dsl/privacy/ExpectNoValidPrivateContractValuesReturned.java b/...sys/pantheon/tests/acceptance/dsl/privacy/ExpectNoValidPrivateContractValuesReturned.java
@@ -26,10 +26,9 @@ public ExpectNoValidPrivateContractValuesReturned(
     super(eea, transactions);
   }
 
-  public void verify(
-      final PantheonNode node, final String transactionHash, final String publicKey) {
+  public void verify(final PantheonNode node, final String transactionHash) {
     ResponseTypes.PrivateTransactionReceipt privateTxReceipt =
-        getPrivateTransactionReceipt(node, transactionHash, publicKey);
+        getPrivateTransactionReceipt(node, transactionHash);
 
     assertEquals("0x", privateTxReceipt.getOutput());
   }

diff --git a/...asys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateContractDeployedReceipt.java b/...asys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateContractDeployedReceipt.java
@@ -29,10 +29,9 @@ public ExpectValidPrivateContractDeployedReceipt(
     this.contractAddress = contractAddress;
   }
 
-  public void verify(
-      final PantheonNode node, final String transactionHash, final String publicKey) {
+  public void verify(final PantheonNode node, final String transactionHash) {
     ResponseTypes.PrivateTransactionReceipt privateTxReceipt =
-        getPrivateTransactionReceipt(node, transactionHash, publicKey);
+        getPrivateTransactionReceipt(node, transactionHash);
 
     assertEquals(contractAddress, privateTxReceipt.getContractAddress());
   }

diff --git a/...egasys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateContractEventsEmitted.java b/...egasys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateContractEventsEmitted.java
@@ -32,10 +32,9 @@ public ExpectValidPrivateContractEventsEmitted(
     this.eventValue = eventValue;
   }
 
-  public void verify(
-      final PantheonNode node, final String transactionHash, final String publicKey) {
+  public void verify(final PantheonNode node, final String transactionHash) {
     ResponseTypes.PrivateTransactionReceipt privateTxReceipt =
-        getPrivateTransactionReceipt(node, transactionHash, publicKey);
+        getPrivateTransactionReceipt(node, transactionHash);
 
     String event = privateTxReceipt.getLogs().get(0).getData().substring(66, 130);
     assertEquals(

diff --git a/...gasys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateContractValuesReturned.java b/...gasys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateContractValuesReturned.java
@@ -33,10 +33,9 @@ public ExpectValidPrivateContractValuesReturned(
     this.returnValue = returnValue;
   }
 
-  public void verify(
-      final PantheonNode node, final String transactionHash, final String publicKey) {
+  public void verify(final PantheonNode node, final String transactionHash) {
     ResponseTypes.PrivateTransactionReceipt privateTxReceipt =
-        getPrivateTransactionReceipt(node, transactionHash, publicKey);
+        getPrivateTransactionReceipt(node, transactionHash);
 
     BytesValue output = BytesValue.fromHexString(privateTxReceipt.getOutput());
     assertEquals(new BigInteger(returnValue), Numeric.decodeQuantity(output.toString()));

diff --git a/...h/pegasys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateTransactionReceipt.java b/...h/pegasys/pantheon/tests/acceptance/dsl/privacy/ExpectValidPrivateTransactionReceipt.java
@@ -26,10 +26,9 @@ public ExpectValidPrivateTransactionReceipt(final Eea eea, final Transactions tr
     super(eea, transactions);
   }
 
-  public void verify(
-      final PantheonNode node, final String transactionHash, final String publicKey) {
+  public void verify(final PantheonNode node, final String transactionHash) {
     ResponseTypes.PrivateTransactionReceipt privateTxReceipt =
-        getPrivateTransactionReceipt(node, transactionHash, publicKey);
+        getPrivateTransactionReceipt(node, transactionHash);
     assertNotNull(privateTxReceipt);
     assertThat(privateTxReceipt.getFrom()).isNotBlank();
   }

diff --git a/...tech/pegasys/pantheon/tests/acceptance/dsl/privacy/GetValidPrivateTransactionReceipt.java b/...tech/pegasys/pantheon/tests/acceptance/dsl/privacy/GetValidPrivateTransactionReceipt.java
@@ -30,11 +30,11 @@ public abstract class GetValidPrivateTransactionReceipt {
   }
 
   ResponseTypes.PrivateTransactionReceipt getPrivateTransactionReceipt(
-      final PantheonNode node, final String transactionHash, final String publicKey) {
+      final PantheonNode node, final String transactionHash) {
 
-    waitFor(() -> node.verify(eea.expectSuccessfulTransactionReceipt(transactionHash, publicKey)));
+    waitFor(() -> node.verify(eea.expectSuccessfulTransactionReceipt(transactionHash)));
     ResponseTypes.PrivateTransactionReceipt privateTxReceipt =
-        node.execute(transactions.getPrivateTransactionReceipt(transactionHash, publicKey));
+        node.execute(transactions.getPrivateTransactionReceipt(transactionHash));
     return privateTxReceipt;
   }
 }
diff --git a/...java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/EeaJsonRpcRequestFactory.java b/...java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/EeaJsonRpcRequestFactory.java
@@ -38,10 +38,10 @@ public EeaJsonRpcRequestFactory(final Web3jService web3jService) {
   }
 
   public Request<?, PrivateTransactionReceiptResponse> eeaGetTransactionReceipt(
-      final String txHash, final String publicKey) {
+      final String txHash) {
     return new Request<>(
         "eea_getTransactionReceipt",
-        Lists.newArrayList(txHash, publicKey),
+        Lists.newArrayList(txHash),
         web3jService,
         PrivateTransactionReceiptResponse.class);
   }

diff --git a/...ts/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transactions.java b/...ts/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transactions.java
@@ -144,8 +144,8 @@ public EthGetTransactionReceiptTransaction getTransactionReceipt(final String tr
   }
 
   public EeaGetTransactionReceiptTransaction getPrivateTransactionReceipt(
-      final String transactionHash, final String publicKey) {
-    return new EeaGetTransactionReceiptTransaction(transactionHash, publicKey);
+      final String transactionHash) {
+    return new EeaGetTransactionReceiptTransaction(transactionHash);
   }
 
   public PermAddNodeTransaction addNodesToWhitelist(final List<URI> enodeList) {

diff --git a/...ys/pantheon/tests/acceptance/dsl/transaction/eea/EeaGetTransactionReceiptTransaction.java b/...ys/pantheon/tests/acceptance/dsl/transaction/eea/EeaGetTransactionReceiptTransaction.java
@@ -24,18 +24,16 @@
 public class EeaGetTransactionReceiptTransaction implements Transaction<PrivateTransactionReceipt> {
 
   private final String txHash;
-  private final String publicKey;
 
-  public EeaGetTransactionReceiptTransaction(final String txHash, final String publicKey) {
+  public EeaGetTransactionReceiptTransaction(final String txHash) {
     this.txHash = txHash;
-    this.publicKey = publicKey;
   }
 
   @Override
   public PrivateTransactionReceipt execute(final JsonRequestFactories node) {
     try {
       final PrivateTransactionReceiptResponse result =
-          node.eea().eeaGetTransactionReceipt(txHash, publicKey).send();
+          node.eea().eeaGetTransactionReceipt(txHash).send();
       assertThat(result).isNotNull();
       assertThat(result.hasError()).isFalse();
       return result.getResult();

diff --git a/...test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eea/EeaTransactions.java b/...test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eea/EeaTransactions.java
@@ -14,8 +14,7 @@
 
 public class EeaTransactions {
 
-  public EeaGetTransactionReceiptTransaction getTransactionReceipt(
-      final String transactionHash, final String pubKey) {
-    return new EeaGetTransactionReceiptTransaction(transactionHash, pubKey);
+  public EeaGetTransactionReceiptTransaction getTransactionReceipt(final String transactionHash) {
+    return new EeaGetTransactionReceiptTransaction(transactionHash);
   }
 }
diff --git a/...a/tech/pegasys/pantheon/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java b/...a/tech/pegasys/pantheon/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java
@@ -91,7 +91,7 @@ public void deployingMustGiveValidReceipt() {
 
     privateTransactionVerifier
         .validPrivateContractDeployed(CONTRACT_ADDRESS.toString())
-        .verify(minerNode, transactionHash, PUBLIC_KEY);
+        .verify(minerNode, transactionHash);
   }
 
   @Test
@@ -101,9 +101,7 @@ public void privateSmartContractMustEmitEvents() {
     final String transactionHash =
         minerNode.execute(transactions.createPrivateRawTransaction(storeValue));
 
-    privateTransactionVerifier
-        .validEventReturned("1000")
-        .verify(minerNode, transactionHash, PUBLIC_KEY);
+    privateTransactionVerifier.validEventReturned("1000").verify(minerNode, transactionHash);
   }
 
   @Test
@@ -116,9 +114,7 @@ public void privateSmartContractMustReturnValues() {
     final String transactionHash =
         minerNode.execute(transactions.createPrivateRawTransaction(getValue));
 
-    privateTransactionVerifier
-        .validOutputReturned("1000")
-        .verify(minerNode, transactionHash, PUBLIC_KEY);
+    privateTransactionVerifier.validOutputReturned("1000").verify(minerNode, transactionHash);
   }
 
   @After

diff --git a/...src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java b/...src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java
@@ -146,7 +146,7 @@ public void node2CanSeeContract() {
 
     privateTransactionVerifier
         .validPrivateContractDeployed(CONTRACT_ADDRESS.toString())
-        .verify(node2, transactionHash, PUBLIC_KEY_2);
+        .verify(node2, transactionHash);
   }
 
   @Test
@@ -156,13 +156,11 @@ public void node2CanExecuteContract() {
 
     privateTransactionVerifier
         .validPrivateContractDeployed(CONTRACT_ADDRESS.toString())
-        .verify(node2, transactionHash, PUBLIC_KEY_2);
+        .verify(node2, transactionHash);
 
     transactionHash = node2.execute(transactions.createPrivateRawTransaction(storeValueFromNode2));
 
-    privateTransactionVerifier
-        .validEventReturned("1000")
-        .verify(node1, transactionHash, PUBLIC_KEY_1);
+    privateTransactionVerifier.validEventReturned("1000").verify(node1, transactionHash);
   }
 
   @Test
@@ -172,33 +170,25 @@ public void node2CanSeePrivateTransactionReceipt() {
 
     privateTransactionVerifier
         .validPrivateContractDeployed(CONTRACT_ADDRESS.toString())
-        .verify(node2, transactionHash, PUBLIC_KEY_2);
+        .verify(node2, transactionHash);
 
     transactionHash = node2.execute(transactions.createPrivateRawTransaction(storeValueFromNode2));
 
-    privateTransactionVerifier
-        .validEventReturned("1000")
-        .verify(node1, transactionHash, PUBLIC_KEY_1);
+    privateTransactionVerifier.validEventReturned("1000").verify(node1, transactionHash);
 
     transactionHash = node2.execute(transactions.createPrivateRawTransaction(getValueFromNode2));
 
-    privateTransactionVerifier
-        .validOutputReturned("1000")
-        .verify(node2, transactionHash, PUBLIC_KEY_2);
+    privateTransactionVerifier.validOutputReturned("1000").verify(node2, transactionHash);
 
-    privateTransactionVerifier
-        .validOutputReturned("1000")
-        .verify(node1, transactionHash, PUBLIC_KEY_1);
+    privateTransactionVerifier.validOutputReturned("1000").verify(node1, transactionHash);
   }
 
   @Test
   public void node3CannotSeeContract() {
     final String transactionHash =
         node1.execute(transactions.deployPrivateSmartContract(deployContractFromNode1));
 
-    privateTransactionVerifier
-        .noPrivateContractDeployed()
-        .verify(node3, transactionHash, PUBLIC_KEY_3);
+    privateTransactionVerifier.noPrivateContractDeployed().verify(node3, transactionHash);
   }
 
   @Test
@@ -208,7 +198,7 @@ public void node3CannotExecuteContract() {
     final String transactionHash =
         node3.execute(transactions.createPrivateRawTransaction(getValueFromNode3));
 
-    privateTransactionVerifier.noValidOutputReturned().verify(node3, transactionHash, PUBLIC_KEY_3);
+    privateTransactionVerifier.noValidOutputReturned().verify(node3, transactionHash);
   }
 
   @Test(expected = RuntimeException.class)

diff --git a/docs/Reference/JSON-RPC-API-Methods.md b/docs/Reference/JSON-RPC-API-Methods.md
@@ -2648,19 +2648,17 @@ are not available.
 
 `data` - 32-byte hash of a transaction.
 
-`data` - Orion node public key
-
 **Returns**
 
 `Object` - [Private Transaction receipt object](JSON-RPC-API-Objects.md#private-transaction-receipt-object), or `null` if no receipt found.
 
 !!! example 
     ```bash tab="curl HTTP request"
-    curl -X POST --data '{"jsonrpc":"2.0","method":"eea_getTransactionReceipt","params":["0xf3ab9693ad92e277bf785e1772f29fb1864904bbbe87b0470455ddb082caab9d", "g59BmTeJIn7HIcnq8VQWgyh/pDbvbt2eyP0Ii60aDDw="],"id":1}' http://127.0.0.1:8545
+    curl -X POST --data '{"jsonrpc":"2.0","method":"eea_getTransactionReceipt","params":["0xf3ab9693ad92e277bf785e1772f29fb1864904bbbe87b0470455ddb082caab9d"],"id":1}' http://127.0.0.1:8545
     ```
 
     ```bash tab="wscat WS request"
-    {"jsonrpc":"2.0","method":"eea_getTransactionReceipt","params":["0xf3ab9693ad92e277bf785e1772f29fb1864904bbbe87b0470455ddb082caab9d", "g59BmTeJIn7HIcnq8VQWgyh/pDbvbt2eyP0Ii60aDDw="],"id":1}
+    {"jsonrpc":"2.0","method":"eea_getTransactionReceipt","params":["0xf3ab9693ad92e277bf785e1772f29fb1864904bbbe87b0470455ddb082caab9d"],"id":1}
     ```
 
     ```json tab="JSON result"

diff --git a/.../pegasys/pantheon/ethereum/jsonrpc/internal/methods/privacy/EeaGetTransactionReceipt.java b/.../pegasys/pantheon/ethereum/jsonrpc/internal/methods/privacy/EeaGetTransactionReceipt.java
@@ -77,7 +77,6 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequest request) {
     LOG.trace("Executing eea_getTransactionReceipt");
     final Hash transactionHash = parameters.required(request.getParams(), 0, Hash.class);
-    final String publicKey = parameters.required(request.getParams(), 1, String.class);
     final Optional<TransactionLocation> maybeLocation =
         blockchain.getBlockchain().getTransactionLocation(transactionHash);
     if (!maybeLocation.isPresent()) {
@@ -91,6 +90,7 @@ public JsonRpcResponse response(final JsonRpcRequest request) {
     final Hash blockhash = location.getBlockHash();
     final long blockNumber = blockchain.getBlockchain().getBlockHeader(blockhash).get().getNumber();
 
+    final String publicKey = privacyParameters.getEnclavePublicKey();
     PrivateTransaction privateTransaction;
     String privacyGroupId;
     try {

diff --git a/...asys/pantheon/ethereum/jsonrpc/internal/methods/privacy/EeaGetTransactionReceiptTest.java b/...asys/pantheon/ethereum/jsonrpc/internal/methods/privacy/EeaGetTransactionReceiptTest.java
@@ -155,7 +155,7 @@ public void createsPrivateTransactionReceipt() throws IOException {
 
     final EeaGetTransactionReceipt eeaGetTransactionReceipt =
         new EeaGetTransactionReceipt(blockchainQueries, enclave, parameters, privacyParameters);
-    final Object[] params = new Object[] {transaction.hash(), "EnclavePublicKey"};
+    final Object[] params = new Object[] {transaction.hash()};
     final JsonRpcRequest request = new JsonRpcRequest("1", "eea_getTransactionReceipt", params);
 
     when(blockchainQueries.getBlockchain()).thenReturn(blockchain);