@defuse-protocol/intents-sdk 0.80.0 → 0.82.0

package/dist/src/bridges/omni-bridge/omni-bridge-utils.cjs

@@ -6,39 +6,28 @@ let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils")
 let valibot = require("valibot");
 valibot = require_rolldown_runtime.__toESM(valibot);
 let _omni_bridge_core = require("@omni-bridge/core");
-let _omni_bridge_near = require("@omni-bridge/near");
 
 //#region src/bridges/omni-bridge/omni-bridge-utils.ts
-function createWithdrawIntentsPrimitive(params) {
-	const { contractId: tokenAccountId, standard } = _defuse_protocol_internal_utils.utils.parseDefuseAssetId(params.assetId);
-	(0, _defuse_protocol_internal_utils.assert)(standard === "nep141", "Only NEP-141 is supported");
-	const recipient = (0, _omni_bridge_core.omniAddress)(params.omniChainKind, params.destinationAddress);
-	let msg = "";
+/**
+* Lays a calculated withdrawal out as intents.
+*
+* It takes the result of `deriveOmniWithdrawIntentParams` rather than the inputs to it, so
+* there is one calculation and no way to hand it a value that was worked out some other way.
+* That matters most for the amount: a UTXO chain has already added its fees to it, and doing
+* that twice would send more than the caller asked for.
+*/
+function createWithdrawIntentsPrimitive({ tokenAccountId, recipient, msg, externalId, storageDepositAccountId, amount, nativeFee, storageDepositAmount }) {
 	const ftWithdrawPayload = {
 		recipient,
 		fee: "0",
-		native_token_fee: params.nativeFee.toString(),
-		external_id: crypto.randomUUID()
+		native_token_fee: nativeFee.toString(),
+		external_id: externalId
 	};
-	if (isUtxoChain(params.omniChainKind)) {
-		(0, _defuse_protocol_internal_utils.assert)(params.utxoMaxGasFee !== null && params.utxoMaxGasFee > 0n, `Invalid utxo max gas fee: expected > 0, got ${params.utxoMaxGasFee}`);
-		msg = JSON.stringify({ MaxGasFee: params.utxoMaxGasFee.toString() });
-		ftWithdrawPayload.msg = msg;
-	}
+	if (msg !== "") ftWithdrawPayload.msg = msg;
 	const intents = [];
-	if (params.nativeFee > 0n) intents.push({
-		deposit_for_account_id: (0, _omni_bridge_near.calculateStorageAccountId)({
-			token: `near:${tokenAccountId}`,
-			amount: params.amount,
-			recipient,
-			fee: {
-				fee: 0n,
-				native_fee: params.nativeFee
-			},
-			sender: `near:${params.intentsContract}`,
-			msg
-		}, ftWithdrawPayload.external_id),
-		amount: params.nativeFee.toString(),
+	if (storageDepositAccountId !== null) intents.push({
+		deposit_for_account_id: storageDepositAccountId,
+		amount: nativeFee.toString(),
 		contract_id: require_omni_bridge_constants.OMNI_BRIDGE_CONTRACT,
 		intent: "storage_deposit"
 	});
@@ -46,8 +35,8 @@ function createWithdrawIntentsPrimitive(params) {
 		intent: "ft_withdraw",
 		token: tokenAccountId,
 		receiver_id: require_omni_bridge_constants.OMNI_BRIDGE_CONTRACT,
-		amount: params.amount.toString(),
-		storage_deposit: params.storageDepositAmount > 0n ? params.storageDepositAmount.toString() : void 0,
+		amount: amount.toString(),
+		storage_deposit: storageDepositAmount > 0n ? storageDepositAmount.toString() : void 0,
 		msg: JSON.stringify(ftWithdrawPayload),
 		min_gas: require_omni_bridge_constants.MIN_GAS_AMOUNT
 	});
@@ -71,16 +60,9 @@ const CHAIN_MAPPINGS = [
 	[require_caip2.Chains.Aptos, _omni_bridge_core.ChainKind.Aptos],
 	[require_caip2.Chains.HyperEvm, _omni_bridge_core.ChainKind.HlEvm]
 ];
-function caip2ToChainKind(network) {
-	return CHAIN_MAPPINGS.find(([chain]) => chain === network)?.[1] ?? null;
-}
 function chainKindToCaip2(network) {
 	return CHAIN_MAPPINGS.find(([_, kind]) => kind === network)?.[0] ?? null;
 }
-const UTXO_CHAINS = [_omni_bridge_core.ChainKind.Btc];
-function isUtxoChain(network) {
-	return UTXO_CHAINS.includes(network);
-}
 function poaContractIdToChainKind(contractId) {
 	return require_poa_tokens_migrated_to_omni_bridge.POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE[contractId] ?? null;
 }
@@ -149,12 +131,11 @@ async function getTokenDecimals(nearProvider, tokenAddress) {
 }
 
 //#endregion
-exports.caip2ToChainKind = caip2ToChainKind;
+exports.CHAIN_MAPPINGS = CHAIN_MAPPINGS;
 exports.chainKindToCaip2 = chainKindToCaip2;
 exports.createWithdrawIntentsPrimitive = createWithdrawIntentsPrimitive;
 exports.getAccountOmniStorageBalance = getAccountOmniStorageBalance;
 exports.getBridgedToken = getBridgedToken;
 exports.getTokenDecimals = getTokenDecimals;
-exports.isUtxoChain = isUtxoChain;
 exports.poaContractIdToChainKind = poaContractIdToChainKind;
 exports.validateOmniToken = validateOmniToken;

package/dist/src/bridges/omni-bridge/omni-bridge-utils.js

@@ -1,42 +1,31 @@
 import { Chains } from "../../lib/caip2.js";
 import { MIN_GAS_AMOUNT, OMNI_BRIDGE_CONTRACT } from "./omni-bridge-constants.js";
 import { POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE } from "../../constants/poa-tokens-migrated-to-omni-bridge.js";
-import { assert, utils } from "@defuse-protocol/internal-utils";
+import { utils } from "@defuse-protocol/internal-utils";
 import * as v from "valibot";
-import { ChainKind, getChain, isBridgeToken, omniAddress } from "@omni-bridge/core";
-import { calculateStorageAccountId } from "@omni-bridge/near";
+import { ChainKind, getChain, isBridgeToken } from "@omni-bridge/core";
 
 //#region src/bridges/omni-bridge/omni-bridge-utils.ts
-function createWithdrawIntentsPrimitive(params) {
-	const { contractId: tokenAccountId, standard } = utils.parseDefuseAssetId(params.assetId);
-	assert(standard === "nep141", "Only NEP-141 is supported");
-	const recipient = omniAddress(params.omniChainKind, params.destinationAddress);
-	let msg = "";
+/**
+* Lays a calculated withdrawal out as intents.
+*
+* It takes the result of `deriveOmniWithdrawIntentParams` rather than the inputs to it, so
+* there is one calculation and no way to hand it a value that was worked out some other way.
+* That matters most for the amount: a UTXO chain has already added its fees to it, and doing
+* that twice would send more than the caller asked for.
+*/
+function createWithdrawIntentsPrimitive({ tokenAccountId, recipient, msg, externalId, storageDepositAccountId, amount, nativeFee, storageDepositAmount }) {
 	const ftWithdrawPayload = {
 		recipient,
 		fee: "0",
-		native_token_fee: params.nativeFee.toString(),
-		external_id: crypto.randomUUID()
+		native_token_fee: nativeFee.toString(),
+		external_id: externalId
 	};
-	if (isUtxoChain(params.omniChainKind)) {
-		assert(params.utxoMaxGasFee !== null && params.utxoMaxGasFee > 0n, `Invalid utxo max gas fee: expected > 0, got ${params.utxoMaxGasFee}`);
-		msg = JSON.stringify({ MaxGasFee: params.utxoMaxGasFee.toString() });
-		ftWithdrawPayload.msg = msg;
-	}
+	if (msg !== "") ftWithdrawPayload.msg = msg;
 	const intents = [];
-	if (params.nativeFee > 0n) intents.push({
-		deposit_for_account_id: calculateStorageAccountId({
-			token: `near:${tokenAccountId}`,
-			amount: params.amount,
-			recipient,
-			fee: {
-				fee: 0n,
-				native_fee: params.nativeFee
-			},
-			sender: `near:${params.intentsContract}`,
-			msg
-		}, ftWithdrawPayload.external_id),
-		amount: params.nativeFee.toString(),
+	if (storageDepositAccountId !== null) intents.push({
+		deposit_for_account_id: storageDepositAccountId,
+		amount: nativeFee.toString(),
 		contract_id: OMNI_BRIDGE_CONTRACT,
 		intent: "storage_deposit"
 	});
@@ -44,8 +33,8 @@ function createWithdrawIntentsPrimitive(params) {
 		intent: "ft_withdraw",
 		token: tokenAccountId,
 		receiver_id: OMNI_BRIDGE_CONTRACT,
-		amount: params.amount.toString(),
-		storage_deposit: params.storageDepositAmount > 0n ? params.storageDepositAmount.toString() : void 0,
+		amount: amount.toString(),
+		storage_deposit: storageDepositAmount > 0n ? storageDepositAmount.toString() : void 0,
 		msg: JSON.stringify(ftWithdrawPayload),
 		min_gas: MIN_GAS_AMOUNT
 	});
@@ -69,16 +58,9 @@ const CHAIN_MAPPINGS = [
 	[Chains.Aptos, ChainKind.Aptos],
 	[Chains.HyperEvm, ChainKind.HlEvm]
 ];
-function caip2ToChainKind(network) {
-	return CHAIN_MAPPINGS.find(([chain]) => chain === network)?.[1] ?? null;
-}
 function chainKindToCaip2(network) {
 	return CHAIN_MAPPINGS.find(([_, kind]) => kind === network)?.[0] ?? null;
 }
-const UTXO_CHAINS = [ChainKind.Btc];
-function isUtxoChain(network) {
-	return UTXO_CHAINS.includes(network);
-}
 function poaContractIdToChainKind(contractId) {
 	return POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE[contractId] ?? null;
 }
@@ -147,4 +129,4 @@ async function getTokenDecimals(nearProvider, tokenAddress) {
 }
 
 //#endregion
-export { caip2ToChainKind, chainKindToCaip2, createWithdrawIntentsPrimitive, getAccountOmniStorageBalance, getBridgedToken, getTokenDecimals, isUtxoChain, poaContractIdToChainKind, validateOmniToken };
+export { CHAIN_MAPPINGS, chainKindToCaip2, createWithdrawIntentsPrimitive, getAccountOmniStorageBalance, getBridgedToken, getTokenDecimals, poaContractIdToChainKind, validateOmniToken };

package/dist/src/bridges/omni-bridge/omni-bridge.cjs

@@ -1,7 +1,6 @@
 const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
 const require_errors = require('../../classes/errors.cjs');
 const require_route_enum = require('../../constants/route-enum.cjs');
-const require_caip2 = require('../../lib/caip2.cjs');
 const require_estimate_fee = require('../../lib/estimate-fee.cjs');
 const require_parse_defuse_asset_id = require('../../lib/parse-defuse-asset-id.cjs');
 const require_validateAddress = require('../../lib/validateAddress.cjs');
@@ -11,6 +10,7 @@ const require_error = require('./error.cjs');
 const require_omni_bridge_constants = require('./omni-bridge-constants.cjs');
 const require_poa_tokens_migrated_to_omni_bridge = require('../../constants/poa-tokens-migrated-to-omni-bridge.cjs');
 const require_omni_bridge_utils = require('./omni-bridge-utils.cjs');
+const require_src_bridges_omni_bridge_omni_withdraw_params = require('./omni-withdraw-params.cjs');
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
 let lru_cache = require("lru-cache");
 let _isaacs_ttlcache = require("@isaacs/ttlcache");
@@ -55,7 +55,7 @@ var OmniBridge = class {
 		let omniChainKind = null;
 		let caip2Chain = null;
 		if (this.targetChainSpecified(params.routeConfig)) {
-			omniChainKind = require_omni_bridge_utils.caip2ToChainKind(params.routeConfig.chain);
+			omniChainKind = require_src_bridges_omni_bridge_omni_withdraw_params.caip2ToChainKind(params.routeConfig.chain);
 			if (omniChainKind === null) throw new require_errors.UnsupportedAssetIdError(params.assetId, `Chain ${params.routeConfig.chain} is not supported in Omni Bridge.`);
 			caip2Chain = params.routeConfig.chain;
 		} else {
@@ -89,7 +89,7 @@ var OmniBridge = class {
 		let omniChainKind = null;
 		let blockchain = null;
 		if (this.targetChainSpecified(routeConfig)) {
-			omniChainKind = require_omni_bridge_utils.caip2ToChainKind(routeConfig.chain);
+			omniChainKind = require_src_bridges_omni_bridge_omni_withdraw_params.caip2ToChainKind(routeConfig.chain);
 			blockchain = routeConfig.chain;
 		} else {
 			omniChainKind = this.isPoaTokenMigratedToOmniBridge(parsed.contractId) ? require_omni_bridge_utils.poaContractIdToChainKind(parsed.contractId) : (0, _omni_bridge_core.parseOriginChain)(parsed.contractId);
@@ -106,7 +106,7 @@ var OmniBridge = class {
 	async createWithdrawalIntents(args) {
 		const assetInfo = this.makeAssetInfo(args.withdrawalParams.assetId, args.withdrawalParams.routeConfig);
 		(0, _defuse_protocol_internal_utils.assert)(assetInfo !== null, `Asset ${args.withdrawalParams.assetId} is not supported by Omni Bridge`);
-		const omniChainKind = require_omni_bridge_utils.caip2ToChainKind(assetInfo.blockchain);
+		const omniChainKind = require_src_bridges_omni_bridge_omni_withdraw_params.caip2ToChainKind(assetInfo.blockchain);
 		(0, _defuse_protocol_internal_utils.assert)(omniChainKind !== null, `Chain ${assetInfo.blockchain} is not supported by Omni Bridge`);
 		const intents = [];
 		if (args.feeEstimation.quote !== null) intents.push({
@@ -117,42 +117,14 @@ var OmniBridge = class {
 			},
 			referral: args.referral
 		});
-		const relayerFee = require_estimate_fee.getUnderlyingFee(args.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "relayerFee");
-		(0, _defuse_protocol_internal_utils.assert)(relayerFee >= 0n, `Invalid Omni bridge relayer fee: expected >= 0, got ${relayerFee}`);
-		let amount = args.withdrawalParams.amount;
-		let utxoMaxGasFee = null;
-		/**
-		* UTXO withdrawals add protocol + max gas fees to the intent amount since they're paid
-		* from the withdrawn asset, not wrap.near.
-		*
-		* Example with nep141:nbtc.bridge.near (made-up values):
-		* utxoFees = 50 + 50 = 100, relayerFee = 2 (excluded; paid in wrap.near)
-		*
-		* feeInclusive=false:
-		*   - amount = 4000 → intent = 4000 + 100 = 4100 → user receives 4000
-		*
-		* feeInclusive=true:
-		*   - amount = 3898 (4000 − 102) → intent = 3898 + 100 = 3998 → user receives 3898
-		**/
-		if (require_omni_bridge_utils.isUtxoChain(omniChainKind)) {
-			utxoMaxGasFee = require_estimate_fee.getUnderlyingFee(args.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "utxoMaxGasFee");
-			const utxoProtocolFee = require_estimate_fee.getUnderlyingFee(args.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "utxoProtocolFee");
-			(0, _defuse_protocol_internal_utils.assert)(utxoMaxGasFee !== void 0 && utxoMaxGasFee > 0n, `Invalid Omni Bridge utxo max gas fee: expected > 0, got ${utxoMaxGasFee}`);
-			(0, _defuse_protocol_internal_utils.assert)(utxoProtocolFee !== void 0 && utxoProtocolFee > 0n, `Invalid Omni Bridge utxo protocol fee: expected > 0, got ${utxoProtocolFee}`);
-			amount += utxoMaxGasFee + utxoProtocolFee;
-		}
-		let destinationAddress = args.withdrawalParams.destinationAddress;
-		if (assetInfo.blockchain === require_caip2.Chains.Bitcoin && /^bc1/i.test(destinationAddress)) destinationAddress = destinationAddress.toLowerCase();
-		intents.push(...require_omni_bridge_utils.createWithdrawIntentsPrimitive({
+		intents.push(...require_omni_bridge_utils.createWithdrawIntentsPrimitive(require_src_bridges_omni_bridge_omni_withdraw_params.deriveOmniWithdrawIntentParams({
 			assetId: args.withdrawalParams.assetId,
-			destinationAddress,
-			amount,
+			destinationAddress: args.withdrawalParams.destinationAddress,
+			actualAmount: args.withdrawalParams.amount,
 			omniChainKind,
 			intentsContract: this.envConfig.contractID,
-			nativeFee: relayerFee,
-			storageDepositAmount: require_estimate_fee.getUnderlyingFee(args.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "storageDepositFee"),
-			utxoMaxGasFee
-		}));
+			feeEstimation: args.feeEstimation
+		})));
 		return Promise.resolve(intents);
 	}
 	async validateWithdrawal(args) {
@@ -162,7 +134,7 @@ var OmniBridge = class {
 		const assetInfo = this.makeAssetInfo(args.assetId, args.routeConfig);
 		(0, _defuse_protocol_internal_utils.assert)(assetInfo !== null, `Asset ${args.assetId} is not supported by Omni Bridge`);
 		if (require_validateAddress.validateAddress(args.destinationAddress, assetInfo.blockchain) === false) throw new require_errors.InvalidDestinationAddressForWithdrawalError(args.destinationAddress, assetInfo.blockchain);
-		const omniChainKind = require_omni_bridge_utils.caip2ToChainKind(assetInfo.blockchain);
+		const omniChainKind = require_src_bridges_omni_bridge_omni_withdraw_params.caip2ToChainKind(assetInfo.blockchain);
 		(0, _defuse_protocol_internal_utils.assert)(omniChainKind !== null, `Chain ${assetInfo.blockchain} is not supported by Omni Bridge`);
 		const destTokenOmniAddress = await this.getCachedDestinationTokenAddress(assetInfo.contractId, omniChainKind);
 		if (destTokenOmniAddress === null) throw new require_error.TokenNotFoundInDestinationChainError(args.assetId, assetInfo.blockchain);
@@ -176,7 +148,7 @@ var OmniBridge = class {
 		}
 		const intentsStorageBalance = await this.getCachedIntentsStorageBalance();
 		if (intentsStorageBalance <= require_omni_bridge_constants.MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR) throw new require_error.IntentsNearOmniAvailableBalanceTooLowError(intentsStorageBalance.toString());
-		const utxoChainWithdrawal = require_omni_bridge_utils.isUtxoChain(omniChainKind);
+		const utxoChainWithdrawal = require_src_bridges_omni_bridge_omni_withdraw_params.isUtxoChain(omniChainKind);
 		if (!utxoChainWithdrawal && !isFeeSubsidized) {
 			const relayerFee = require_estimate_fee.getUnderlyingFee(args.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "relayerFee");
 			(0, _defuse_protocol_internal_utils.assert)(require_estimate_fee.getUnderlyingFee(args.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "relayerFee") > 0n, `Invalid Omni Bridge relayer fee for non UTXO chain withdrawal: expected > 0, got ${relayerFee}`);
@@ -202,7 +174,7 @@ var OmniBridge = class {
 	async estimateWithdrawalFee(args) {
 		const assetInfo = this.makeAssetInfo(args.withdrawalParams.assetId, args.withdrawalParams.routeConfig);
 		(0, _defuse_protocol_internal_utils.assert)(assetInfo !== null, `Asset ${args.withdrawalParams.assetId} is not supported by Omni Bridge`);
-		const omniChainKind = require_omni_bridge_utils.caip2ToChainKind(assetInfo.blockchain);
+		const omniChainKind = require_src_bridges_omni_bridge_omni_withdraw_params.caip2ToChainKind(assetInfo.blockchain);
 		(0, _defuse_protocol_internal_utils.assert)(omniChainKind !== null, `Chain ${assetInfo.blockchain} is not supported by Omni Bridge`);
 		const fee = await (0, _defuse_protocol_internal_utils.withTimeout)(() => this.omniBridgeAPI.getFee((0, _omni_bridge_core.omniAddress)(_omni_bridge_core.ChainKind.Near, this.envConfig.contractID), (0, _omni_bridge_core.omniAddress)(omniChainKind, args.withdrawalParams.destinationAddress), (0, _omni_bridge_core.omniAddress)(_omni_bridge_core.ChainKind.Near, assetInfo.contractId), args.withdrawalParams.amount), {
 			timeout: typeof window !== "undefined" ? 1e4 : 3e3,
@@ -240,7 +212,7 @@ var OmniBridge = class {
 			});
 			amount += BigInt(quote.amount_in);
 		}
-		if (require_omni_bridge_utils.isUtxoChain(omniChainKind)) {
+		if (require_src_bridges_omni_bridge_omni_withdraw_params.isUtxoChain(omniChainKind)) {
 			(0, _defuse_protocol_internal_utils.assert)(fee.gas_fee !== null && fee.gas_fee !== void 0 && fee.gas_fee > 0n, `Invalid Omni Bridge utxo gas fee: expected > 0, got ${fee.gas_fee}`);
 			(0, _defuse_protocol_internal_utils.assert)(fee.protocol_fee !== null && fee.protocol_fee !== void 0 && fee.protocol_fee > 0n, `Invalid Omni Bridge utxo protocol fee: expected > 0, got ${fee.protocol_fee}`);
 			amount += fee.gas_fee + fee.protocol_fee;
@@ -269,7 +241,7 @@ var OmniBridge = class {
 		const destinationChain = (0, _omni_bridge_core.getChain)(transfer.recipient);
 		let txHash = null;
 		if ((0, _omni_bridge_core.isEvmChain)(destinationChain) || destinationChain === _omni_bridge_core.ChainKind.Sol || destinationChain === _omni_bridge_core.ChainKind.Fogo || destinationChain === _omni_bridge_core.ChainKind.Strk || destinationChain === _omni_bridge_core.ChainKind.Aptos) txHash = transfer.finalised?.transaction_hash;
-		else if (require_omni_bridge_utils.isUtxoChain(destinationChain)) txHash = typeof window !== "undefined" ? transfer.utxo_meta?.pending_sign_id : transfer.finalised?.transaction_hash;
+		else if (require_src_bridges_omni_bridge_omni_withdraw_params.isUtxoChain(destinationChain)) txHash = typeof window !== "undefined" ? transfer.utxo_meta?.pending_sign_id : transfer.finalised?.transaction_hash;
 		else return {
 			status: "completed",
 			txHash: null

package/dist/src/bridges/omni-bridge/omni-bridge.js

@@ -1,6 +1,5 @@
 import { DestinationAddressMatchesTokenAddressError, InvalidDestinationAddressForWithdrawalError, MinWithdrawalAmountError, UnsupportedAssetIdError } from "../../classes/errors.js";
 import { RouteEnum } from "../../constants/route-enum.js";
-import { Chains } from "../../lib/caip2.js";
 import { getFeeQuote, getUnderlyingFee } from "../../lib/estimate-fee.js";
 import { parseDefuseAssetId } from "../../lib/parse-defuse-asset-id.js";
 import { validateAddress } from "../../lib/validateAddress.js";
@@ -9,7 +8,8 @@ import { compareAddresses } from "../../lib/compareAddresses.js";
 import { InsufficientUtxoForOmniBridgeWithdrawalError, IntentsNearOmniAvailableBalanceTooLowError, InvalidFeeValueError, OmniWithdrawalApiFeeRequestTimeoutError, TokenNotFoundInDestinationChainError } from "./error.js";
 import { FEE_SUBSIDIZED_TOKENS, INTENTS_STORAGE_BALANCE_CACHE_KEY, MIN_AMOUNT_SOL_OMNI_WITHDRAWAL, MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR, NEAR_NATIVE_ASSET_ID, OMNI_BRIDGE_CONTRACT, SOL_OMNI_CONTRACT_ID } from "./omni-bridge-constants.js";
 import { POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE } from "../../constants/poa-tokens-migrated-to-omni-bridge.js";
-import { caip2ToChainKind, chainKindToCaip2, createWithdrawIntentsPrimitive, getAccountOmniStorageBalance, getBridgedToken, getTokenDecimals, isUtxoChain, poaContractIdToChainKind, validateOmniToken } from "./omni-bridge-utils.js";
+import { chainKindToCaip2, createWithdrawIntentsPrimitive, getAccountOmniStorageBalance, getBridgedToken, getTokenDecimals, poaContractIdToChainKind, validateOmniToken } from "./omni-bridge-utils.js";
+import { caip2ToChainKind, deriveOmniWithdrawIntentParams, isUtxoChain } from "./omni-withdraw-params.js";
 import { assert, getNearNep141MinStorageBalance, getNearNep141StorageBalance, withTimeout } from "@defuse-protocol/internal-utils";
 import { LRUCache } from "lru-cache";
 import TTLCache from "@isaacs/ttlcache";
@@ -115,42 +115,14 @@ var OmniBridge = class {
 			},
 			referral: args.referral
 		});
-		const relayerFee = getUnderlyingFee(args.feeEstimation, RouteEnum.OmniBridge, "relayerFee");
-		assert(relayerFee >= 0n, `Invalid Omni bridge relayer fee: expected >= 0, got ${relayerFee}`);
-		let amount = args.withdrawalParams.amount;
-		let utxoMaxGasFee = null;
-		/**
-		* UTXO withdrawals add protocol + max gas fees to the intent amount since they're paid
-		* from the withdrawn asset, not wrap.near.
-		*
-		* Example with nep141:nbtc.bridge.near (made-up values):
-		* utxoFees = 50 + 50 = 100, relayerFee = 2 (excluded; paid in wrap.near)
-		*
-		* feeInclusive=false:
-		*   - amount = 4000 → intent = 4000 + 100 = 4100 → user receives 4000
-		*
-		* feeInclusive=true:
-		*   - amount = 3898 (4000 − 102) → intent = 3898 + 100 = 3998 → user receives 3898
-		**/
-		if (isUtxoChain(omniChainKind)) {
-			utxoMaxGasFee = getUnderlyingFee(args.feeEstimation, RouteEnum.OmniBridge, "utxoMaxGasFee");
-			const utxoProtocolFee = getUnderlyingFee(args.feeEstimation, RouteEnum.OmniBridge, "utxoProtocolFee");
-			assert(utxoMaxGasFee !== void 0 && utxoMaxGasFee > 0n, `Invalid Omni Bridge utxo max gas fee: expected > 0, got ${utxoMaxGasFee}`);
-			assert(utxoProtocolFee !== void 0 && utxoProtocolFee > 0n, `Invalid Omni Bridge utxo protocol fee: expected > 0, got ${utxoProtocolFee}`);
-			amount += utxoMaxGasFee + utxoProtocolFee;
-		}
-		let destinationAddress = args.withdrawalParams.destinationAddress;
-		if (assetInfo.blockchain === Chains.Bitcoin && /^bc1/i.test(destinationAddress)) destinationAddress = destinationAddress.toLowerCase();
-		intents.push(...createWithdrawIntentsPrimitive({
+		intents.push(...createWithdrawIntentsPrimitive(deriveOmniWithdrawIntentParams({
 			assetId: args.withdrawalParams.assetId,
-			destinationAddress,
-			amount,
+			destinationAddress: args.withdrawalParams.destinationAddress,
+			actualAmount: args.withdrawalParams.amount,
 			omniChainKind,
 			intentsContract: this.envConfig.contractID,
-			nativeFee: relayerFee,
-			storageDepositAmount: getUnderlyingFee(args.feeEstimation, RouteEnum.OmniBridge, "storageDepositFee"),
-			utxoMaxGasFee
-		}));
+			feeEstimation: args.feeEstimation
+		})));
 		return Promise.resolve(intents);
 	}
 	async validateWithdrawal(args) {

package/dist/src/bridges/omni-bridge/omni-withdraw-params.cjs

@@ -0,0 +1,72 @@
+const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
+const require_route_enum = require('../../constants/route-enum.cjs');
+const require_estimate_fee = require('../../lib/estimate-fee.cjs');
+const require_omni_bridge_utils = require('./omni-bridge-utils.cjs');
+let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
+let _omni_bridge_core = require("@omni-bridge/core");
+let _omni_bridge_near = require("@omni-bridge/near");
+
+//#region src/bridges/omni-bridge/omni-withdraw-params.ts
+/**
+* Computes the values of an Omni withdrawal without building the intents. `OmniBridge` calls
+* it too, so a caller that signs the payload elsewhere gets the same numbers.
+* @param params.actualAmount Net of `feeEstimation.amount`. `IntentsSDK` subtracts it for a
+* fee-inclusive withdrawal, so a caller that builds the payload itself has to do the same
+* @param params.feeEstimation Read for every fee of the route, one of which raises the amount
+* @param params.externalId Supply one to repeat an earlier call.
+* `calculateStorageAccountId` throws above 64 UTF-8 bytes. Omit it and the function draws a
+* random one
+* @returns The values the `ft_withdraw` carries
+*/
+function deriveOmniWithdrawIntentParams(params) {
+	const { contractId: tokenAccountId, standard } = _defuse_protocol_internal_utils.utils.parseDefuseAssetId(params.assetId);
+	(0, _defuse_protocol_internal_utils.assert)(standard === "nep141", "Only NEP-141 is supported");
+	const nativeFee = require_estimate_fee.getUnderlyingFee(params.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "relayerFee");
+	(0, _defuse_protocol_internal_utils.assert)(nativeFee >= 0n, `Invalid Omni bridge relayer fee: expected >= 0, got ${nativeFee}`);
+	const storageDepositAmount = require_estimate_fee.getUnderlyingFee(params.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "storageDepositFee");
+	let amount = params.actualAmount;
+	let msg = "";
+	if (isUtxoChain(params.omniChainKind)) {
+		const utxoMaxGasFee = require_estimate_fee.getUnderlyingFee(params.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "utxoMaxGasFee");
+		const utxoProtocolFee = require_estimate_fee.getUnderlyingFee(params.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "utxoProtocolFee");
+		(0, _defuse_protocol_internal_utils.assert)(utxoMaxGasFee !== void 0 && utxoMaxGasFee > 0n, `Invalid Omni Bridge utxo max gas fee: expected > 0, got ${utxoMaxGasFee}`);
+		(0, _defuse_protocol_internal_utils.assert)(utxoProtocolFee !== void 0 && utxoProtocolFee > 0n, `Invalid Omni Bridge utxo protocol fee: expected > 0, got ${utxoProtocolFee}`);
+		amount += utxoMaxGasFee + utxoProtocolFee;
+		msg = JSON.stringify({ MaxGasFee: utxoMaxGasFee.toString() });
+	}
+	const destinationAddress = params.omniChainKind === _omni_bridge_core.ChainKind.Btc && /^bc1/i.test(params.destinationAddress) ? params.destinationAddress.toLowerCase() : params.destinationAddress;
+	const recipient = (0, _omni_bridge_core.omniAddress)(params.omniChainKind, destinationAddress);
+	const externalId = params.externalId ?? crypto.randomUUID();
+	return {
+		tokenAccountId,
+		recipient,
+		msg,
+		externalId,
+		amount,
+		nativeFee,
+		storageDepositAmount,
+		storageDepositAccountId: nativeFee > 0n ? (0, _omni_bridge_near.calculateStorageAccountId)({
+			token: `near:${tokenAccountId}`,
+			amount,
+			recipient,
+			fee: {
+				fee: 0n,
+				native_fee: nativeFee
+			},
+			sender: `near:${params.intentsContract}`,
+			msg
+		}, externalId) : null
+	};
+}
+function caip2ToChainKind(network) {
+	return require_omni_bridge_utils.CHAIN_MAPPINGS.find(([chain]) => chain === network)?.[1] ?? null;
+}
+const UTXO_CHAINS = [_omni_bridge_core.ChainKind.Btc];
+function isUtxoChain(network) {
+	return UTXO_CHAINS.includes(network);
+}
+
+//#endregion
+exports.caip2ToChainKind = caip2ToChainKind;
+exports.deriveOmniWithdrawIntentParams = deriveOmniWithdrawIntentParams;
+exports.isUtxoChain = isUtxoChain;

package/dist/src/bridges/omni-bridge/omni-withdraw-params.d.cts

@@ -0,0 +1,60 @@
+import { Chain } from "../../lib/caip2.cjs";
+import { FeeEstimation } from "../../shared-types.cjs";
+import { ChainKind, OmniAddress } from "@omni-bridge/core";
+
+//#region src/bridges/omni-bridge/omni-withdraw-params.d.ts
+
+/**
+ * The values an Omni withdrawal computes before it builds the intents.
+ *
+ * `storageDepositAccountId` is derived from `externalId`, and letter case takes part in that
+ * derivation, so recomputing any of these sends the native fee to a different account.
+ */
+type OmniWithdrawIntentParams = {
+  /** The NEP-141 account of the asset. */
+  tokenAccountId: string;
+  recipient: OmniAddress;
+  /** Empty, except for a UTXO chain. Then it contains `MaxGasFee`. */
+  msg: string;
+  /**
+   * This value makes the storage account unique. The hash covers the rest of the transfer,
+   * so two withdrawals that match on every field would otherwise land on one account.
+   * `calculateStorageAccountId` throws above 64 UTF-8 bytes.
+   */
+  externalId: string;
+  /** The account that gets the native fee. Null if there is no native fee. */
+  storageDepositAccountId: string | null;
+  /**
+   * The amount the `ft_withdraw` carries. A UTXO chain adds its own fees to the amount the
+   * caller asked for, because they are paid from the asset and not from wrap.near.
+   */
+  amount: bigint;
+  /** The relayer fee. It goes in `native_token_fee`, and the storage deposit transfers it. */
+  nativeFee: bigint;
+  /** The `storage_deposit` of the `ft_withdraw`. Zero leaves the field out. */
+  storageDepositAmount: bigint;
+};
+/**
+ * Computes the values of an Omni withdrawal without building the intents. `OmniBridge` calls
+ * it too, so a caller that signs the payload elsewhere gets the same numbers.
+ * @param params.actualAmount Net of `feeEstimation.amount`. `IntentsSDK` subtracts it for a
+ * fee-inclusive withdrawal, so a caller that builds the payload itself has to do the same
+ * @param params.feeEstimation Read for every fee of the route, one of which raises the amount
+ * @param params.externalId Supply one to repeat an earlier call.
+ * `calculateStorageAccountId` throws above 64 UTF-8 bytes. Omit it and the function draws a
+ * random one
+ * @returns The values the `ft_withdraw` carries
+ */
+declare function deriveOmniWithdrawIntentParams(params: {
+  assetId: string;
+  destinationAddress: string;
+  actualAmount: bigint;
+  omniChainKind: ChainKind;
+  intentsContract: string;
+  feeEstimation: FeeEstimation;
+  externalId?: string;
+}): OmniWithdrawIntentParams;
+declare function caip2ToChainKind(network: Chain): ChainKind | null;
+declare function isUtxoChain(network: ChainKind): boolean;
+//#endregion
+export { OmniWithdrawIntentParams, caip2ToChainKind, deriveOmniWithdrawIntentParams, isUtxoChain };

package/dist/src/bridges/omni-bridge/omni-withdraw-params.d.ts

@@ -0,0 +1,60 @@
+import { Chain } from "../../lib/caip2.js";
+import { FeeEstimation } from "../../shared-types.js";
+import { ChainKind, OmniAddress } from "@omni-bridge/core";
+
+//#region src/bridges/omni-bridge/omni-withdraw-params.d.ts
+
+/**
+ * The values an Omni withdrawal computes before it builds the intents.
+ *
+ * `storageDepositAccountId` is derived from `externalId`, and letter case takes part in that
+ * derivation, so recomputing any of these sends the native fee to a different account.
+ */
+type OmniWithdrawIntentParams = {
+  /** The NEP-141 account of the asset. */
+  tokenAccountId: string;
+  recipient: OmniAddress;
+  /** Empty, except for a UTXO chain. Then it contains `MaxGasFee`. */
+  msg: string;
+  /**
+   * This value makes the storage account unique. The hash covers the rest of the transfer,
+   * so two withdrawals that match on every field would otherwise land on one account.
+   * `calculateStorageAccountId` throws above 64 UTF-8 bytes.
+   */
+  externalId: string;
+  /** The account that gets the native fee. Null if there is no native fee. */
+  storageDepositAccountId: string | null;
+  /**
+   * The amount the `ft_withdraw` carries. A UTXO chain adds its own fees to the amount the
+   * caller asked for, because they are paid from the asset and not from wrap.near.
+   */
+  amount: bigint;
+  /** The relayer fee. It goes in `native_token_fee`, and the storage deposit transfers it. */
+  nativeFee: bigint;
+  /** The `storage_deposit` of the `ft_withdraw`. Zero leaves the field out. */
+  storageDepositAmount: bigint;
+};
+/**
+ * Computes the values of an Omni withdrawal without building the intents. `OmniBridge` calls
+ * it too, so a caller that signs the payload elsewhere gets the same numbers.
+ * @param params.actualAmount Net of `feeEstimation.amount`. `IntentsSDK` subtracts it for a
+ * fee-inclusive withdrawal, so a caller that builds the payload itself has to do the same
+ * @param params.feeEstimation Read for every fee of the route, one of which raises the amount
+ * @param params.externalId Supply one to repeat an earlier call.
+ * `calculateStorageAccountId` throws above 64 UTF-8 bytes. Omit it and the function draws a
+ * random one
+ * @returns The values the `ft_withdraw` carries
+ */
+declare function deriveOmniWithdrawIntentParams(params: {
+  assetId: string;
+  destinationAddress: string;
+  actualAmount: bigint;
+  omniChainKind: ChainKind;
+  intentsContract: string;
+  feeEstimation: FeeEstimation;
+  externalId?: string;
+}): OmniWithdrawIntentParams;
+declare function caip2ToChainKind(network: Chain): ChainKind | null;
+declare function isUtxoChain(network: ChainKind): boolean;
+//#endregion
+export { OmniWithdrawIntentParams, caip2ToChainKind, deriveOmniWithdrawIntentParams, isUtxoChain };

package/dist/src/bridges/omni-bridge/omni-withdraw-params.js

@@ -0,0 +1,69 @@
+import { RouteEnum } from "../../constants/route-enum.js";
+import { getUnderlyingFee } from "../../lib/estimate-fee.js";
+import { CHAIN_MAPPINGS } from "./omni-bridge-utils.js";
+import { assert, utils } from "@defuse-protocol/internal-utils";
+import { ChainKind, omniAddress } from "@omni-bridge/core";
+import { calculateStorageAccountId } from "@omni-bridge/near";
+
+//#region src/bridges/omni-bridge/omni-withdraw-params.ts
+/**
+* Computes the values of an Omni withdrawal without building the intents. `OmniBridge` calls
+* it too, so a caller that signs the payload elsewhere gets the same numbers.
+* @param params.actualAmount Net of `feeEstimation.amount`. `IntentsSDK` subtracts it for a
+* fee-inclusive withdrawal, so a caller that builds the payload itself has to do the same
+* @param params.feeEstimation Read for every fee of the route, one of which raises the amount
+* @param params.externalId Supply one to repeat an earlier call.
+* `calculateStorageAccountId` throws above 64 UTF-8 bytes. Omit it and the function draws a
+* random one
+* @returns The values the `ft_withdraw` carries
+*/
+function deriveOmniWithdrawIntentParams(params) {
+	const { contractId: tokenAccountId, standard } = utils.parseDefuseAssetId(params.assetId);
+	assert(standard === "nep141", "Only NEP-141 is supported");
+	const nativeFee = getUnderlyingFee(params.feeEstimation, RouteEnum.OmniBridge, "relayerFee");
+	assert(nativeFee >= 0n, `Invalid Omni bridge relayer fee: expected >= 0, got ${nativeFee}`);
+	const storageDepositAmount = getUnderlyingFee(params.feeEstimation, RouteEnum.OmniBridge, "storageDepositFee");
+	let amount = params.actualAmount;
+	let msg = "";
+	if (isUtxoChain(params.omniChainKind)) {
+		const utxoMaxGasFee = getUnderlyingFee(params.feeEstimation, RouteEnum.OmniBridge, "utxoMaxGasFee");
+		const utxoProtocolFee = getUnderlyingFee(params.feeEstimation, RouteEnum.OmniBridge, "utxoProtocolFee");
+		assert(utxoMaxGasFee !== void 0 && utxoMaxGasFee > 0n, `Invalid Omni Bridge utxo max gas fee: expected > 0, got ${utxoMaxGasFee}`);
+		assert(utxoProtocolFee !== void 0 && utxoProtocolFee > 0n, `Invalid Omni Bridge utxo protocol fee: expected > 0, got ${utxoProtocolFee}`);
+		amount += utxoMaxGasFee + utxoProtocolFee;
+		msg = JSON.stringify({ MaxGasFee: utxoMaxGasFee.toString() });
+	}
+	const destinationAddress = params.omniChainKind === ChainKind.Btc && /^bc1/i.test(params.destinationAddress) ? params.destinationAddress.toLowerCase() : params.destinationAddress;
+	const recipient = omniAddress(params.omniChainKind, destinationAddress);
+	const externalId = params.externalId ?? crypto.randomUUID();
+	return {
+		tokenAccountId,
+		recipient,
+		msg,
+		externalId,
+		amount,
+		nativeFee,
+		storageDepositAmount,
+		storageDepositAccountId: nativeFee > 0n ? calculateStorageAccountId({
+			token: `near:${tokenAccountId}`,
+			amount,
+			recipient,
+			fee: {
+				fee: 0n,
+				native_fee: nativeFee
+			},
+			sender: `near:${params.intentsContract}`,
+			msg
+		}, externalId) : null
+	};
+}
+function caip2ToChainKind(network) {
+	return CHAIN_MAPPINGS.find(([chain]) => chain === network)?.[1] ?? null;
+}
+const UTXO_CHAINS = [ChainKind.Btc];
+function isUtxoChain(network) {
+	return UTXO_CHAINS.includes(network);
+}
+
+//#endregion
+export { caip2ToChainKind, deriveOmniWithdrawIntentParams, isUtxoChain };

package/dist/src/bridges/poa-bridge/poa-bridge-utils.cjs

@@ -41,7 +41,8 @@ const caip2Mapping = {
 	[require_caip2.Chains.Litecoin]: "ltc:mainnet",
 	[require_caip2.Chains.Aleo]: "aleo:mainnet",
 	[require_caip2.Chains.Dash]: "dash:mainnet",
-	[require_caip2.Chains.Plasma]: "eth:9745"
+	[require_caip2.Chains.Plasma]: "eth:9745",
+	[require_caip2.Chains.Adi]: "eth:36900"
 };
 function toPoaNetwork(caip2) {
 	if (caip2Mapping[caip2] == null) throw new Error(`Unsupported POA Bridge chain = ${caip2}`);
@@ -65,7 +66,8 @@ const tokenPrefixMapping = {
 	ltc: require_caip2.Chains.Litecoin,
 	aleo: require_caip2.Chains.Aleo,
 	dash: require_caip2.Chains.Dash,
-	plasma: require_caip2.Chains.Plasma
+	plasma: require_caip2.Chains.Plasma,
+	adi: require_caip2.Chains.Adi
 };
 function contractIdToCaip2(contractId) {
 	for (const [prefix, caip2] of Object.entries(tokenPrefixMapping)) if (contractId.startsWith(`${prefix}.`) || contractId.startsWith(`${prefix}-`)) return caip2;

package/dist/src/bridges/poa-bridge/poa-bridge-utils.js

@@ -40,7 +40,8 @@ const caip2Mapping = {
 	[Chains.Litecoin]: "ltc:mainnet",
 	[Chains.Aleo]: "aleo:mainnet",
 	[Chains.Dash]: "dash:mainnet",
-	[Chains.Plasma]: "eth:9745"
+	[Chains.Plasma]: "eth:9745",
+	[Chains.Adi]: "eth:36900"
 };
 function toPoaNetwork(caip2) {
 	if (caip2Mapping[caip2] == null) throw new Error(`Unsupported POA Bridge chain = ${caip2}`);
@@ -64,7 +65,8 @@ const tokenPrefixMapping = {
 	ltc: Chains.Litecoin,
 	aleo: Chains.Aleo,
 	dash: Chains.Dash,
-	plasma: Chains.Plasma
+	plasma: Chains.Plasma,
+	adi: Chains.Adi
 };
 function contractIdToCaip2(contractId) {
 	for (const [prefix, caip2] of Object.entries(tokenPrefixMapping)) if (contractId.startsWith(`${prefix}.`) || contractId.startsWith(`${prefix}-`)) return caip2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defuse-protocol/intents-sdk",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "private": false,
   "type": "module",
   "repository": {
@@ -26,6 +26,16 @@
         "types": "./dist/index.d.cts",
         "default": "./dist/index.cjs"
       }
+    },
+    "./omni-bridge": {
+      "import": {
+        "types": "./dist/src/bridges/omni-bridge/omni-withdraw-params.d.ts",
+        "default": "./dist/src/bridges/omni-bridge/omni-withdraw-params.js"
+      },
+      "require": {
+        "types": "./dist/src/bridges/omni-bridge/omni-withdraw-params.d.cts",
+        "default": "./dist/src/bridges/omni-bridge/omni-withdraw-params.cjs"
+      }
     }
   },
   "files": [
@@ -49,7 +59,7 @@
     "valibot": "^1.0.0",
     "viem": "^2.0.0",
     "@defuse-protocol/contract-types": "0.6.4",
-    "@defuse-protocol/internal-utils": "0.36.0"
+    "@defuse-protocol/internal-utils": "0.37.0"
   },
   "devDependencies": {
     "@ton/core": "^0.60.0",