pan-3222-private-tx-evm-breaking

Signed-off-by: Ivaylo Kirilov <iikirilov@gmail.com>
hyperledger · Oct 9, 2019 · 5913baf · 5913baf
1 parent 13ae431
commit 5913baf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/.../src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java b/.../src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java
@@ -98,7 +98,29 @@ public void onlyAliceAndBobCanExecuteContract() {
     bob.verify(
         privateTransactionVerifier.validPrivateTransactionReceipt(
             transactionHash, expectedReceipt));
+
     charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(transactionHash));
+
+    // When Alice executes a contract call in the wrong privacy group the transaction should pass
+    // but it should return any output
+    final String transactionHash2 =
+        alice.execute(
+            privateContractTransactions.callSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.value().encodeFunctionCall(),
+                alice.getTransactionSigningKey(),
+                POW_CHAIN_ID,
+                alice.getEnclaveKey(),
+                charlie.getEnclaveKey()));
+
+    final PrivateTransactionReceipt expectedReceipt2 =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash2));
+
+    assertThat(expectedReceipt2.getOutput()).isEqualTo("0x");
+
+    charlie.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash2, expectedReceipt2));
   }
 
   @Test

diff --git a/...java/org/hyperledger/besu/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java b/...java/org/hyperledger/besu/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java
@@ -60,7 +60,7 @@ public DefaultEvmAccount getAccount(final Address address) {
       publicAccount.setImmutable(true);
       return publicAccount;
     }
-    return null;
+    return privateAccount;
   }
 
   @Override