@paraspell/sdk-core 11.2.3 → 11.2.4

package/dist/index.cjs

@@ -5604,21 +5604,17 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           initialDestParaId = _yield$getOriginXcmFe.destParaId;
           originWeight = _yield$getOriginXcmFe.weight;
           sufficientOriginFee = _yield$getOriginXcmFe.sufficient;
-          api.setDisconnectAllowed(true);
-          _context2.n = 2;
-          return api.disconnect();
-        case 2:
           if (!(originDryRunError || originFeeType === 'paymentInfo')) {
-            _context2.n = 8;
+            _context2.n = 7;
             break;
           }
           destApi = api.clone();
-          _context2.p = 3;
-          _context2.n = 4;
+          _context2.p = 2;
+          _context2.n = 3;
           return destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 4:
+        case 3:
           destApi.setDisconnectAllowed(false);
-          _context2.n = 5;
+          _context2.n = 4;
           return getDestXcmFee({
             api: destApi,
             forwardedXcms: undefined,
@@ -5635,7 +5631,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
-        case 5:
+        case 4:
           destFeeRes = _context2.v;
           _result = {
             origin: _objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
@@ -5669,14 +5665,14 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             failureChain: _failureChain,
             failureReason: _failureReason
           }));
-        case 6:
-          _context2.p = 6;
+        case 5:
+          _context2.p = 5;
           destApi.setDisconnectAllowed(true);
-          _context2.n = 7;
+          _context2.n = 6;
           return destApi.disconnect();
+        case 6:
+          return _context2.f(5);
         case 7:
-          return _context2.f(6);
-        case 8:
           processHop = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
               var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopResult, hopCurrency;
@@ -5724,7 +5720,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               return _ref3.apply(this, arguments);
             };
           }();
-          _context2.n = 9;
+          _context2.n = 8;
           return traverseXcmHops({
             api: api,
             origin: origin,
@@ -5744,14 +5740,14 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               };
             }
           });
-        case 9:
+        case 8:
           traversalResult = _context2.v;
           // Handle case where we failed before reaching destination
           destFee = 0n;
           destFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
           destSufficient = undefined;
           if (!traversalResult.destination) {
-            _context2.n = 10;
+            _context2.n = 9;
             break;
           }
           destResult = traversalResult.destination;
@@ -5760,23 +5756,23 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           destDryRunError = destResult.dryRunError;
           destSufficient = destResult.sufficient;
           destCurrency = destResult.currency;
-          _context2.n = 14;
+          _context2.n = 13;
           break;
-        case 10:
+        case 9:
           if (!(traversalResult.hops.length > 0 && traversalResult.hops[traversalResult.hops.length - 1].result.dryRunError)) {
-            _context2.n = 13;
+            _context2.n = 12;
             break;
           }
           // We failed before reaching destination, use fallback
           _destApi = api.clone();
           if (!(destination !== 'Ethereum')) {
-            _context2.n = 11;
+            _context2.n = 10;
             break;
           }
-          _context2.n = 11;
+          _context2.n = 10;
           return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 11:
-          _context2.n = 12;
+        case 10:
+          _context2.n = 11;
           return getDestXcmFee({
             api: _destApi,
             forwardedXcms: undefined,
@@ -5792,25 +5788,25 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
-        case 12:
+        case 11:
           destFallback = _context2.v;
           destFee = destFallback.fee;
           destFeeType = destFallback.feeType;
           destSufficient = destFallback.sufficient;
           destCurrency = assets.getNativeAssetSymbol(destination);
-          _context2.n = 14;
+          _context2.n = 13;
           break;
-        case 13:
+        case 12:
           destFee = 0n;
           destFeeType = 'noFeeRequired';
           destSufficient = true;
           destCurrency = assets.getNativeAssetSymbol(destination);
-        case 14:
+        case 13:
           // Process Ethereum bridge fees
           assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
-          _context2.n = 15;
+          _context2.n = 14;
           return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
-        case 15:
+        case 14:
           processedBridgeHub = _context2.v;
           // Update bridge hub fee in hops if needed
           if (processedBridgeHub && traversalResult.bridgeHub && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
@@ -5884,7 +5880,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             failureReason: failureReason
           }));
       }
