@ton/mcp 0.1.10 → 0.1.11

package/dist/index.cjs

@@ -19941,6 +19941,15 @@ var require_ShardStateUnsplit = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.loadShardStateUnsplit = loadShardStateUnsplit;
 }));
 
+//#endregion
+//#region ../../node_modules/@ton/core/dist/types/SignatureDomain.js
+var require_SignatureDomain = /* @__PURE__ */ __commonJSMin(((exports) => {
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.signatureDomainEmptyTag = exports.signatureDomainL2Tag = void 0;
+	exports.signatureDomainL2Tag = 1907576545;
+	exports.signatureDomainEmptyTag = 236803867;
+}));
+
 //#endregion
 //#region ../../node_modules/@ton/core/dist/types/SplitMergeInfo.js
 var require_SplitMergeInfo = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -20457,8 +20466,8 @@ var require__export = /* @__PURE__ */ __commonJSMin(((exports) => {
 	* LICENSE file in the root directory of this source tree.
 	*/
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.loadSimpleLibrary = exports.loadShardStateUnsplit = exports.storeShardIdent = exports.loadShardIdent = exports.storeShardAccounts = exports.loadShardAccounts = exports.ShardAccountRefValue = exports.storeShardAccount = exports.loadShardAccount = exports.ReserveMode = exports.SendMode = exports.storeMessageRelaxed = exports.loadMessageRelaxed = exports.storeMessage = exports.loadMessage = exports.loadMasterchainStateExtra = exports.storeHashUpdate = exports.loadHashUpdate = exports.storeExtraCurrency = exports.loadMaybeExtraCurrency = exports.loadExtraCurrency = exports.packExtraCurrencyDict = exports.packExtraCurrencyCell = exports.storeDepthBalanceInfo = exports.loadDepthBalanceInfo = exports.storeCurrencyCollection = exports.loadCurrencyCollection = exports.storeComputeSkipReason = exports.loadComputeSkipReason = exports.storeCommonMessageInfoRelaxed = exports.loadCommonMessageInfoRelaxed = exports.storeCommonMessageInfo = exports.loadCommonMessageInfo = exports.storeOutList = exports.loadOutList = exports.storeOutAction = exports.loadOutAction = exports.storeAccountStorage = exports.loadAccountStorage = exports.storeAccountStatusChange = exports.loadAccountStatusChange = exports.storeAccountStatus = exports.loadAccountStatus = exports.storeAccountState = exports.loadAccountState = exports.storeAccount = exports.loadAccount = exports.comment = exports.external = exports.internal = void 0;
-	exports.storeTransactionsStoragePhase = exports.loadTransactionStoragePhase = exports.storeTransactionDescription = exports.loadTransactionDescription = exports.storeTransactionCreditPhase = exports.loadTransactionCreditPhase = exports.storeTransactionComputePhase = exports.loadTransactionComputePhase = exports.storeTransactionBouncePhase = exports.loadTransactionBouncePhase = exports.storeTransactionActionPhase = exports.loadTransactionActionPhase = exports.storeTransaction = exports.loadTransaction = exports.storeTickTock = exports.loadTickTock = exports.storeStorageUsed = exports.loadStorageUsed = exports.storeStorageInfo = exports.loadStorageInfo = exports.storeStateInit = exports.loadStateInit = exports.storeSplitMergeInfo = exports.loadSplitMergeInfo = exports.storeLibRef = exports.loadLibRef = exports.storeSimpleLibrary = void 0;
+	exports.signatureDomainEmptyTag = exports.loadShardStateUnsplit = exports.storeShardIdent = exports.loadShardIdent = exports.storeShardAccounts = exports.loadShardAccounts = exports.ShardAccountRefValue = exports.storeShardAccount = exports.loadShardAccount = exports.ReserveMode = exports.SendMode = exports.storeMessageRelaxed = exports.loadMessageRelaxed = exports.storeMessage = exports.loadMessage = exports.loadMasterchainStateExtra = exports.storeHashUpdate = exports.loadHashUpdate = exports.storeExtraCurrency = exports.loadMaybeExtraCurrency = exports.loadExtraCurrency = exports.packExtraCurrencyDict = exports.packExtraCurrencyCell = exports.storeDepthBalanceInfo = exports.loadDepthBalanceInfo = exports.storeCurrencyCollection = exports.loadCurrencyCollection = exports.storeComputeSkipReason = exports.loadComputeSkipReason = exports.storeCommonMessageInfoRelaxed = exports.loadCommonMessageInfoRelaxed = exports.storeCommonMessageInfo = exports.loadCommonMessageInfo = exports.storeOutList = exports.loadOutList = exports.storeOutAction = exports.loadOutAction = exports.storeAccountStorage = exports.loadAccountStorage = exports.storeAccountStatusChange = exports.loadAccountStatusChange = exports.storeAccountStatus = exports.loadAccountStatus = exports.storeAccountState = exports.loadAccountState = exports.storeAccount = exports.loadAccount = exports.comment = exports.external = exports.internal = void 0;
+	exports.storeTransactionsStoragePhase = exports.loadTransactionStoragePhase = exports.storeTransactionDescription = exports.loadTransactionDescription = exports.storeTransactionCreditPhase = exports.loadTransactionCreditPhase = exports.storeTransactionComputePhase = exports.loadTransactionComputePhase = exports.storeTransactionBouncePhase = exports.loadTransactionBouncePhase = exports.storeTransactionActionPhase = exports.loadTransactionActionPhase = exports.storeTransaction = exports.loadTransaction = exports.storeTickTock = exports.loadTickTock = exports.storeStorageUsed = exports.loadStorageUsed = exports.storeStorageInfo = exports.loadStorageInfo = exports.storeStateInit = exports.loadStateInit = exports.storeSplitMergeInfo = exports.loadSplitMergeInfo = exports.storeLibRef = exports.loadLibRef = exports.storeSimpleLibrary = exports.loadSimpleLibrary = exports.signatureDomainL2Tag = void 0;
 	var _helpers_1 = require__helpers();
 	Object.defineProperty(exports, "internal", {
 		enumerable: true,
@@ -20776,6 +20785,19 @@ var require__export = /* @__PURE__ */ __commonJSMin(((exports) => {
 			return ShardStateUnsplit_1.loadShardStateUnsplit;
 		}
 	});
+	var SignatureDomain_1 = require_SignatureDomain();
+	Object.defineProperty(exports, "signatureDomainEmptyTag", {
+		enumerable: true,
+		get: function() {
+			return SignatureDomain_1.signatureDomainEmptyTag;
+		}
+	});
+	Object.defineProperty(exports, "signatureDomainL2Tag", {
+		enumerable: true,
+		get: function() {
+			return SignatureDomain_1.signatureDomainL2Tag;
+		}
+	});
 	var SimpleLibrary_1 = require_SimpleLibrary();
 	Object.defineProperty(exports, "loadSimpleLibrary", {
 		enumerable: true,
@@ -21343,6 +21365,53 @@ var require_safeSign = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.safeSignVerify = safeSignVerify;
 }));
 
+//#endregion
+//#region ../../node_modules/@ton/core/dist/crypto/domainSignature.js
+var require_domainSignature = /* @__PURE__ */ __commonJSMin(((exports) => {
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.domainSignVerify = exports.domainSign = exports.signatureDomainPrefix = exports.signatureDomainHash = void 0;
+	const crypto_1 = require_dist$2();
+	const SignatureDomain_1 = require_SignatureDomain();
+	function signatureDomainHash(domain) {
+		switch (domain.type) {
+			case "empty":
+				const tl = Buffer.alloc(4);
+				tl.writeInt32LE(SignatureDomain_1.signatureDomainEmptyTag);
+				return (0, crypto_1.sha256_sync)(tl);
+			case "l2": {
+				const tl = Buffer.alloc(8);
+				tl.writeInt32LE(SignatureDomain_1.signatureDomainL2Tag);
+				tl.writeInt32LE(domain.globalId, 4);
+				return (0, crypto_1.sha256_sync)(tl);
+			}
+			default: throw new Error(`Unknown SignatureDomain type ${domain.type}`);
+		}
+	}
+	exports.signatureDomainHash = signatureDomainHash;
+	const signatureDomainEmptyHash = signatureDomainHash({ type: "empty" });
+	function signatureDomainPrefix(domainOrHash) {
+		const domainHash = Buffer.isBuffer(domainOrHash) ? domainOrHash : signatureDomainHash(domainOrHash);
+		if (domainHash.length !== 32) throw new Error("Invalid signature domain hash length");
+		if (domainHash.equals(signatureDomainEmptyHash)) return null;
+		return domainHash;
+	}
+	exports.signatureDomainPrefix = signatureDomainPrefix;
+	function domainDataToSign(data, domain) {
+		const prefix = signatureDomainPrefix(domain);
+		return prefix ? Buffer.concat([prefix, data]) : data;
+	}
+	function domainSign({ data, secretKey, domain = { type: "empty" } }) {
+		const dataToSign = domainDataToSign(data, domain);
+		return (0, crypto_1.sign)(dataToSign, secretKey);
+	}
+	exports.domainSign = domainSign;
+	function domainSignVerify({ data, signature, publicKey, domain = { type: "empty" } }) {
+		const dataToSign = domainDataToSign(data, domain);
+		return (0, crypto_1.signVerify)(dataToSign, signature, publicKey);
+	}
+	exports.domainSignVerify = domainSignVerify;
+}));
+
 //#endregion
 //#region ../../node_modules/@ton/core/dist/index.js
 var require_dist$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -21371,7 +21440,7 @@ var require_dist$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 		for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$3, p)) __createBinding(exports$3, m, p);
 	};
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.safeSignVerify = exports.safeSign = exports.getMethodId = exports.base32Encode = exports.base32Decode = exports.crc32c = exports.crc16 = exports.fromNano = exports.toNano = exports.ComputeError = exports.openContract = exports.TupleBuilder = exports.TupleReader = exports.serializeTupleItem = exports.parseTupleItem = exports.serializeTuple = exports.parseTuple = exports.generateMerkleUpdate = exports.generateMerkleProofDirect = exports.generateMerkleProof = exports.exoticPruned = exports.exoticMerkleUpdate = exports.convertToMerkleProof = exports.exoticMerkleProof = exports.Dictionary = exports.Cell = exports.CellType = exports.Slice = exports.beginCell = exports.Builder = exports.BitBuilder = exports.BitReader = exports.BitString = exports.contractAddress = exports.ADNLAddress = exports.ExternalAddress = exports.address = exports.Address = void 0;
+	exports.domainSignVerify = exports.domainSign = exports.signatureDomainPrefix = exports.signatureDomainHash = exports.safeSignVerify = exports.safeSign = exports.getMethodId = exports.base32Encode = exports.base32Decode = exports.crc32c = exports.crc16 = exports.fromNano = exports.toNano = exports.ComputeError = exports.openContract = exports.TupleBuilder = exports.TupleReader = exports.serializeTupleItem = exports.parseTupleItem = exports.serializeTuple = exports.parseTuple = exports.generateMerkleUpdate = exports.generateMerkleProofDirect = exports.generateMerkleProof = exports.exoticPruned = exports.exoticMerkleUpdate = exports.convertToMerkleProof = exports.exoticMerkleProof = exports.Dictionary = exports.Cell = exports.CellType = exports.Slice = exports.beginCell = exports.Builder = exports.BitBuilder = exports.BitReader = exports.BitString = exports.contractAddress = exports.ADNLAddress = exports.ExternalAddress = exports.address = exports.Address = void 0;
 	var Address_1 = require_Address();
 	Object.defineProperty(exports, "Address", {
 		enumerable: true,
@@ -21629,6 +21698,31 @@ var require_dist$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 			return safeSign_1.safeSignVerify;
 		}
 	});
