From 64ec6c763ec3cfa50e41d5367c89595161cc3b79 Mon Sep 17 00:00:00 2001 From: Antony Denyer Date: Wed, 9 Mar 2022 23:55:14 +0000 Subject: [PATCH] Always show privacyGroupId on PrivateTransactionReceipt (#3544) - This is to provide a clearer way of knowing which privacyGroupId a private transaction ended up in. Signed-off-by: Antony Denyer Co-authored-by: Sally MacFarlane --- .../acceptance/privacy/PrivacyClusterAcceptanceTest.java | 2 +- .../results/privacy/PrivateTransactionReceiptResult.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java index 4b6023ac1c7..5f10b1e0c0e 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java @@ -220,7 +220,7 @@ public void aliceCanUsePrivDistributeTransaction() { "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=", new ArrayList<>( Collections.singletonList("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=")), - null, + "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=", "0x1", null); diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java index ff4f598100b..bd58ed82049 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java @@ -17,6 +17,7 @@ import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptLogResult; +import org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil; import org.hyperledger.besu.evm.log.Log; import org.hyperledger.besu.evm.log.LogsBloomFilter; @@ -91,7 +92,10 @@ public PrivateTransactionReceiptResult( privateFor != null ? privateFor.stream().map(Bytes::toBase64String).collect(Collectors.toList()) : null; - this.privacyGroupId = privacyGroupId != null ? privacyGroupId.toBase64String() : null; + this.privacyGroupId = + privacyGroupId != null + ? privacyGroupId.toBase64String() + : PrivacyGroupUtil.calculateEeaPrivacyGroupId(privateFrom, privateFor).toBase64String(); this.revertReason = revertReason != null ? revertReason.toString() : null; this.status = status; this.logs = logReceipts(logs, blockNumber, commitmentHash, blockHash, txIndex);