@paraspell/sdk-core 11.12.2 → 11.12.3

package/dist/index.mjs

@@ -1,11 +1,11 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isChainEvm, getAssetsObject, InvalidCurrencyError, isForeignAsset, extractAssetLocation, findAssetInfoOrThrow, getNativeAssetSymbol, getOtherAssets, isAssetEqual, findNativeAssetInfoOrThrow, findAssetInfo, isTAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, isOverrideLocationSpecifier, findAssetInfoByLoc, findAssetOnDestOrThrow, findAssetInfoOnDest, Native, hasXcmPaymentApiSupport, getExistentialDeposit, getRelayChainSymbol, findNativeAssetInfo, isAssetXcEqual, hasSupportForAsset, isSymbolSpecifier, normalizeLocation, getEdFromAssetOrThrow, normalizeSymbol } from '@paraspell/assets';
+import { isChainEvm, getAssetsObject, InvalidCurrencyError, isForeignAsset, extractAssetLocation, findAssetInfoOrThrow, getNativeAssetSymbol, getOtherAssets, isAssetEqual, findNativeAssetInfoOrThrow, findAssetInfo, isTAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, findAssetOnDestOrThrow, findAssetInfoOnDest, hasSupportForAsset, isOverrideLocationSpecifier, getRelayChainSymbol, isSymbolSpecifier, findAssetInfoByLoc, Native, hasXcmPaymentApiSupport, getExistentialDeposit, findNativeAssetInfo, isAssetXcEqual, normalizeLocation, getEdFromAssetOrThrow, normalizeSymbol } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, parseUnits as parseUnits$1, formatUnits as formatUnits$1, createPublicClient, http, getContract, pad, toHex, getAddress, concat, keccak256 } from 'viem';
 import { getSupportedPalletsDetails, getDefaultPallet, getSupportedPallets, getNativeAssetsPallet, getOtherAssetsPallets } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
-import { replaceBigInt, isTLocation, Version, hasJunction, getJunctionValue, isRelayChain, Parents, PARACHAINS, deepEqual, isTrustedChain, isExternalChain, isDotKsmBridge, isSystemChain } from '@paraspell/sdk-common';
+import { replaceBigInt, isTLocation, Version, hasJunction, getJunctionValue, isRelayChain, Parents, isExternalChain, deepEqual, PARACHAINS, isSubstrateBridge, isTrustedChain, isSystemChain } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import { moonbeam, moonriver, mainnet } from 'viem/chains';
 
