@paraspell/sdk-core 11.14.3 → 11.14.4

package/dist/index.cjs

@@ -4647,11 +4647,12 @@ var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency)
   return !(isMultipleAssets || hasOverriddenLocation);
 };
 
-var validateAddress = function validateAddress(address, chain) {
-  var isDestination = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+var validateAddress = function validateAddress(api, address, chain) {
+  var isDestination = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   if (sdkCommon.isTLocation(address)) return;
   var isEvm = assets.isChainEvm(chain);
   var isEthereumAddress = viem.isAddress(address);
+  var isPublicKeyFormat = typeof address === 'string' && address.startsWith('0x') && !isEthereumAddress;
   if (isEvm) {
     if (!isEthereumAddress) {
       throw new InvalidAddressError("".concat(isDestination ? 'Destination chain' : 'Chain', " is an EVM chain, but the address provided is not a valid Ethereum address."));
@@ -4660,12 +4661,21 @@ var validateAddress = function validateAddress(address, chain) {
     if (isEthereumAddress) {
       throw new InvalidAddressError("EVM address provided but ".concat(isDestination ? 'destination ' : '', "chain is not an EVM chain."));
     }
+    if (isPublicKeyFormat) {
+      return;
+    }
+    if (typeof address === 'string') {
+      var isValid = api.validateSubstrateAddress(address);
+      if (!isValid) {
+        throw new InvalidAddressError("Invalid address: ".concat(address));
+      }
+    }
   }
 };
 
-var validateDestinationAddress = function validateDestinationAddress(address, destination) {
+var validateDestinationAddress = function validateDestinationAddress(address, destination, api) {
   if (typeof address === 'string' && !sdkCommon.isTLocation(destination)) {
-    validateAddress(address, destination);
+    validateAddress(api, address, destination, true);
   }
 };
 
@@ -7508,7 +7518,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function () {
       var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-        var api, scenario, assetInfo, destination, feeAssetInfo, overriddenAsset, call, isNativeAsset, isNativeFeeAsset, isExternalAsset, _call, method, modifiedInput, _t, _t2;
+        var api, scenario, assetInfo, destination, feeAssetInfo, overriddenAsset, call, isNativeAsset, isNativeFeeAsset, isExternalAsset, requiresTypeThen, _call, method, modifiedInput, _t, _t2;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
@@ -7558,7 +7568,10 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
               return _context3.a(2, this.handleMythosTransfer(options));
             case 7:
               isExternalAsset = assetInfo.location && assetInfo.location.parents === sdkCommon.Parents.TWO;
-              if (!isExternalAsset) {
+              requiresTypeThen = AH_REQUIRES_FEE_ASSET_LOCS.some(function (loc) {
+                return sdkCommon.deepEqual(loc, assetInfo.location);
+              });
+              if (!(isExternalAsset || requiresTypeThen)) {
                 _context3.n = 9;
                 break;
               }
@@ -8433,24 +8446,6 @@ var HeimaPaseo = /*#__PURE__*/function (_Heima) {
   return _createClass(HeimaPaseo);
 }(Heima);
 
-var createCustomXcmAh = function createCustomXcmAh(_ref, version) {
-  var api = _ref.api,
-    address = _ref.address;
-  return _defineProperty({}, version, [{
-    DepositAsset: {
-      assets: {
-        Wild: {
-          AllCounted: 2
-        }
-      },
-      beneficiary: createBeneficiaryLocation({
-        api: api,
-        address: address,
-        version: version
-      })
-    }
-  }]);
-};
 var Hydration = /*#__PURE__*/function (_Parachain) {
   function Hydration() {
     var chain = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'Hydration';
@@ -8462,35 +8457,10 @@ var Hydration = /*#__PURE__*/function (_Parachain) {
   }
   _inherits(Hydration, _Parachain);
   return _createClass(Hydration, [{
-    key: "transferToAssetHub",
-    value: function transferToAssetHub(input) {
-      var api = input.api,
-        asset = input.assetInfo,
-        version = input.version,
-        destination = input.destination;
-      var call = {
-        module: 'PolkadotXcm',
-        method: 'transfer_assets_using_type_and_then',
-        parameters: {
-          dest: createVersionedDestination(version, this.chain, destination, getParaId('AssetHubPolkadot')),
-          assets: _defineProperty({}, version, [createAsset(version, asset.amount, DOT_LOCATION)]),
-          assets_transfer_type: 'DestinationReserve',
-          remote_fees_id: _defineProperty({}, version, {
-            parents: sdkCommon.Parents.ONE,
-            interior: 'Here'
-          }),
-          fees_transfer_type: 'DestinationReserve',
-          custom_xcm_on_dest: createCustomXcmAh(input, version),
-          weight_limit: 'Unlimited'
-        }
-      };
-      return api.callTxMethod(call);
-    }
-  }, {
     key: "transferPolkadotXCM",
     value: function () {
       var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(input) {
-        var api, destination, feeAsset, asset, overriddenAsset, isNativeAsset, isNativeFeeAsset, _t;
+        var api, destination, feeAsset, asset, overriddenAsset, isNativeAsset, isNativeFeeAsset, _t, _t2;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -8523,7 +8493,11 @@ var Hydration = /*#__PURE__*/function (_Parachain) {
             case 3:
               return _context.a(2, _t.callTxMethod.call(_t, _context.v));
             case 4:
-              return _context.a(2, this.transferToAssetHub(input));
+              _t2 = api;
+              _context.n = 5;
+              return createTypeAndThenCall(this.chain, input);
+            case 5:
+              return _context.a(2, _t2.callTxMethod.call(_t2, _context.v));
           }
         }, _callee, this);
       }));
@@ -8571,7 +8545,10 @@ var Hydration = /*#__PURE__*/function (_Parachain) {
         assetInfo = options.assetInfo,
         feeAsset = options.feeAsset;
       var baseCanUseXTokens = _superPropGet(Hydration, "canUseXTokens", this, 3)([options]);
-      return destination !== 'Ethereum' && !(destination === 'AssetHubPolkadot' && assetInfo.symbol === 'DOT') && baseCanUseXTokens && !feeAsset;
+      var requiresTypeThen = AH_REQUIRES_FEE_ASSET_LOCS.some(function (loc) {
+        return sdkCommon.deepEqual(loc, assetInfo.location);
+      });
+      return destination !== 'Ethereum' && !(destination === 'AssetHubPolkadot' && assetInfo.symbol === 'DOT') && baseCanUseXTokens && !feeAsset && !requiresTypeThen;
     }
   }, {
     key: "transferLocalNativeAsset",
@@ -9989,6 +9966,18 @@ var RELAY_LOCATION = {
     Here: null
   }
 };
+var AH_REQUIRES_FEE_ASSET_LOCS = [{
+  parents: sdkCommon.Parents.ONE,
+  interior: {
+    X3: [{
+      Parachain: 1000
+    }, {
+      PalletInstance: 50
+    }, {
+      GeneralIndex: 50000075
+    }]
+  }
+}];
 var ASSET_HUB_EXECUTION_FEE = 2200000000n; // 0.22 DOT
 var TX_CLIENT_TIMEOUT_MS = 20 * 60 * 1000; // 20 minutes
 var DRY_RUN_CLIENT_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
@@ -10048,7 +10037,7 @@ var claimAssets = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           api = options.api, chain = options.chain, address = options.address;
-          validateAddress(address, chain);
+          validateAddress(api, address, chain, true);
           _context.n = 1;
           return api.init(chain, TX_CLIENT_TIMEOUT_MS);
         case 1:
@@ -10089,7 +10078,7 @@ var dryRun = /*#__PURE__*/function () {
       while (1) switch (_context.p = _context.n) {
         case 0:
           api = options.api, senderAddress = options.senderAddress, origin = options.origin;
-          validateAddress(senderAddress, origin, false);
+          validateAddress(api, senderAddress, origin, false);
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -10121,7 +10110,7 @@ var dryRunOrigin = /*#__PURE__*/function () {
       while (1) switch (_context.p = _context.n) {
         case 0:
           api = options.api, chain = options.chain, address = options.address;
-          validateAddress(address, chain, false);
+          validateAddress(api, address, chain, false);
           _context.n = 1;
           return api.init(chain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -11683,8 +11672,8 @@ var send = /*#__PURE__*/function () {
           api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method, isAmountAll = options.isAmountAll;
           validateCurrency(currency, feeAsset);
           validateDestination(origin, destination);
-          validateDestinationAddress(address, destination);
-          if (senderAddress) validateAddress(senderAddress, origin, false);
+          validateDestinationAddress(address, destination, api);
+          if (senderAddress) validateAddress(api, senderAddress, origin, false);
           isBridge = !sdkCommon.isTLocation(destination) && sdkCommon.isSubstrateBridge(origin, destination);
           assetCheckEnabled = shouldPerformAssetCheck(origin, currency);
           validateAssetSpecifiers(assetCheckEnabled, currency);
@@ -12258,7 +12247,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
           api = _ref.api, origin = _ref.origin, senderAddress = _ref.senderAddress, address = _ref.address, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, feeAsset = _ref.feeAsset, buildTx = _ref.buildTx, builder = _ref.builder;
-          validateAddress(senderAddress, chain, false);
+          validateAddress(api, senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = assets.findAssetInfoOrThrow(chain, currency, null);
           destAsset = assets.findAssetOnDestOrThrow(origin, destination, currency);
@@ -12427,7 +12416,7 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, buildTx = _ref.buildTx, feeAsset = _ref.feeAsset;
-          validateAddress(senderAddress, chain, false);
+          validateAddress(api, senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = assets.findAssetInfoOrThrow(chain, currency, null);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
@@ -12737,11 +12726,12 @@ var createRefundInstruction = function createRefundInstruction(api, senderAddres
 
 var buildAssets = function buildAssets(chain, asset, feeAmount, isDotAsset, version) {
   var assets = [];
+  var shouldLocalizeAndSort = sdkCommon.isRelayChain(chain) || chain.startsWith('AssetHub');
   if (!isDotAsset) {
     assets.push(createAsset(version, feeAmount, RELAY_LOCATION));
   }
-  assets.push(createAsset(version, asset.amount, sdkCommon.isRelayChain(chain) ? localizeLocation(chain, asset.location) : asset.location));
-  return assets;
+  assets.push(createAsset(version, asset.amount, shouldLocalizeAndSort ? localizeLocation(chain, asset.location) : asset.location));
+  return shouldLocalizeAndSort ? sortAssets(assets) : assets;
 };
 var DEFAULT_SYSTEM_ASSET_AMOUNT = '1';
 var resolveSystemAssetAmount = function resolveSystemAssetAmount(_ref, isForFeeCalc, fees) {
@@ -12928,7 +12918,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           }
           return _context.a(2, true);
         case 1:
-          validateAddress(address, destination);
+          validateAddress(api, address, destination, true);
           if (!(origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama')) {
             _context.n = 2;
             break;

package/dist/index.d.ts

@@ -1538,6 +1538,7 @@ interface IPolkadotApi<TApi, TRes> {
      * Convert a location to a chain account address using the runtime LocationToAccount API, if available.
      */
     convertLocationToAccount(location: TLocation): Promise<string | undefined>;
+    validateSubstrateAddress(address: string): boolean;
 }
 
 declare const blake2b256: (msg: Uint8Array) => Uint8Array<ArrayBufferLike>;
@@ -1851,7 +1852,6 @@ declare class HeimaPaseo<TApi, TRes> extends Heima<TApi, TRes> {
 declare class Hydration<TApi, TRes> extends Parachain<TApi, TRes> implements IXTokensTransfer, IPolkadotXCMTransfer {
     private static NATIVE_ASSET_ID;
     constructor(chain?: TParachain, info?: string, ecosystem?: TRelaychain, version?: Version);
-    transferToAssetHub<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): TRes;
     transferPolkadotXCM<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     transferMoonbeamWhAsset<TApi, TRes>(input: TXTokensTransferOptions<TApi, TRes>): TRes;
     transferXTokens<TApi, TRes>(input: TXTokensTransferOptions<TApi, TRes>): TRes;
@@ -2377,7 +2377,7 @@ declare const handleToAhTeleport: <TApi, TRes>(origin: TParachain, input: TPolka
 declare const parseUnits: typeof parseUnits$1;
 declare const formatUnits: typeof formatUnits$1;
 
-declare const validateAddress: (address: TAddress, chain: TChain, isDestination?: boolean) => void;
+declare const validateAddress: <TApi, TRes>(api: IPolkadotApi<TApi, TRes>, address: TAddress, chain: TChain, isDestination?: boolean) => void;
 
 export { AmountTooLowError, AssetClaimBuilder, AssetsPallet, BatchMode, BridgeHaltedError, Builder, ChainNotSupportedError, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleChainsError, InvalidAddressError, InvalidParameterError, MissingChainApiError, NoXCMSupportImplementedError, PolkadotXcmError, PolkadotXcmExecutionError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, applyDecimalAbstraction, assertAddressIsString, assertHasId, assertHasLocation, assertIsForeign, assertSenderAddress, assertToIsString, blake2b256, blake2b512, calcPreviewMintAmount, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, computeOverridenAmount, constructTypeAndThenCall, convertSs58, createAsset, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createTx, createTypeAndThenCall, createTypeThenAutoReserve, createVersionedAssets, createX1Payload, deriveAccountId, dryRun, dryRunInternal, dryRunOrigin, encodeSs58, formatUnits, getAssetBalance, getAssetBalanceInternal, getAssetReserveChain, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChain, getChainConfig, getChainLocation, getChainProviders, getChainVersion, getCurrencySelection, getFailureInfo, getMinTransferableAmount, getMinTransferableAmountInternal, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getRelayChainOf, getTChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, getXcmFeeInternal, getXcmFeeOnce, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, localizeLocation, maybeOverrideAsset, maybeOverrideAssets, normalizeAmount, overrideTxAmount, padFee, padValueBy, parseUnits, resolveDestChain, resolveModuleError, resolveParaId, reverseTransformLocation, send, sortAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, validateAssetSpecifiers, validateCurrency, validateDestination, verifyEdOnDestination, wrapTxBypass };
 export type { BuildHopInfoOptions, HopProcessParams, HopTraversalConfig, HopTraversalResult, IPolkadotApi, IPolkadotXCMTransfer, IXTokensTransfer, IXTransferTransfer, OneKey, TAddress, TApiOrUrl, TAssetClaimInternalOptions, TAssetClaimOptions, TAssetClaimOptionsBase, TBatchOptions, TBatchedSendOptions, TBifrostToken, TBridgeStatus, TBuildDestInfoOptions, TBuildInternalRes, TBuilderConfig, TBuilderOptions, TBypassOptions, TChainConfig, TChainConfigMap, TChainWithApi, TConditionalXcmFeeDetail, TConditionalXcmFeeHopInfo, TCreateBaseSwapXcmOptions, TCreateBaseTransferXcmOptions, TCreateBeneficiaryOptions, TCreateBeneficiaryXTokensOptions, TCreateSwapXcmInternalOptions, TCreateSwapXcmOptions, TCreateTransferXcmOptions, TCreateTxsOptions, TDestWeight, TDestXcmFeeDetail, TDestination, TDryRunBaseOptions, TDryRunBypassOptions, TDryRunCallBaseOptions, TDryRunCallOptions, TDryRunChain, TDryRunChainFailure, TDryRunChainResult, TDryRunChainSuccess, TDryRunError, TDryRunOptions, TDryRunPreviewOptions, TDryRunResBase, TDryRunResult, TDryRunXcmBaseOptions, TDryRunXcmOptions, TEvmBuilderOptions, TEvmBuilderOptionsBase, TEvmChainFrom, TFeeType, TForeignAssetId, TForeignOrNativeAsset, TForeignOrTokenAsset, TGetAssetBalanceOptions, TGetAssetBalanceOptionsBase, TGetBalanceForeignByAssetOptions, TGetBalanceForeignOptions, TGetBalanceForeignOptionsBase, TGetBalanceNativeOptions, TGetBalanceNativeOptionsBase, TGetFeeForDestChainBaseOptions, TGetFeeForDestChainOptions, TGetMinTransferableAmountOptions, TGetOriginFeeDetailsOptions, TGetOriginFeeDetailsOptionsBase, TGetOriginXcmFeeBaseOptions, TGetOriginXcmFeeEstimateOptions, TGetOriginXcmFeeInternalOptions, TGetOriginXcmFeeOptions, TGetReverseTxFeeOptions, TGetTransferInfoOptions, TGetTransferInfoOptionsBase, TGetTransferableAmountOptions, TGetTransferableAmountOptionsBase, TGetXcmFeeBaseOptions, TGetXcmFeeBuilderOptions, TGetXcmFeeEstimateDetail, TGetXcmFeeEstimateOptions, TGetXcmFeeEstimateResult, TGetXcmFeeInternalOptions, TGetXcmFeeOptions, TGetXcmFeeResult, THopInfo, THopTransferInfo, THubKey, TMantaAsset, TModuleError, TNativeTokenAsset, TNodleAsset, TOriginFeeDetails, TOtherReserveAsset, TPolkadotXCMTransferOptions, TPolkadotXcmMethod, TProviderEntry, TRelayToParaDestination, TRelayToParaOptions, TRelayToParaOverrides, TReserveAsset, TResolveHopParams, TScenario, TSelfReserveAsset, TSendBaseOptions, TSendBaseOptionsWithSenderAddress, TSendInternalOptions, TSendOptions, TSerializeEthTransferOptions, TSerializedApiCall, TSerializedEthTransfer, TSwapConfig, TSwapFeeEstimates, TTransferFeeEstimates, TTransferInfo, TTransferLocalOptions, TTxFactory, TTypeAndThenCallContext, TTypeAndThenFees, TUrl, TVerifyEdOnDestinationOptions, TVerifyEdOnDestinationOptionsBase, TWeight, TXTokensCurrencySelection, TXTokensMethod, TXTokensTransferOptions, TXTransferMethod, TXTransferTransferOptions, TXcmAsset, TXcmFeeBase, TXcmFeeChain, TXcmFeeDetail, TXcmFeeDetailError, TXcmFeeDetailSuccess, TXcmFeeDetailWithFallback, TXcmFeeHopInfo, TXcmFeeHopResult, TXcmFeeSwapConfig, TXcmForeignAsset, TXcmPalletMethod, TXcmVersioned, TZeitgeistAsset, WithApi, WithRequiredSenderAddress };

package/dist/index.mjs

@@ -4648,11 +4648,12 @@ var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency)
   return !(isMultipleAssets || hasOverriddenLocation);
 };
 
-var validateAddress = function validateAddress(address, chain) {
-  var isDestination = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+var validateAddress = function validateAddress(api, address, chain) {
+  var isDestination = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   if (isTLocation(address)) return;
   var isEvm = isChainEvm(chain);
   var isEthereumAddress = isAddress(address);
+  var isPublicKeyFormat = typeof address === 'string' && address.startsWith('0x') && !isEthereumAddress;
   if (isEvm) {
     if (!isEthereumAddress) {
       throw new InvalidAddressError("".concat(isDestination ? 'Destination chain' : 'Chain', " is an EVM chain, but the address provided is not a valid Ethereum address."));
@@ -4661,12 +4662,21 @@ var validateAddress = function validateAddress(address, chain) {
     if (isEthereumAddress) {
       throw new InvalidAddressError("EVM address provided but ".concat(isDestination ? 'destination ' : '', "chain is not an EVM chain."));
     }
+    if (isPublicKeyFormat) {
+      return;
+    }
+    if (typeof address === 'string') {
+      var isValid = api.validateSubstrateAddress(address);
+      if (!isValid) {
+        throw new InvalidAddressError("Invalid address: ".concat(address));
+      }
+    }
   }
 };
 
-var validateDestinationAddress = function validateDestinationAddress(address, destination) {
+var validateDestinationAddress = function validateDestinationAddress(address, destination, api) {
   if (typeof address === 'string' && !isTLocation(destination)) {
-    validateAddress(address, destination);
+    validateAddress(api, address, destination, true);
   }
 };
 
@@ -7509,7 +7519,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function () {
       var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-        var api, scenario, assetInfo, destination, feeAssetInfo, overriddenAsset, call, isNativeAsset, isNativeFeeAsset, isExternalAsset, _call, method, modifiedInput, _t, _t2;
+        var api, scenario, assetInfo, destination, feeAssetInfo, overriddenAsset, call, isNativeAsset, isNativeFeeAsset, isExternalAsset, requiresTypeThen, _call, method, modifiedInput, _t, _t2;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
@@ -7559,7 +7569,10 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
               return _context3.a(2, this.handleMythosTransfer(options));
             case 7:
               isExternalAsset = assetInfo.location && assetInfo.location.parents === Parents.TWO;
-              if (!isExternalAsset) {
+              requiresTypeThen = AH_REQUIRES_FEE_ASSET_LOCS.some(function (loc) {
+                return deepEqual(loc, assetInfo.location);
+              });
+              if (!(isExternalAsset || requiresTypeThen)) {
                 _context3.n = 9;
                 break;
               }
@@ -8434,24 +8447,6 @@ var HeimaPaseo = /*#__PURE__*/function (_Heima) {
   return _createClass(HeimaPaseo);
 }(Heima);
 
-var createCustomXcmAh = function createCustomXcmAh(_ref, version) {
-  var api = _ref.api,
-    address = _ref.address;
-  return _defineProperty({}, version, [{
-    DepositAsset: {
-      assets: {
-        Wild: {
-          AllCounted: 2
-        }
-      },
-      beneficiary: createBeneficiaryLocation({
-        api: api,
-        address: address,
-        version: version
-      })
-    }
-  }]);
-};
 var Hydration = /*#__PURE__*/function (_Parachain) {
   function Hydration() {
     var chain = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'Hydration';
@@ -8463,35 +8458,10 @@ var Hydration = /*#__PURE__*/function (_Parachain) {
   }
   _inherits(Hydration, _Parachain);
   return _createClass(Hydration, [{
-    key: "transferToAssetHub",
-    value: function transferToAssetHub(input) {
-      var api = input.api,
-        asset = input.assetInfo,
-        version = input.version,
-        destination = input.destination;
-      var call = {
-        module: 'PolkadotXcm',
-        method: 'transfer_assets_using_type_and_then',
-        parameters: {
-          dest: createVersionedDestination(version, this.chain, destination, getParaId('AssetHubPolkadot')),
-          assets: _defineProperty({}, version, [createAsset(version, asset.amount, DOT_LOCATION)]),
-          assets_transfer_type: 'DestinationReserve',
-          remote_fees_id: _defineProperty({}, version, {
-            parents: Parents.ONE,
-            interior: 'Here'
-          }),
-          fees_transfer_type: 'DestinationReserve',
-          custom_xcm_on_dest: createCustomXcmAh(input, version),
-          weight_limit: 'Unlimited'
-        }
-      };
-      return api.callTxMethod(call);
-    }
-  }, {
     key: "transferPolkadotXCM",
     value: function () {
       var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(input) {
-        var api, destination, feeAsset, asset, overriddenAsset, isNativeAsset, isNativeFeeAsset, _t;
+        var api, destination, feeAsset, asset, overriddenAsset, isNativeAsset, isNativeFeeAsset, _t, _t2;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -8524,7 +8494,11 @@ var Hydration = /*#__PURE__*/function (_Parachain) {
             case 3:
               return _context.a(2, _t.callTxMethod.call(_t, _context.v));
             case 4:
-              return _context.a(2, this.transferToAssetHub(input));
+              _t2 = api;
+              _context.n = 5;
+              return createTypeAndThenCall(this.chain, input);
+            case 5:
+              return _context.a(2, _t2.callTxMethod.call(_t2, _context.v));
           }
         }, _callee, this);
       }));
@@ -8572,7 +8546,10 @@ var Hydration = /*#__PURE__*/function (_Parachain) {
         assetInfo = options.assetInfo,
         feeAsset = options.feeAsset;
       var baseCanUseXTokens = _superPropGet(Hydration, "canUseXTokens", this, 3)([options]);
-      return destination !== 'Ethereum' && !(destination === 'AssetHubPolkadot' && assetInfo.symbol === 'DOT') && baseCanUseXTokens && !feeAsset;
+      var requiresTypeThen = AH_REQUIRES_FEE_ASSET_LOCS.some(function (loc) {
+        return deepEqual(loc, assetInfo.location);
+      });
+      return destination !== 'Ethereum' && !(destination === 'AssetHubPolkadot' && assetInfo.symbol === 'DOT') && baseCanUseXTokens && !feeAsset && !requiresTypeThen;
     }
   }, {
     key: "transferLocalNativeAsset",
@@ -9990,6 +9967,18 @@ var RELAY_LOCATION = {
     Here: null
   }
 };
+var AH_REQUIRES_FEE_ASSET_LOCS = [{
+  parents: Parents.ONE,
+  interior: {
+    X3: [{
+      Parachain: 1000
+    }, {
+      PalletInstance: 50
+    }, {
+      GeneralIndex: 50000075
+    }]
+  }
+}];
 var ASSET_HUB_EXECUTION_FEE = 2200000000n; // 0.22 DOT
 var TX_CLIENT_TIMEOUT_MS = 20 * 60 * 1000; // 20 minutes
 var DRY_RUN_CLIENT_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
@@ -10049,7 +10038,7 @@ var claimAssets = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           api = options.api, chain = options.chain, address = options.address;
-          validateAddress(address, chain);
+          validateAddress(api, address, chain, true);
           _context.n = 1;
           return api.init(chain, TX_CLIENT_TIMEOUT_MS);
         case 1:
@@ -10090,7 +10079,7 @@ var dryRun = /*#__PURE__*/function () {
       while (1) switch (_context.p = _context.n) {
         case 0:
           api = options.api, senderAddress = options.senderAddress, origin = options.origin;
-          validateAddress(senderAddress, origin, false);
+          validateAddress(api, senderAddress, origin, false);
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -10122,7 +10111,7 @@ var dryRunOrigin = /*#__PURE__*/function () {
       while (1) switch (_context.p = _context.n) {
         case 0:
           api = options.api, chain = options.chain, address = options.address;
-          validateAddress(address, chain, false);
+          validateAddress(api, address, chain, false);
           _context.n = 1;
           return api.init(chain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -11684,8 +11673,8 @@ var send = /*#__PURE__*/function () {
           api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method, isAmountAll = options.isAmountAll;
           validateCurrency(currency, feeAsset);
           validateDestination(origin, destination);
-          validateDestinationAddress(address, destination);
-          if (senderAddress) validateAddress(senderAddress, origin, false);
+          validateDestinationAddress(address, destination, api);
+          if (senderAddress) validateAddress(api, senderAddress, origin, false);
           isBridge = !isTLocation(destination) && isSubstrateBridge(origin, destination);
           assetCheckEnabled = shouldPerformAssetCheck(origin, currency);
           validateAssetSpecifiers(assetCheckEnabled, currency);
@@ -12259,7 +12248,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
           api = _ref.api, origin = _ref.origin, senderAddress = _ref.senderAddress, address = _ref.address, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, feeAsset = _ref.feeAsset, buildTx = _ref.buildTx, builder = _ref.builder;
-          validateAddress(senderAddress, chain, false);
+          validateAddress(api, senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = findAssetInfoOrThrow(chain, currency, null);
           destAsset = findAssetOnDestOrThrow(origin, destination, currency);
@@ -12428,7 +12417,7 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, buildTx = _ref.buildTx, feeAsset = _ref.feeAsset;
-          validateAddress(senderAddress, chain, false);
+          validateAddress(api, senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = findAssetInfoOrThrow(chain, currency, null);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
@@ -12738,11 +12727,12 @@ var createRefundInstruction = function createRefundInstruction(api, senderAddres
 
 var buildAssets = function buildAssets(chain, asset, feeAmount, isDotAsset, version) {
   var assets = [];
+  var shouldLocalizeAndSort = isRelayChain(chain) || chain.startsWith('AssetHub');
   if (!isDotAsset) {
     assets.push(createAsset(version, feeAmount, RELAY_LOCATION));
   }
-  assets.push(createAsset(version, asset.amount, isRelayChain(chain) ? localizeLocation(chain, asset.location) : asset.location));
-  return assets;
+  assets.push(createAsset(version, asset.amount, shouldLocalizeAndSort ? localizeLocation(chain, asset.location) : asset.location));
+  return shouldLocalizeAndSort ? sortAssets(assets) : assets;
 };
 var DEFAULT_SYSTEM_ASSET_AMOUNT = '1';
 var resolveSystemAssetAmount = function resolveSystemAssetAmount(_ref, isForFeeCalc, fees) {
@@ -12929,7 +12919,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           }
           return _context.a(2, true);
         case 1:
-          validateAddress(address, destination);
+          validateAddress(api, address, destination, true);
           if (!(origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama')) {
             _context.n = 2;
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "11.14.3",
+  "version": "11.14.4",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "@noble/hashes": "^1.8.0",
     "@scure/base": "^2.0.0",
     "viem": "^2.38.5",
-    "@paraspell/assets": "11.14.3",
-    "@paraspell/sdk-common": "11.14.3",
-    "@paraspell/pallets": "11.14.3"
+    "@paraspell/assets": "11.14.4",
+    "@paraspell/sdk-common": "11.14.4",
+    "@paraspell/pallets": "11.14.4"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",