@paraspell/sdk-core 10.4.6 → 10.4.8

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isNodeEvm, getAssetsObject, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, InvalidCurrencyError, isForeignAsset, findAssetForNodeOrThrow, findAsset, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, isTMultiAsset, getExistentialDeposit, isAssetEqual, findAssetOnDestOrThrow, normalizeSymbol, getExistentialDepositOrThrow, hasDryRunSupport, hasSupportForAsset, extractMultiAssetLoc, isSymbolSpecifier, normalizeMultiLocation, getAssetId } from '@paraspell/assets';
+import { isNodeEvm, getAssetsObject, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, InvalidCurrencyError, isForeignAsset, findAssetForNodeOrThrow, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAsset, isTMultiAsset, getExistentialDeposit, getExistentialDepositOrThrow, isAssetEqual, findAssetOnDestOrThrow, normalizeSymbol, hasDryRunSupport, hasSupportForAsset, extractMultiAssetLoc, isSymbolSpecifier, normalizeMultiLocation, getAssetId } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, createPublicClient, http, getContract } from 'viem';
-import { Parents, Version, isTMultiLocation, isRelayChain, NODE_NAMES_DOT_KSM, hasJunction, deepEqual, isDotKsmBridge } from '@paraspell/sdk-common';
+import { Parents, Version, isTMultiLocation, isRelayChain, replaceBigInt, NODE_NAMES_DOT_KSM, hasJunction, deepEqual, isDotKsmBridge } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import { getSupportedPalletsDetails, getDefaultPallet } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
@@ -2400,10 +2400,6 @@ var getNode = function getNode(node) {
   return nodeMap[node];
 };
 
-var replaceBigInt = function replaceBigInt(_key, value) {
-  return typeof value === 'bigint' ? value.toString() : value;
-};
-
 var resolveParaId = function resolveParaId(paraId, destination) {
   if (isTMultiLocation(destination) || isRelayChain(destination) || destination === 'Ethereum') {
     return undefined;
@@ -2592,7 +2588,7 @@ var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, node)
   if ('multilocation' in currency) {
     throw new InvalidCurrencyError("\n      Selected chain doesn't support multilocation you provided. Maybe you meant custom multilocation. If so, you need to use override option. Your selection should look like this: {multilocation: Override(".concat(JSON.stringify(currency.multilocation), ")}."));
   }
-  throw new InvalidCurrencyError("".concat(isDestination ? 'Destination' : 'Origin', " node ").concat(node, " does not support currency ").concat(JSON.stringify(currency), "."));
+  throw new InvalidCurrencyError("".concat(isDestination ? 'Destination' : 'Origin', " node ").concat(node, " does not support currency ").concat(JSON.stringify(currency, replaceBigInt), "."));
 };
 
 var resolveMultiLocationFromDest = function resolveMultiLocationFromDest(destination, asset) {
@@ -3373,29 +3369,23 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
               wallet: signer
             }
           });
-          foundAsset = findAsset(from, currency, to);
-          if (!(foundAsset === null)) {
-            _context.n = 3;
-            break;
-          }
-          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
-        case 3:
+          foundAsset = findAssetForNodeOrThrow(from, currency, to);
           if (!(foundAsset.symbol === getNativeAssetSymbol(from))) {
-            _context.n = 4;
+            _context.n = 3;
             break;
           }
           asset = NATIVE_ASSET_ID;
-          _context.n = 6;
+          _context.n = 5;
           break;
-        case 4:
+        case 3:
           if (!(!isForeignAsset(foundAsset) || !foundAsset.assetId)) {
-            _context.n = 5;
+            _context.n = 4;
             break;
           }
           throw new InvalidCurrencyError('Currency must be a foreign asset with valid assetId');
-        case 5:
+        case 4:
           asset = formatAssetIdToERC20(foundAsset.assetId);
-        case 6:
+        case 5:
           destMultiLocation = getDestinationMultilocation(api, address, to);
           weight = U_64_MAX; // Partially inspired by Moonbeam XCM-SDK
           // https://github.com/moonbeam-foundation/xcm-sdk/blob/ab835c15bf41612604b1c858d956a9f07705ed65/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts#L53
@@ -3405,27 +3395,27 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
           };
           multiCurrencySymbols = ['xcPINK', 'xcDED', 'xcSTINK', 'xcWIFD', 'xcNCTR'];
           useMultiAssets = from === 'Moonbeam' && to === 'AssetHubPolkadot' && multiCurrencySymbols.includes(foundAsset.symbol);