@@ -3091,7 +3091,13 @@ var getChainLocation = function getChainLocation(chain, destChain) {
  * @param location - The location to localize
  * @returns The localized location
  */
-var localizeLocation = function localizeLocation(chain, location) {
+var localizeLocation = function localizeLocation(chain, location, origin) {
+  var targetRelay = isExternalChain(chain) ? undefined : getRelayChainOf(chain).toLowerCase();
+  var originRelay = origin && !isExternalChain(origin) ? getRelayChainOf(origin).toLowerCase() : undefined;
+  var ecosystemDiffers = originRelay !== targetRelay;
+  if (origin && ecosystemDiffers && location.parents === Parents.TWO && originRelay !== undefined && targetRelay !== undefined && deepEqual(getJunctionValue(location, 'GlobalConsensus'), _defineProperty({}, targetRelay, null))) {
+    return RELAY_LOCATION;
+  }
   var newInterior = location.interior;
   var parachainRemoved = false;
   if (location.interior !== 'Here') {
@@ -3115,6 +3121,20 @@ var localizeLocation = function localizeLocation(chain, location) {
       newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
     }
   }
+  var isOriginRelayHere = deepEqual(location, RELAY_LOCATION);
+  var hasGlobalConsensus = hasJunction(location, 'GlobalConsensus');
+  if (origin && ecosystemDiffers && isOriginRelayHere && !hasGlobalConsensus && originRelay !== undefined) {
+    return {
+      parents: Parents.TWO,
+      interior: {
+        X2: [{
+          GlobalConsensus: _defineProperty({}, originRelay, null)
+        }, {
+          Parachain: getParaId(origin)
+        }]
+      }
+    };
+  }
   var shouldSetParentsToZero = parachainRemoved || newInterior === 'Here' && isRelayChain(chain);
   return {
     parents: shouldSetParentsToZero ? Parents.ZERO : location.parents,
@@ -3243,13 +3263,26 @@ var constructRelayToParaParameters = function constructRelayToParaParameters(_re
 };
 
 var createDestination = function createDestination(version, origin, destination, chainId, junction, parents) {
+  var isLocDestination = isTLocation(destination);
+  var isSubBridge = !isLocDestination && !isExternalChain(destination) && isSubstrateBridge(origin, destination);
+  if (isSubBridge) {
+    return {
+      parents: Parents.TWO,
+      interior: {
+        X2: [{
+          GlobalConsensus: getRelayChainOf(destination)
+        }, {
+          Parachain: chainId
+        }]
+      }
+    };
+  }
   var scenario = resolveScenario(origin, destination);
   var parentsResolved = parents !== null && parents !== void 0 ? parents : scenario === 'RelayToPara' ? Parents.ZERO : Parents.ONE;
   var interior = scenario === 'ParaToRelay' ? 'Here' : createX1Payload(version, junction !== null && junction !== void 0 ? junction : {
     Parachain: chainId
   });
-  var isLocationDestination = isTLocation(destination);
-  return isLocationDestination ? destination : {
+  return isLocDestination ? destination : {
     parents: parentsResolved,
     interior: interior
   };
@@ -3258,19 +3291,6 @@ var createVersionedDestination = function createVersionedDestination(version, or
   var plainDestination = createDestination(version, origin, destination, chainId, junction, parents);
   return addXcmVersionHeader(plainDestination, version);
 };
-var createBridgeDestination = function createBridgeDestination(ecosystem, destination, chainId) {
-  var location = {
-    parents: Parents.TWO,
-    interior: {
-      X2: [{
-        GlobalConsensus: ecosystem
-      }, {
-        Parachain: chainId
-      }]
-    }
-  };
-  return isTLocation(destination) ? destination : location;
-};
 var resolveTChainFromLocation = function resolveTChainFromLocation(relaychain, location) {
   var _PARACHAINS$find;
   var parachainId = getJunctionValue(location, 'Parachain');
@@ -4499,6 +4519,204 @@ var getDestXcmFee = /*#__PURE__*/function () {
   };
 }();
 
+var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
+  return assetCheckEnabled ? findAssetInfo(origin, currency, !isTLocation(destination) ? destination : null) : null;
+};
+
+var resolveHopAsset = function resolveHopAsset(_ref) {
+  var _asset$location, _findAssetInfoOnDest;
+  var originChain = _ref.originChain,
+    currentChain = _ref.currentChain,
+    swapConfig = _ref.swapConfig,
+    asset = _ref.asset,
+    hasPassedExchange = _ref.hasPassedExchange,
+    currency = _ref.currency;
+  var isExternalAsset = ((_asset$location = asset.location) === null || _asset$location === void 0 ? void 0 : _asset$location.parents) === Parents.TWO;
+  if (isExternalAsset) {
+    return findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
+  }
+  if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
+    return findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
+  }
+  return (_findAssetInfoOnDest = findAssetInfoOnDest(originChain, currentChain, currency)) !== null && _findAssetInfoOnDest !== void 0 ? _findAssetInfoOnDest : asset;
+};
+
+var validateBridgeAsset = function validateBridgeAsset(origin, destination, asset, currency, isBridge) {
+  var _asset$location;
+  if (!asset || isTLocation(destination) || isExternalChain(destination) || !isBridge) {
+    return;
+  }
+  var nativeAsset = findNativeAssetInfoOrThrow(origin);
+  var isNativeAsset = isAssetEqual(asset, nativeAsset);
+  var ecosystem = getRelayChainOf(destination).toLowerCase();
+  var isBridgedAsset = ((_asset$location = asset.location) === null || _asset$location === void 0 ? void 0 : _asset$location.parents) === Parents.TWO && deepEqual(getJunctionValue(asset.location, 'GlobalConsensus'), _defineProperty({}, ecosystem, null));
+  if (!(isNativeAsset || isBridgedAsset)) {
+    throw new InvalidCurrencyError("Substrate bridge does not support currency ".concat(JSON.stringify(currency, replaceBigInt), "."));
+  }
+};
+var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
+  var origin = _ref.from,
+    destination = _ref.to,
+    currency = _ref.currency;
+  var isRelayDestination = !isTLocation(destination) && isRelayChain(destination);
+  var isLocationDestination = _typeof(destination) === 'object';
+  if (!isBridge && !isRelayDestination && !isLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !hasSupportForAsset(destination, asset.symbol)) {
+    throw new InvalidCurrencyError("Destination chain ".concat(destination, " does not support currency ").concat(JSON.stringify(currency, replaceBigInt), "."));
+  }
+  if (asset === null && assetCheckEnabled) {
+    throwUnsupportedCurrency(currency, origin);
+  }
+  validateBridgeAsset(origin, destination, asset, currency, isBridge);
+};
+
+var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset) {
+  var api = options.api,
+    currency = options.currency,
+    feeAsset = options.feeAsset,
+    origin = options.from,
+    destination = options.to;
+  if ('location' in currency && isOverrideLocationSpecifier(currency.location)) {
+    return currency.location.value;
+  }
+  if (Array.isArray(currency)) {
+    if (!feeAsset) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
+    if ('location' in feeAsset && isOverrideLocationSpecifier(feeAsset.location)) {
+      throw new InvalidCurrencyError('Fee asset cannot be an overridden location specifier');
+    }
+    if (currency.every(function (asset) {
+      return isTAsset(asset);
+    })) {
+      if (!feeAsset) {
+        throw new InvalidCurrencyError('Fee asset not provided');
+      }
+      if (!('location' in feeAsset)) {
+        throw new InvalidCurrencyError('Fee asset must be specified by location when using raw overridden multi assets');
+      }
+      return currency.map(function (asset) {
+        var ml = extractAssetLocation(asset);
+        return _objectSpread2(_objectSpread2({}, asset), {}, {
+          fun: {
+            Fungible: BigInt(asset.fun.Fungible)
+          },
+          isFeeAsset: deepEqual(ml, feeAsset.location)
+        });
+      });
+    }
+    // MultiAsset is an array of TCurrencyCore, search for assets
+    var assets = currency.map(function (currency) {
+      if (currency.amount === AMOUNT_ALL) {
+        throw new InvalidCurrencyError('Multi assets cannot use amount all. Please specify amount.');
+      }
+      var asset = findAssetInfo(origin, currency, !isTLocation(destination) ? destination : null);
+      if (!asset) {
+        throw new InvalidCurrencyError("Origin chain ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
+      }
+      assertHasLocation(asset);
+      if (!resolvedFeeAsset) {
+        throw new InvalidCurrencyError('Fee asset not found');
+      }
+      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
+      var version = getChainVersion(origin);
+      var abstractedAmount = abstractDecimals(currency.amount, asset.decimals, api);
+      return _objectSpread2({
+        isFeeAsset: isAssetEqual(resolvedFeeAsset, asset)
+      }, createAsset(version, abstractedAmount, asset.location));
+    });
+    if (assets.filter(function (asset) {
+      return asset.isFeeAsset;
+    }).length > 1) {
+      throw new InvalidCurrencyError("Fee asset matches multiple assets in multiassets");
+    }
+    if (assets.filter(function (asset) {
+      return asset.isFeeAsset;
+    }).length === 0) {
+      throw new InvalidCurrencyError("Fee asset not found in multiassets");
+    }
+    return assets;
+  }
+  return undefined;
+};
+
+var selectXcmVersion = function selectXcmVersion(forcedVersion, originVersion, destMaxVersion) {
+  if (forcedVersion) return forcedVersion;
+  var destVersion = destMaxVersion !== null && destMaxVersion !== void 0 ? destMaxVersion : originVersion;
+  return destVersion < originVersion ? destVersion : originVersion;
+};
+
+var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
+  if (isRelayChain(origin)) return true;
+  var isMultipleAssets = Array.isArray(currency);
+  var hasOverriddenLocation = 'location' in currency && isOverrideLocationSpecifier(currency.location);
+  return !(isMultipleAssets || hasOverriddenLocation);
+};
+
+var validateAddress = function validateAddress(address, chain) {
+  var isDestination = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  if (isTLocation(address)) return;
+  var isEvm = isChainEvm(chain);
+  var isEthereumAddress = isAddress(address);
+  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."));
+    }
+  } else {
+    if (isEthereumAddress) {
+      throw new InvalidAddressError("EVM address provided but ".concat(isDestination ? 'destination ' : '', "chain is not an EVM chain."));
+    }
+  }
+};
+
+var validateDestinationAddress = function validateDestinationAddress(address, destination) {
+  if (typeof address === 'string' && !isTLocation(destination)) {
+    validateAddress(address, destination);
+  }
+};
+
+var validateCurrency = function validateCurrency(currency, feeAsset) {
+  if (Array.isArray(currency)) {
+    if (currency.length === 0) {
+      throw new InvalidCurrencyError('Overridden assets cannot be empty');
+    }
+    if (currency.length === 1) {
+      throw new InvalidCurrencyError('Please provide more than one asset');
+    }
+    if (currency.length > 1 && !currency.every(function (asset) {
+      return isTAsset(asset);
+    }) && !feeAsset) {
+      throw new InvalidCurrencyError('Overridden assets cannot be used without specifying fee asset');
+    }
+  }
+};
+var validateDestination = function validateDestination(origin, destination) {
+  if (isRelayChain(origin) && !isTLocation(destination) && isRelayChain(destination) && origin !== destination) {
+    throw new IncompatibleChainsError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
+  }
+  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam', 'Mythos'];
+  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
+    throw new IncompatibleChainsError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
+  }
+  var isLocationDestination = _typeof(destination) === 'object';
+  var isBridge = !isTLocation(destination) && isSubstrateBridge(origin, destination);
+  var isRelayDestination = !isTLocation(destination) && isRelayChain(destination);
+  if (!isRelayDestination && !isLocationDestination) {
+    var originRelayChainSymbol = getRelayChainSymbol(origin);
+    var destinationRelayChainSymbol = getRelayChainSymbol(destination);
+    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
+      throw new IncompatibleChainsError();
+    }
+  }
+};
+var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled, currency) {
+  if (!assetCheckEnabled && 'symbol' in currency && isSymbolSpecifier(currency.symbol)) {
+    throw new InvalidCurrencyError('Symbol specifier is not supported when asset check is disabled. Please use normal symbol instead.');
+  }
+  if (!assetCheckEnabled && 'id' in currency) {
+    throw new InvalidCurrencyError('Asset ID is not supported when asset check is disabled. Please use normal symbol instead');
+  }
+};
+
 var getFailureInfo$1 = function getFailureInfo(result) {
   var orderedChecks = [{
     chain: 'origin',
@@ -5331,19 +5549,19 @@ var dryRunInternal = /*#__PURE__*/function () {
           initialForwardedXcms = originDryModified.forwardedXcms, initialDestParaId = originDryModified.destParaId;
           processHop = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
-              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopAsset, _findAssetInfoOnDest, hopDryRun;
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopAsset, hopDryRun;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange;
-                    if (asset.location && asset.location.parents === Parents.TWO) {
-                      hopAsset = findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
-                    } else if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
-                      hopAsset = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
-                    } else {
-                      hopAsset = asset;
-                      hopAsset = (_findAssetInfoOnDest = findAssetInfoOnDest(origin, currentChain, currency)) !== null && _findAssetInfoOnDest !== void 0 ? _findAssetInfoOnDest : asset;
-                    }
+                    hopAsset = resolveHopAsset({
+                      originChain: origin,
+                      currentChain: currentChain,
+                      asset: currentAsset,
+                      currency: currency,
+                      swapConfig: swapConfig,
+                      hasPassedExchange: hasPassedExchange
+                    });
                     if (hasDryRunSupport(currentChain)) {
                       _context.n = 1;
                       break;
@@ -5907,22 +6125,6 @@ var handleToAhTeleport = /*#__PURE__*/function () {
   };
 }();
 
-var validateAddress = function validateAddress(address, chain) {
-  var isDestination = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  if (isTLocation(address)) return;
-  var isEvm = isChainEvm(chain);
-  var isEthereumAddress = isAddress(address);
-  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."));
-    }
-  } else {
-    if (isEthereumAddress) {
-      throw new InvalidAddressError("EVM address provided but ".concat(isDestination ? 'destination ' : '', "chain is not an EVM chain."));
-    }
-  }
-};
-
 var resolveLocationFromDest = function resolveLocationFromDest(destination, asset) {
   if (_typeof(destination) === 'object') return destination;
   if (isRelayChain(destination)) return DOT_LOCATION;
@@ -6229,15 +6431,16 @@ var Parachain = /*#__PURE__*/function () {
   }, {
     key: "canUseXTokens",
     value: function canUseXTokens(options) {
+      var _asset$location;
       var asset = options.assetInfo;
-      var isExternalAsset = asset.location && asset.location.parents === Parents.TWO;
+      var isExternalAsset = ((_asset$location = asset.location) === null || _asset$location === void 0 ? void 0 : _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, destChain, isLocalTransfer, isRelayAsset, supportsTypeThen, useTypeAndThen, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, options, shouldUseTeleport, isAhToOtherPara, isOtherParaToAh, isAllowedAhTransfer, isAHPOrigin, isAHPDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, call, _t;
+        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, scenario, paraId, destChain, isLocalTransfer, isRelayAsset, supportsTypeThen, isSubBridge, useTypeAndThen, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, _asset$location2, options, shouldUseTeleport, isAhToOtherPara, isOtherParaToAh, isAllowedAhTransfer, isAHOrigin, isAHDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, call, _t;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -6271,7 +6474,8 @@ var Parachain = /*#__PURE__*/function () {
               }
               throw new InvalidParameterError('Relaychain assets can only be transferred using the type-and-then method which is not supported by this chain');
             case 4:
-              useTypeAndThen = isRelayAsset && supportsTypeThen && destChain && !feeAsset && (!isTrustedChain(this.chain) || !isTrustedChain(destChain));
+              isSubBridge = !isTLocation(destination) && isSubstrateBridge(this.chain, destination);
+              useTypeAndThen = isRelayAsset && supportsTypeThen && destChain && !feeAsset && (!isTrustedChain(this.chain) || !isTrustedChain(destChain)) || isSubBridge;
               if (!(supportsXTokens(this) && this.canUseXTokens(sendOptions) && !useTypeAndThen)) {
                 _context.n = 6;
                 break;
@@ -6364,17 +6568,17 @@ var Parachain = /*#__PURE__*/function () {
               }
               throw new InvalidParameterError('Astar system asset transfers are temporarily disabled');
             case 9:
-              isAHPOrigin = this.chain.includes('AssetHub');
-              isAHPDest = !isTLocation(destination) && destination.includes('AssetHub'); // Handle common cases
-              isExternalAsset = asset.location && asset.location.parents === Parents.TWO;
+              isAHOrigin = this.chain.includes('AssetHub');
+              isAHDest = !isTLocation(destination) && destination.includes('AssetHub'); // Handle common cases
+              isExternalAsset = ((_asset$location2 = asset.location) === null || _asset$location2 === void 0 ? void 0 : _asset$location2.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;
+              isExternalAssetViaAh = isExternalAsset && !isAHOrigin && !isAHDest && !isEthDest && !feeAsset; // External asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
+              isExternalAssetToAh = isExternalAsset && isAHDest && !isAHOrigin && !isEthDest && !feeAsset;
               if (!(isExternalAssetViaAh || isExternalAssetToAh || useTypeAndThen)) {
                 _context.n = 15;
                 break;
               }
-              if (!(useTypeAndThen && supportsPolkadotXCM(this))) {
+              if (!(useTypeAndThen && supportsPolkadotXCM(this) && !isSubBridge)) {
                 _context.n = 10;
                 break;
               }
@@ -6461,7 +6665,7 @@ var Parachain = /*#__PURE__*/function () {
     value: function shouldUseNativeAssetTeleport(_ref) {
       var asset = _ref.assetInfo,
         to = _ref.to;
-      if (isTLocation(to) || isDotKsmBridge(this.chain, to) || to === 'Ethereum') return false;
+      if (isTLocation(to) || isSubstrateBridge(this.chain, to) || to === 'Ethereum') return false;
       var isAHPOrigin = this.chain.includes('AssetHub');
       var isAHPDest = !isTLocation(to) && to.includes('AssetHub');
       var isNativeAsset = !isTLocation(to) && (isAHPOrigin && isForeignAsset(asset) && isSymbolMatch(asset.symbol, getNativeAssetSymbol(to)) || isAHPDest && !isForeignAsset(asset) && isSymbolMatch(asset.symbol, getNativeAssetSymbol(this.chain)));
@@ -6557,51 +6761,57 @@ var Parachain = /*#__PURE__*/function () {
     key: "transferLocal",
     value: function () {
       var _transferLocal = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-        var api, asset, address, senderAddress, currency, isAmountAll, validatedOptions, isNativeAsset, balance, localOptions;
+        var api, asset, feeAsset, address, senderAddress, currency, isAmountAll, validatedOptions, isNativeAsset, balance, localOptions;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              api = options.api, asset = options.assetInfo, address = options.address, senderAddress = options.senderAddress, currency = options.currency, isAmountAll = options.isAmountAll;
+              api = options.api, asset = options.assetInfo, feeAsset = options.feeAsset, address = options.address, senderAddress = options.senderAddress, currency = options.currency, isAmountAll = options.isAmountAll;
               if (!isTLocation(address)) {
                 _context3.n = 1;
                 break;
               }
               throw new InvalidAddressError('Location address is not supported for local transfers');
             case 1:
+              if (!feeAsset) {
+                _context3.n = 2;
+                break;
+              }
+              throw new InvalidParameterError('Fee asset is not supported for local transfers');
+            case 2:
               validatedOptions = _objectSpread2(_objectSpread2({}, options), {}, {
                 address: address
               });
               isNativeAsset = asset.symbol === this.getNativeAssetSymbol() && !isForeignAsset(asset);
               if (!isAmountAll) {
-                _context3.n = 3;
+                _context3.n = 4;
                 break;
               }
               assertSenderAddress(senderAddress);
-              _context3.n = 2;
+              _context3.n = 3;
               return getAssetBalanceInternal({
                 api: api,
                 chain: this.chain,
                 address: senderAddress,
                 currency: currency
               });
-            case 2:
+            case 3:
               balance = _context3.v;
-              _context3.n = 4;
+              _context3.n = 5;
               break;
-            case 3:
-              balance = MIN_AMOUNT;
             case 4:
+              balance = MIN_AMOUNT;
+            case 5:
               localOptions = _objectSpread2(_objectSpread2({}, validatedOptions), {}, {
                 balance: balance
               });
               if (!isNativeAsset) {
-                _context3.n = 5;
+                _context3.n = 6;
                 break;
               }
               return _context3.a(2, this.transferLocalNativeAsset(localOptions));
-            case 5:
-              return _context3.a(2, this.transferLocalNonNativeAsset(localOptions));
             case 6:
+              return _context3.a(2, this.transferLocalNonNativeAsset(localOptions));
+            case 7:
               return _context3.a(2);
           }
         }, _callee3, this);
@@ -7102,9 +7312,6 @@ var AssetHubKusama = /*#__PURE__*/function (_Parachain) {
         scenario = input.scenario;
       // TESTED https://kusama.subscan.io/xcm_message/kusama-ddc2a48f0d8e0337832d7aae26f6c3053e1f4ffd
       // TESTED https://kusama.subscan.io/xcm_message/kusama-8e423130a4d8b61679af95dbea18a55124f99672
-      if (destination === 'AssetHubPolkadot') {
-        return getChain('AssetHubPolkadot').handleBridgeTransfer(input, 'Polkadot');
-      }
       if (scenario === 'ParaToPara' && asset.symbol === 'DOT' && !isForeignAsset(asset)) {
         throw new ScenarioNotSupportedError(this.chain, scenario, 'Bridged DOT cannot currently be transfered from AssetHubKusama, if you are sending different DOT asset, please specify {id: <DOTID>}.');
       }
@@ -7150,36 +7357,6 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
   }
   _inherits(AssetHubPolkadot, _Parachain);
   return _createClass(AssetHubPolkadot, [{
-    key: "handleBridgeTransfer",
-    value: function handleBridgeTransfer(input, targetChain) {
-      var _asset$symbol, _asset$symbol2, _asset$symbol3;
-      var api = input.api,
-        asset = input.assetInfo,
-        destination = input.destination,
-        address = input.address,
-        version = input.version,
-        paraIdTo = input.paraIdTo;
-      if (targetChain === 'Kusama' && ((_asset$symbol = asset.symbol) === null || _asset$symbol === void 0 ? void 0 : _asset$symbol.toUpperCase()) === 'KSM' || targetChain === 'Polkadot' && ((_asset$symbol2 = asset.symbol) === null || _asset$symbol2 === void 0 ? void 0 : _asset$symbol2.toUpperCase()) === 'DOT') {
-        var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          destLocation: createBridgeDestination(targetChain, destination, paraIdTo),
-          beneficiaryLocation: createBeneficiaryLocation({
-            api: api,
-            address: address,
-            version: version
-          }),
-          asset: createAsset(version, asset.amount, asset.location)
-        });
-        return transferPolkadotXcm(modifiedInput, 'transfer_assets', 'Unlimited');
-      } else if (targetChain === 'Polkadot' && ((_asset$symbol3 = asset.symbol) === null || _asset$symbol3 === void 0 ? void 0 : _asset$symbol3.toUpperCase()) === 'KSM' || targetChain === 'Kusama' && 'DOT') {
-        var _modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          destLocation: createBridgeDestination(targetChain, destination, paraIdTo),
-          asset: createAsset(version, asset.amount, DOT_LOCATION)
-        });
-        return transferPolkadotXcm(_modifiedInput, 'limited_reserve_transfer_assets', 'Unlimited');
-      }
-      throw new InvalidCurrencyError("Polkadot <-> Kusama bridge does not support currency ".concat(asset.symbol));
-    }
-  }, {
     key: "handleEthBridgeNativeTransfer",
     value: function () {
       var _handleEthBridgeNativeTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(input) {
@@ -7384,52 +7561,46 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
             case 4:
               return _context3.a(2, _t.callTxMethod.call(_t, _context3.v));
             case 5:
-              if (!(destination === 'AssetHubKusama')) {
-                _context3.n = 6;
-                break;
-              }
-              return _context3.a(2, this.handleBridgeTransfer(options, 'Kusama'));
-            case 6:
               if (!(destination === 'Ethereum')) {
-                _context3.n = 7;
+                _context3.n = 6;
                 break;
               }
               return _context3.a(2, this.handleEthBridgeTransfer(options));
-            case 7:
+            case 6:
               if (!(destination === 'Mythos')) {
-                _context3.n = 8;
+                _context3.n = 7;
                 break;
               }
               return _context3.a(2, this.handleMythosTransfer(options));
-            case 8:
+            case 7:
               isExternalAsset = assetInfo.location && assetInfo.location.parents === Parents.TWO;
               if (!isExternalAsset) {
-                _context3.n = 10;
+                _context3.n = 9;
                 break;
               }
-              _context3.n = 9;
+              _context3.n = 8;
               return createTypeAndThenCall(this.chain, options);
-            case 9:
+            case 8:
               _call = _context3.v;
               return _context3.a(2, api.callTxMethod(_call));
-            case 10:
+            case 9:
               if (!(scenario === 'ParaToPara' && assetInfo.symbol === 'KSM' && !isForeignAsset(assetInfo))) {
-                _context3.n = 11;
+                _context3.n = 10;
                 break;
               }
               throw new ScenarioNotSupportedError(this.chain, scenario, 'Bridged KSM cannot currently be transfered from AssetHubPolkadot, if you are sending different KSM asset, please specify {id: <KSMID>}.');
-            case 11:
+            case 10:
               method = this.getMethod(scenario, destination); // Patch transfer_assets to use type_and_then transfer
               if (!(method === 'transfer_assets' && isSymbolMatch(assetInfo.symbol, getRelayChainSymbol(this.chain)))) {
-                _context3.n = 13;
+                _context3.n = 12;
                 break;
               }
               _t2 = api;
-              _context3.n = 12;
+              _context3.n = 11;
               return createTypeAndThenCall(this.chain, options);
-            case 12:
+            case 11:
               return _context3.a(2, _t2.callTxMethod.call(_t2, _context3.v));
-            case 13:
+            case 12:
               modifiedInput = this.patchInput(options);
               return _context3.a(2, transferPolkadotXcm(modifiedInput, method, 'Unlimited'));
           }
@@ -11127,156 +11298,6 @@ var getOriginXcmFee = /*#__PURE__*/function () {
   };
 }();
 
-var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
-  return assetCheckEnabled ? findAssetInfo(origin, currency, !isTLocation(destination) ? destination : null) : null;
-};
-
-var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
-  var origin = _ref.from,
-    destination = _ref.to,
-    currency = _ref.currency;
-  var isRelayDestination = !isTLocation(destination) && isRelayChain(destination);
-  var isLocationDestination = _typeof(destination) === 'object';
-  if (!isBridge && !isRelayDestination && !isLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !hasSupportForAsset(destination, asset.symbol)) {
-    throw new InvalidCurrencyError("Destination chain ".concat(destination, " does not support currency ").concat(JSON.stringify(currency, replaceBigInt), "."));
-  }
-  if (!isBridge && asset === null && assetCheckEnabled) {
-    throwUnsupportedCurrency(currency, origin);
-  }
-};
-
-var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset) {
-  var api = options.api,
-    currency = options.currency,
-    feeAsset = options.feeAsset,
-    origin = options.from,
-    destination = options.to;
-  if ('location' in currency && isOverrideLocationSpecifier(currency.location)) {
-    return currency.location.value;
-  }
-  if (Array.isArray(currency)) {
-    if (!feeAsset) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
-    }
-    if ('location' in feeAsset && isOverrideLocationSpecifier(feeAsset.location)) {
-      throw new InvalidCurrencyError('Fee asset cannot be an overridden location specifier');
-    }
-    if (currency.every(function (asset) {
-      return isTAsset(asset);
-    })) {
-      if (!feeAsset) {
-        throw new InvalidCurrencyError('Fee asset not provided');
-      }
-      if (!('location' in feeAsset)) {
-        throw new InvalidCurrencyError('Fee asset must be specified by location when using raw overridden multi assets');
-      }
-      return currency.map(function (asset) {
-        var ml = extractAssetLocation(asset);
-        return _objectSpread2(_objectSpread2({}, asset), {}, {
-          fun: {
-            Fungible: BigInt(asset.fun.Fungible)
-          },
-          isFeeAsset: deepEqual(ml, feeAsset.location)
-        });
-      });
-    }
-    // MultiAsset is an array of TCurrencyCore, search for assets
-    var assets = currency.map(function (currency) {
-      if (currency.amount === AMOUNT_ALL) {
-        throw new InvalidCurrencyError('Multi assets cannot use amount all. Please specify amount.');
-      }
-      var asset = findAssetInfo(origin, currency, !isTLocation(destination) ? destination : null);
-      if (!asset) {
-        throw new InvalidCurrencyError("Origin chain ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
-      }
-      assertHasLocation(asset);
-      if (!resolvedFeeAsset) {
-        throw new InvalidCurrencyError('Fee asset not found');
-      }
-      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
-      var version = getChainVersion(origin);
-      var abstractedAmount = abstractDecimals(currency.amount, asset.decimals, api);
-      return _objectSpread2({
-        isFeeAsset: isAssetEqual(resolvedFeeAsset, asset)
-      }, createAsset(version, abstractedAmount, asset.location));
-    });
-    if (assets.filter(function (asset) {
-      return asset.isFeeAsset;
-    }).length > 1) {
-      throw new InvalidCurrencyError("Fee asset matches multiple assets in multiassets");
-    }
-    if (assets.filter(function (asset) {
-      return asset.isFeeAsset;
-    }).length === 0) {
-      throw new InvalidCurrencyError("Fee asset not found in multiassets");
-    }
-    return assets;
-  }
-  return undefined;
-};
-
-var selectXcmVersion = function selectXcmVersion(forcedVersion, originVersion, destMaxVersion) {
-  if (forcedVersion) return forcedVersion;
-  var destVersion = destMaxVersion !== null && destMaxVersion !== void 0 ? destMaxVersion : originVersion;
-  return destVersion < originVersion ? destVersion : originVersion;
-};
-
-var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
-  if (isRelayChain(origin)) return true;
-  var isMultipleAssets = Array.isArray(currency);
-  var hasOverriddenLocation = 'location' in currency && isOverrideLocationSpecifier(currency.location);
-  return !(isMultipleAssets || hasOverriddenLocation);
-};
-
-var validateDestinationAddress = function validateDestinationAddress(address, destination) {
-  if (typeof address === 'string' && !isTLocation(destination)) {
-    validateAddress(address, destination);
-  }
-};
-
-var validateCurrency = function validateCurrency(currency, feeAsset) {
-  if (Array.isArray(currency)) {
-    if (currency.length === 0) {
-      throw new InvalidCurrencyError('Overridden assets cannot be empty');
-    }
-    if (currency.length === 1) {
-      throw new InvalidCurrencyError('Please provide more than one asset');
-    }
-    if (currency.length > 1 && !currency.every(function (asset) {
-      return isTAsset(asset);
-    }) && !feeAsset) {
-      throw new InvalidCurrencyError('Overridden assets cannot be used without specifying fee asset');
-    }
-  }
-};
-var validateDestination = function validateDestination(origin, destination) {
-  if (isRelayChain(origin) && !isTLocation(destination) && isRelayChain(destination) && origin !== destination) {
-    throw new IncompatibleChainsError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
-  }
-  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam', 'Mythos'];
-  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
-    throw new IncompatibleChainsError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
-  }
-  var isLocationDestination = _typeof(destination) === 'object';
-  var isBridge = !isTLocation(destination) && isDotKsmBridge(origin, destination);
-  var isRelayDestination = !isTLocation(destination) && isRelayChain(destination);
-  if (!isRelayDestination && !isLocationDestination) {
-    var originRelayChainSymbol = getRelayChainSymbol(origin);
-    var destinationRelayChainSymbol = getRelayChainSymbol(destination);
-    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
-      throw new IncompatibleChainsError();
-    }
-  }
-};
-var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled, currency) {
-  if (!assetCheckEnabled && 'symbol' in currency && isSymbolSpecifier(currency.symbol)) {
-    throw new InvalidCurrencyError('Symbol specifier is not supported when asset check is disabled. Please use normal symbol instead.');
-  }
-  if (!assetCheckEnabled && 'id' in currency) {
-    throw new InvalidCurrencyError('Asset ID is not supported when asset check is disabled. Please use normal symbol instead');
-  }
-};
-
 var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
     var api, tx, origin, destination, currency, senderAddress, feeAsset, originAsset, amount, rawOriginFee, originFee, resolvedFeeAsset, sufficient, asset;
@@ -11476,20 +11497,19 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
         case 10:
           processHop = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
-              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopAsset, _findAssetInfoOnDest, hopResult;
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopAsset, hopResult;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange;
-                    if (!(currentAsset.location && currentAsset.location.parents === Parents.TWO)) {
-                      if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
-                        hopAsset = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
-                      } else {
-                        hopAsset = (_findAssetInfoOnDest = findAssetInfoOnDest(origin, currentChain, currency)) !== null && _findAssetInfoOnDest !== void 0 ? _findAssetInfoOnDest : currentAsset;
-                      }
-                    } else {
-                      hopAsset = findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
-                    }
+                    hopAsset = resolveHopAsset({
+                      originChain: origin,
+                      currentChain: currentChain,
+                      asset: currentAsset,
+                      currency: currency,
+                      swapConfig: swapConfig,
+                      hasPassedExchange: hasPassedExchange
+                    });
                     _context.n = 1;
                     return getDestXcmFee({
                       api: hopApi,
@@ -11943,7 +11963,7 @@ var send = /*#__PURE__*/function () {
           validateDestination(origin, destination);
           validateDestinationAddress(address, destination);
           if (senderAddress) validateAddress(senderAddress, origin, false);
-          isBridge = !isTLocation(destination) && isDotKsmBridge(origin, destination);
+          isBridge = !isTLocation(destination) && isSubstrateBridge(origin, destination);
           assetCheckEnabled = shouldPerformAssetCheck(origin, currency);
           validateAssetSpecifiers(assetCheckEnabled, currency);
           asset = resolveAsset(currency, origin, destination, assetCheckEnabled);
@@ -12717,18 +12737,19 @@ var computeInstructionFee = /*#__PURE__*/function () {
 }();
 var computeAllFees = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref3, customXcm, isDotAsset, refundInstruction) {
-    var _customXcm$DepositRes;
     var reserve, dest, version, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           reserve = _ref3.reserve, dest = _ref3.dest, version = _ref3.options.version;
-          if (!('DepositReserveAsset' in customXcm || 'InitiateTeleport' in customXcm)) {
+          if (!customXcm.some(function (x) {
+            return 'DepositReserveAsset' in x || 'InitiateTeleport' in x;
+          })) {
             _context2.n = 6;
             break;
           }
           _context2.n = 1;
-          return computeInstructionFee(reserve, version, [customXcm]);
+          return computeInstructionFee(reserve, version, customXcm);
         case 1:
           _t3 = _context2.v;
           if (!refundInstruction) {
@@ -12746,7 +12767,12 @@ var computeAllFees = /*#__PURE__*/function () {
         case 4:
           _t5 = _t4;
           _context2.n = 5;
-          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, ((_customXcm$DepositRes = customXcm === null || customXcm === void 0 ? void 0 : customXcm.DepositReserveAsset) !== null && _customXcm$DepositRes !== void 0 ? _customXcm$DepositRes : customXcm.InitiateTeleport).xcm);
+          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, function () {
+            var instr = customXcm.find(function (j) {
+              return 'DepositReserveAsset' in j || 'InitiateTeleport' in j;
+            });
+            return instr ? 'DepositReserveAsset' in instr ? instr.DepositReserveAsset.xcm : instr.InitiateTeleport.xcm : undefined;
+          }());
         case 5:
           _t6 = _context2.v;
           _t2 = {
@@ -12762,7 +12788,7 @@ var computeAllFees = /*#__PURE__*/function () {
             break;
           }
           _context2.n = 7;
-          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, [customXcm]);
+          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, customXcm);
         case 7:
           _t7 = _context2.v;
           _context2.n = 9;
@@ -12800,28 +12826,49 @@ var computeAllFees = /*#__PURE__*/function () {
   };
 }();
 
+var getSubBridgeReserve = function getSubBridgeReserve(chain, destination, location) {
+  if (deepEqual(location, RELAY_LOCATION)) return chain;
+  return destination;
+};
+var resolveReserveChain = function resolveReserveChain(chain, destination, assetLocation, isSubBridge, overrideReserve) {
+  if (isSubBridge) {
+    return getSubBridgeReserve(chain, destination, assetLocation);
+  }
+  if (overrideReserve !== undefined) {
+    return overrideReserve;
+  }
+  var relayChain = getRelayChainOf(chain);
+  if (relayChain === 'Paseo' || relayChain === 'Kusama') {
+    // Paseo and Kusama ecosystems migrate reserves to AssetHub
+    return getAssetReserveChain(chain, chain, assetLocation);
+  }
+  if (isRelayChain(destination)) {
+    return destination;
+  }
+  return getAssetReserveChain(chain, chain, assetLocation);
+};
 var createTypeAndThenCallContext = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options, overrideReserve) {
-    var api, destChain, assetInfo, reserveChain, destApi, reserveApi;
+    var api, destination, assetInfo, destinationChain, isSubBridge, reserveChain, destApi, reserveApi;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, destChain = options.destChain, assetInfo = options.assetInfo;
+          api = options.api, destination = options.destination, assetInfo = options.assetInfo;
           assertHasLocation(assetInfo);
-          if (destChain) {
+          if (!isTLocation(destination)) {
             _context.n = 1;
             break;
           }
           throw new InvalidParameterError('Cannot override destination when using type and then transfer.');
         case 1:
-          reserveChain = overrideReserve !== undefined ? overrideReserve :
-          // Paseo ecosystem migrated reserves to AssetHub
-          getRelayChainOf(chain) === 'Paseo' ? getAssetReserveChain(chain, chain, assetInfo.location) : isRelayChain(destChain) ? destChain : getAssetReserveChain(chain, chain, assetInfo.location);
+          destinationChain = destination;
+          isSubBridge = isSubstrateBridge(chain, destinationChain);
+          reserveChain = resolveReserveChain(chain, destinationChain, assetInfo.location, isSubBridge, overrideReserve);
           destApi = api.clone();
           _context.n = 2;
-          return destApi.init(destChain);
+          return destApi.init(destinationChain);
         case 2:
-          reserveApi = reserveChain === chain ? api : reserveChain === destChain ? destApi : api.clone();
+          reserveApi = reserveChain === chain ? api : reserveChain === destinationChain ? destApi : api.clone();
           _context.n = 3;
           return reserveApi.init(reserveChain);
         case 3:
@@ -12832,12 +12879,13 @@ var createTypeAndThenCallContext = /*#__PURE__*/function () {
             },
             dest: {
               api: destApi,
-              chain: destChain
+              chain: destinationChain
             },
             reserve: {
               api: reserveApi,
               chain: reserveChain
             },
+            isSubBridge: isSubBridge,
             assetInfo: assetInfo,
             options: options
           });
@@ -12849,13 +12897,14 @@ var createTypeAndThenCallContext = /*#__PURE__*/function () {
   };
 }();
 
