Always return a transaction type for pending transactions (hyperledge…

…r#4364)

* always return a transaction type for pending transactions

Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net>

CHANGELOG.md

@@ -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
 
 

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java

@@ -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;

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java

@@ -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;
@@ -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());