Merge pull request #54 from rootstock/json_null_address

Handling null address serialization
rsksmart · Sep 4, 2018 · d94b035 · d94b035
2 parents d89e31a + 49a3103
commit d94b035
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionResultDTO.java b/rskj-core/src/main/java/org/ethereum/rpc/dto/TransactionResultDTO.java
@@ -74,6 +74,9 @@ public TransactionResultDTO (Block b, Integer index, Transaction tx) {
     }
 
     private String addressToJsonHex(RskAddress address) {
+        if (RskAddress.nullAddress().equals(address)) {
+            return null;
+        }
         // Web3.js requires the address to be valid (20 bytes),
         // so we have to serialize the Remasc sender as a valid address.
         if (address.equals(RemascTransaction.REMASC_ADDRESS)) {