-var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
+var createCustomXcm = function createCustomXcm(_ref, isDotAsset, assetCount) {
   var origin = _ref.origin,
     dest = _ref.dest,
     reserve = _ref.reserve,
+    isSubBridge = _ref.isSubBridge,
     assetInfo = _ref.assetInfo,
     options = _ref.options;
-  var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+  var fees = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
     reserveFee: MIN_FEE,
     refundFee: 0n,
     destFee: MIN_FEE
@@ -12868,20 +12917,22 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
     refundFee = fees.refundFee,
     destFee = fees.destFee;
   var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
-  var feeLocLocalized = localizeLocation(dest.chain, feeAssetLocation);
-  var asset = createAsset(version, assetInfo.amount, localizeLocation(dest.chain, assetInfo.location));
+  var feeLocLocalized = localizeLocation(dest.chain, feeAssetLocation, origin.chain);
+  var asset = createAsset(version, assetInfo.amount, localizeLocation(dest.chain, assetInfo.location, origin.chain));
   var depositInstruction = {
     DepositAsset: {
       assets: {
-        Wild: {
+        Wild: assetCount > 1 ? {
           AllOf: {
             id: asset.id,
             fun: 'Fungible'
           }
+        } : {
+          AllCounted: 1
         }
       },
       beneficiary: createBeneficiaryLocation({
-        api: origin.api,
+        api: isSubBridge ? dest.api : origin.api,
         address: address,
         version: version
       })
@@ -12890,7 +12941,7 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
   var assetsFilter = [];
   if (!isDotAsset) assetsFilter.push(createAsset(version, reserveFee + destFee, localizeLocation(reserve.chain, RELAY_LOCATION)));
   assetsFilter.push(createAsset(version, assetInfo.amount, localizeLocation(reserve.chain, assetInfo.location)));
-  if (origin.chain !== reserve.chain && dest.chain !== reserve.chain) {
+  if (isSubBridge || origin.chain !== reserve.chain && dest.chain !== reserve.chain) {
     var buyExecutionAmount = !isDotAsset ? destFee : assetInfo.amount - reserveFee - refundFee;
     if (buyExecutionAmount < 0n) throw new AmountTooLowError();
     var filter = fees.destFee === MIN_FEE ? {
@@ -12904,26 +12955,29 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
         weight_limit: 'Unlimited'
       }
     };
+    if (isSubBridge) {
+      return [buyExecution, depositInstruction];
+    }
     var destLoc = createDestination(version, origin.chain, destination, paraIdTo);
     // If destination is a system chain, use teleport instead of reserve deposit
     if (isSystemChain(dest.chain)) {
-      return {
+      return [{
         InitiateTeleport: {
           assets: filter,
           dest: destLoc,
           xcm: [buyExecution, depositInstruction]
         }
-      };
+      }];
     }
-    return {
+    return [{
       DepositReserveAsset: {
         assets: filter,
         dest: destLoc,
         xcm: [buyExecution, depositInstruction]
       }
-    };
+    }];
   }
-  return depositInstruction;
+  return [depositInstruction];
 };
 
 var createRefundInstruction = function createRefundInstruction(api, senderAddress, version, assetCount) {
@@ -12958,7 +13012,7 @@ var buildAssets = function buildAssets(chain, asset, feeAmount, isDotAsset, vers
  */
 var createTypeAndThenCall = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options, overrideReserve) {
-    var api, senderAddress, version, context, assetInfo, isDotAsset, customXcm, assetCount, refundInstruction, fees, finalCustomXcm, totalFee, assets;
+    var api, senderAddress, version, context, assetInfo, isSubBridge, LOCATIONS, isRelayAsset, assetCount, customXcm, refundInstruction, fees, finalCustomXcm, totalFee, assets;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -12967,8 +13021,8 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
           return createTypeAndThenCallContext(chain, options, overrideReserve);
         case 1:
           context = _context.v;
-          assetInfo = context.assetInfo;
-          isDotAsset = deepEqual(assetInfo.location, RELAY_LOCATION) || deepEqual(assetInfo.location, {
+          assetInfo = context.assetInfo, isSubBridge = context.isSubBridge;
+          LOCATIONS = [RELAY_LOCATION, {
             parents: 2,
             interior: {
               X1: [{
@@ -12977,20 +13031,32 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
                 }
               }]
             }
+          }, {
+            parents: 2,
+            interior: {
+              X1: [{
+                GlobalConsensus: {
+                  Polkadot: null
+                }
+              }]
+            }
+          }];
+          isRelayAsset = LOCATIONS.some(function (loc) {
+            return deepEqual(assetInfo.location, loc);
           });
-          customXcm = createCustomXcm(context, isDotAsset);
-          assetCount = isDotAsset ? 1 : 2;
+          assetCount = isRelayAsset ? 1 : 2;
+          customXcm = createCustomXcm(context, isRelayAsset, assetCount);
           refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version, assetCount) : null;
           _context.n = 2;
-          return computeAllFees(context, customXcm, isDotAsset, refundInstruction);
+          return computeAllFees(context, customXcm, isRelayAsset, refundInstruction);
         case 2:
           fees = _context.v;
           finalCustomXcm = [];
-          if (refundInstruction) finalCustomXcm.push(refundInstruction);
-          finalCustomXcm.push(createCustomXcm(context, isDotAsset, fees));
+          if (refundInstruction && !isSubBridge) finalCustomXcm.push(refundInstruction);
+          finalCustomXcm.push.apply(finalCustomXcm, _toConsumableArray(createCustomXcm(context, isRelayAsset, assetCount, fees)));
           totalFee = fees.reserveFee + fees.destFee + fees.refundFee;
-          assets = buildAssets(chain, assetInfo, totalFee, isDotAsset, version);
-          return _context.a(2, buildTypeAndThenCall(context, isDotAsset, finalCustomXcm, assets));
+          assets = buildAssets(chain, assetInfo, totalFee, isRelayAsset, version);
+          return _context.a(2, buildTypeAndThenCall(context, isRelayAsset, finalCustomXcm, assets));
       }
     }, _callee);
   }));
