@defuse-protocol/intents-sdk 0.64.0 → 0.64.1

package/dist/src/intents/intent-hashes/ton-connect.cjs

@@ -1,4 +1,5 @@
 const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
+const require_ton_address = require('../../lib/ton-address.cjs');
 let _noble_hashes_sha2 = require("@noble/hashes/sha2");
 
 //#region src/intents/intent-hashes/ton-connect.ts
@@ -13,27 +14,10 @@ function numberToBigEndian(num, bytes) {
 	}
 	return result;
 }
-/**
-* Parse TON address string to TonAddress object
-* Supports raw format: "workchain:address_hex"
-* Example: "0:f4809e5ffac9dc42a6b1d94c5e74ad5fd86378de675c805f2274d0055cbc9378"
-*
-* @param addressString - TON address string in raw format
-* @returns Parsed TonAddress object
-*/
 function parseTonAddress(addressString) {
-	const parts = addressString.split(":");
-	if (parts.length !== 2) throw new Error(`Invalid TON address format: ${addressString}. Expected "workchain:address_hex"`);
-	const workchainId = parseInt(parts[0], 10);
-	if (Number.isNaN(workchainId)) throw new Error(`Invalid workchain ID: ${parts[0]}`);
-	const addressHex = parts[1].startsWith("0x") ? parts[1].slice(2) : parts[1];
-	if (addressHex.length !== 64) throw new Error(`Invalid address length: expected 64 hex characters, got ${addressHex.length}`);
-	const address = new Uint8Array(32);
-	for (let i = 0; i < 32; i++) address[i] = parseInt(addressHex.slice(i * 2, i * 2 + 2), 16);
-	return {
-		workchainId,
-		address
-	};
+	const parsed = require_ton_address.tryParseTonAddress(addressString);
+	if (parsed === null) throw new Error(`Invalid TON address: ${addressString}`);
+	return parsed;
 }
 /**
 * Compute the SHA-256 hash of a TON Connect payload

package/dist/src/intents/intent-hashes/ton-connect.js

@@ -1,3 +1,4 @@
+import { tryParseTonAddress } from "../../lib/ton-address.js";
 import { sha256 } from "@noble/hashes/sha2";
 
 //#region src/intents/intent-hashes/ton-connect.ts
@@ -12,27 +13,10 @@ function numberToBigEndian(num, bytes) {
 	}
 	return result;
 }
-/**
-* Parse TON address string to TonAddress object
-* Supports raw format: "workchain:address_hex"
-* Example: "0:f4809e5ffac9dc42a6b1d94c5e74ad5fd86378de675c805f2274d0055cbc9378"
-*
-* @param addressString - TON address string in raw format
-* @returns Parsed TonAddress object
-*/
 function parseTonAddress(addressString) {
-	const parts = addressString.split(":");
-	if (parts.length !== 2) throw new Error(`Invalid TON address format: ${addressString}. Expected "workchain:address_hex"`);
-	const workchainId = parseInt(parts[0], 10);
-	if (Number.isNaN(workchainId)) throw new Error(`Invalid workchain ID: ${parts[0]}`);
-	const addressHex = parts[1].startsWith("0x") ? parts[1].slice(2) : parts[1];
-	if (addressHex.length !== 64) throw new Error(`Invalid address length: expected 64 hex characters, got ${addressHex.length}`);
-	const address = new Uint8Array(32);
-	for (let i = 0; i < 32; i++) address[i] = parseInt(addressHex.slice(i * 2, i * 2 + 2), 16);
-	return {
-		workchainId,
-		address
-	};
+	const parsed = tryParseTonAddress(addressString);
+	if (parsed === null) throw new Error(`Invalid TON address: ${addressString}`);
+	return parsed;
 }
 /**
 * Compute the SHA-256 hash of a TON Connect payload

package/dist/src/lib/ton-address.cjs

@@ -0,0 +1,74 @@
+const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
+let _scure_base = require("@scure/base");
+
+//#region src/lib/ton-address.ts
+/**
+* Tag byte for user-friendly TON addresses. Bit 7 sets testnet, bit 6 sets
+* non-bounceable. See https://docs.ton.org/learn/overviews/addresses#user-friendly-address
+*/
+const TON_ADDRESS_TAG_BOUNCEABLE_MAINNET = 17;
+const TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET = 81;
+/**
+* Real TON only uses these two workchains. Other values parse fine but no
+* wallet emits them, so the validator treats them as typos.
+*/
+const TON_WORKCHAIN_BASECHAIN = 0;
+const TON_WORKCHAIN_MASTERCHAIN = -1;
+const TON_USER_FRIENDLY_LENGTH = 36;
+function crc16ccitt(data) {
+	let crc = 0;
+	for (const byte of data) {
+		crc ^= byte << 8;
+		for (let i = 0; i < 8; i++) crc = crc & 32768 ? crc << 1 ^ 4129 : crc << 1;
+		crc &= 65535;
+	}
+	return [crc >> 8 & 255, crc & 255];
+}
+function parseTonUserFriendlyAddress(s) {
+	const normalized = s.replace(/\+/g, "-").replace(/\//g, "_");
+	let data;
+	try {
+		data = _scure_base.base64urlnopad.decode(normalized);
+	} catch {
+		return null;
+	}
+	if (data.length !== TON_USER_FRIENDLY_LENGTH) return null;
+	const [hi, lo] = crc16ccitt(data.subarray(0, 34));
+	if (data[34] !== hi || data[35] !== lo) return null;
+	const tag = data[0];
+	const wcByte = data[1];
+	return {
+		tag,
+		workchainId: wcByte > 127 ? wcByte - 256 : wcByte,
+		address: data.slice(2, 34)
+	};
+}
+const RAW_HEX_LENGTH = 64;
+function parseTonRawAddress(s) {
+	const parts = s.split(":");
+	if (parts.length !== 2) return null;
+	const workchainId = parseInt(parts[0], 10);
+	if (Number.isNaN(workchainId)) return null;
+	let hex = parts[1];
+	if (hex.startsWith("0x")) hex = hex.slice(2);
+	if (hex.length !== RAW_HEX_LENGTH) return null;
+	if (!/^[0-9a-fA-F]+$/.test(hex)) return null;
+	const address = new Uint8Array(32);
+	for (let i = 0; i < 32; i++) address[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+	return {
+		workchainId,
+		address,
+		tag: null
+	};
+}
+function tryParseTonAddress(s) {
+	if (s.includes(":")) return parseTonRawAddress(s);
+	return parseTonUserFriendlyAddress(s);
+}
+
+//#endregion
+exports.TON_ADDRESS_TAG_BOUNCEABLE_MAINNET = TON_ADDRESS_TAG_BOUNCEABLE_MAINNET;
+exports.TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET = TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET;
+exports.TON_WORKCHAIN_BASECHAIN = TON_WORKCHAIN_BASECHAIN;
+exports.TON_WORKCHAIN_MASTERCHAIN = TON_WORKCHAIN_MASTERCHAIN;
+exports.tryParseTonAddress = tryParseTonAddress;

package/dist/src/lib/ton-address.js

@@ -0,0 +1,69 @@
+import { base64urlnopad } from "@scure/base";
+
+//#region src/lib/ton-address.ts
+/**
+* Tag byte for user-friendly TON addresses. Bit 7 sets testnet, bit 6 sets
+* non-bounceable. See https://docs.ton.org/learn/overviews/addresses#user-friendly-address
+*/
+const TON_ADDRESS_TAG_BOUNCEABLE_MAINNET = 17;
+const TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET = 81;
+/**
+* Real TON only uses these two workchains. Other values parse fine but no
+* wallet emits them, so the validator treats them as typos.
+*/
+const TON_WORKCHAIN_BASECHAIN = 0;
+const TON_WORKCHAIN_MASTERCHAIN = -1;
+const TON_USER_FRIENDLY_LENGTH = 36;
+function crc16ccitt(data) {
+	let crc = 0;
+	for (const byte of data) {
+		crc ^= byte << 8;
+		for (let i = 0; i < 8; i++) crc = crc & 32768 ? crc << 1 ^ 4129 : crc << 1;
+		crc &= 65535;
+	}
+	return [crc >> 8 & 255, crc & 255];
+}
+function parseTonUserFriendlyAddress(s) {
+	const normalized = s.replace(/\+/g, "-").replace(/\//g, "_");
+	let data;
+	try {
+		data = base64urlnopad.decode(normalized);
+	} catch {
+		return null;
+	}
+	if (data.length !== TON_USER_FRIENDLY_LENGTH) return null;
+	const [hi, lo] = crc16ccitt(data.subarray(0, 34));
+	if (data[34] !== hi || data[35] !== lo) return null;
+	const tag = data[0];
+	const wcByte = data[1];
+	return {
+		tag,
+		workchainId: wcByte > 127 ? wcByte - 256 : wcByte,
+		address: data.slice(2, 34)
+	};
+}
+const RAW_HEX_LENGTH = 64;
+function parseTonRawAddress(s) {
+	const parts = s.split(":");
+	if (parts.length !== 2) return null;
+	const workchainId = parseInt(parts[0], 10);
+	if (Number.isNaN(workchainId)) return null;
+	let hex$1 = parts[1];
+	if (hex$1.startsWith("0x")) hex$1 = hex$1.slice(2);
+	if (hex$1.length !== RAW_HEX_LENGTH) return null;
+	if (!/^[0-9a-fA-F]+$/.test(hex$1)) return null;
+	const address = new Uint8Array(32);
+	for (let i = 0; i < 32; i++) address[i] = parseInt(hex$1.slice(i * 2, i * 2 + 2), 16);
+	return {
+		workchainId,
+		address,
+		tag: null
+	};
+}
+function tryParseTonAddress(s) {
+	if (s.includes(":")) return parseTonRawAddress(s);
+	return parseTonUserFriendlyAddress(s);
+}
+
+//#endregion
+export { TON_ADDRESS_TAG_BOUNCEABLE_MAINNET, TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET, TON_WORKCHAIN_BASECHAIN, TON_WORKCHAIN_MASTERCHAIN, tryParseTonAddress };

package/dist/src/lib/validateAddress.cjs

@@ -1,5 +1,6 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
 const require_caip2 = require('./caip2.cjs');
+const require_ton_address = require('./ton-address.cjs');
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
 let viem = require("viem");
 let _noble_hashes_sha2 = require("@noble/hashes/sha2");
@@ -244,26 +245,11 @@ function validateTronHexAddress(address) {
 		return false;
 	}
 }
-function crc16ccitt(data) {
-	let crc = 0;
-	for (const byte of data) {
-		crc ^= byte << 8;
-		for (let i = 0; i < 8; i++) crc = crc & 32768 ? crc << 1 ^ 4129 : crc << 1;
-		crc &= 65535;
-	}
-	return [crc >> 8 & 255, crc & 255];
-}
 function validateTonAddress(address) {
-	try {
-		const data = _scure_base.base64urlnopad.decode(address);
-		if (data.length !== 36) return false;
-		const tag = data[0];
-		if (tag !== 17 && tag !== 81) return false;
-		const [hi, lo] = crc16ccitt(data.subarray(0, 34));
-		return data[34] === hi && data[35] === lo;
-	} catch {
-		return false;
-	}
+	const parsed = require_ton_address.tryParseTonAddress(address);
+	if (parsed === null) return false;
+	if (parsed.workchainId !== require_ton_address.TON_WORKCHAIN_BASECHAIN && parsed.workchainId !== require_ton_address.TON_WORKCHAIN_MASTERCHAIN) return false;
+	return parsed.tag === null || parsed.tag === require_ton_address.TON_ADDRESS_TAG_BOUNCEABLE_MAINNET || parsed.tag === require_ton_address.TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET;
 }
 function validateSuiAddress(address) {
 	return /^(?:0x)?[a-fA-F0-9]{64}$/.test(address);

package/dist/src/lib/validateAddress.js

@@ -1,8 +1,9 @@
 import { Chains } from "./caip2.js";
+import { TON_ADDRESS_TAG_BOUNCEABLE_MAINNET, TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET, TON_WORKCHAIN_BASECHAIN, TON_WORKCHAIN_MASTERCHAIN, tryParseTonAddress } from "./ton-address.js";
 import { utils } from "@defuse-protocol/internal-utils";
 import { isAddress } from "viem";
 import { sha256 } from "@noble/hashes/sha2";
-import { base58, base64urlnopad, bech32, bech32m, hex } from "@scure/base";
+import { base58, bech32, bech32m, hex } from "@scure/base";
 import { PublicKey } from "@solana/web3.js";
 import { isValidClassicAddress, isValidXAddress } from "ripple-address-codec";
 
@@ -243,26 +244,11 @@ function validateTronHexAddress(address) {
 		return false;
 	}
 }
-function crc16ccitt(data) {
-	let crc = 0;
-	for (const byte of data) {
-		crc ^= byte << 8;
-		for (let i = 0; i < 8; i++) crc = crc & 32768 ? crc << 1 ^ 4129 : crc << 1;
-		crc &= 65535;
-	}
-	return [crc >> 8 & 255, crc & 255];
-}
 function validateTonAddress(address) {
-	try {
-		const data = base64urlnopad.decode(address);
-		if (data.length !== 36) return false;
-		const tag = data[0];
-		if (tag !== 17 && tag !== 81) return false;
-		const [hi, lo] = crc16ccitt(data.subarray(0, 34));
-		return data[34] === hi && data[35] === lo;
-	} catch {
-		return false;
-	}
+	const parsed = tryParseTonAddress(address);
+	if (parsed === null) return false;
+	if (parsed.workchainId !== TON_WORKCHAIN_BASECHAIN && parsed.workchainId !== TON_WORKCHAIN_MASTERCHAIN) return false;
+	return parsed.tag === null || parsed.tag === TON_ADDRESS_TAG_BOUNCEABLE_MAINNET || parsed.tag === TON_ADDRESS_TAG_NON_BOUNCEABLE_MAINNET;
 }
 function validateSuiAddress(address) {
 	return /^(?:0x)?[a-fA-F0-9]{64}$/.test(address);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defuse-protocol/intents-sdk",
-  "version": "0.64.0",
+  "version": "0.64.1",
   "private": false,
   "type": "module",
   "repository": {
@@ -53,6 +53,7 @@
     "@defuse-protocol/internal-utils": "0.32.0"
   },
   "devDependencies": {
+    "@ton/core": "^0.60.0",
     "tsdown": "0.19.0"
   },
   "scripts": {