-          usdtAsset = findAsset(from, {
+          usdtAsset = findAssetForNodeOrThrow(from, {
             symbol: 'xcUSDT'
           }, to);
           if (!useMultiAssets) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
-          _context.n = 7;
+          _context.n = 6;
           return createTx('transferMultiCurrencies', [[[asset, currency.amount], [formatAssetIdToERC20((_usdtAsset$assetId = usdtAsset.assetId) !== null && _usdtAsset$assetId !== void 0 ? _usdtAsset$assetId : ''), '200000']], 1,
           // index of the fee asset
           destMultiLocation, weight]);
-        case 7:
+        case 6:
           _t = _context.v;
-          _context.n = 10;
-          break;
-        case 8:
           _context.n = 9;
+          break;
+        case 7:
+          _context.n = 8;
           return createTx('transfer', [asset, currency.amount, destMultiLocation, weight]);
-        case 9:
+        case 8:
           _t = _context.v;
-        case 10:
+        case 9:
           tx = _t;
           return _context.a(2, tx);
       }
@@ -3697,26 +3687,20 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           }
           throw new InvalidParameterError('Override multilocation is not supported for Evm transfers');
         case 5:
-          foundAsset = findAsset(from, currency, to);
-          if (!(foundAsset === null)) {
-            _context.n = 6;
-            break;
-          }
-          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
-        case 6:
+          foundAsset = findAssetForNodeOrThrow(from, currency, to);
           if (!(!isForeignAsset(foundAsset) || !foundAsset.multiLocation)) {
-            _context.n = 7;
+            _context.n = 6;
             break;
           }
           throw new InvalidCurrencyError('Currency must be a foreign asset with valid multi-location');
-        case 7:
+        case 6:
           ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), foundAsset.multiLocation);
           if (!(!ethAsset || !ethAsset.assetId)) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
           throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(foundAsset)));
-        case 8:
+        case 7:
           contract = getContract({
             abi: abi,
             address: xcmInterfacePrecompile,
@@ -3730,17 +3714,17 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           });
           senderAddress = (_signer$account = signer.account) === null || _signer$account === void 0 ? void 0 : _signer$account.address;
           if (senderAddress) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           throw new InvalidParameterError('Unable to get sender address');
+        case 8:
+          _context.n = 9;
+          return api.init(from, TX_CLIENT_TIMEOUT_MS);
         case 9:
           _context.n = 10;
-          return api.init(from, TX_CLIENT_TIMEOUT_MS);
-        case 10:
-          _context.n = 11;
           return generateMessageId(api, senderAddress, getParaId(from), ethAsset.assetId, address, currency.amount);
-        case 11:
+        case 10:
           messageId = _context.v;
           customXcm = createCustomXcmOnDest({
             api: api,
@@ -3753,17 +3737,17 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
             }),
             version: Version.V4
           }, from, messageId);
-          _context.n = 12;
+          _context.n = 11;
           return api.objectToHex(customXcm, 'XcmVersionedXcm');
-        case 12:
+        case 11:
           customXcmOnDest = _context.v;
-          _context.n = 13;
+          _context.n = 12;
           return api.createApiForNode('AssetHubPolkadot');
-        case 13:
+        case 12:
           assetHubApi = _context.v;
-          _context.n = 14;
+          _context.n = 13;
           return getParaEthTransferFees(assetHubApi);
-        case 14:
+        case 13:
           _yield$getParaEthTran = _context.v;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
           bridgeFee = _yield$getParaEthTran2[0];
@@ -3778,7 +3762,7 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
               throw new InvalidParameterError('Input must be a valid number');
             }() : "0x".concat((num >>> 0).toString(16).padStart(8, '0'));
           }; // Execute the custom XCM message with the precompile
-          _context.n = 15;
+          _context.n = 14;
           return createTx('transferAssetsUsingTypeAndThenAddress', [
           // This represents (1,X1(Parachain(1000)))
           [1, ['0x00' + numberToHex32(getParaId('AssetHubPolkadot')).slice(2)]],
@@ -3790,7 +3774,7 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           0,
           // The TransferType corresponding to fee asset
           2, customXcmOnDest]);
-        case 15:
+        case 14:
           tx = _context.v;
           return _context.a(2, tx);
       }
@@ -3949,7 +3933,7 @@ var getOriginFeeDetails = /*#__PURE__*/function () {
 
 var getTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, senderAddress, node, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, balance, ed, edBN, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
+    var api, senderAddress, node, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, balance, ed, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -3966,22 +3950,15 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
           });
         case 1:
           balance = _context.v;
