Tests fixes

rsksmart · Apr 12, 2024 · b269200 · b269200
1 parent 3928697
commit b269200
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/util/ContractUtil.java b/rskj-core/src/main/java/co/rsk/util/ContractUtil.java
@@ -96,9 +96,10 @@ public static boolean isClaimTxAndValid(Transaction newTx,
                                             Constants constants,
                                             SignatureCache signatureCache,
                                             PropertyGetter propertyGetter) {
-        byte[] functionSelector = Arrays.copyOfRange(newTx.getData(), 0, 4);
-        if(newTx.getReceiveAddress().toHexString().equalsIgnoreCase(constants.getEtherSwapContractAddress())
-                && Arrays.equals(functionSelector, Constants.CLAIM_FUNCTION_SIGNATURE)) {
+        if(newTx.getReceiveAddress() != null
+                && newTx.getData() != null
+                && newTx.getReceiveAddress().toHexString().equalsIgnoreCase(constants.getEtherSwapContractAddress())
+                && Arrays.equals(Arrays.copyOfRange(newTx.getData(), 0, 4), Constants.CLAIM_FUNCTION_SIGNATURE)) {
 
             String swapHash = HexUtils.toUnformattedJsonHex(calculateSwapHash(newTx, signatureCache));
             byte[] key = HashUtil.keccak256(HexUtils.decode(HexUtils.stringToByteArray(swapHash + SWAPS_MAP_POSITION)));