+	var domainSignature_1 = require_domainSignature();
+	Object.defineProperty(exports, "signatureDomainHash", {
+		enumerable: true,
+		get: function() {
+			return domainSignature_1.signatureDomainHash;
+		}
+	});
+	Object.defineProperty(exports, "signatureDomainPrefix", {
+		enumerable: true,
+		get: function() {
+			return domainSignature_1.signatureDomainPrefix;
+		}
+	});
+	Object.defineProperty(exports, "domainSign", {
+		enumerable: true,
+		get: function() {
+			return domainSignature_1.domainSign;
+		}
+	});
+	Object.defineProperty(exports, "domainSignVerify", {
+		enumerable: true,
+		get: function() {
+			return domainSignature_1.domainSignVerify;
+		}
+	});
 }));
 
 //#endregion
@@ -23919,7 +24013,7 @@ var TONConnectStoredSessionManager = class {
 };
 
 //#endregion
-//#region ../../node_modules/@tonconnect/isomorphic-eventsource/node_modules/eventsource/lib/eventsource.js
+//#region ../../node_modules/eventsource/lib/eventsource.js
 var require_eventsource = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var parse = require("url").parse;
 	var events = require("events");
@@ -24334,7 +24428,7 @@ var import_eventsource = /* @__PURE__ */ __toESM(require_eventsource(), 1);
 if (!global.EventSource) global.EventSource = import_eventsource.default;
 
 //#endregion
-//#region ../../node_modules/whatwg-url/node_modules/webidl-conversions/lib/index.js
+//#region ../../node_modules/node-fetch/node_modules/webidl-conversions/lib/index.js
 var require_lib$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var conversions = {};
 	module.exports = conversions;
@@ -24451,7 +24545,7 @@ var require_lib$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/whatwg-url/lib/utils.js
+//#region ../../node_modules/node-fetch/node_modules/whatwg-url/lib/utils.js
 var require_utils = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports.mixin = function mixin(target, source) {
 		const keys = Object.getOwnPropertyNames(source);
@@ -60165,7 +60259,7 @@ var require_tr46 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/whatwg-url/lib/url-state-machine.js
+//#region ../../node_modules/node-fetch/node_modules/whatwg-url/lib/url-state-machine.js
 var require_url_state_machine = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const punycode = require("punycode");
 	const tr46 = require_tr46();
@@ -61037,7 +61131,7 @@ var require_url_state_machine = /* @__PURE__ */ __commonJSMin(((exports, module)
 }));
 
 //#endregion