-          ed = getExistentialDeposit(node, currency);
-          if (!(ed === null)) {
-            _context.n = 2;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get existential deposit for currency ".concat(JSON.stringify(currency), "."));
-        case 2:
-          edBN = BigInt(ed);
+          ed = getExistentialDepositOrThrow(node, currency);
           isNativeAsset = getNativeAssetSymbol(node) === asset.symbol;
           shouldSubstractFee = isNativeAsset || node === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, asset);
           feeToSubtract = 0n;
           if (!shouldSubstractFee) {
-            _context.n = 5;
+            _context.n = 4;
             break;
           }
-          _context.n = 3;
+          _context.n = 2;
           return getOriginXcmFee({
             api: api,
             tx: tx,
@@ -3992,18 +3969,18 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
             currency: currency,
             disableFallback: false
           });
-        case 3:
+        case 2:
           _yield$getOriginXcmFe = _context.v;
           fee = _yield$getOriginXcmFe.fee;
           if (!(fee === undefined)) {
-            _context.n = 4;
+            _context.n = 3;
             break;
           }
-          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(node, "."));
-        case 4:
+          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on node ").concat(node, "."));
+        case 3:
           feeToSubtract = fee;
-        case 5:
-          transferable = balance - edBN - feeToSubtract;
+        case 4:
+          transferable = balance - ed - feeToSubtract;
           return _context.a(2, transferable > 0n ? transferable : 0n);
       }
     }, _callee);
@@ -4063,7 +4040,7 @@ var buildDestInfo = /*#__PURE__*/function () {
             _context.n = 2;
             break;
           }
-          throw new InvalidParameterError("Existential deposit not found for ".concat(destination, " with currency ").concat(JSON.stringify(currency)));
+          throw new InvalidParameterError("Existential deposit not found for ".concat(destination, " with currency ").concat(JSON.stringify(currency, replaceBigInt)));
         case 2:
           edDestBn = BigInt(edDest);
           destCurrency = destAsset.multiLocation ? {
@@ -4241,7 +4218,7 @@ var buildHopInfo = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, edOriginBn, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, destinationInfo, _t;
+    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, destinationInfo, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -4294,15 +4271,8 @@ var getTransferInfo = /*#__PURE__*/function () {
           });
         case 8:
           originBalance = _context.v;
-          edOrigin = getExistentialDeposit(origin, currency);
-          if (edOrigin) {
-            _context.n = 9;
-            break;
-          }
-          throw new InvalidParameterError("Existential deposit not found for ".concat(origin, " with currency ").concat(JSON.stringify(currency)));
-        case 9:
-          edOriginBn = BigInt(edOrigin);
-          _context.n = 10;
+          edOrigin = getExistentialDepositOrThrow(origin, currency);
+          _context.n = 9;
           return getXcmFee({
             api: api,
             tx: tx,
@@ -4314,7 +4284,7 @@ var getTransferInfo = /*#__PURE__*/function () {
             feeAsset: feeAsset,
             disableFallback: false
           });
-        case 10:
+        case 9:
           _yield$getXcmFee = _context.v;
           _yield$getXcmFee$orig = _yield$getXcmFee.origin;
           originFee = _yield$getXcmFee$orig.fee;
@@ -4323,21 +4293,21 @@ var getTransferInfo = /*#__PURE__*/function () {
           bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
           destFeeDetail = _yield$getXcmFee.destination;
           if (!(originFee === undefined)) {
-            _context.n = 11;
+            _context.n = 10;
             break;
           }
-          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(origin, "."));
-        case 11:
+          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on node ").concat(origin, "."));
+        case 10:
           isFeeAssetAh = origin === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, originAsset);
           originBalanceAfter = originBalance - BigInt(currency.amount);
           originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - BigInt(currency.amount) : originBalanceFee - originFee;
           originBalanceNativeSufficient = originBalanceFee >= originFee;
-          originBalanceSufficient = originBalanceAfter >= edOriginBn;
+          originBalanceSufficient = originBalanceAfter >= edOrigin;
           if (!assetHubFeeResult) {
-            _context.n = 13;
+            _context.n = 12;
             break;
           }
-          _context.n = 12;
+          _context.n = 11;
           return buildHopInfo({
             api: api,
             node: determineRelayChain(origin) === 'Polkadot' ? 'AssetHubPolkadot' : 'AssetHubKusama',
@@ -4347,15 +4317,15 @@ var getTransferInfo = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             ahAddress: ahAddress
           });
-        case 12:
+        case 11:
           assetHub = _context.v;
-        case 13:
+        case 12:
           if (!bridgeHubFeeResult) {
-            _context.n = 15;
+            _context.n = 14;
             break;
           }
           bridgeHubNode = determineRelayChain(origin) === 'Polkadot' ? 'BridgeHubPolkadot' : 'BridgeHubKusama';
