Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always return a transaction type for pending transactions #4364

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

### Bug Fixes
- Corrects emission of blockadded events when rewinding during a re-org. Fix for [#4495](https://github.com/hyperledger/besu/issues/4495)
-
- Always return a transaction type for pending transactions [#4364](https://github.com/hyperledger/besu/pull/4364)

### Download Links


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,7 @@ public class TransactionCompleteResult implements TransactionResult {
private final String raw;
private final String to;
private final String transactionIndex;

@JsonInclude(JsonInclude.Include.NON_NULL)
private final String type;

private final String value;
private final String v;
private final String r;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,7 @@ public class TransactionPendingResult implements TransactionResult {
private final String publicKey;
private final String raw;
private final String to;

@JsonInclude(JsonInclude.Include.NON_NULL)
private final String type;

private final String value;
private final String v;
private final String r;
Expand All @@ -97,7 +94,7 @@ public TransactionPendingResult(final Transaction transaction) {
this.to = transaction.getTo().map(Address::toHexString).orElse(null);
this.type =
transactionType.equals(TransactionType.FRONTIER)
? null
? Quantity.create(0)
: Quantity.create(transactionType.getSerializedType());
this.value = Quantity.create(transaction.getValue());
this.v = Quantity.create(transaction.getV());
Expand Down