@@ -13817,9 +13883,6 @@ var GeneralBuilder = /*#__PURE__*/function () {
     value: function () {
       var _buildCommon = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
         var isCalledInternally,
-          _this$_options,
-          from,
-          to,
           _yield$this$prepareNo,
           normalizedOptions,
           tx,
@@ -13834,25 +13897,18 @@ var GeneralBuilder = /*#__PURE__*/function () {
               }
               throw new InvalidParameterError('Transaction manager contains batched items. Use buildBatch() to process them.');
             case 1:
-              _this$_options = this._options, from = _this$_options.from, to = _this$_options.to;
-              if (!(!isTLocation(to) && isRelayChain(from) && isRelayChain(to) && from !== to)) {
-                _context4.n = 2;
-                break;
-              }
-              throw new InvalidParameterError('Transfers between relay chains are not yet supported.');
-            case 2:
-              _context4.n = 3;
+              _context4.n = 2;
               return this.prepareNormalizedOptions(this._options);
-            case 3:
+            case 2:
               _yield$this$prepareNo = _context4.v;
               normalizedOptions = _yield$this$prepareNo.normalizedOptions;
-              _context4.n = 4;
+              _context4.n = 3;
               return send(normalizedOptions);
-            case 4:
+            case 3:
               tx = _context4.v;
-              _context4.n = 5;
+              _context4.n = 4;
               return this.maybePerformXcmFormatCheck(tx, normalizedOptions, isCalledInternally);
-            case 5:
+            case 4:
               return _context4.a(2, {
                 tx: tx,
                 options: normalizedOptions