-          _context.n = 14;
+          _context.n = 13;
           return buildHopInfo({
             api: api,
             node: bridgeHubNode,
@@ -4365,10 +4335,10 @@ var getTransferInfo = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             ahAddress: ahAddress
           });
-        case 14:
+        case 13:
           bridgeHub = _context.v;
-        case 15:
-          _context.n = 16;
+        case 14:
+          _context.n = 15;
           return buildDestInfo({
             api: api,
             origin: origin,
@@ -4381,7 +4351,7 @@ var getTransferInfo = /*#__PURE__*/function () {
             assetHubFee: assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.fee,
             bridgeFee: bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.fee
           });
-        case 16:
+        case 15:
           destinationInfo = _context.v;
           return _context.a(2, {
             chain: {
@@ -4395,7 +4365,7 @@ var getTransferInfo = /*#__PURE__*/function () {
                 balance: originBalance,
                 balanceAfter: originBalanceAfter,
                 currencySymbol: originAsset.symbol,
-                existentialDeposit: edOriginBn
+                existentialDeposit: edOrigin
               },
               xcmFee: {
                 sufficient: originBalanceNativeSufficient,
@@ -4409,17 +4379,17 @@ var getTransferInfo = /*#__PURE__*/function () {
             bridgeHub: bridgeHub,
             destination: destinationInfo
           });
-        case 17:
-          _context.p = 17;
+        case 16:
+          _context.p = 16;
           api.setDisconnectAllowed(true);
-          _context.n = 18;
+          _context.n = 17;
           return api.disconnect();
+        case 17:
+          return _context.f(16);
         case 18:
-          return _context.f(17);
-        case 19:
           return _context.a(2);
       }
-    }, _callee, null, [[3,, 17, 19]]);
+    }, _callee, null, [[3,, 16, 18]]);
   }));
   return function getTransferInfo(_x) {
     return _ref2.apply(this, arguments);
@@ -4439,7 +4409,7 @@ var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, edBN, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
+    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -4473,24 +4443,17 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           } : {
             symbol: asset.symbol
           };
-          ed = getExistentialDeposit(destination, destCurrency);
-          if (!(ed === null)) {
-            _context.n = 5;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get existential deposit for currency ".concat(JSON.stringify(currency)));
-        case 5:
-          edBN = BigInt(ed);
-          _context.n = 6;
+          ed = getExistentialDepositOrThrow(destination, destCurrency);
+          _context.n = 5;
           return getAssetBalanceInternal({
             address: address,
             node: destination,
             api: destApi,
             currency: destCurrency
           });
-        case 6:
+        case 5:
           balance = _context.v;
-          _context.n = 7;
+          _context.n = 6;
           return getXcmFee({
             api: api,
             tx: tx,
@@ -4502,40 +4465,40 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
             feeAsset: feeAsset,
             disableFallback: false
           });
-        case 7:
+        case 6:
           xcmFeeResult = _context.v;
           dryRunError = xcmFeeResult.origin.dryRunError, assetHubFeeResult = xcmFeeResult.assetHub, bridgeHubFeeResult = xcmFeeResult.bridgeHub, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
           if (!(destFee === undefined)) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
-          throw new InvalidParameterError("Cannot get destination xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(destination, "."));
-        case 8:
+          throw new InvalidParameterError("Cannot get destination xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on node ").concat(destination, "."));
+        case 7:
           if (!dryRunError) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           throw new DryRunFailedError(dryRunError, 'origin');
-        case 9:
+        case 8:
           hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
           if (!hopDryRunError) {
-            _context.n = 10;
+            _context.n = 9;
             break;
           }
           throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
-        case 10:
+        case 9:
           if (!destDryRunError) {
-            _context.n = 11;
+            _context.n = 10;
             break;
           }
           throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
-        case 11:
+        case 10:
           if (!(normalizeSymbol(asset.symbol) !== normalizeSymbol(destFeeCurrency))) {
-            _context.n = 12;
+            _context.n = 11;
             break;
           }
           throw new UnableToComputeError("The XCM fee could not be calculated because the origin or destination chain does not support DryRun.\n       As a result, fee estimation is only available through PaymentInfo, which provides the cost in the native asset.\n       This limitation restricts support to transfers involving the native asset of the Destination chain only.");
-        case 12:
+        case 11:
           totalFee = calculateTotalXcmFee(xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
@@ -4543,7 +4506,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           } else {
             feeToSubtract = destFee;
           }
-          return _context.a(2, BigInt(currency.amount) - feeToSubtract > (balance < edBN ? edBN : 0));
+          return _context.a(2, BigInt(currency.amount) - feeToSubtract > (balance < ed ? ed : 0));
       }
     }, _callee);
   }));
