refactor(core): validate pk earlier in address validation

fleet-sdk · May 7, 2023 · 051387c · 051387c
1 parent 0f1ffe5
commit 051387c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/packages/core/src/models/ergoAddress.ts b/packages/core/src/models/ergoAddress.ts
@@ -180,11 +180,6 @@ export class ErgoAddress {
       return false;
     }
 
-    const script = bytes.subarray(0, bytes.length - CHECKSUM_LENGTH);
-    const checksum = bytes.subarray(bytes.length - CHECKSUM_LENGTH, bytes.length);
-    const blakeHash = blake2b256(script);
-    const calculatedChecksum = blakeHash.subarray(0, CHECKSUM_LENGTH);
-
     if (_getEncodedAddressType(bytes) === AddressType.P2PK) {
       const pk = bytes.subarray(1, bytes.length - CHECKSUM_LENGTH);
 
@@ -193,6 +188,11 @@ export class ErgoAddress {
       }
     }
 
+    const script = bytes.subarray(0, bytes.length - CHECKSUM_LENGTH);
+    const checksum = bytes.subarray(bytes.length - CHECKSUM_LENGTH, bytes.length);
+    const blakeHash = blake2b256(script);
+    const calculatedChecksum = blakeHash.subarray(0, CHECKSUM_LENGTH);
+
     return areEqual(calculatedChecksum, checksum);
   }