@alephium/web3 0.38.0 → 0.38.1

package/dist/src/utils/address.d.ts

@@ -6,6 +6,8 @@ export declare enum AddressType {
     P2C = 3
 }
 export declare function validateAddress(address: string): void;
+export declare function isAssetAddress(address: string): boolean;
+export declare function isContractAddress(address: string): boolean;
 export declare function groupOfAddress(address: string): number;
 export declare function contractIdFromAddress(address: string): Uint8Array;
 export declare function tokenIdFromAddress(address: string): Uint8Array;

package/dist/src/utils/address.js

@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.xorByte = exports.subContractId = exports.contractIdFromTx = exports.addressFromTokenId = exports.addressFromContractId = exports.addressFromScript = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.groupOfPrivateKey = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.validateAddress = exports.AddressType = void 0;
+exports.xorByte = exports.subContractId = exports.contractIdFromTx = exports.addressFromTokenId = exports.addressFromContractId = exports.addressFromScript = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.groupOfPrivateKey = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isContractAddress = exports.isAssetAddress = exports.validateAddress = exports.AddressType = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("../constants");
@@ -37,6 +37,10 @@ var AddressType;
     AddressType[AddressType["P2C"] = 3] = "P2C";
 })(AddressType = exports.AddressType || (exports.AddressType = {}));
 function validateAddress(address) {
+    decodeAndValidateAddress(address);
+}
+exports.validateAddress = validateAddress;
+function decodeAndValidateAddress(address) {
     let decoded;
     try {
         decoded = bs58_1.default.decode(address);
@@ -50,19 +54,27 @@ function validateAddress(address) {
     if (addressType === AddressType.P2MPKH) {
         // [1, n, ...hashes, m]
         if ((decoded.length - 3) % 32 === 0)
-            return;
+            return decoded;
     }
     else if (addressType === AddressType.P2PKH || addressType === AddressType.P2SH || addressType === AddressType.P2C) {
         // [type, ...hash]
         if (decoded.length === 33)
-            return;
+            return decoded;
     }
     throw new Error(`Invalid address: ${address}`);
 }
-exports.validateAddress = validateAddress;
+function isAssetAddress(address) {
+    const addressType = decodeAndValidateAddress(address)[0];
+    return addressType === AddressType.P2PKH || addressType === AddressType.P2MPKH || addressType === AddressType.P2SH;
+}
+exports.isAssetAddress = isAssetAddress;
+function isContractAddress(address) {
+    const addressType = decodeAndValidateAddress(address)[0];
+    return addressType === AddressType.P2C;
+}
+exports.isContractAddress = isContractAddress;
 function groupOfAddress(address) {
-    validateAddress(address);
-    const decoded = bs58_1.default.decode(address);
+    const decoded = decodeAndValidateAddress(address);
     const addressType = decoded[0];
     const addressBody = decoded.slice(1);
     if (addressType == AddressType.P2PKH) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.38.0",
+  "version": "0.38.1",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",

package/src/utils/address.ts

@@ -35,6 +35,10 @@ export enum AddressType {
 }
 
 export function validateAddress(address: string) {
+  decodeAndValidateAddress(address)
+}
+
+function decodeAndValidateAddress(address: string): Uint8Array {
   let decoded: Uint8Array
   try {
     decoded = bs58.decode(address)
@@ -46,19 +50,27 @@ export function validateAddress(address: string) {
   const addressType = decoded[0]
   if (addressType === AddressType.P2MPKH) {
     // [1, n, ...hashes, m]
-    if ((decoded.length - 3) % 32 === 0) return
+    if ((decoded.length - 3) % 32 === 0) return decoded
   } else if (addressType === AddressType.P2PKH || addressType === AddressType.P2SH || addressType === AddressType.P2C) {
     // [type, ...hash]
-    if (decoded.length === 33) return
+    if (decoded.length === 33) return decoded
   }
 
   throw new Error(`Invalid address: ${address}`)
 }
 
-export function groupOfAddress(address: string): number {
-  validateAddress(address)
+export function isAssetAddress(address: string) {
+  const addressType = decodeAndValidateAddress(address)[0]
+  return addressType === AddressType.P2PKH || addressType === AddressType.P2MPKH || addressType === AddressType.P2SH
+}
 
-  const decoded = bs58.decode(address)
+export function isContractAddress(address: string) {
+  const addressType = decodeAndValidateAddress(address)[0]
+  return addressType === AddressType.P2C
+}
+
+export function groupOfAddress(address: string): number {
+  const decoded = decodeAndValidateAddress(address)
   const addressType = decoded[0]
   const addressBody = decoded.slice(1)