-
Notifications
You must be signed in to change notification settings - Fork 839
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Lucas Saldanha <lucas.saldanha@consensys.net>
- Loading branch information
1 parent
cb5244d
commit 4af9d1c
Showing
17 changed files
with
923 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogs.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright 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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; | ||
|
|
||
| import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult; | ||
| import org.hyperledger.besu.ethereum.api.query.BlockchainQueries; | ||
| import org.hyperledger.besu.ethereum.api.query.LogsQuery; | ||
| import org.hyperledger.besu.ethereum.api.query.PrivacyQueries; | ||
| import org.hyperledger.besu.ethereum.privacy.PrivacyController; | ||
|
|
||
| public class PrivGetLogs implements JsonRpcMethod { | ||
|
|
||
| private final BlockchainQueries blockchainQueries; | ||
| private final PrivacyQueries privacyQueries; | ||
| private final PrivacyController privacyController; | ||
| private final EnclavePublicKeyProvider enclavePublicKeyProvider; | ||
|
|
||
| public PrivGetLogs( | ||
| final BlockchainQueries blockchainQueries, | ||
| final PrivacyQueries privacyQueries, | ||
| final PrivacyController privacyController, | ||
| final EnclavePublicKeyProvider enclavePublicKeyProvider) { | ||
| this.blockchainQueries = blockchainQueries; | ||
| this.privacyQueries = privacyQueries; | ||
| this.privacyController = privacyController; | ||
| this.enclavePublicKeyProvider = enclavePublicKeyProvider; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return RpcMethod.PRIV_GET_LOGS.getMethodName(); | ||
| } | ||
|
|
||
| @Override | ||
| public JsonRpcResponse response(final JsonRpcRequestContext request) { | ||
| final String privacyGroupId = request.getRequiredParameter(0, String.class); | ||
| final FilterParameter filter = request.getRequiredParameter(1, FilterParameter.class); | ||
|
|
||
| checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(request, privacyGroupId); | ||
|
|
||
| final LogsQuery query = | ||
| new LogsQuery.Builder().addresses(filter.getAddresses()).topics(filter.getTopics()).build(); | ||
|
|
||
| if (!filter.isValid()) { | ||
| return new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); | ||
| } | ||
|
|
||
| if (filter.getBlockhash() != null) { | ||
| return new JsonRpcSuccessResponse( | ||
| request.getRequest().getId(), | ||
| new LogsResult( | ||
| privacyQueries.matchingLogs(privacyGroupId, filter.getBlockhash(), query))); | ||
| } | ||
|
|
||
| final long fromBlockNumber = filter.getFromBlock().getNumber().orElse(0); | ||
| final long toBlockNumber = | ||
| filter.getToBlock().getNumber().orElse(blockchainQueries.headBlockNumber()); | ||
|
|
||
| return new JsonRpcSuccessResponse( | ||
| request.getRequest().getId(), | ||
| new LogsResult( | ||
| privacyQueries.matchingLogs(privacyGroupId, fromBlockNumber, toBlockNumber, query))); | ||
| } | ||
|
|
||
| private void checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey( | ||
| final JsonRpcRequestContext request, final String privacyGroupId) { | ||
| final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser()); | ||
| privacyController.verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueries.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Copyright 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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.api.query; | ||
|
|
||
| import org.hyperledger.besu.ethereum.chain.Blockchain; | ||
| import org.hyperledger.besu.ethereum.core.BlockHeader; | ||
| import org.hyperledger.besu.ethereum.core.Hash; | ||
| import org.hyperledger.besu.ethereum.core.LogWithMetadata; | ||
| import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt; | ||
| import org.hyperledger.besu.ethereum.privacy.PrivateWorldStateReader; | ||
| import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.IntStream; | ||
| import java.util.stream.LongStream; | ||
|
|
||
| public class PrivacyQueries { | ||
|
|
||
| private final Blockchain blockchain; | ||
| private final PrivateWorldStateReader privateWorldStateReader; | ||
|
|
||
| public PrivacyQueries( | ||
| final Blockchain blockchain, final PrivateWorldStateReader privateWorldStateReader) { | ||
| this.blockchain = blockchain; | ||
| this.privateWorldStateReader = privateWorldStateReader; | ||
| } | ||
|
|
||
| public List<LogWithMetadata> matchingLogs( | ||
| final String privacyGroupId, | ||
| final long fromBlockNumber, | ||
| final long toBlockNumber, | ||
| final LogsQuery query) { | ||
|
|
||
| return LongStream.rangeClosed(fromBlockNumber, toBlockNumber) | ||
| .mapToObj(blockchain::getBlockHashByNumber) | ||
| .takeWhile(Optional::isPresent) | ||
| .map(Optional::get) | ||
| .map(hash -> matchingLogs(privacyGroupId, hash, query)) | ||
| .flatMap(List::stream) | ||
| .collect(Collectors.toList()); | ||
| } | ||
|
|
||
| public List<LogWithMetadata> matchingLogs( | ||
| final String privacyGroupId, final Hash blockHash, final LogsQuery query) { | ||
|
|
||
| final Optional<BlockHeader> blockHeader = blockchain.getBlockHeader(blockHash); | ||
| if (blockHeader.isEmpty()) { | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| final List<PrivateTransactionMetadata> privateTransactionMetadatas = | ||
| privateWorldStateReader.getPrivateTransactionsMetadata(privacyGroupId, blockHash); | ||
|
|
||
| final List<PrivateTransactionReceipt> privateTransactionReceipts = | ||
| privateTransactionMetadatas.stream() | ||
| .map(PrivateTransactionMetadata::getPrivacyMarkerTransactionHash) | ||
| .map( | ||
| pmtHash -> privateWorldStateReader.getPrivateTransactionReceipt(blockHash, pmtHash)) | ||
| .flatMap(Optional::stream) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| final long number = blockHeader.get().getNumber(); | ||
| final boolean removed = !blockchain.blockIsOnCanonicalChain(blockHash); | ||
|
|
||
| return IntStream.range(0, privateTransactionReceipts.size()) | ||
| .mapToObj( | ||
| i -> | ||
| LogWithMetadata.generate( | ||
| privateTransactionReceipts.get(i), | ||
| number, | ||
| blockHash, | ||
| privateTransactionMetadatas.get(i).getPrivacyMarkerTransactionHash(), | ||
| i, | ||
| removed)) | ||
| .flatMap(Collection::stream) | ||
| .filter(query::matches) | ||
| .collect(Collectors.toList()); | ||
| } | ||
| } |
Oops, something went wrong.