-    }, _callee2, null, [[3,, 6, 8]]);
+    }, _callee2, null, [[2,, 5, 7]]);
   }));
   return function getXcmFeeInternal(_x, _x2) {
     return _ref2.apply(this, arguments);
@@ -5894,7 +5890,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
 var getXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _real$assetHub, _real$bridgeHub;
-    var forced, real;
+    var forced, real, api;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5906,6 +5902,10 @@ var getXcmFee = /*#__PURE__*/function () {
           return getXcmFeeInternal(options, false);
         case 2:
           real = _context.v;
+          api = options.api;
+          _context.n = 3;
+          return api.disconnect();
+        case 3:
           return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, forced), {}, {
             origin: _objectSpread2(_objectSpread2({}, forced.origin), {}, {
               sufficient: real.origin.sufficient
@@ -8308,20 +8308,21 @@ var Parachain = /*#__PURE__*/function () {
     key: "canUseXTokens",
     value: function canUseXTokens(options) {
       var asset = options.assetInfo;
-      var isEthAsset = asset.location && assets.findAssetInfoByLoc(assets.getOtherAssets('Ethereum'), asset.location);
-      return !isEthAsset && !this.shouldUseNativeAssetTeleport(options);
+      var isExternalAsset = asset.location && asset.location.parents === sdkCommon.Parents.TWO;
+      return !isExternalAsset && !this.shouldUseNativeAssetTeleport(options);
     }
   }, {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(sendOptions) {
-        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, scenario, paraId, isLocalTransfer, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, options, shouldUseTeleport, isAHPOrigin, isAHPDest, isEthAsset, isEthDest, isEthAssetViaAh, isEthAssetToAh, call;
+        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, scenario, paraId, destChain, isLocalTransfer, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, options, shouldUseTeleport, isAhToOtherPara, isOtherParaToAh, isAHPOrigin, isAHPDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, call;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
               api = sendOptions.api, asset = sendOptions.assetInfo, currency = sendOptions.currency, feeAsset = sendOptions.feeAsset, feeCurrency = sendOptions.feeCurrency, address = sendOptions.address, destination = sendOptions.to, paraIdTo = sendOptions.paraIdTo, overriddenAsset = sendOptions.overriddenAsset, version = sendOptions.version, senderAddress = sendOptions.senderAddress, ahAddress = sendOptions.ahAddress, pallet = sendOptions.pallet, method = sendOptions.method;
               scenario = resolveScenario(this.chain, destination);
               paraId = resolveParaId(paraIdTo, destination);
+              destChain = paraId ? getTChain(paraId, getRelayChainOf(this.chain)) : undefined;
               if (!(destination === 'Polimec' && this.chain !== 'AssetHubPolkadot' && this.chain !== 'Hydration' && this.chain !== destination)) {
                 _context.n = 1;
                 break;
@@ -8401,6 +8402,7 @@ var Parachain = /*#__PURE__*/function () {
                 feeCurrency: feeCurrency,
                 scenario: scenario,
                 destination: destination,
+                destChain: destChain,
                 paraIdTo: paraId,
                 version: version,
                 senderAddress: senderAddress,
@@ -8409,7 +8411,9 @@ var Parachain = /*#__PURE__*/function () {
                 method: method
               };
               shouldUseTeleport = this.shouldUseNativeAssetTeleport(sendOptions);
-              if (!((this.chain.includes('AssetHub') && destination !== 'Mythos' && typeof destination === 'string' && !sdkCommon.isSystemChain(destination) || !sdkCommon.isSystemChain(this.chain) && this.chain !== 'Mythos' && typeof destination === 'string' && destination.includes('AssetHub')) && shouldUseTeleport)) {
+              isAhToOtherPara = this.chain.startsWith('AssetHub') && destChain && destChain !== 'Mythos' && !sdkCommon.isSystemChain(destChain);
+              isOtherParaToAh = (destChain === null || destChain === void 0 ? void 0 : destChain.startsWith('AssetHub')) && this.chain !== 'Mythos' && !sdkCommon.isSystemChain(this.chain);
+              if (!((isAhToOtherPara || isOtherParaToAh) && shouldUseTeleport)) {
                 _context.n = 6;
                 break;
               }
@@ -8417,11 +8421,11 @@ var Parachain = /*#__PURE__*/function () {
             case 6:
               isAHPOrigin = this.chain.includes('AssetHub');
               isAHPDest = !sdkCommon.isTLocation(destination) && destination.includes('AssetHub'); // Handle common cases
-              isEthAsset = asset.location && assets.findAssetInfoByLoc(assets.getOtherAssets('Ethereum'), asset.location);
-              isEthDest = destination === 'Ethereum'; // Eth asset - Any origin to any dest via AH - DestinationReserve - multiple instructions
-              isEthAssetViaAh = isEthAsset && !isAHPOrigin && !isAHPDest && !isEthDest && !feeAsset; // Eth asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
-              isEthAssetToAh = isEthAsset && isAHPDest && !isAHPOrigin && !isEthDest && !feeAsset;
-              if (!(isEthAssetViaAh || isEthAssetToAh)) {
+              isExternalAsset = asset.location && asset.location.parents === sdkCommon.Parents.TWO;
+              isEthDest = destination === 'Ethereum'; // External asset - Any origin to any dest via AH - DestinationReserve - multiple instructions
+              isExternalAssetViaAh = isExternalAsset && !isAHPOrigin && !isAHPDest && !isEthDest && !feeAsset; // External asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
+              isExternalAssetToAh = isExternalAsset && isAHPDest && !isAHPOrigin && !isEthDest && !feeAsset;
+              if (!(isExternalAssetViaAh || isExternalAssetToAh)) {
                 _context.n = 8;
                 break;
               }
@@ -8486,9 +8490,11 @@ var Parachain = /*#__PURE__*/function () {
     }
   }, {
     key: "createCurrencySpec",
-    value: function createCurrencySpec(amount, scenario, version, _asset, _isOverridenAsset) {
+    value: function createCurrencySpec(amount, scenario, version, asset, _isOverridenAsset) {
+      var isRelayAsset = sdkCommon.deepEqual(asset === null || asset === void 0 ? void 0 : asset.location, RELAY_LOCATION);
+      var parents = scenario === 'ParaToRelay' || isRelayAsset && sdkCommon.isSystemChain(this.chain) ? sdkCommon.Parents.ONE : sdkCommon.Parents.ZERO;
       return createAsset(version, amount, {
-        parents: scenario === 'ParaToRelay' ? sdkCommon.Parents.ONE : sdkCommon.Parents.ZERO,
+        parents: parents,
         interior: 'Here'
       });
     }
@@ -9181,7 +9187,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, isEthereumAsset, _call, CHAINS_SUPPORT_DOT_TRANSFER, isTrusted, isDotReserveAh, method, modifiedInput, _t, _t2;
+        var api, scenario, assetInfo, destination, feeAssetInfo, overriddenAsset, call, isNativeAsset, isNativeFeeAsset, isExternalAsset, _call, CHAINS_SUPPORT_DOT_TRANSFER, isTrusted, isDotReserveAh, method, modifiedInput, _t, _t2;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
@@ -9236,8 +9242,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
               }
               return _context3.a(2, this.handleMythosTransfer(options));
             case 8:
-              isEthereumAsset = assetInfo.location && assets.findAssetInfoByLoc(assets.getOtherAssets('Ethereum'), assetInfo.location);
-              if (!isEthereumAsset) {
+              isExternalAsset = assetInfo.location && assetInfo.location.parents === sdkCommon.Parents.TWO;
+              if (!isExternalAsset) {
                 _context3.n = 10;
                 break;
               }
@@ -9625,19 +9631,11 @@ var BridgeHubPolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario,
-        destination = input.destination;
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
-      if (scenario === 'ParaToPara' && destination !== 'AssetHubPolkadot' && destination !== 'AssetHubKusama' && destination !== 'AssetHubPaseo' && destination !== 'AssetHubWestend') {
-        throw new ScenarioNotSupportedError(this.chain, scenario, 'Unable to use bridge hub for transfers to other Parachains.');
+        destChain = input.destChain;
+      if (scenario === 'ParaToPara' && !(destChain !== null && destChain !== void 0 && destChain.startsWith('AssetHub'))) {
+        throw new ScenarioNotSupportedError(this.chain, scenario, "Unable to use ".concat(this.chain, " for transfers to other Parachains."));
       }
-      var method = 'limited_teleport_assets';
-      return transferPolkadotXcm(input, method, 'Unlimited');
+      return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -9726,16 +9724,9 @@ var Collectives = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario,
-        destination = input.destination;
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
-      if (scenario === 'ParaToPara' && destination !== 'AssetHubPolkadot' && destination !== 'AssetHubKusama' && destination !== 'AssetHubPaseo' && destination !== 'AssetHubWestend') {
-        throw new ScenarioNotSupportedError(this.chain, scenario);
+        destChain = input.destChain;
+      if (scenario === 'ParaToPara' && !(destChain !== null && destChain !== void 0 && destChain.startsWith('AssetHub'))) {
+        throw new ScenarioNotSupportedError(this.chain, scenario, "Unable to use ".concat(this.chain, " for transfers to other Parachains."));
       }
       return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
@@ -9814,13 +9805,6 @@ var CoretimePolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario;
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
       if (scenario === 'ParaToPara') {
         throw new ScenarioNotSupportedError(this.chain, scenario);
       }
@@ -11233,17 +11217,10 @@ var PeoplePolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario,
-        destination = input.destination;
-      if (scenario === 'ParaToPara' && destination !== 'AssetHubPolkadot' && destination !== 'AssetHubKusama' && destination !== 'AssetHubPaseo' && destination !== 'AssetHubWestend') {
-        throw new ScenarioNotSupportedError(this.chain, scenario);
+        destChain = input.destChain;
+      if (scenario === 'ParaToPara' && !(destChain !== null && destChain !== void 0 && destChain.startsWith('AssetHub'))) {
+        throw new ScenarioNotSupportedError(this.chain, scenario, "Unable to use ".concat(this.chain, " for transfers to other Parachains."));
       }
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
       return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
   }, {

package/dist/index.d.ts

@@ -26,6 +26,7 @@ type TPolkadotXCMTransferOptions<TApi, TRes> = {
     feeAssetInfo?: TAssetInfo;
     feeCurrency?: TCurrencyInput;
     destination: TDestination;
+    destChain?: TChain;
     paraIdTo?: number;
     version: Version;
     senderAddress?: string;
@@ -1428,7 +1429,7 @@ declare abstract class Parachain<TApi, TRes> {
     shouldUseNativeAssetTeleport({ assetInfo: asset, to }: TSendInternalOptions<TApi, TRes>): boolean;
     getRelayToParaOverrides(): TRelayToParaOverrides;
     transferRelayToPara(options: TRelayToParaOptions<TApi, TRes>): TSerializedApiCall;
-    createCurrencySpec(amount: bigint, scenario: TScenario, version: Version, _asset?: TAssetInfo, _isOverridenAsset?: boolean): TAsset;
+    createCurrencySpec(amount: bigint, scenario: TScenario, version: Version, asset?: TAssetInfo, _isOverridenAsset?: boolean): TAsset;
     getNativeAssetSymbol(): string;
     transferLocal(options: TSendInternalOptions<TApi, TRes>): TRes;
     transferLocalNativeAsset(options: TTransferLocalOptions<TApi, TRes>): TRes;

package/dist/index.mjs

@@ -5605,21 +5605,17 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           initialDestParaId = _yield$getOriginXcmFe.destParaId;
           originWeight = _yield$getOriginXcmFe.weight;
           sufficientOriginFee = _yield$getOriginXcmFe.sufficient;
-          api.setDisconnectAllowed(true);
-          _context2.n = 2;
-          return api.disconnect();
-        case 2:
           if (!(originDryRunError || originFeeType === 'paymentInfo')) {
-            _context2.n = 8;
+            _context2.n = 7;
             break;
           }
           destApi = api.clone();
-          _context2.p = 3;
-          _context2.n = 4;
+          _context2.p = 2;
+          _context2.n = 3;
           return destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 4:
+        case 3:
           destApi.setDisconnectAllowed(false);
-          _context2.n = 5;
+          _context2.n = 4;
           return getDestXcmFee({
             api: destApi,
             forwardedXcms: undefined,
@@ -5636,7 +5632,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
-        case 5:
+        case 4:
           destFeeRes = _context2.v;
           _result = {
             origin: _objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
@@ -5670,14 +5666,14 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             failureChain: _failureChain,
             failureReason: _failureReason
           }));
-        case 6:
-          _context2.p = 6;
+        case 5:
+          _context2.p = 5;
           destApi.setDisconnectAllowed(true);
-          _context2.n = 7;
+          _context2.n = 6;
           return destApi.disconnect();
+        case 6:
+          return _context2.f(5);
         case 7:
-          return _context2.f(6);
-        case 8:
           processHop = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
               var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopResult, hopCurrency;
@@ -5725,7 +5721,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               return _ref3.apply(this, arguments);
             };
           }();
-          _context2.n = 9;
+          _context2.n = 8;
           return traverseXcmHops({
             api: api,
             origin: origin,
@@ -5745,14 +5741,14 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               };
             }
           });
-        case 9:
+        case 8:
           traversalResult = _context2.v;
           // Handle case where we failed before reaching destination
           destFee = 0n;
           destFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
           destSufficient = undefined;
           if (!traversalResult.destination) {
-            _context2.n = 10;
+            _context2.n = 9;
             break;
           }
           destResult = traversalResult.destination;
@@ -5761,23 +5757,23 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           destDryRunError = destResult.dryRunError;
           destSufficient = destResult.sufficient;
           destCurrency = destResult.currency;
-          _context2.n = 14;
+          _context2.n = 13;
           break;
-        case 10:
+        case 9:
           if (!(traversalResult.hops.length > 0 && traversalResult.hops[traversalResult.hops.length - 1].result.dryRunError)) {
-            _context2.n = 13;
+            _context2.n = 12;
             break;
           }
           // We failed before reaching destination, use fallback
           _destApi = api.clone();
           if (!(destination !== 'Ethereum')) {
-            _context2.n = 11;
+            _context2.n = 10;
             break;
           }
-          _context2.n = 11;
+          _context2.n = 10;
           return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 11:
-          _context2.n = 12;
+        case 10:
+          _context2.n = 11;
           return getDestXcmFee({
             api: _destApi,
             forwardedXcms: undefined,
@@ -5793,25 +5789,25 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
-        case 12:
+        case 11:
           destFallback = _context2.v;
           destFee = destFallback.fee;
           destFeeType = destFallback.feeType;
           destSufficient = destFallback.sufficient;
           destCurrency = getNativeAssetSymbol(destination);
-          _context2.n = 14;
+          _context2.n = 13;
           break;
-        case 13:
+        case 12:
           destFee = 0n;
           destFeeType = 'noFeeRequired';
           destSufficient = true;
           destCurrency = getNativeAssetSymbol(destination);
-        case 14:
+        case 13:
           // Process Ethereum bridge fees
           assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
-          _context2.n = 15;
+          _context2.n = 14;
           return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
-        case 15:
+        case 14:
           processedBridgeHub = _context2.v;
           // Update bridge hub fee in hops if needed
           if (processedBridgeHub && traversalResult.bridgeHub && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
@@ -5885,7 +5881,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             failureReason: failureReason
           }));
       }
-    }, _callee2, null, [[3,, 6, 8]]);
+    }, _callee2, null, [[2,, 5, 7]]);
   }));
   return function getXcmFeeInternal(_x, _x2) {
     return _ref2.apply(this, arguments);
@@ -5895,7 +5891,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
 var getXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _real$assetHub, _real$bridgeHub;
-    var forced, real;
+    var forced, real, api;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5907,6 +5903,10 @@ var getXcmFee = /*#__PURE__*/function () {
           return getXcmFeeInternal(options, false);
         case 2:
           real = _context.v;
+          api = options.api;
+          _context.n = 3;
+          return api.disconnect();
+        case 3:
           return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, forced), {}, {
             origin: _objectSpread2(_objectSpread2({}, forced.origin), {}, {
               sufficient: real.origin.sufficient
@@ -8309,20 +8309,21 @@ var Parachain = /*#__PURE__*/function () {
     key: "canUseXTokens",
     value: function canUseXTokens(options) {
       var asset = options.assetInfo;
-      var isEthAsset = asset.location && findAssetInfoByLoc(getOtherAssets('Ethereum'), asset.location);
-      return !isEthAsset && !this.shouldUseNativeAssetTeleport(options);
+      var isExternalAsset = asset.location && asset.location.parents === Parents.TWO;
+      return !isExternalAsset && !this.shouldUseNativeAssetTeleport(options);
     }
   }, {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(sendOptions) {
-        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, scenario, paraId, isLocalTransfer, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, options, shouldUseTeleport, isAHPOrigin, isAHPDest, isEthAsset, isEthDest, isEthAssetViaAh, isEthAssetToAh, call;
+        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, scenario, paraId, destChain, isLocalTransfer, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, options, shouldUseTeleport, isAhToOtherPara, isOtherParaToAh, isAHPOrigin, isAHPDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, call;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
               api = sendOptions.api, asset = sendOptions.assetInfo, currency = sendOptions.currency, feeAsset = sendOptions.feeAsset, feeCurrency = sendOptions.feeCurrency, address = sendOptions.address, destination = sendOptions.to, paraIdTo = sendOptions.paraIdTo, overriddenAsset = sendOptions.overriddenAsset, version = sendOptions.version, senderAddress = sendOptions.senderAddress, ahAddress = sendOptions.ahAddress, pallet = sendOptions.pallet, method = sendOptions.method;
               scenario = resolveScenario(this.chain, destination);
               paraId = resolveParaId(paraIdTo, destination);
+              destChain = paraId ? getTChain(paraId, getRelayChainOf(this.chain)) : undefined;
               if (!(destination === 'Polimec' && this.chain !== 'AssetHubPolkadot' && this.chain !== 'Hydration' && this.chain !== destination)) {
                 _context.n = 1;
                 break;
@@ -8402,6 +8403,7 @@ var Parachain = /*#__PURE__*/function () {
                 feeCurrency: feeCurrency,
                 scenario: scenario,
                 destination: destination,
+                destChain: destChain,
                 paraIdTo: paraId,
                 version: version,
                 senderAddress: senderAddress,
@@ -8410,7 +8412,9 @@ var Parachain = /*#__PURE__*/function () {
                 method: method
               };
               shouldUseTeleport = this.shouldUseNativeAssetTeleport(sendOptions);
-              if (!((this.chain.includes('AssetHub') && destination !== 'Mythos' && typeof destination === 'string' && !isSystemChain(destination) || !isSystemChain(this.chain) && this.chain !== 'Mythos' && typeof destination === 'string' && destination.includes('AssetHub')) && shouldUseTeleport)) {
+              isAhToOtherPara = this.chain.startsWith('AssetHub') && destChain && destChain !== 'Mythos' && !isSystemChain(destChain);
+              isOtherParaToAh = (destChain === null || destChain === void 0 ? void 0 : destChain.startsWith('AssetHub')) && this.chain !== 'Mythos' && !isSystemChain(this.chain);
+              if (!((isAhToOtherPara || isOtherParaToAh) && shouldUseTeleport)) {
                 _context.n = 6;
                 break;
               }
@@ -8418,11 +8422,11 @@ var Parachain = /*#__PURE__*/function () {
             case 6:
               isAHPOrigin = this.chain.includes('AssetHub');
               isAHPDest = !isTLocation(destination) && destination.includes('AssetHub'); // Handle common cases
-              isEthAsset = asset.location && findAssetInfoByLoc(getOtherAssets('Ethereum'), asset.location);
-              isEthDest = destination === 'Ethereum'; // Eth asset - Any origin to any dest via AH - DestinationReserve - multiple instructions
-              isEthAssetViaAh = isEthAsset && !isAHPOrigin && !isAHPDest && !isEthDest && !feeAsset; // Eth asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
-              isEthAssetToAh = isEthAsset && isAHPDest && !isAHPOrigin && !isEthDest && !feeAsset;
-              if (!(isEthAssetViaAh || isEthAssetToAh)) {
+              isExternalAsset = asset.location && asset.location.parents === Parents.TWO;
+              isEthDest = destination === 'Ethereum'; // External asset - Any origin to any dest via AH - DestinationReserve - multiple instructions
+              isExternalAssetViaAh = isExternalAsset && !isAHPOrigin && !isAHPDest && !isEthDest && !feeAsset; // External asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
+              isExternalAssetToAh = isExternalAsset && isAHPDest && !isAHPOrigin && !isEthDest && !feeAsset;
+              if (!(isExternalAssetViaAh || isExternalAssetToAh)) {
                 _context.n = 8;
                 break;
               }
@@ -8487,9 +8491,11 @@ var Parachain = /*#__PURE__*/function () {
     }
   }, {
     key: "createCurrencySpec",
-    value: function createCurrencySpec(amount, scenario, version, _asset, _isOverridenAsset) {
+    value: function createCurrencySpec(amount, scenario, version, asset, _isOverridenAsset) {
+      var isRelayAsset = deepEqual(asset === null || asset === void 0 ? void 0 : asset.location, RELAY_LOCATION);
+      var parents = scenario === 'ParaToRelay' || isRelayAsset && isSystemChain(this.chain) ? Parents.ONE : Parents.ZERO;
       return createAsset(version, amount, {
-        parents: scenario === 'ParaToRelay' ? Parents.ONE : Parents.ZERO,
+        parents: parents,
         interior: 'Here'
       });
     }
@@ -9182,7 +9188,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, isEthereumAsset, _call, CHAINS_SUPPORT_DOT_TRANSFER, isTrusted, isDotReserveAh, method, modifiedInput, _t, _t2;
+        var api, scenario, assetInfo, destination, feeAssetInfo, overriddenAsset, call, isNativeAsset, isNativeFeeAsset, isExternalAsset, _call, CHAINS_SUPPORT_DOT_TRANSFER, isTrusted, isDotReserveAh, method, modifiedInput, _t, _t2;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
@@ -9237,8 +9243,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
               }
               return _context3.a(2, this.handleMythosTransfer(options));
             case 8:
-              isEthereumAsset = assetInfo.location && findAssetInfoByLoc(getOtherAssets('Ethereum'), assetInfo.location);
-              if (!isEthereumAsset) {
+              isExternalAsset = assetInfo.location && assetInfo.location.parents === Parents.TWO;
+              if (!isExternalAsset) {
                 _context3.n = 10;
                 break;
               }
@@ -9626,19 +9632,11 @@ var BridgeHubPolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario,
-        destination = input.destination;
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
-      if (scenario === 'ParaToPara' && destination !== 'AssetHubPolkadot' && destination !== 'AssetHubKusama' && destination !== 'AssetHubPaseo' && destination !== 'AssetHubWestend') {
-        throw new ScenarioNotSupportedError(this.chain, scenario, 'Unable to use bridge hub for transfers to other Parachains.');
+        destChain = input.destChain;
+      if (scenario === 'ParaToPara' && !(destChain !== null && destChain !== void 0 && destChain.startsWith('AssetHub'))) {
+        throw new ScenarioNotSupportedError(this.chain, scenario, "Unable to use ".concat(this.chain, " for transfers to other Parachains."));
       }
-      var method = 'limited_teleport_assets';
-      return transferPolkadotXcm(input, method, 'Unlimited');
+      return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -9727,16 +9725,9 @@ var Collectives = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario,
-        destination = input.destination;
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
-      if (scenario === 'ParaToPara' && destination !== 'AssetHubPolkadot' && destination !== 'AssetHubKusama' && destination !== 'AssetHubPaseo' && destination !== 'AssetHubWestend') {
-        throw new ScenarioNotSupportedError(this.chain, scenario);
+        destChain = input.destChain;
+      if (scenario === 'ParaToPara' && !(destChain !== null && destChain !== void 0 && destChain.startsWith('AssetHub'))) {
+        throw new ScenarioNotSupportedError(this.chain, scenario, "Unable to use ".concat(this.chain, " for transfers to other Parachains."));
       }
       return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
@@ -9815,13 +9806,6 @@ var CoretimePolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario;
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
       if (scenario === 'ParaToPara') {
         throw new ScenarioNotSupportedError(this.chain, scenario);
       }
@@ -11234,17 +11218,10 @@ var PeoplePolkadot = /*#__PURE__*/function (_Parachain) {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario,
-        destination = input.destination;
-      if (scenario === 'ParaToPara' && destination !== 'AssetHubPolkadot' && destination !== 'AssetHubKusama' && destination !== 'AssetHubPaseo' && destination !== 'AssetHubWestend') {
-        throw new ScenarioNotSupportedError(this.chain, scenario);
+        destChain = input.destChain;
+      if (scenario === 'ParaToPara' && !(destChain !== null && destChain !== void 0 && destChain.startsWith('AssetHub'))) {
+        throw new ScenarioNotSupportedError(this.chain, scenario, "Unable to use ".concat(this.chain, " for transfers to other Parachains."));
       }
-      var newOverridenAsset = {
-        parents: 1,
-        interior: {
-          Here: null
-        }
-      };
-      input.overriddenAsset = newOverridenAsset;
       return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "11.2.3",
+  "version": "11.2.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.36.0",
-    "@paraspell/assets": "11.2.3",
-    "@paraspell/sdk-common": "11.2.3",
-    "@paraspell/pallets": "11.2.3"
+    "@paraspell/pallets": "11.2.4",
+    "@paraspell/assets": "11.2.4",
+    "@paraspell/sdk-common": "11.2.4"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",