@@ -4581,25 +4544,31 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
 }();
 
 var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee, feeAsset) {
     var existentialDeposit, nativeBalance;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          if (!feeAsset) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 1:
           existentialDeposit = getExistentialDepositOrThrow(node);
-          _context.n = 1;
+          _context.n = 2;
           return getBalanceNativeInternal({
             api: api,
             node: node,
             address: senderAddress
           });
-        case 1:
+        case 2:
           nativeBalance = _context.v;
           return _context.a(2, nativeBalance - existentialDeposit - fee > 0n);
       }
     }, _callee);
   }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4) {
+  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -4628,7 +4597,7 @@ var isSufficientDestination = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function isSufficientDestination(_x5, _x6, _x7, _x8, _x9) {
+  return function isSufficientDestination(_x6, _x7, _x8, _x9, _x0) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -4664,54 +4633,48 @@ var getDestXcmFee = /*#__PURE__*/function () {
                     }
                     return _context.a(2, 0n);
                   case 1:
-                    originAsset = findAsset(origin, currency, destination);
-                    if (originAsset) {
-                      _context.n = 2;
-                      break;
-                    }
-                    throw new InvalidCurrencyError("Currency ".concat(JSON.stringify(currency, replaceBigInt), " not found in ").concat(origin));
-                  case 2:
+                    originAsset = findAssetForNodeOrThrow(origin, currency, destination);
                     if (!originAsset.multiLocation) {
-                      _context.n = 8;
+                      _context.n = 7;
                       break;
                     }
-                    _context.p = 3;
-                    _context.n = 4;
+                    _context.p = 2;
+                    _context.n = 3;
                     return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
                       destination: destination
                     }), {
                       multilocation: originAsset.multiLocation
                     });
-                  case 4:
+                  case 3:
                     return _context.a(2, _context.v);
-                  case 5:
-                    _context.p = 5;
+                  case 4:
+                    _context.p = 4;
                     _t = _context.v;
                     if (!(_t instanceof InvalidCurrencyError)) {
-                      _context.n = 7;
+                      _context.n = 6;
                       break;
                     }
-                    _context.n = 6;
+                    _context.n = 5;
                     return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
                       destination: destination
                     }), {
                       symbol: originAsset.symbol
                     });
-                  case 6:
+                  case 5:
                     return _context.a(2, _context.v);
-                  case 7:
+                  case 6:
                     throw _t;
-                  case 8:
-                    _context.n = 9;
+                  case 7:
+                    _context.n = 8;
                     return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
                       destination: destination
                     }), {
                       symbol: originAsset.symbol
                     });
-                  case 9:
+                  case 8:
                     return _context.a(2, _context.v);
                 }
-              }, _callee, null, [[3, 5]]);
+              }, _callee, null, [[2, 4]]);
             }));
             return function calcPaymentInfoFee() {
               return _ref2.apply(this, arguments);
@@ -4782,6 +4745,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
           return _context2.a(2, {
             fee: fee,
             feeType: 'dryRun',
+            sufficient: true,
             forwardedXcms: newForwardedXcms,
             destParaId: destParaId
           });
@@ -5034,7 +4998,7 @@ var dryRunOrigin = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, currencySymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight;
+    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5043,7 +5007,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
-          currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin);
+          nativeAssetSymbol = getNativeAssetSymbol(origin);
           if (hasDryRunSupport(origin)) {
             _context.n = 4;
             break;
@@ -5054,12 +5018,12 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           rawFee = _context.v;
           paddedFee = padFee(rawFee, origin, destination, 'origin');
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, paddedFee);
+          return isSufficientOrigin(api, origin, senderAddress, paddedFee, resolvedFeeAsset);
         case 3:
           sufficient = _context.v;
           return _context.a(2, {
             fee: paddedFee,
-            currency: currencySymbol,
+            currency: nativeAssetSymbol,
             feeType: 'paymentInfo',
             sufficient: sufficient
           });
@@ -5091,21 +5055,23 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _rawFee = _context.v;
           _paddedFee = padFee(_rawFee, origin, destination, 'origin');
           _context.n = 8;
-          return isSufficientOrigin(api, origin, senderAddress, _paddedFee);
+          return isSufficientOrigin(api, origin, senderAddress, _paddedFee, resolvedFeeAsset);
         case 8:
           _sufficient = _context.v;
           return _context.a(2, {
             fee: _paddedFee,
-            currency: currencySymbol,
+            currency: nativeAssetSymbol,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
             sufficient: _sufficient
           });
         case 9:
           fee = dryRunResult.fee, forwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId, weight = dryRunResult.weight;