-//#region ../../node_modules/whatwg-url/lib/URL-impl.js
+//#region ../../node_modules/node-fetch/node_modules/whatwg-url/lib/URL-impl.js
 var require_URL_impl = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const usm = require_url_state_machine();
 	exports.implementation = class URLImpl {
@@ -61176,7 +61270,7 @@ var require_URL_impl = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region ../../node_modules/whatwg-url/lib/URL.js
+//#region ../../node_modules/node-fetch/node_modules/whatwg-url/lib/URL.js
 var require_URL = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const conversions = require_lib$1();
 	const utils = require_utils();
@@ -61342,7 +61436,7 @@ var require_URL = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/whatwg-url/lib/public-api.js
+//#region ../../node_modules/node-fetch/node_modules/whatwg-url/lib/public-api.js
 var require_public_api = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.URL = require_URL().interface;
 	exports.serializeURL = require_url_state_machine().serializeURL;
@@ -64314,7 +64408,8 @@ var BridgeManager = class {
 				tabId: event?.tabId,
 				messageId: event?.messageId,
 				traceId: event?.traceId,
-				walletId: event?.walletId
+				walletId: event?.walletId,
+				returnStrategy: event?.returnStrategy
 			};
 			if (!rawEvent.traceId) rawEvent.traceId = v7_default();
 			await this.sessionManager.initialize();
@@ -64464,9 +64559,11 @@ function isValidHost(host) {
 */
 const log$18 = globalLogger.createChild("ConnectHandler");
 var ConnectHandler = class ConnectHandler extends BasicHandler {
+	config;
 	analytics;
-	constructor(notify, analyticsManager) {
+	constructor(notify, config, analyticsManager) {
 		super(notify);
+		this.config = config;
 		this.analytics = analyticsManager?.scoped();
 	}
 	canHandle(event) {
@@ -64491,7 +64588,8 @@ var ConnectHandler = class ConnectHandler extends BasicHandler {
 			preview,
 			dAppInfo: preview.dAppInfo,
 			isJsBridge: event.isJsBridge,
-			tabId: event.tabId
+			tabId: event.tabId,
+			returnStrategy: event.params.returnStrategy
 		};
 		this.analytics?.emitWalletConnectRequestReceived({
 			trace_id: event.traceId,
@@ -64536,18 +64634,20 @@ var ConnectHandler = class ConnectHandler extends BasicHandler {
 		const manifest = fetchedManifest || eventManifest;
 		const dAppUrl = (event?.domain || manifest?.url?.toString() || "").trim();
 		let finalManifestFetchErrorCode = manifestFetchErrorCode;
-		if (!finalManifestFetchErrorCode && dAppUrl) try {
-			const parsedDAppUrl = new URL(dAppUrl);
-			if (!isValidHost(parsedDAppUrl.host)) {
-				log$18.warn("Invalid dApp URL in manifest - invalid host format", {
-					dAppUrl,
-					host: parsedDAppUrl.host
-				});
+		if (!this.config.dev?.disableManifestDomainCheck) {
+			if (!finalManifestFetchErrorCode && dAppUrl) try {
+				const parsedDAppUrl = new URL(dAppUrl);
+				if (!isValidHost(parsedDAppUrl.host)) {
+					log$18.warn("Invalid dApp URL in manifest - invalid host format", {
+						dAppUrl,
+						host: parsedDAppUrl.host
+					});
+					finalManifestFetchErrorCode = CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR;
+				}
+			} catch (_) {
+				log$18.warn("Invalid dApp URL in manifest - failed to parse", { dAppUrl });
 				finalManifestFetchErrorCode = CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR;
 			}
-		} catch (_) {
-			log$18.warn("Invalid dApp URL in manifest - failed to parse", { dAppUrl });
-			finalManifestFetchErrorCode = CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR;
 		}
 		const sanitizedManifest = manifest && {
 			name: manifest.name?.toString()?.trim() || "",
@@ -64605,15 +64705,25 @@ var ConnectHandler = class ConnectHandler extends BasicHandler {
 	async tryFetchManifest(url) {
 		try {
 			const response = await fetch(url);
-			if (!response.ok) return {
-				manifest: null,
-				manifestFetchErrorCode: CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR
-			};
+			if (!response.ok) {
+				log$18.error("Failed to fetch manifest not ok", {
+					url,
+					status: response.status
+				});
+				return {
+					manifest: null,
+					manifestFetchErrorCode: CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR
+				};
+			}
 			return {
 				manifest: await response.json(),
 				manifestFetchErrorCode: void 0
 			};
-		} catch (_) {
+		} catch (e) {
+			log$18.error("Failed to fetch manifest catched", {
+				url,
+				error: e
+			});
 			return {
 				manifest: null,
 				manifestFetchErrorCode: CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR
@@ -64715,6 +64825,17 @@ function toExtraCurrencies(extraCurrency) {
 	if (!extraCurrency) return;
 	return extraCurrency;
 }
+/**
+* Parse raw TON Connect transaction params to internal format
+*/
+function parseConnectTransactionParamContent(raw) {
+	return {
+		messages: raw.messages,
+		network: raw.network,
+		validUntil: raw.valid_until,
+		from: raw.from
+	};
+}
 function toTransactionRequestMessage(msg) {
 	asAddressFriendly(msg.address);
 	return {
@@ -64736,14 +64857,20 @@ function toConnectTransactionParamMessage(message) {
 		mode: message.mode ? SendModeToValue(message.mode) : void 0
 	};
 }
+/**
+* Convert internal params format to TransactionRequest model.
+*/
 function toTransactionRequest(params) {
 	return {
 		messages: params.messages.map(toTransactionRequestMessage),
 		network: params.network ? { chainId: params.network } : void 0,
-		validUntil: params.valid_until,
+		validUntil: params.validUntil,
 		fromAddress: params.from
 	};
 }
+/**
+* Convert internal TransactionRequest to raw TON Connect protocol
+*/
 function toConnectTransactionParamContent(request) {
 	return {
 		messages: request.messages.map(toConnectTransactionParamMessage),
@@ -65348,10 +65475,10 @@ var TransactionHandler = class extends BasicHandler {
 				paramCount: event.params.length,
 				eventId: event.id
 			});
-			const params = JSON.parse(event.params[0]);
-			const validUntilValidation = this.validateValidUntil(params.valid_until);
+			const params = parseConnectTransactionParamContent(JSON.parse(event.params[0]));
+			const validUntilValidation = this.validateValidUntil(params.validUntil);
 			if (!validUntilValidation.isValid) errors = errors.concat(validUntilValidation.errors);
-			else params.valid_until = validUntilValidation.result;
+			else params.validUntil = validUntilValidation.result;
 			const networkValidation = this.validateNetwork(params.network, wallet);
 			if (!networkValidation.isValid) errors = errors.concat(networkValidation.errors);
 			else params.network = networkValidation.result;
@@ -65852,7 +65979,7 @@ var EventRouter = class {
 	*/
 	setupHandlers() {
 		this.handlers = [
-			new ConnectHandler(this.notifyConnectRequestCallbacks.bind(this), this.analyticsManager),
+			new ConnectHandler(this.notifyConnectRequestCallbacks.bind(this), this.config, this.analyticsManager),
 			new TransactionHandler(this.notifyTransactionRequestCallbacks.bind(this), this.config, this.eventEmitter, this.walletManager, this.sessionManager, this.analyticsManager),
 			new SignDataHandler(this.notifySignDataRequestCallbacks.bind(this), this.walletManager, this.sessionManager, this.analyticsManager),
 			new DisconnectHandler(this.notifyDisconnectCallbacks.bind(this), this.sessionManager)
@@ -67187,144 +67314,6 @@ var StorageEventProcessor = class {
 	}
 };
 
-//#endregion
-//#region ../walletkit/dist/esm/core/wallet/extensions/ton.js
-/**
-* Copyright (c) TonTech.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-*/
-const log$11 = globalLogger.createChild("WalletTonClass");
-var WalletTonClass = class {
-	async createTransferTonTransaction(param) {
-		if (!isValidAddress(param.recipientAddress)) throw new Error(`Invalid to address: ${param.recipientAddress}`);
-		if (!isValidNanotonAmount(param.transferAmount)) throw new Error(`Invalid amount: ${param.transferAmount}`);
-		let body;
-		if (param.payload) body = param.payload;
-		else if (param.comment) body = (0, import_dist$2.beginCell)().storeUint(0, 32).storeStringTail(param.comment).endCell().toBoc().toString("base64");
-		const message = {
-			address: param.recipientAddress,
-			amount: param.transferAmount,
-			payload: body,
-			stateInit: param.stateInit,
-			extraCurrency: param.extraCurrency,
-			mode: param.mode
-		};
-		if (!validateTransactionMessage(message, false).isValid) throw new Error(`Invalid transaction message: ${JSON.stringify(message)}`);
-		return {
-			messages: [message],
-			fromAddress: this.getAddress()
-		};
-	}
-	async createTransferMultiTonTransaction(params) {
-		let messages = [];
-		for (const param of params) {
-			if (!isValidAddress(param.recipientAddress)) throw new Error(`Invalid to address: ${param.recipientAddress}`);
-			if (!isValidNanotonAmount(param.transferAmount)) throw new Error(`Invalid amount: ${param.transferAmount}`);
-			let body;
-			if (param.payload) body = param.payload;
-			else if (param.comment) body = (0, import_dist$2.beginCell)().storeUint(0, 32).storeStringTail(param.comment).endCell().toBoc().toString("base64");
-			const message = {
-				address: param.recipientAddress,
-				amount: param.transferAmount,
-				payload: body,
-				stateInit: param.stateInit,
-				extraCurrency: param.extraCurrency,
-				mode: param.mode
-			};
-			if (!validateTransactionMessage(message, false).isValid) throw new Error(`Invalid transaction message: ${JSON.stringify(message)}`);
-			messages.push(message);
-		}
-		return {
-			messages,
-			fromAddress: this.getAddress()
-		};
-	}
-	async getTransactionPreview(param) {
-		const transaction = await param;
-		return await CallForSuccess(() => createTransactionPreview(this.client, transaction, this));
-	}
-	async sendTransaction(request) {
-		try {
-			const boc = await this.getSignedSendTransaction(request);
-			await CallForSuccess(() => this.getClient().sendBoc(boc));
-			return { boc };
-		} catch (error) {
-			log$11.error("Failed to send transaction", { error });
-			if (error instanceof WalletKitError) throw error;
-			if (error?.message?.includes("Ledger device")) throw new WalletKitError(ERROR_CODES.LEDGER_DEVICE_ERROR, "Ledger device error", error);
-			throw error;
-		}
-	}
-	async getBalance() {
-		return await CallForSuccess(async () => this.getClient().getBalance(this.getAddress()));
-	}
-};
-
-//#endregion
-//#region ../walletkit/dist/esm/utils/tvmStack.js
-/**
-* Copyright (c) TonTech.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-*/
-function ParseStackItem(item) {
-	switch (item.type) {
-		case "num": if (item.value.startsWith("-")) return {
-			type: "int",
-			value: -BigInt(item.value.slice(1))
-		};
-		else return {
-			type: "int",
-			value: BigInt(item.value)
-		};
-		case "null": return { type: "null" };
-		case "cell": return {
-			type: "cell",
-			cell: import_dist$2.Cell.fromBoc(Buffer.from(item.value, "base64"))[0]
-		};
-		case "tuple":
-		case "list":
-			if (item.value.length === 0) return { type: "null" };
-			return {
-				type: "tuple",
-				items: item.value.map((value) => ParseStackItem(value))
-			};
-		default: throw Error(`Unsupported parse stack item type: ${JSON.stringify(item)}`);
-	}
-}
-function ParseStack(list) {
-	let stack = [];
-	for (let item of list) stack.push(ParseStackItem(item));
-	return stack;
-}
-function SerializeStackItem(item) {
-	switch (item.type) {
-		case "int": return {
-			type: "num",
-			value: `${item.value < 0 ? "-" : ""}0x${item.value.toString(16)}`
-		};
-		case "slice": return {
-			type: "slice",
-			value: item.cell.toBoc().toString("base64")
-		};
-		case "cell": return {
-			type: "cell",
-			value: item.cell.toBoc().toString("base64")
-		};
-		default: throw Error(`Unsupported serialize stack item type: ${item.type}`);
-	}
-}
-function SerializeStack(list) {
-	let stack = [];
-	for (let item of list) stack.push(SerializeStackItem(item));
-	return stack;
-}
-
 //#endregion
 //#region ../walletkit/dist/esm/types/toncenter/parsers/messageHandler.js
 /**
@@ -68242,6 +68231,68 @@ function getUnixtime() {
 	return Math.floor(Date.now() / 1e3);
 }
 
+//#endregion
+//#region ../walletkit/dist/esm/utils/tvmStack.js
+/**
+* Copyright (c) TonTech.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+*/
+function ParseStackItem(item) {
+	switch (item.type) {
+		case "num": if (item.value.startsWith("-")) return {
+			type: "int",
+			value: -BigInt(item.value.slice(1))
+		};
+		else return {
+			type: "int",
+			value: BigInt(item.value)
+		};
+		case "null": return { type: "null" };
+		case "cell": return {
+			type: "cell",
+			cell: import_dist$2.Cell.fromBoc(Buffer.from(item.value, "base64"))[0]
+		};
+		case "tuple":
+		case "list":
+			if (item.value.length === 0) return { type: "null" };
+			return {
+				type: "tuple",
+				items: item.value.map((value) => ParseStackItem(value))
+			};
+		default: throw Error(`Unsupported parse stack item type: ${JSON.stringify(item)}`);
+	}
+}
+function ParseStack(list) {
+	let stack = [];
+	for (let item of list) stack.push(ParseStackItem(item));
+	return stack;
+}
+function SerializeStackItem(item) {
+	switch (item.type) {
+		case "int": return {
+			type: "num",
+			value: `${item.value < 0 ? "-" : ""}0x${item.value.toString(16)}`
+		};
+		case "slice": return {
+			type: "slice",
+			value: item.cell.toBoc().toString("base64")
+		};
+		case "cell": return {
+			type: "cell",
+			value: item.cell.toBoc().toString("base64")
+		};
+		default: throw Error(`Unsupported serialize stack item type: ${item.type}`);
+	}
+}
+function SerializeStack(list) {
+	let stack = [];
+	for (let item of list) stack.push(SerializeStackItem(item));
+	return stack;
+}
+
 //#endregion
 //#region ../walletkit/dist/esm/utils/version.js
 /**
@@ -68276,7 +68327,7 @@ function createWalletId(network, address) {
 }
 
 //#endregion
-//#region ../walletkit/dist/esm/core/wallet/extensions/jetton.js
+//#region ../walletkit/dist/esm/utils/assetHelpers.js
 /**
 * Copyright (c) TonTech.
 *
@@ -68284,6 +68335,79 @@ function createWalletId(network, address) {
 * LICENSE file in the root directory of this source tree.
 *
 */
+/**
+* Gets the jetton wallet address for an owner
+*/
+async function getJettonWalletAddressFromClient(client, jettonAddress, ownerAddress) {
+	if (!isValidAddress(jettonAddress)) throw new Error(`Invalid jetton address: ${jettonAddress}`);
+	try {
+		const parsedStack = ParseStack((await client.runGetMethod(jettonAddress, "get_wallet_address", SerializeStack([{
+			type: "slice",
+			cell: (0, import_dist$2.beginCell)().storeAddress(import_dist$2.Address.parse(ownerAddress)).endCell()
+		}]))).stack);
+		const jettonWalletAddress = parsedStack[0].type === "slice" || parsedStack[0].type === "cell" ? parsedStack[0].cell.asSlice().loadAddress() : null;
+		if (!jettonWalletAddress) throw new Error("Failed to get jetton wallet address");
+		return asAddressFriendly(jettonWalletAddress.toString());
+	} catch (error) {
+		throw new Error(`Failed to get jetton wallet address for ${jettonAddress}: ${error instanceof Error ? error.message : "Unknown error"}`);
+	}
+}
+/**
+* Gets the jetton balance for an owner's jetton wallet
+*/
+async function getJettonBalanceFromClient(client, jettonWalletAddress) {
+	try {
+		const parsedStack = ParseStack((await client.runGetMethod(jettonWalletAddress, "get_wallet_data")).stack);
+		return (parsedStack[0].type === "int" ? parsedStack[0].value : 0n).toString();
+	} catch (_error) {
+		return "0";
+	}
+}
+/**
+* Gets jettons owned by an address
+*/
+async function getJettonsFromClient(client, ownerAddress, params) {
+	return client.jettonsByOwnerAddress({
+		ownerAddress,
+		offset: params?.pagination.offset,
+		limit: params?.pagination.limit
+	});
+}
+/**
+* Gets NFTs owned by an address
+*/
+async function getNftsFromClient(client, ownerAddress, params) {
+	return client.nftItemsByOwner({
+		ownerAddress,
+		pagination: params.pagination
+	});
+}
+/**
+* Gets a single NFT by address
+*/
+async function getNftFromClient(client, address) {
+	const result = await client.nftItemsByAddress({ address });
+	return result.nfts.length > 0 ? result.nfts[0] : null;
+}
+
+//#endregion
+//#region ../walletkit/dist/esm/utils/messageBuilders.js
+/**
+* Copyright (c) TonTech.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+*/
+/** Default gas fee for jetton transfers (0.05 TON) */
+const DEFAULT_JETTON_GAS_FEE = "50000000";
+/** Default gas fee for NFT transfers (0.1 TON) */
+const DEFAULT_NFT_GAS_FEE = "100000000";
+/** Default forward amount for jetton/NFT transfers (1 nanoton) */
+const DEFAULT_FORWARD_AMOUNT = 1n;
+/**
+* Stores a jetton transfer message into a builder
+*/
 function storeJettonTransferMessage(src) {
 	return (builder) => {
 		builder.storeUint(Number(OpCode.JettonTransfer), 32);
@@ -68296,28 +68420,119 @@ function storeJettonTransferMessage(src) {
 		builder.storeMaybeRef(src.forwardPayload);
 	};
 }
-var WalletJettonClass = class {
-	async createTransferJettonTransaction(jettonTransferParams) {
-		if (!isValidAddress(jettonTransferParams.recipientAddress)) throw new Error(`Invalid to address: ${jettonTransferParams.recipientAddress}`);
-		if (!isValidAddress(jettonTransferParams.jettonAddress)) throw new Error(`Invalid jetton address: ${jettonTransferParams.jettonAddress}`);
-		if (!jettonTransferParams.transferAmount || BigInt(jettonTransferParams.transferAmount) <= 0n) throw new Error(`Invalid amount: ${jettonTransferParams.transferAmount}`);
-		const jettonWalletAddress = await CallForSuccess(() => this.getJettonWalletAddress(jettonTransferParams.jettonAddress));
-		const forwardPayload = jettonTransferParams.comment ? (0, import_dist$2.beginCell)().storeUint(0, 32).storeStringTail(jettonTransferParams.comment).endCell() : null;
+/**
+* Creates a jetton transfer payload cell
+*/
+function createJettonTransferPayload(params) {
+	const forwardPayload = params.comment ? createCommentPayload(params.comment) : null;
+	return (0, import_dist$2.beginCell)().store(storeJettonTransferMessage({
+		queryId: params.queryId ?? 0n,
+		amount: params.amount,
+		destination: import_dist$2.Address.parse(params.destination),
+		responseDestination: import_dist$2.Address.parse(params.responseDestination),
+		customPayload: params.customPayload ?? null,
+		forwardAmount: params.forwardAmount ?? DEFAULT_FORWARD_AMOUNT,
+		forwardPayload
+	})).endCell();
+}
+/**
+* Stores an NFT transfer message into a builder
+*/
+function storeNftTransferMessage(message) {
+	return (builder) => {
+		builder.storeUint(Number(OpCode.NftTransfer), 32);
+		builder.storeUint(message.queryId, 64);
+		builder.storeAddress(message.newOwner);
+		builder.storeAddress(message.responseDestination);
+		builder.storeMaybeRef(message.customPayload);
+		builder.storeCoins(message.forwardAmount);
+		builder.storeMaybeRef(message.forwardPayload);
+	};
+}
+/**
+* Creates an NFT transfer payload cell
+*/
+function createNftTransferPayload(params) {
+	const forwardPayload = params.comment ? createCommentPayload(params.comment) : null;
+	return (0, import_dist$2.beginCell)().store(storeNftTransferMessage({
+		queryId: params.queryId ?? 0n,
+		newOwner: import_dist$2.Address.parse(params.newOwner),
+		responseDestination: import_dist$2.Address.parse(params.responseDestination),
+		customPayload: params.customPayload ?? null,
+		forwardAmount: params.forwardAmount ?? DEFAULT_FORWARD_AMOUNT,
+		forwardPayload
+	})).endCell();
+}
+/**
+* Creates an NFT transfer payload cell from raw parameters
+* Handles string/Address conversion automatically
+*/
+function createNftTransferRawPayload(params) {
+	const transferMessage = {
+		queryId: BigInt(params.queryId),
+		newOwner: typeof params.newOwner === "string" ? import_dist$2.Address.parse(params.newOwner) : params.newOwner,
+		responseDestination: params.responseDestination ? typeof params.responseDestination === "string" ? import_dist$2.Address.parse(params.responseDestination) : params.responseDestination : null,
+		customPayload: params.customPayload ? typeof params.customPayload === "string" ? import_dist$2.Cell.fromBase64(params.customPayload) : params.customPayload : null,
+		forwardAmount: BigInt(params.forwardAmount),
+		forwardPayload: params.forwardPayload ? typeof params.forwardPayload === "string" ? import_dist$2.Cell.fromBase64(params.forwardPayload) : params.forwardPayload : null
+	};
+	return (0, import_dist$2.beginCell)().store(storeNftTransferMessage(transferMessage)).endCell();
+}
+/**
+* Creates a comment payload cell (op code 0 + text)
+*/
+function createCommentPayload(comment) {
+	return (0, import_dist$2.beginCell)().storeUint(0, 32).storeStringTail(comment).endCell();
+}
+/**
+* Creates a comment payload as base64 string
+*/
+function createCommentPayloadBase64(comment) {
+	return createCommentPayload(comment).toBoc().toString("base64");
+}
+/**
+* Creates a standard transfer transaction request with default send mode flags
+*/
+function createTransferTransaction(params) {
+	const message = {
+		address: params.targetAddress,
+		amount: params.amount,
+		payload: params.payload.toBoc().toString("base64"),
+		stateInit: void 0,
+		extraCurrency: void 0,
+		mode: { flags: [SendModeFlag.IGNORE_ERRORS, SendModeFlag.PAY_GAS_SEPARATELY] }
+	};
+	if (!validateTransactionMessage(message, false).isValid) throw new Error(`Invalid transaction message: ${JSON.stringify(message)}`);
+	return {
+		messages: [message],
+		fromAddress: params.fromAddress
+	};
+}
+
+//#endregion
+//#region ../walletkit/dist/esm/core/wallet/extensions/ton.js
+/**
+* Copyright (c) TonTech.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+*/
+const log$11 = globalLogger.createChild("WalletTonClass");
+var WalletTonClass = class {
+	async createTransferTonTransaction(param) {
+		if (!isValidAddress(param.recipientAddress)) throw new Error(`Invalid to address: ${param.recipientAddress}`);
+		if (!isValidNanotonAmount(param.transferAmount)) throw new Error(`Invalid amount: ${param.transferAmount}`);
+		let body;
+		if (param.payload) body = param.payload;
+		else if (param.comment) body = createCommentPayloadBase64(param.comment);
 		const message = {
-			address: jettonWalletAddress,
-			amount: "50000000",
-			payload: (0, import_dist$2.beginCell)().store(storeJettonTransferMessage({
-				queryId: 0n,
-				amount: BigInt(jettonTransferParams.transferAmount),
-				destination: import_dist$2.Address.parse(jettonTransferParams.recipientAddress),
-				responseDestination: import_dist$2.Address.parse(this.getAddress()),
-				customPayload: null,
-				forwardAmount: 1n,
-				forwardPayload
-			})).endCell().toBoc().toString("base64"),
-			stateInit: void 0,
-			extraCurrency: void 0,
-			mode: { flags: [SendModeFlag.IGNORE_ERRORS, SendModeFlag.PAY_GAS_SEPARATELY] }
+			address: param.recipientAddress,
+			amount: param.transferAmount,
+			payload: body,
+			stateInit: param.stateInit,
+			extraCurrency: param.extraCurrency,
+			mode: param.mode
 		};
 		if (!validateTransactionMessage(message, false).isValid) throw new Error(`Invalid transaction message: ${JSON.stringify(message)}`);
 		return {
@@ -68325,36 +68540,87 @@ var WalletJettonClass = class {
 			fromAddress: this.getAddress()
 		};
 	}
-	async getJettonBalance(jettonAddress) {
-		const jettonWalletAddress = await this.getJettonWalletAddress(jettonAddress);
-		try {
-			const parsedStack = ParseStack((await this.getClient().runGetMethod(jettonWalletAddress, "get_wallet_data")).stack);
-			return (parsedStack[0].type === "int" ? parsedStack[0].value : 0n).toString();
-		} catch (_error) {
-			return "0";
+	async createTransferMultiTonTransaction(params) {
+		const messages = [];
+		for (const param of params) {
+			if (!isValidAddress(param.recipientAddress)) throw new Error(`Invalid to address: ${param.recipientAddress}`);
+			if (!isValidNanotonAmount(param.transferAmount)) throw new Error(`Invalid amount: ${param.transferAmount}`);
+			let body;
+			if (param.payload) body = param.payload;
+			else if (param.comment) body = createCommentPayloadBase64(param.comment);
+			const message = {
+				address: param.recipientAddress,
+				amount: param.transferAmount,
+				payload: body,
+				stateInit: param.stateInit,
+				extraCurrency: param.extraCurrency,
+				mode: param.mode
+			};
+			if (!validateTransactionMessage(message, false).isValid) throw new Error(`Invalid transaction message: ${JSON.stringify(message)}`);
+			messages.push(message);
 		}
+		return {
+			messages,
+			fromAddress: this.getAddress()
+		};
 	}
-	async getJettonWalletAddress(jettonAddress) {
-		if (!isValidAddress(jettonAddress)) throw new Error(`Invalid jetton address: ${jettonAddress}`);
+	async getTransactionPreview(param) {
+		const transaction = await param;
+		return await CallForSuccess(() => createTransactionPreview(this.client, transaction, this));
+	}
+	async sendTransaction(request) {
 		try {
-			const parsedStack = ParseStack((await this.getClient().runGetMethod(jettonAddress, "get_wallet_address", SerializeStack([{
-				type: "slice",
-				cell: (0, import_dist$2.beginCell)().storeAddress(import_dist$2.Address.parse(this.getAddress())).endCell()
-			}]))).stack);
-			const jettonWalletAddress = parsedStack[0].type === "slice" || parsedStack[0].type === "cell" ? parsedStack[0].cell.asSlice().loadAddress() : null;
-			if (!jettonWalletAddress) throw new Error("Failed to get jetton wallet address");
-			return asAddressFriendly(jettonWalletAddress.toString());
+			const boc = await this.getSignedSendTransaction(request);
+			await CallForSuccess(() => this.getClient().sendBoc(boc));
+			return { boc };
 		} catch (error) {
-			throw new Error(`Failed to get jetton wallet address for ${jettonAddress}: ${error instanceof Error ? error.message : "Unknown error"}`);
+			log$11.error("Failed to send transaction", { error });
+			if (error instanceof WalletKitError) throw error;
+			if (error?.message?.includes("Ledger device")) throw new WalletKitError(ERROR_CODES.LEDGER_DEVICE_ERROR, "Ledger device error", error);
+			throw error;
 		}
 	}
-	async getJettons(params) {
-		return this.getClient().jettonsByOwnerAddress({
-			ownerAddress: this.getAddress(),
-			offset: params?.pagination.offset,
-			limit: params?.pagination.limit
+	async getBalance() {
+		return await CallForSuccess(async () => this.getClient().getBalance(this.getAddress()));
+	}
+};
+
+//#endregion
+//#region ../walletkit/dist/esm/core/wallet/extensions/jetton.js
+/**
+* Copyright (c) TonTech.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+*/
+var WalletJettonClass = class {
+	async createTransferJettonTransaction(params) {
+		if (!isValidAddress(params.recipientAddress)) throw new Error(`Invalid to address: ${params.recipientAddress}`);
+		if (!isValidAddress(params.jettonAddress)) throw new Error(`Invalid jetton address: ${params.jettonAddress}`);
+		if (!params.transferAmount || BigInt(params.transferAmount) <= 0n) throw new Error(`Invalid amount: ${params.transferAmount}`);
+		return createTransferTransaction({
+			targetAddress: await CallForSuccess(() => this.getJettonWalletAddress(params.jettonAddress)),
+			amount: DEFAULT_JETTON_GAS_FEE,
+			payload: createJettonTransferPayload({
+				amount: BigInt(params.transferAmount),
+				destination: params.recipientAddress,
+				responseDestination: this.getAddress(),
+				comment: params.comment
+			}),
+			fromAddress: this.getAddress()
 		});
 	}
+	async getJettonBalance(jettonAddress) {
+		const jettonWalletAddress = await this.getJettonWalletAddress(jettonAddress);
+		return getJettonBalanceFromClient(this.getClient(), jettonWalletAddress);
+	}
+	async getJettonWalletAddress(jettonAddress) {
+		return getJettonWalletAddressFromClient(this.getClient(), jettonAddress, this.getAddress());
+	}
+	async getJettons(params) {
+		return getJettonsFromClient(this.getClient(), this.getAddress(), params);
+	}
 };
 
 //#endregion
@@ -68366,76 +68632,41 @@ var WalletJettonClass = class {
 * LICENSE file in the root directory of this source tree.
 *
 */
-function storeNftTransferMessage(message) {
-	return (builder) => {
-		builder.storeUint(Number(OpCode.NftTransfer), 32);
-		builder.storeUint(message.queryId, 64);
-		builder.storeAddress(message.newOwner);
-		builder.storeAddress(message.responseDestination);
-		builder.storeMaybeRef(message.customPayload);
-		builder.storeCoins(message.forwardAmount);
-		builder.storeMaybeRef(message.forwardPayload);
-	};
-}
 var WalletNftClass = class {
 	async getNfts(params) {
-		return await this.getClient().nftItemsByOwner({
-			ownerAddress: this.getAddress(),
-			pagination: params.pagination
-		});
+		return getNftsFromClient(this.getClient(), this.getAddress(), params);
 	}
 	async getNft(address) {
-		const result = await this.getClient().nftItemsByAddress({ address });
-		if (result.nfts.length > 0) return result.nfts[0];
-		return null;
+		return getNftFromClient(this.getClient(), address);
 	}
-	async createTransferNftTransaction(nftTransferMessage) {
-		const forwardPayload = nftTransferMessage.comment ? (0, import_dist$2.beginCell)().storeUint(0, 32).storeStringTail(nftTransferMessage.comment).endCell() : null;
-		const nftPayload = (0, import_dist$2.beginCell)().store(storeNftTransferMessage({
-			customPayload: null,
-			forwardAmount: 1n,
-			forwardPayload,
-			newOwner: import_dist$2.Address.parse(nftTransferMessage.recipientAddress),
-			queryId: 0n,
-			responseDestination: import_dist$2.Address.parse(this.getAddress())
-		})).endCell();
-		const message = {
-			address: nftTransferMessage.nftAddress,
-			amount: nftTransferMessage.transferAmount?.toString() ?? "100000000",
-			payload: nftPayload.toBoc().toString("base64"),
-			stateInit: void 0,
-			extraCurrency: void 0,
-			mode: { flags: [SendModeFlag.IGNORE_ERRORS, SendModeFlag.PAY_GAS_SEPARATELY] }
-		};
-		if (!validateTransactionMessage(message, false).isValid) throw new Error(`Invalid transaction message: ${JSON.stringify(message)}`);
-		return {
-			messages: [message],
+	async createTransferNftTransaction(params) {
+		const nftPayload = createNftTransferPayload({
+			newOwner: params.recipientAddress,
+			responseDestination: this.getAddress(),
+			comment: params.comment
+		});
+		return createTransferTransaction({
+			targetAddress: params.nftAddress,
+			amount: params.transferAmount?.toString() ?? DEFAULT_NFT_GAS_FEE,
+			payload: nftPayload,
 			fromAddress: this.getAddress()
-		};
+		});
 	}
 	async createTransferNftRawTransaction(params) {
-		const transferMessage = {
-			queryId: BigInt(params.message.queryId),
-			newOwner: typeof params.message.newOwner === "string" ? import_dist$2.Address.parse(params.message.newOwner) : params.message.newOwner,
-			responseDestination: params.message.responseDestination ? typeof params.message.responseDestination === "string" ? import_dist$2.Address.parse(params.message.responseDestination) : params.message.responseDestination : null,
-			customPayload: params.message.customPayload ? typeof params.message.customPayload === "string" ? import_dist$2.Cell.fromBase64(params.message.customPayload) : params.message.customPayload : null,
-			forwardAmount: BigInt(params.message.forwardAmount),
-			forwardPayload: params.message.forwardPayload ? typeof params.message.forwardPayload === "string" ? import_dist$2.Cell.fromBase64(params.message.forwardPayload) : params.message.forwardPayload : null
-		};
-		const nftPayload = (0, import_dist$2.beginCell)().store(storeNftTransferMessage(transferMessage)).endCell();
-		const message = {
-			address: params.nftAddress,
+		const nftPayload = createNftTransferRawPayload({
+			queryId: params.message.queryId,
+			newOwner: params.message.newOwner,
+			responseDestination: params.message.responseDestination,
+			customPayload: params.message.customPayload,
+			forwardAmount: params.message.forwardAmount,
+			forwardPayload: params.message.forwardPayload
+		});
+		return createTransferTransaction({
+			targetAddress: params.nftAddress,
 			amount: params.transferAmount.toString(),
-			payload: nftPayload.toBoc().toString("base64"),
-			stateInit: void 0,
-			extraCurrency: void 0,
-			mode: { flags: [SendModeFlag.IGNORE_ERRORS, SendModeFlag.PAY_GAS_SEPARATELY] }
-		};
-		if (!validateTransactionMessage(message, false).isValid) throw new Error(`Invalid transaction message: ${JSON.stringify(message)}`);
-		return {
-			messages: [message],
+			payload: nftPayload,
 			fromAddress: this.getAddress()
-		};
+		});
 	}
 };
 
@@ -68581,7 +68812,7 @@ async function wrapWalletInterface(wallet) {
 }
 
 //#endregion
-//#region ../walletkit/node_modules/lru-cache/dist/esm/index.js
+//#region ../../node_modules/lru-cache/dist/esm/index.js
 /**
 * @module LRUCache
 */
@@ -70078,7 +70309,9 @@ var JettonsManager = class {
 * }
 * ```
 */
-var SwapProvider = class {};
+var SwapProvider = class {
+	type = "swap";
+};
 
 //#endregion
 //#region ../walletkit/dist/esm/defi/errors.js
@@ -70217,19 +70450,19 @@ var SwapManager = class extends DefiManager {
 	/**
 	* Get a quote for swapping tokens
 	* @param params - Quote parameters
-	* @param provider - Optional provider name to use
+	* @param providerId - Optional provider name to use
 	* @returns Promise resolving to swap quote
 	*/
-	async getQuote(params, provider) {
+	async getQuote(params, providerId) {
 		log$8.debug("Getting swap quote", {
-			fromToken: params.fromToken,
-			toToken: params.toToken,
+			fromToken: params.from,
+			toToken: params.to,
 			amount: params.amount,
 			isReverseSwap: params.isReverseSwap,
-			provider: provider || this.defaultProviderId
+			providerId: providerId || this.defaultProviderId
 		});
 		try {
-			const quote = await this.getProvider(provider).getQuote(params);
+			const quote = await this.getProvider(providerId || this.defaultProviderId).getQuote(params);
 			log$8.debug("Received swap quote", {
 				fromAmount: quote.fromAmount,
 				toAmount: quote.toAmount,
@@ -70247,16 +70480,16 @@ var SwapManager = class extends DefiManager {
 	/**
 	* Build a transaction for executing a swap
 	* @param params - Swap parameters including quote
-	* @param provider - Optional provider name to use
 	* @returns Promise resolving to transaction request
 	*/
-	async buildSwapTransaction(params, provider) {
+	async buildSwapTransaction(params) {
+		const providerId = params.quote.providerId || this.defaultProviderId;
 		log$8.debug("Building swap transaction", {
-			userAddress: params.userAddress,
-			provider: provider || this.defaultProviderId
+			providerId,
+			userAddress: params.userAddress
 		});
 		try {
-			const transaction = await this.getProvider(provider).buildSwapTransaction(params);
+			const transaction = await this.getProvider(providerId).buildSwapTransaction(params);
 			log$8.debug("Built swap transaction", params.quote);
 			return transaction;
 		} catch (error) {
@@ -71387,7 +71620,7 @@ const log$4 = globalLogger.createChild("NetworkManager");
 * Each network (identified by CHAIN) has its own ApiClient instance.
 * At least one network must be configured.
 */
-var NetworkManager = class {
+var KitNetworkManager = class {
 	clients = /* @__PURE__ */ new Map();
 	constructor(options) {
 		this.initializeClients(options);
@@ -71511,7 +71744,7 @@ var TonWalletKit = class {
 				...options?.analytics?.appInfo
 			}
 		});
-		this.networkManager = new NetworkManager(options);
+		this.networkManager = new KitNetworkManager(options);
 		this.eventEmitter = new EventEmitter$2();
 		this.initializer = new Initializer(options, this.eventEmitter, this.analyticsManager);
 		this.initializationPromise = this.initialize();
@@ -72191,7 +72424,7 @@ var WalletV5R1Adapter = class WalletV5R1Adapter {
 		if (input.validUntil) {
 			const now = Math.floor(Date.now() / 1e3);
 			const maxValidUntil = now + 600;
-			if (input.validUntil < now) throw new WalletKitError(ERROR_CODES.VALIDATION_ERROR, "Transaction valid_until timestamp is in the past", void 0, {
+			if (input.validUntil < now) throw new WalletKitError(ERROR_CODES.VALIDATION_ERROR, "Transaction validUntil timestamp is in the past", void 0, {
 				validUntil: input.validUntil,
 				currentTime: now
 			});
@@ -72457,6 +72690,72 @@ const WalletV4R2CodeCell = import_dist$2.Cell.fromBoc(Buffer.from("te6ccgECFAEAA
 */
 const log$1 = globalLogger.createChild("WalletV4R2Adapter");
 
+//#endregion
+//#region ../walletkit/dist/esm/utils/units.js
+/**
+* Copyright (c) TonTech.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+*/
+/**
+* Multiplies a string representation of a number by a given exponent of base 10 (10exponent).
+*
+* - Docs: https://viem.sh/docs/utilities/parseUnits
+*
+* @example
+* import { parseUnits } from 'viem'
+*
+* parseUnits('420', 9)
+* // 420000000000n
+*/
+function parseUnits(value, decimals) {
+	let [integer, fraction = "0"] = value.split(".");
+	const negative = integer.startsWith("-");
+	if (negative) integer = integer.slice(1);
+	fraction = fraction.replace(/(0+)$/, "");
+	if (decimals === 0) {
+		if (Math.round(Number(`.${fraction}`)) === 1) integer = `${BigInt(integer) + 1n}`;
+		fraction = "";
+	} else if (fraction.length > decimals) {
+		const [left, unit, right] = [
+			fraction.slice(0, decimals - 1),
+			fraction.slice(decimals - 1, decimals),
+			fraction.slice(decimals)
+		];
+		const rounded = Math.round(Number(`${unit}.${right}`));
+		if (rounded > 9) fraction = `${BigInt(left) + BigInt(1)}0`.padStart(left.length + 1, "0");
+		else fraction = `${left}${rounded}`;
+		if (fraction.length > decimals) {
+			fraction = fraction.slice(1);
+			integer = `${BigInt(integer) + 1n}`;
+		}
+		fraction = fraction.slice(0, decimals);
+	} else fraction = fraction.padEnd(decimals, "0");
+	return BigInt(`${negative ? "-" : ""}${integer}${fraction}`);
+}
+/**
+*  Divides a number by a given exponent of base 10 (10exponent), and formats it into a string representation of the number..
+*
+* - Docs: https://viem.sh/docs/utilities/formatUnits
+*
+* @example
+* import { formatUnits } from 'viem'
+*
+* formatUnits(420000000000n, 9)
+* // '420'
+*/
+function formatUnits(value, decimals) {
+	let display = value.toString();
+	const negative = display.startsWith("-");
+	if (negative) display = display.slice(1);
+	display = display.padStart(decimals, "0");
+	let [integer, fraction] = [display.slice(0, display.length - decimals), display.slice(display.length - decimals)];
+	fraction = fraction.replace(/(0+)$/, "");
+	return `${negative ? "-" : ""}${integer || "0"}${fraction ? `.${fraction}` : ""}`;
+}
+
 //#endregion
 //#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/rxjs/dist/cjs/internal/util/isFunction.js
 var require_isFunction = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -84689,7 +84988,7 @@ var require_node = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/json-rpc-2.0/dist/models.js
+//#region ../../node_modules/json-rpc-2.0/dist/models.js
 var require_models = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var __extends = exports && exports.__extends || (function() {
 		var extendStatics = function(d, b) {
@@ -84798,7 +85097,7 @@ var require_models = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/json-rpc-2.0/dist/internal.js
+//#region ../../node_modules/json-rpc-2.0/dist/internal.js
 var require_internal = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.DefaultErrorCode = void 0;
@@ -84806,7 +85105,7 @@ var require_internal = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/json-rpc-2.0/dist/client.js
+//#region ../../node_modules/json-rpc-2.0/dist/client.js
 var require_client = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
 		function adopt(value) {
@@ -85059,13 +85358,13 @@ var require_client = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/json-rpc-2.0/dist/interfaces.js
+//#region ../../node_modules/json-rpc-2.0/dist/interfaces.js
 var require_interfaces = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 }));
 
 //#endregion
-//#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/json-rpc-2.0/dist/server.js
+//#region ../../node_modules/json-rpc-2.0/dist/server.js
 var require_server = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var __assign = exports && exports.__assign || function() {
 		__assign = Object.assign || function(t) {
@@ -85362,7 +85661,7 @@ var require_server = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/json-rpc-2.0/dist/server-and-client.js
+//#region ../../node_modules/json-rpc-2.0/dist/server-and-client.js
 var require_server_and_client = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
 		function adopt(value) {
@@ -85550,7 +85849,7 @@ var require_server_and_client = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region ../../node_modules/@ston-fi/omniston-sdk/node_modules/json-rpc-2.0/dist/index.js
+//#region ../../node_modules/json-rpc-2.0/dist/index.js
 var require_dist = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
 		if (k2 === void 0) k2 = k;
@@ -87572,20 +87871,23 @@ function unwrapObservable(originalMethod) {
 *
 */
 const tokenToAddress = (token) => {
-	if (token.type === "ton") return "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c";
-	return import_dist$2.Address.parse(token.value).toRawString();
+	if (token.address === "ton") return "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c";
+	return import_dist$2.Address.parse(token.address).toRawString();
 };
-const addressToToken = (address) => {
-	if (address === "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c") return { type: "ton" };
+const addressToToken = (address, decimals = 9) => {
+	if (address === "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c") return {
+		address: "ton",
+		decimals: 9
+	};
 	try {
 		return {
-			type: "jetton",
-			value: import_dist$2.Address.parseRaw(address).toString()
+			address: import_dist$2.Address.parseRaw(address).toString(),
+			decimals
 		};
 	} catch {
 		return {
-			type: "jetton",
-			value: address
+			address,
+			decimals
 		};
 	}
 };
@@ -87674,20 +87976,20 @@ var OmnistonSwapProvider = class extends SwapProvider {
 	}
 	async getQuote(params) {
 		log.debug("Getting Omniston quote", {
-			fromToken: params.fromToken,
-			toToken: params.toToken,
+			fromToken: params.from,
+			toToken: params.to,
 			amount: params.amount,
 			isReverseSwap: params.isReverseSwap
 		});
 		try {
-			const bidAssetAddress = tokenToAddress(params.fromToken);
-			const askAssetAddress = tokenToAddress(params.toToken);
+			const bidAssetAddress = tokenToAddress(params.from);
+			const askAssetAddress = tokenToAddress(params.to);
 			const slippageBps = params.slippageBps ?? this.defaultSlippageBps;
 			const referrerAddress = params.providerOptions?.referrerAddress ?? this.referrerAddress;
 			const referrerFeeBps = params.providerOptions?.referrerFeeBps ?? this.referrerFeeBps;
 			const flexibleReferrerFee = params.providerOptions?.flexibleReferrerFee ?? this.flexibleReferrerFee;
 			const quoteRequest = {
-				amount: params.isReverseSwap ? { askUnits: params.amount } : { bidUnits: params.amount },
+				amount: params.isReverseSwap ? { askUnits: parseUnits(params.amount, params.to.decimals).toString() } : { bidUnits: parseUnits(params.amount, params.from.decimals).toString() },
 				settlementMethods: [SettlementMethod.SETTLEMENT_METHOD_SWAP],
 				bidAssetAddress: toOmnistonAddress(bidAssetAddress, params.network),
 				askAssetAddress: toOmnistonAddress(askAssetAddress, params.network),
@@ -87702,7 +88004,7 @@ var OmnistonSwapProvider = class extends SwapProvider {
 			};
 			const quoteEvent = await new Promise((resolve, reject) => {
 				let isSettled = false;
-				log.debug("Requesting quote");
+				log.debug("Requesting quote", { quoteRequest });
 				const timeoutId = setTimeout(() => {
 					log.debug("Timeout reached");
 					if (!isSettled) {
@@ -87820,13 +88122,16 @@ var OmnistonSwapProvider = class extends SwapProvider {
 			token: addressToToken(quote.referrerFeeAsset.address)
 		});
 		return {
+			rawFromAmount: quote.bidUnits,
+			rawToAmount: quote.askUnits,
+			rawMinReceived: quote.askUnits,
+			fromAmount: formatUnits(quote.bidUnits, params.from.decimals),
+			toAmount: formatUnits(quote.askUnits, params.to.decimals),
+			minReceived: formatUnits(quote.askUnits, params.to.decimals),
 			metadata,
 			providerId: this.providerId,
-			fromToken: params.fromToken,
-			toToken: params.toToken,
-			fromAmount: quote.bidUnits,
-			toAmount: quote.askUnits,
-			minReceived: quote.askUnits,
+			fromToken: params.from,
+			toToken: params.to,
 			network: params.network,
 			expiresAt: quote.tradeStartDeadline ? quote.tradeStartDeadline : void 0,
 			fee: fee?.length ? fee : void 0
@@ -88050,18 +88355,27 @@ var McpWalletService = class McpWalletService {
 	}
 	/**
 	* Get swap quote with transaction params ready to execute
+	* @param fromToken Token to swap from ("TON" or jetton address)
+	* @param toToken Token to swap to ("TON" or jetton address)
+	* @param amount Amount to swap in human-readable format (e.g., "1.5" for 1.5 TON)
+	* @param slippageBps Slippage tolerance in basis points (default 100 = 1%)
 	*/
 	async getSwapQuote(fromToken, toToken, amount, slippageBps) {
 		const network = this.wallet.getNetwork();
 		const kit = await this.getKit();
+		const getDecimals = async (token) => {
+			if (token === "TON" || token === "ton") return 9;
+			return (await kit.jettons.getJettonInfo(token, network))?.decimals ?? 9;
+		};
+		const [fromDecimals, toDecimals] = await Promise.all([getDecimals(fromToken), getDecimals(toToken)]);
 		const params = {
-			fromToken: fromToken === "TON" ? { type: "ton" } : {
-				type: "jetton",
-				value: fromToken
+			from: {
+				address: fromToken === "TON" ? "ton" : fromToken,
+				decimals: fromDecimals
 			},
-			toToken: toToken === "TON" ? { type: "ton" } : {
-				type: "jetton",
-				value: toToken
+			to: {
+				address: toToken === "TON" ? "ton" : toToken,
+				decimals: toDecimals
 			},
 			amount,
 			network,
@@ -88074,8 +88388,8 @@ var McpWalletService = class McpWalletService {
 		};
 		const tx = await kit.swap.buildSwapTransaction(swapParams);
 		return {
-			fromToken: quote.fromToken.type === "ton" ? "TON" : quote.fromToken.value,
-			toToken: quote.toToken.type === "ton" ? "TON" : quote.toToken.value,
+			fromToken: quote.fromToken.address === "ton" ? "TON" : quote.fromToken.address,
+			toToken: quote.toToken.address === "ton" ? "TON" : quote.toToken.address,
 			fromAmount: quote.fromAmount,
 			toAmount: quote.toAmount,
 			minReceived: quote.minReceived,
@@ -88204,12 +88518,27 @@ var McpWalletService = class McpWalletService {
 * LICENSE file in the root directory of this source tree.
 *
 */
+const getWalletSchema = zod.z.object({});
 const getBalanceSchema = zod.z.object({});
 const getJettonBalanceSchema = zod.z.object({ jettonAddress: zod.z.string().min(1).describe("Jetton master contract address") });
 const getJettonsSchema = zod.z.object({});
 const getTransactionsSchema = zod.z.object({ limit: zod.z.number().min(1).max(100).optional().describe("Maximum number of transactions to return (default: 20, max: 100)") });
 function createMcpBalanceTools(service) {
 	return {
+		get_wallet: {
+			description: "Get current wallet address and network information.",
+			inputSchema: getWalletSchema,
+			handler: async () => {
+				return { content: [{
+					type: "text",
+					text: JSON.stringify({
+						success: true,
+						address: service.getAddress(),
+						network: service.getNetwork()
+					}, null, 2)
+				}] };
+			}
+		},
 		get_balance: {
 			description: "Get the TON balance of the wallet. Returns both human-readable and raw (nanoTON) amounts.",
 			inputSchema: getBalanceSchema,
@@ -88543,7 +88872,7 @@ function createMcpTransferTools(service) {
 const getSwapQuoteSchema = zod.z.object({
 	fromToken: zod.z.string().min(1).describe("Token to swap from (\"TON\" or jetton address)"),
 	toToken: zod.z.string().min(1).describe("Token to swap to (\"TON\" or jetton address)"),
-	amount: zod.z.string().min(1).describe("Amount to swap in raw units"),
+	amount: zod.z.string().min(1).describe("Amount to swap in human-readable format (e.g., \"1.5\" for 1.5 TON)"),
 	slippageBps: zod.z.number().optional().describe("Slippage tolerance in basis points (default 100 = 1%)")
 });
 function createMcpSwapTools(service) {
@@ -88937,6 +89266,7 @@ async function createTonWalletMCP(config) {
 			inputSchema: tool.inputSchema
 		}, tool.handler);
 	};
+	registerTool("get_wallet", balanceTools.get_wallet);
 	registerTool("get_balance", balanceTools.get_balance);
 	registerTool("get_jetton_balance", balanceTools.get_jetton_balance);
 	registerTool("get_jettons", balanceTools.get_jettons);