diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java index 0202db88f62..d0563c11b4f 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java @@ -53,7 +53,7 @@ public List getTransactions() { return transactionPool.getPendingTransactions().stream() .map(PendingTransaction::getTransaction) .map(TransactionWithMetadata::new) - .map(TransactionAdapter::new) + .map(tx -> new TransactionAdapter(tx, null)) .toList(); } diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java index ced0d24882b..c7b1154863c 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import graphql.schema.DataFetchingEnvironment; import org.apache.tuweni.bytes.Bytes; @@ -48,9 +49,9 @@ public TransactionAdapter(final @Nonnull TransactionWithMetadata transactionWith public TransactionAdapter( final @Nonnull TransactionWithMetadata transactionWithMetadata, - final @Nonnull TransactionReceiptWithMetadata transactionReceiptWithMetadata) { + final @Nullable TransactionReceiptWithMetadata transactionReceiptWithMetadata) { this.transactionWithMetadata = transactionWithMetadata; - this.transactionReceiptWithMetadata = Optional.of(transactionReceiptWithMetadata); + this.transactionReceiptWithMetadata = Optional.ofNullable(transactionReceiptWithMetadata); } private Optional getReceipt(