+          currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : nativeAssetSymbol;
           return _context.a(2, {
             fee: fee,
             feeType: 'dryRun',
+            sufficient: true,
             currency: currencySymbol,
             forwardedXcms: forwardedXcms,
             destParaId: destParaId,
@@ -5119,20 +5085,176 @@ var getOriginXcmFee = /*#__PURE__*/function () {
   };
 }();
 
+var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
+  return assetCheckEnabled ? findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null) : null;
+};
+
+var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
+  var origin = _ref.from,
+    destination = _ref.to,
+    currency = _ref.currency;
+  var isDestAssetHub = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
+  var allowedChainsToAh = ['AssetHubPolkadot', 'BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
+  if (!isRelayChain(origin) && !isBridge && isDestAssetHub && !allowedChainsToAh.includes(origin) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT') {
+    throw new TransferToAhNotSupported("Node ".concat(origin, " does not support DOT transfer to AssetHub"));
+  }
+  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
+  var isMultiLocationDestination = _typeof(destination) === 'object';
+  if (!isBridge && !isRelayDestination && !isMultiLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !hasSupportForAsset(destination, asset.symbol)) {
+    throw new InvalidCurrencyError("Destination node ".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 currency = options.currency,
+    feeAsset = options.feeAsset,
+    origin = options.from,
+    destination = options.to;
+  if ('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation)) {
+    return currency.multilocation.value;
+  }
+  if ('multiasset' in currency) {
+    if (!feeAsset) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
+    if ('multilocation' in feeAsset && isOverrideMultiLocationSpecifier(feeAsset.multilocation)) {
+      throw new InvalidCurrencyError('Fee asset cannot be an overridden multi location specifier');
+    }
+    if (currency.multiasset.every(function (asset) {
+      return isTMultiAsset(asset);
+    })) {
+      if (!feeAsset) {
+        throw new InvalidCurrencyError('Fee asset not provided');
+      }
+      if (!('multilocation' in feeAsset)) {
+        throw new InvalidCurrencyError('Fee asset must be specified by multilocation when using raw overridden multi assets');
+      }
+      return currency.multiasset.map(function (multiAsset) {
+        var ml = extractMultiAssetLoc(multiAsset);
+        return _objectSpread2(_objectSpread2({}, multiAsset), {}, {
+          isFeeAsset: deepEqual(ml, feeAsset.multilocation)
+        });
+      });
+    }
+    // MultiAsset is an array of TCurrencyCore, search for assets
+    var assets = currency.multiasset.map(function (currency) {
+      var asset = findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null);
+      if (asset && !asset.multiLocation) {
+        throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(currency, replaceBigInt), " does not have a multiLocation"));
+      }
+      if (!asset) {
+        throw new InvalidCurrencyError("Origin node ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
+      }
+      if (!resolvedFeeAsset) {
+        throw new InvalidCurrencyError('Fee asset not found');
+      }
+      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
+      var originTyped = origin;
+      var originNode = getNode(originTyped);
+      return _objectSpread2({
+        isFeeAsset: isAssetEqual(resolvedFeeAsset, asset)
+      }, createMultiAsset(originNode.version, currency.amount, asset.multiLocation));
+    });
+    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;
+  if (originVersion === Version.V4 && destVersion === Version.V3) {
+    return Version.V3;
+  }
+  return originVersion;
+};
+
+var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
+  if (isRelayChain(origin)) return true;
+  var hasMultiAsset = 'multiasset' in currency;
+  var hasOverriddenMultilocation = 'multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation);
+  return !(hasMultiAsset || hasOverriddenMultilocation);
+};
+
+var validateDestinationAddress = function validateDestinationAddress(address, destination) {
+  if (typeof address === 'string' && !isTMultiLocation(destination)) {
+    validateAddress(address, destination);
+  }
+};
+
+var validateCurrency = function validateCurrency(currency, feeAsset) {
+  if ('multiasset' in currency) {
+    if (currency.multiasset.length === 0) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be empty');
+    }
+    if (currency.multiasset.length === 1) {
+      throw new InvalidCurrencyError('Please provide more than one multi asset');
+    }
+    if (currency.multiasset.length > 1 && !currency.multiasset.every(function (asset) {
+      return isTMultiAsset(asset);
+    }) && !feeAsset) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
+  }
+};
+var validateDestination = function validateDestination(origin, destination) {
+  if (isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination) && origin !== destination) {
+    throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
+  }
+  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam'];
+  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
+    throw new IncompatibleNodesError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
+  }
+  var isMultiLocationDestination = _typeof(destination) === 'object';
+  var isBridge = !isTMultiLocation(destination) && isDotKsmBridge(origin, destination);
+  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
+  if (!isRelayDestination && !isMultiLocationDestination) {
+    var originRelayChainSymbol = getRelayChainSymbol(origin);
+    var destinationRelayChainSymbol = getRelayChainSymbol(destination);
+    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
+      throw new IncompatibleNodesError();
+    }
+  }
+};
+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, senderAddress, rawOriginFee, originFee, sufficient;
+    var api, tx, origin, destination, currency, senderAddress, feeAsset, rawOriginFee, originFee, resolvedFeeAsset, sufficient;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, currency = _ref.currency, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset;
           _context.n = 1;
           return api.calculateTransactionFee(tx, senderAddress);
         case 1:
           rawOriginFee = _context.v;
           originFee = padFee(rawOriginFee, origin, destination, 'origin');
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 2;
-          return isSufficientOrigin(api, origin, senderAddress, originFee);
+          return isSufficientOrigin(api, origin, senderAddress, originFee, resolvedFeeAsset);
         case 2:
           sufficient = _context.v;
           return _context.a(2, {
@@ -5469,12 +5591,13 @@ var BRIDGE_FEE_DOT = 682395810n; // 0.068239581 DOT
 var BRIDGE_FEE_KSM = 12016807000n; // 0.012016807 KSM
 var getXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, origin, destination, currency, address, senderAddress, originAsset, destApi, _ref2, _ref3, fixedOriginFee, fixedDestinationFee, originSufficient, _destinationSufficient, originFeeDetails, currencyInput, destinationFee, destinationSufficient, destFeeDetails, _t;
+    var api, origin, destination, currency, feeAsset, address, senderAddress, originAsset, resolvedFeeAsset, destApi, _ref2, _ref3, fixedOriginFee, fixedDestinationFee, originSufficient, _destinationSufficient, originFeeDetails, currencyInput, destinationFee, destinationSufficient, destFeeDetails, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, address = options.address, senderAddress = options.senderAddress;
+          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, feeAsset = options.feeAsset, address = options.address, senderAddress = options.senderAddress;
           originAsset = findAssetForNodeOrThrow(origin, currency, destination);
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -5488,7 +5611,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
           }
           _ref2 = origin === 'AssetHubPolkadot' ? [BRIDGE_FEE_DOT, BRIDGE_FEE_KSM] : [BRIDGE_FEE_KSM, BRIDGE_FEE_DOT], _ref3 = _slicedToArray(_ref2, 2), fixedOriginFee = _ref3[0], fixedDestinationFee = _ref3[1];
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee);
+          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee, resolvedFeeAsset);
         case 3:
           originSufficient = _context.v;
           _context.n = 4;
