Merge pull request #1297 from cardano-foundation/fix/genesiss-block-i…

…ssues Fix/genesiss block issues
cardano-foundation · Jul 16, 2024 · fab0961 · fab0961
2 parents 6e613b2 + 092f70b
commit fab0961
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/cardanofoundation/explorer/api/service/impl/AddressServiceImpl.java b/src/main/java/org/cardanofoundation/explorer/api/service/impl/AddressServiceImpl.java
@@ -123,8 +123,10 @@ private void setAssociatedScript(AddressResponse addressResponse) {
   private boolean checkNetworkAddress(String address) {
     if (address.startsWith(CommonConstant.TESTNET_ADDRESS_PREFIX)) {
       return !network.equals(CommonConstant.MAINNET_NETWORK);
-    } else {
+    } else if (address.startsWith(CommonConstant.ADDRESS_PREFIX)) {
       return network.equals(CommonConstant.MAINNET_NETWORK);
+    } else { // Genesis address
+      return true;
     }
   }
 

diff --git a/src/main/java/org/cardanofoundation/explorer/api/service/impl/TxServiceImpl.java b/src/main/java/org/cardanofoundation/explorer/api/service/impl/TxServiceImpl.java
@@ -359,7 +359,9 @@ private List<TxFilterResponse> mapTxDataFromAddressTxAmount(
           txFilterResponse.setTime(block.getTime().toLocalDateTime());
           txFilterResponse.setBlockNo(block.getBlockNo());
           txFilterResponse.setEpochNo(block.getEpochNo());
-          txFilterResponse.setSlot(block.getSlotNo().intValue());
+          if (block.getSlotNo() != null) {
+            txFilterResponse.setSlot(block.getSlotNo().intValue());
+          }
           txFilterResponse.setEpochSlotNo(block.getEpochSlotNo());
           txFilterResponse.setFee(tx.getFee());
           txFilterResponse.setBalance(balance);