-
Notifications
You must be signed in to change notification settings - Fork 871
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial commit with new JSON/RPC method
Signed-off-by: Matthew Whitehead <[email protected]>
- Loading branch information
1 parent
86aed20
commit 335e2da
Showing
4 changed files
with
134 additions
and
1 deletion.
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
96 changes: 96 additions & 0 deletions
96
.../java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockReceipts.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,96 @@ | ||
/* | ||
* Copyright Hyperledger Besu contributors | ||
* | ||
* 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.methods; | ||
|
||
import org.hyperledger.besu.datatypes.Hash; | ||
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.parameters.BlockParameterOrBlockHash; | ||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockReceiptsResult; | ||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptResult; | ||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptRootResult; | ||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptStatusResult; | ||
import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata; | ||
import org.hyperledger.besu.ethereum.api.query.BlockchainQueries; | ||
import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata; | ||
import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata; | ||
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; | ||
import org.hyperledger.besu.ethereum.mainnet.TransactionReceiptType; | ||
|
||
import java.util.List; | ||
import java.util.Optional; | ||
import java.util.function.Supplier; | ||
import java.util.stream.Collectors; | ||
|
||
import com.google.common.base.Suppliers; | ||
|
||
public class EthGetBlockReceipts extends AbstractBlockParameterOrBlockHashMethod { | ||
|
||
private final ProtocolSchedule protocolSchedule; | ||
|
||
public EthGetBlockReceipts( | ||
final BlockchainQueries blockchain, final ProtocolSchedule protocolSchedule) { | ||
this(Suppliers.ofInstance(blockchain), protocolSchedule); | ||
} | ||
|
||
public EthGetBlockReceipts( | ||
final Supplier<BlockchainQueries> blockchain, final ProtocolSchedule protocolSchedule) { | ||
super(blockchain); | ||
this.protocolSchedule = protocolSchedule; | ||
} | ||
|
||
@Override | ||
public String getName() { | ||
return RpcMethod.ETH_GET_BLOCK_RECEIPTS.getMethodName(); | ||
} | ||
|
||
@Override | ||
protected BlockParameterOrBlockHash blockParameterOrBlockHash( | ||
final JsonRpcRequestContext request) { | ||
return request.getRequiredParameter(0, BlockParameterOrBlockHash.class); | ||
} | ||
|
||
@Override | ||
protected Object resultByBlockHash(final JsonRpcRequestContext request, final Hash blockHash) { | ||
return getBlockReceiptsResult(blockHash); | ||
} | ||
|
||
private Optional<TransactionReceiptResult> txReceipt(final TransactionWithMetadata tx) { | ||
Optional<TransactionReceiptWithMetadata> receipt = | ||
blockchainQueries | ||
.get() | ||
.transactionReceiptByTransactionHash(tx.getTransaction().getHash(), protocolSchedule); | ||
if (receipt.isPresent()) { | ||
if (receipt.get().getReceipt().getTransactionReceiptType() == TransactionReceiptType.ROOT) { | ||
return Optional.of(new TransactionReceiptRootResult(receipt.get())); | ||
} else { | ||
return Optional.of(new TransactionReceiptStatusResult(receipt.get())); | ||
} | ||
} | ||
return Optional.empty(); | ||
} | ||
|
||
private BlockReceiptsResult getBlockReceiptsResult(final Hash blockHash) { | ||
BlockchainQueries blockchain = blockchainQueries.get(); | ||
BlockWithMetadata<TransactionWithMetadata, Hash> theBlock = | ||
blockchain.blockByHash(blockHash).get(); | ||
final List<TransactionReceiptResult> txs2 = | ||
theBlock.getTransactions().stream() | ||
.map(tx -> txReceipt(tx).get()) | ||
.collect(Collectors.toList()); | ||
|
||
return new BlockReceiptsResult(txs2); | ||
} | ||
} |
34 changes: 34 additions & 0 deletions
34
.../java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockReceiptsResult.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,34 @@ | ||
/* | ||
* Copyright Hyperledger Besu contributors | ||
* | ||
* 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.results; | ||
|
||
import java.util.List; | ||
|
||
import com.fasterxml.jackson.annotation.JsonValue; | ||
|
||
/** The result set from querying the receipts for a given block. */ | ||
public class BlockReceiptsResult { | ||
|
||
private final List<TransactionReceiptResult> results; | ||
|
||
public BlockReceiptsResult(final List<TransactionReceiptResult> receipts) { | ||
results = receipts; | ||
} | ||
|
||
@JsonValue | ||
public List<TransactionReceiptResult> getResults() { | ||
return results; | ||
} | ||
} |
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