@alephium/web3 0.23.0 → 0.24.0

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

@@ -1,6 +1,6 @@
 import { Transaction } from '../api/api-alephium';
 import { Address } from '../signer';
-export declare function isExchangeAddress(address: string): boolean;
+export declare function validateExchangeAddress(address: string): void;
 export declare function isDepositALPHTransaction(tx: Transaction, exchangeAddress: string): boolean;
 export declare function isDepositTokenTransaction(tx: Transaction, exchangeAddress: string): boolean;
 export declare function getDepositAddress(tx: Transaction): Address;

package/dist/src/utils/exchange.js

@@ -17,16 +17,27 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAddressFromUnlockScript = exports.getDepositAddress = exports.isDepositTokenTransaction = exports.isDepositALPHTransaction = exports.isExchangeAddress = void 0;
+exports.getAddressFromUnlockScript = exports.getDepositAddress = exports.isDepositTokenTransaction = exports.isDepositALPHTransaction = exports.validateExchangeAddress = void 0;
 const __1 = require("..");
-function isExchangeAddress(address) {
-    const decoded = __1.bs58.decode(address);
+function validateExchangeAddress(address) {
+    let decoded;
+    try {
+        decoded = __1.bs58.decode(address);
+    }
+    catch (_) {
+        throw new Error('Invalid base58 string');
+    }
     if (decoded.length === 0)
         throw new Error('Address is empty');
     const addressType = decoded[0];
-    return (addressType === __1.AddressType.P2PKH || addressType === __1.AddressType.P2SH) && decoded.length === 33;
+    if (addressType !== __1.AddressType.P2PKH && addressType !== __1.AddressType.P2SH) {
+        throw new Error('Invalid address type');
+    }
+    if (decoded.length !== 33) {
+        throw new Error('Invalid address length');
+    }
 }
-exports.isExchangeAddress = isExchangeAddress;
+exports.validateExchangeAddress = validateExchangeAddress;
 function isDepositALPHTransaction(tx, exchangeAddress) {
     return isDepositTransaction(tx, exchangeAddress) && checkALPHOutput(tx);
 }
@@ -112,7 +123,7 @@ function isDepositTransaction(tx, exchangeAddress) {
         return false;
     }
     const from = getFromAddress(tx);
-    if (from === undefined) {
+    if (from === undefined || from === exchangeAddress) {
         return false;
     }
     return checkOutputAddress(tx, from, exchangeAddress);

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

@@ -6,4 +6,4 @@ export * from './utils';
 export * from './subscription';
 export * from './sign';
 export * from './number';
-export { isExchangeAddress, isDepositALPHTransaction, isDepositTokenTransaction, getDepositAddress } from './exchange';
+export { validateExchangeAddress, isDepositALPHTransaction, isDepositTokenTransaction, getDepositAddress } from './exchange';

package/dist/src/utils/index.js

@@ -31,7 +31,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDepositAddress = exports.isDepositTokenTransaction = exports.isDepositALPHTransaction = exports.isExchangeAddress = void 0;
+exports.getDepositAddress = exports.isDepositTokenTransaction = exports.isDepositALPHTransaction = exports.validateExchangeAddress = void 0;
 __exportStar(require("./webcrypto"), exports);
 __exportStar(require("./address"), exports);
 __exportStar(require("./bs58"), exports);
@@ -41,7 +41,7 @@ __exportStar(require("./subscription"), exports);
 __exportStar(require("./sign"), exports);
 __exportStar(require("./number"), exports);
 var exchange_1 = require("./exchange");
-Object.defineProperty(exports, "isExchangeAddress", { enumerable: true, get: function () { return exchange_1.isExchangeAddress; } });
+Object.defineProperty(exports, "validateExchangeAddress", { enumerable: true, get: function () { return exchange_1.validateExchangeAddress; } });
 Object.defineProperty(exports, "isDepositALPHTransaction", { enumerable: true, get: function () { return exchange_1.isDepositALPHTransaction; } });
 Object.defineProperty(exports, "isDepositTokenTransaction", { enumerable: true, get: function () { return exchange_1.isDepositTokenTransaction; } });
 Object.defineProperty(exports, "getDepositAddress", { enumerable: true, get: function () { return exchange_1.getDepositAddress; } });

package/package.json

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

package/src/utils/exchange.ts

@@ -20,11 +20,21 @@ import { AddressType, DUST_AMOUNT, addressFromPublicKey, addressFromScript, binT
 import { Transaction } from '../api/api-alephium'
 import { Address } from '../signer'
 
-export function isExchangeAddress(address: string): boolean {
-  const decoded = bs58.decode(address)
+export function validateExchangeAddress(address: string) {
+  let decoded: Uint8Array
+  try {
+    decoded = bs58.decode(address)
+  } catch (_) {
+    throw new Error('Invalid base58 string')
+  }
   if (decoded.length === 0) throw new Error('Address is empty')
   const addressType = decoded[0]
-  return (addressType === AddressType.P2PKH || addressType === AddressType.P2SH) && decoded.length === 33
+  if (addressType !== AddressType.P2PKH && addressType !== AddressType.P2SH) {
+    throw new Error('Invalid address type')
+  }
+  if (decoded.length !== 33) {
+    throw new Error('Invalid address length')
+  }
 }
 
 export function isDepositALPHTransaction(tx: Transaction, exchangeAddress: string): boolean {
@@ -113,7 +123,7 @@ function isDepositTransaction(tx: Transaction, exchangeAddress: string): boolean
     return false
   }
   const from = getFromAddress(tx)
-  if (from === undefined) {
+  if (from === undefined || from === exchangeAddress) {
     return false
   }
   return checkOutputAddress(tx, from, exchangeAddress)

package/src/utils/index.ts

@@ -24,4 +24,9 @@ export * from './utils'
 export * from './subscription'
 export * from './sign'
 export * from './number'
-export { isExchangeAddress, isDepositALPHTransaction, isDepositTokenTransaction, getDepositAddress } from './exchange'
+export {
+  validateExchangeAddress,
+  isDepositALPHTransaction,
+  isDepositTokenTransaction,
+  getDepositAddress
+} from './exchange'