@@ -5592,161 +5715,6 @@ var transferRelayToPara = /*#__PURE__*/function () {
   };
 }();
 
-var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
-  return assetCheckEnabled ? findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null) : null;
-};
-
-var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
-  var origin = _ref.from,
-    destination = _ref.to,
-    currency = _ref.currency;
-  var isDestAssetHub = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
-  var allowedChainsToAh = ['AssetHubPolkadot', 'BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
-  if (!isRelayChain(origin) && !isBridge && isDestAssetHub && !allowedChainsToAh.includes(origin) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT') {
-    throw new TransferToAhNotSupported("Node ".concat(origin, " does not support DOT transfer to AssetHub"));
-  }
-  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
-  var isMultiLocationDestination = _typeof(destination) === 'object';
-  if (!isBridge && !isRelayDestination && !isMultiLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !hasSupportForAsset(destination, asset.symbol)) {
-    throw new InvalidCurrencyError("Destination node ".concat(destination, " does not support currency ").concat(JSON.stringify(currency), "."));
-  }
-  if (!isBridge && asset === null && assetCheckEnabled) {
-    throwUnsupportedCurrency(currency, origin);
-  }
-};
-
-var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset) {
-  var currency = options.currency,
-    feeAsset = options.feeAsset,
-    origin = options.from,
-    destination = options.to;
-  if ('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation)) {
-    return currency.multilocation.value;
-  }
-  if ('multiasset' in currency) {
-    if (!feeAsset) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
-    }
-    if ('multilocation' in feeAsset && isOverrideMultiLocationSpecifier(feeAsset.multilocation)) {
-      throw new InvalidCurrencyError('Fee asset cannot be an overridden multi location specifier');
-    }
-    if (currency.multiasset.every(function (asset) {
-      return isTMultiAsset(asset);
-    })) {
-      if (!feeAsset) {
-        throw new InvalidCurrencyError('Fee asset not provided');
-      }
-      if (!('multilocation' in feeAsset)) {
-        throw new InvalidCurrencyError('Fee asset must be specified by multilocation when using raw overridden multi assets');
-      }
-      return currency.multiasset.map(function (multiAsset) {
-        var ml = extractMultiAssetLoc(multiAsset);
-        return _objectSpread2(_objectSpread2({}, multiAsset), {}, {
-          isFeeAsset: deepEqual(ml, feeAsset.multilocation)
-        });
-      });
-    }
-    // MultiAsset is an array of TCurrencyCore, search for assets
-    var assets = currency.multiasset.map(function (currency) {
-      var asset = findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null);
-      if (asset && !asset.multiLocation) {
-        throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(currency), " does not have a multiLocation"));
-      }
-      if (!asset) {
-        throw new InvalidCurrencyError("Origin node ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
-      }
-      if (!resolvedFeeAsset) {
-        throw new InvalidCurrencyError('Fee asset not found');
-      }
-      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
-      var originTyped = origin;
-      var originNode = getNode(originTyped);
-      return _objectSpread2({
-        isFeeAsset: isAssetEqual(resolvedFeeAsset, asset)
-      }, createMultiAsset(originNode.version, currency.amount, asset.multiLocation));
-    });
-    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;
-  if (originVersion === Version.V4 && destVersion === Version.V3) {
-    return Version.V3;
-  }
-  return originVersion;
-};
-
-var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
-  if (isRelayChain(origin)) return true;
-  var hasMultiAsset = 'multiasset' in currency;
-  var hasOverriddenMultilocation = 'multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation);
-  return !(hasMultiAsset || hasOverriddenMultilocation);
-};
-
-var validateDestinationAddress = function validateDestinationAddress(address, destination) {
-  if (typeof address === 'string' && !isTMultiLocation(destination)) {
-    validateAddress(address, destination);
-  }
-};
-
-var validateCurrency = function validateCurrency(currency, feeAsset) {
-  if ('multiasset' in currency) {
-    if (currency.multiasset.length === 0) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot be empty');
-    }
-    if (currency.multiasset.length === 1) {
-      throw new InvalidCurrencyError('Please provide more than one multi asset');
-    }
-    if (currency.multiasset.length > 1 && !currency.multiasset.every(function (asset) {
-      return isTMultiAsset(asset);
-    }) && !feeAsset) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
-    }
-  }
-};
-var validateDestination = function validateDestination(origin, destination) {
-  if (isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination) && origin !== destination) {
-    throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
-  }
-  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam'];
-  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
-    throw new IncompatibleNodesError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
-  }
-  var isMultiLocationDestination = _typeof(destination) === 'object';
-  var isBridge = !isTMultiLocation(destination) && isDotKsmBridge(origin, destination);
-  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
-  if (!isRelayDestination && !isMultiLocationDestination) {
-    var originRelayChainSymbol = getRelayChainSymbol(origin);
-    var destinationRelayChainSymbol = getRelayChainSymbol(destination);
-    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
-      throw new IncompatibleNodesError();
-    }
-  }
-};
-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 send = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, originVersion, destVersion, resolvedVersion, isLocalTransfer, overriddenAsset, resolvedAsset, finalAsset, finalVersion, normalizedAsset;
@@ -6192,7 +6160,7 @@ var ParachainNode = /*#__PURE__*/function () {
               throw new DryRunFailedError(dryRunResult.origin.failureReason);
             case 5:
               // Pad fee by 50%
-              dryRunFeePadded = BigInt(dryRunResult.origin.fee) * BigInt(3) / BigInt(2);
+              dryRunFeePadded = BigInt(dryRunResult.origin.fee) * 3n / 2n;
               dest = createDestination(scenario, version, destination, paraIdTo);
               call = {
                 module: 'PolkadotXcm',
@@ -10099,11 +10067,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getOriginXcmFeeEstimate",
     value: (function () {
       var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
-        var _this$_options6, from, to, senderAddress, tx;
+        var _this$_options6, from, to, senderAddress, currency, tx;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
             case 0:
-              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress;
+              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress, currency = _this$_options6.currency;
               assertToIsString(to);
               _context7.n = 1;
               return this.build();
@@ -10116,6 +10084,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 tx: tx,
                 origin: from,
                 destination: to,
+                currency: currency,
                 senderAddress: senderAddress
               });
             case 3:
@@ -10287,4 +10256,4 @@ var Builder = function Builder(api) {
   return new GeneralBuilder(api, new BatchTransactionManager());
 };
 
-export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiary, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, replaceBigInt, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiary, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };