@paraspell/sdk-core 10.0.0 → 10.0.1

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isNodeEvm, getAssetsObject, InvalidCurrencyError, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, isForeignAsset, hasDryRunSupport, findAsset, findAssetForNodeOrThrow, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, isTMultiAsset, hasSupportForAsset, extractMultiAssetLoc, isAssetEqual, isSymbolSpecifier, getAssetId, getExistentialDeposit, findAssetOnDestOrThrow, normalizeSymbol } from '@paraspell/assets';
+import { isNodeEvm, getAssetsObject, InvalidCurrencyError, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, isForeignAsset, findAsset, isTMultiAsset, hasDryRunSupport, findAssetForNodeOrThrow, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, hasSupportForAsset, extractMultiAssetLoc, isAssetEqual, isSymbolSpecifier, getAssetId, getExistentialDeposit, findAssetOnDestOrThrow, normalizeSymbol } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { ethers, Contract } from 'ethers';
@@ -2592,12 +2592,15 @@ var getMultiLocationTokenId = function getMultiLocationTokenId(location, node) {
 };
 
 var computeFeeFromDryRun = function computeFeeFromDryRun(dryRun, node, executionFee) {
+  var isFeeAsset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   // Extract delivery fees from emitted events
   var deliveryFees = [];
+  var assetConversionFee = 0n;
   var _iterator = _createForOfIteratorHelper(dryRun.value.emitted_events),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _e$value, _e$value2;
       var e = _step.value;
       var isXcmEvent = e.type === 'XcmPallet' || e.type === 'PolkadotXcm' || e.type === 'CumulusXcm';
       var isFeesPaid = e.value.type === 'FeesPaid';
@@ -2622,20 +2625,26 @@ var computeFeeFromDryRun = function computeFeeFromDryRun(dryRun, node, execution
           _iterator2.f();
         }
       }
+      if (isFeeAsset && e.type === 'AssetConversion' && ((_e$value = e.value) === null || _e$value === void 0 ? void 0 : _e$value.type) === 'SwapCreditExecuted' && (_e$value2 = e.value) !== null && _e$value2 !== void 0 && _e$value2.value && e.value.value.amount_in !== undefined && e.value.value.amount_in !== null) {
+        assetConversionFee += e.value.value.amount_in;
+      }
     }
   } catch (err) {
     _iterator.e(err);
   } finally {
     _iterator.f();
   }
-  var nativeAssetSymbol = getNativeAssetSymbol(node);
-  // Sum the fees that match the feeToken
-  var totalDeliveryFees = deliveryFees.filter(function (df) {
-    return df.tokenSymbol === nativeAssetSymbol;
-  }).reduce(function (acc, df) {
-    return acc + df.plancks;
-  }, 0n);
-  return totalDeliveryFees + executionFee;
+  if (isFeeAsset && assetConversionFee > 0n) {
+    return assetConversionFee;
+  } else {
+    var nativeAssetSymbol = getNativeAssetSymbol(node);
+    var totalDeliveryFees = deliveryFees.filter(function (df) {
+      return df.tokenSymbol === nativeAssetSymbol;
+    }).reduce(function (acc, df) {
+      return acc + df.plancks;
+    }, 0n);
+    return totalDeliveryFees + executionFee;
+  }
 };
 
 var getMultiLocationTokenIdPjs = function getMultiLocationTokenIdPjs(location, node) {
@@ -2952,6 +2961,15 @@ var getTNode = function getTNode(paraId, ecosystem) {
   })) !== null && _NODE_NAMES_DOT_KSM$f !== void 0 ? _NODE_NAMES_DOT_KSM$f : null;
 };
 
+var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
+  var asset = findAsset(origin, feeAsset, !isTMultiLocation(destination) ? destination : null);
+  var usesRawOverriddenMultiAssets = 'multiasset' in currency && currency.multiasset.every(isTMultiAsset);
+  if (!asset && !usesRawOverriddenMultiAssets) {
+    throwUnsupportedCurrency(feeAsset, origin);
+  }
+  return asset !== null && asset !== void 0 ? asset : undefined;
+};
+
 var isAssetHub = function isAssetHub(chain) {
   return chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama';
 };
@@ -3031,11 +3049,12 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
 };
 var getDestXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
-    var api, origin, destination, currency, forwardedXcms, disableFallback, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
+    var api, origin, destination, currency, forwardedXcms, asset, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, disableFallback = options.disableFallback;
+          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           calcPaymentInfoFee = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
               var originAsset;
@@ -3093,42 +3112,46 @@ var getDestXcmFee = /*#__PURE__*/function () {
             };
           }();
           if (!(!hasDryRunSupport(destination) || !forwardedXcms)) {
-            _context2.next = 7;
+            _context2.next = 8;
             break;
           }
-          _context2.next = 5;
+          _context2.next = 6;
           return calcPaymentInfoFee();
-        case 5:
+        case 6:
           _context2.t0 = _context2.sent;
           return _context2.abrupt("return", {
             fee: _context2.t0,
             feeType: 'paymentInfo'
           });
-        case 7:
-          _context2.next = 9;
+        case 8:
+          _context2.next = 10;
           return api.getDryRunXcm({
             originLocation: addXcmVersionHeader(createOriginLocation(origin, destination), Version.V4),
             xcm: forwardedXcms[1][0],
             node: destination,
-            origin: origin
+            origin: origin,
+            asset: asset,
+            originFee: originFee,
+            feeAsset: resolvedFeeAsset,
+            amount: BigInt(currency.amount)
           });
-        case 9:
+        case 10:
           dryRunResult = _context2.sent;
           if (dryRunResult.success) {
-            _context2.next = 18;
+            _context2.next = 19;
             break;
           }
           if (!disableFallback) {
-            _context2.next = 13;
+            _context2.next = 14;
             break;
           }
           return _context2.abrupt("return", {
             dryRunError: dryRunResult.failureReason
           });
-        case 13:
-          _context2.next = 15;
+        case 14:
+          _context2.next = 16;
           return calcPaymentInfoFee();
-        case 15:
+        case 16:
           _context2.t1 = _context2.sent;
           _context2.t2 = dryRunResult.failureReason;
           return _context2.abrupt("return", {
@@ -3136,7 +3159,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
             feeType: 'paymentInfo',
             dryRunError: _context2.t2
           });
-        case 18:
+        case 19:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
           return _context2.abrupt("return", {
             fee: fee,
@@ -3144,7 +3167,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
             forwardedXcms: newForwardedXcms,
             destParaId: destParaId
           });
-        case 20:
+        case 21:
         case "end":
           return _context2.stop();
       }
@@ -3158,49 +3181,51 @@ var getDestXcmFee = /*#__PURE__*/function () {
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
     var _intermediateFees$ass, _intermediateFees$bri, _destinationDryRun;
-    var origin, destination, currency, api, tx, senderAddress, asset, originDryRun, initialForwardedXcms, initialDestParaId, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationDryRun, nextChain, hopApi, hopDryRun, newXcms, destParaId;
+    var origin, destination, currency, api, tx, senderAddress, feeAsset, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationDryRun, nextChain, hopApi, hopDryRun, newXcms, destParaId;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress;
+          origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset;
+          resolvedFeeAsset = feeAsset && origin === 'AssetHubPolkadot' ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           asset = findAssetForNodeOrThrow(origin, currency, destination);
-          _context.next = 4;
+          _context.next = 5;
           return api.getDryRunCall({
             tx: tx,
             node: origin,
-            address: senderAddress
+            address: senderAddress,
+            isFeeAsset: !!resolvedFeeAsset
           });
-        case 4:
+        case 5:
           originDryRun = _context.sent;
           if (originDryRun.success) {
-            _context.next = 7;
+            _context.next = 8;
             break;
           }
           return _context.abrupt("return", {
             origin: originDryRun
           });
-        case 7:
+        case 8:
           initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
           currentOrigin = origin;
           forwardedXcms = initialForwardedXcms;
           nextParaId = initialDestParaId;
           intermediateFees = {};
-        case 12:
+        case 13:
           if (!(Array.isArray(forwardedXcms) && forwardedXcms.length && forwardedXcms[1].length && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context.next = 39;
+            _context.next = 40;
             break;
           }
           nextChain = getTNode(nextParaId, determineRelayChain(origin) === 'Polkadot' ? 'polkadot' : 'kusama');
           if (nextChain) {
-            _context.next = 16;
+            _context.next = 17;
             break;
           }
           throw new Error("Unable to find TNode for paraId ".concat(nextParaId));
-        case 16:
+        case 17:
           hopApi = api.clone();
-          _context.prev = 17;
+          _context.prev = 18;
           if (hasDryRunSupport(nextChain)) {
-            _context.next = 21;
+            _context.next = 22;
             break;
           }
           if (nextChain === destination) {
@@ -3209,19 +3234,23 @@ var dryRunInternal = /*#__PURE__*/function () {
               failureReason: "DryRunApi is not available on node ".concat(nextChain)
             };
           }
-          return _context.abrupt("break", 39);
-        case 21:
-          _context.next = 23;
+          return _context.abrupt("break", 40);
+        case 22:
+          _context.next = 24;
           return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 23:
-          _context.next = 25;
+        case 24:
+          _context.next = 26;
           return hopApi.getDryRunXcm({
             originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, nextChain), Version.V4),
             xcm: forwardedXcms[1][0],
             node: nextChain,
-            origin: currentOrigin
+            origin: currentOrigin,
+            asset: asset,
+            feeAsset: resolvedFeeAsset,
+            originFee: originDryRun.fee,
+            amount: BigInt(currency.amount)
           });
-        case 25:
+        case 26:
           hopDryRun = _context.sent;
           if (nextChain === destination || isRelayChain(nextChain) && !isRelayChain(destination)) {
             destinationDryRun = hopDryRun;
@@ -3231,28 +3260,28 @@ var dryRunInternal = /*#__PURE__*/function () {
             intermediateFees.bridgeHub = hopDryRun;
           }
           if (hopDryRun.success) {
-            _context.next = 29;
+            _context.next = 30;
             break;
           }
-          return _context.abrupt("break", 39);
-        case 29:
+          return _context.abrupt("break", 40);
+        case 30:
           newXcms = hopDryRun.forwardedXcms, destParaId = hopDryRun.destParaId;
           forwardedXcms = newXcms;
           nextParaId = destParaId;
           currentOrigin = nextChain;
-        case 33:
-          _context.prev = 33;
-          _context.next = 36;
+        case 34:
+          _context.prev = 34;
+          _context.next = 37;
           return hopApi.disconnect();
-        case 36:
-          return _context.finish(33);
         case 37:
-          _context.next = 12;
+          return _context.finish(34);
+        case 38:
+          _context.next = 13;
           break;
-        case 39:
+        case 40:
           return _context.abrupt("return", {
             origin: originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
-              currency: getNativeAssetSymbol(origin)
+              currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin)
             }) : originDryRun,
             assetHub: (_intermediateFees$ass = intermediateFees.assetHub) !== null && _intermediateFees$ass !== void 0 && _intermediateFees$ass.success ? _objectSpread2(_objectSpread2({}, intermediateFees.assetHub), {}, {
               currency: getNativeAssetSymbol('AssetHubPolkadot')
@@ -3264,11 +3293,11 @@ var dryRunInternal = /*#__PURE__*/function () {
               currency: asset.symbol
             }) : destinationDryRun
           });
-        case 40:
+        case 41:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[17,, 33, 37]]);
+    }, _callee, null, [[18,, 34, 38]]);
   }));
   return function dryRunInternal(_x) {
     return _ref.apply(this, arguments);
@@ -4385,69 +4414,71 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, currency, rawFee, dryRunResult, _rawFee, fee, forwardedXcms, destParaId;
+    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, currencySymbol, rawFee, dryRunResult, _rawFee, fee, forwardedXcms, destParaId;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, disableFallback = _ref.disableFallback;
-          _context.next = 3;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          _context.next = 4;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 3:
-          currency = getNativeAssetSymbol(origin);
+        case 4:
+          currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin);
           if (hasDryRunSupport(origin)) {
-            _context.next = 9;
+            _context.next = 10;
             break;
           }
-          _context.next = 7;
+          _context.next = 8;
           return api.calculateTransactionFee(tx, senderAddress);
-        case 7:
+        case 8:
           rawFee = _context.sent;
           return _context.abrupt("return", {
             fee: padFee(rawFee, origin, destination, 'origin'),
-            currency: currency,
+            currency: currencySymbol,
             feeType: 'paymentInfo'
           });
-        case 9:
-          _context.next = 11;
+        case 10:
+          _context.next = 12;
           return api.getDryRunCall({
             tx: tx,
             node: origin,
-            address: senderAddress
+            address: senderAddress,
+            isFeeAsset: !!resolvedFeeAsset
           });
-        case 11:
+        case 12:
           dryRunResult = _context.sent;
           if (dryRunResult.success) {
-            _context.next = 19;
+            _context.next = 20;
             break;
           }
           if (!disableFallback) {
-            _context.next = 15;
+            _context.next = 16;
             break;
           }
           return _context.abrupt("return", {
             dryRunError: dryRunResult.failureReason
           });
-        case 15:
-          _context.next = 17;
+        case 16:
+          _context.next = 18;
           return api.calculateTransactionFee(tx, senderAddress);
-        case 17:
+        case 18:
           _rawFee = _context.sent;
           return _context.abrupt("return", {
             fee: padFee(_rawFee, origin, destination, 'origin'),
-            currency: currency,
+            currency: currencySymbol,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason
           });
-        case 19:
+        case 20:
           fee = dryRunResult.fee, forwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
           return _context.abrupt("return", {
             fee: fee,
             feeType: 'dryRun',
-            currency: currency,
+            currency: currencySymbol,
             forwardedXcms: forwardedXcms,
             destParaId: destParaId
           });
-        case 21:
+        case 22:
         case "end":
           return _context.stop();
       }
@@ -4487,11 +4518,11 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
 
 var getXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, destApi, destFeeRes, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, destFallback;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, destApi, destFeeRes, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, destFallback;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, disableFallback = _ref.disableFallback;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback;
           asset = findAssetForNodeOrThrow(origin, currency, destination); // Origin fee = execution fee + delivery fees
           _context.next = 4;
           return getOriginXcmFee({
@@ -4500,6 +4531,8 @@ var getXcmFee = /*#__PURE__*/function () {
             origin: origin,
             destination: destination,
             senderAddress: senderAddress,
+            feeAsset: feeAsset,
+            currency: currency,
             disableFallback: disableFallback
           });
         case 4:
@@ -4533,6 +4566,8 @@ var getXcmFee = /*#__PURE__*/function () {
             destination: destination,
             currency: currency,
             address: address,
+            asset: asset,
+            originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
@@ -4596,6 +4631,9 @@ var getXcmFee = /*#__PURE__*/function () {
             currency: currency,
             address: address,
             senderAddress: senderAddress,
+            asset: asset,
+            feeAsset: feeAsset,
+            originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             disableFallback: disableFallback
           });
         case 45:
@@ -4633,6 +4671,8 @@ var getXcmFee = /*#__PURE__*/function () {
             destination: destination,
             currency: currency,
             address: address,
+            asset: asset,
+            originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
@@ -4847,15 +4887,6 @@ var resolveAsset = function resolveAsset(currency, origin, destination, assetChe
   return assetCheckEnabled ? findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null) : null;
 };
 
-var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
-  var asset = findAsset(origin, feeAsset, !isTMultiLocation(destination) ? destination : null);
-  var usesRawOverriddenMultiAssets = 'multiasset' in currency && currency.multiasset.every(isTMultiAsset);
-  if (!asset && !usesRawOverriddenMultiAssets) {
-    throwUnsupportedCurrency(feeAsset, origin);
-  }
-  return asset !== null && asset !== void 0 ? asset : undefined;
-};
-
 var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
   var origin = _ref.from,
     destination = _ref.to,
@@ -6346,7 +6377,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleExecuteTransfer",
     value: function () {
       var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(input) {
-        var api, senderAddress, asset, MIN_FEE, maxU64, dummyTx, dryRunResult, feeDotShifted, toMl, feeConverted, feeConvertedPadded;
+        var api, senderAddress, asset, decimals, multiplier, base, scaledMultiplier, MIN_FEE, maxU64, dummyTx, dryRunResult, feeDotShifted, toMl, feeConverted, feeConvertedPadded;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -6358,53 +6389,58 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               throw new Error('Please provide senderAddress');
             case 3:
               validateAddress(senderAddress, this.node, false);
-              MIN_FEE = 150000n;
+              decimals = asset.decimals;
+              multiplier = decimals > 10 ? 0.4 : 0.15;
+              base = BigInt(Math.pow(10, decimals));
+              scaledMultiplier = BigInt(Math.floor(multiplier * Math.pow(10, decimals)));
+              MIN_FEE = base * scaledMultiplier / BigInt(Math.pow(10, decimals));
               maxU64 = (1n << 64n) - 1n;
               dummyTx = createExecuteXcm(input, {
                 refTime: maxU64,
                 proofSize: maxU64
               }, MIN_FEE);
-              _context3.next = 9;
+              _context3.next = 13;
               return api.getDryRunCall({
                 node: this.node,
                 tx: dummyTx,
-                address: senderAddress
+                address: senderAddress,
+                isFeeAsset: false
               });
-            case 9:
+            case 13:
               dryRunResult = _context3.sent;
               if (dryRunResult.success) {
-                _context3.next = 12;
+                _context3.next = 16;
                 break;
               }
               throw new Error("Dry run failed: ".concat(dryRunResult.failureReason));
-            case 12:
+            case 16:
               if (dryRunResult.weight) {
-                _context3.next = 14;
+                _context3.next = 18;
                 break;
               }
               throw new Error('Dry run failed: weight not found');
-            case 14:
+            case 18:
               feeDotShifted = dryRunResult.fee / 10n;
               toMl = transformMultiLocation(asset.multiLocation);
-              _context3.next = 18;
+              _context3.next = 22;
               return api.quoteAhPrice(DOT_MULTILOCATION, toMl, feeDotShifted);
-            case 18:
+            case 22:
               feeConverted = _context3.sent;
               if (feeConverted) {
-                _context3.next = 21;
+                _context3.next = 25;
                 break;
               }
               throw new Error("Pool DOT -> ".concat(asset.symbol, " not found."));
-            case 21:
+            case 25:
               if (!(BigInt(asset.amount) - feeConverted < 0)) {
-                _context3.next = 23;
+                _context3.next = 27;
                 break;
               }
               throw new Error("Insufficient balance. Fee: ".concat(feeConverted, ", Amount: ").concat(asset.amount));
-            case 23:
+            case 27:
               feeConvertedPadded = feeConverted * 3n / 2n; // increases fee by 50%
               return _context3.abrupt("return", createExecuteXcm(input, dryRunResult.weight, feeConvertedPadded));
-            case 25:
+            case 29:
             case "end":
               return _context3.stop();
           }
@@ -6430,7 +6466,10 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         if (!isAssetEqual(feeAsset, asset)) {
           throw new InvalidCurrencyError("Fee asset does not match transfer asset.");
         }
-        return Promise.resolve(this.handleExecuteTransfer(input));
+        var isNativeAsset = asset.symbol === this.getNativeAssetSymbol();
+        if (!isNativeAsset) {
+          return Promise.resolve(this.handleExecuteTransfer(input));
+        }
       }
       if (destination === 'AssetHubKusama') {
         return Promise.resolve(this.handleBridgeTransfer(input, 'Kusama'));
@@ -8741,59 +8780,63 @@ var getOriginFeeDetails = /*#__PURE__*/function () {
 
 var getTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, senderAddress, node, currency, tx, asset, balance, ed, edBN, isNativeAsset, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
+    var api, senderAddress, node, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, balance, ed, edBN, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = _ref.api, senderAddress = _ref.senderAddress, node = _ref.node, currency = _ref.currency, tx = _ref.tx;
+          api = _ref.api, senderAddress = _ref.senderAddress, node = _ref.origin, destination = _ref.destination, currency = _ref.currency, tx = _ref.tx, feeAsset = _ref.feeAsset;
           validateAddress(senderAddress, node, false);
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, node, destination, currency) : undefined;
           asset = findAssetForNodeOrThrow(node, currency, null);
-          _context.next = 5;
+          _context.next = 6;
           return getAssetBalanceInternal({
             api: api,
             address: senderAddress,
             node: node,
             currency: currency
           });
-        case 5:
+        case 6:
           balance = _context.sent;
           ed = getExistentialDeposit(node, currency);
           if (!(ed === null)) {
-            _context.next = 9;
+            _context.next = 10;
             break;
           }
           throw new Error("Cannot get existential deposit for currency ".concat(JSON.stringify(currency), "."));
-        case 9:
+        case 10:
           edBN = BigInt(ed);
           isNativeAsset = getNativeAssetSymbol(node) === asset.symbol;
+          shouldSubstractFee = isNativeAsset || node === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, asset);
           feeToSubtract = 0n;
-          if (!isNativeAsset) {
-            _context.next = 20;
+          if (!shouldSubstractFee) {
+            _context.next = 22;
             break;
           }
-          _context.next = 15;
+          _context.next = 17;
           return getOriginXcmFee({
             api: api,
             tx: tx,
             origin: node,
             destination: node,
             senderAddress: senderAddress,
+            feeAsset: feeAsset,
+            currency: currency,
             disableFallback: false
           });
-        case 15:
+        case 17:
           _yield$getOriginXcmFe = _context.sent;
           fee = _yield$getOriginXcmFe.fee;
           if (!(fee === undefined)) {
-            _context.next = 19;
+            _context.next = 21;
             break;
           }
           throw new Error("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(node, "."));
-        case 19:
+        case 21:
           feeToSubtract = fee;
-        case 20:
+        case 22:
           transferable = balance - edBN - feeToSubtract;
           return _context.abrupt("return", transferable > 0n ? transferable : 0n);
-        case 22:
+        case 24:
         case "end":
           return _context.stop();
       }
@@ -8836,70 +8879,89 @@ var getTransferableAmount = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, destApi, destAsset, destCurrency, originBalanceNative, originBalance, destBalance, edOrigin, edOriginBn, edDest, edDestBn, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, _yield$getXcmFee$dest, destFee, destFeeCurrency, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, originBalanceAfter, originBalanceNativeAfter, originBalanceNativeSufficient, originBalanceSufficient, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, destXcmFeeBalanceAfter;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, resolvedFeeAsset, destApi, destAsset, destCurrency, originBalanceFee, originBalance, destBalance, edOrigin, edOriginBn, edDest, edDestBn, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, _yield$getXcmFee$dest, destFee, destFeeCurrency, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, destAmount, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, destXcmFeeBalanceAfter;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency;
-          _context.next = 3;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          _context.next = 4;
           return api.init(origin);
-        case 3:
+        case 4:
           api.setDisconnectAllowed(false);
           destApi = api.clone();
-          _context.next = 7;
+          _context.next = 8;
           return destApi.init(destination);
-        case 7:
+        case 8:
           destApi.setDisconnectAllowed(false);
-          _context.prev = 8;
+          _context.prev = 9;
           destAsset = findAssetOnDestOrThrow(origin, destination, currency);
           destCurrency = destAsset.multiLocation ? {
             multilocation: destAsset.multiLocation
           } : {
             symbol: destAsset.symbol
           };
-          _context.next = 13;
-          return getBalanceNativeInternal({
+          if (!(feeAsset && resolvedFeeAsset)) {
+            _context.next = 18;
+            break;
+          }
+          _context.next = 15;
+          return getAssetBalanceInternal({
+            api: api,
             address: senderAddress,
             node: origin,
-            api: api
+            currency: feeAsset
           });
-        case 13:
-          originBalanceNative = _context.sent;
-          _context.next = 16;
+        case 15:
+          _context.t0 = _context.sent;
+          _context.next = 21;
+          break;
+        case 18:
+          _context.next = 20;
+          return getBalanceNativeInternal({
+            api: api,
+            address: senderAddress,
+            node: origin
+          });
+        case 20:
+          _context.t0 = _context.sent;
+        case 21:
+          originBalanceFee = _context.t0;
+          _context.next = 24;
           return getAssetBalanceInternal({
             api: api,
             address: senderAddress,
             node: origin,
             currency: currency
           });
-        case 16:
+        case 24:
           originBalance = _context.sent;
-          _context.next = 19;
+          _context.next = 27;
           return getAssetBalanceInternal({
             api: destApi,
             address: address,
             node: destination,
             currency: destCurrency
           });
-        case 19:
+        case 27:
           destBalance = _context.sent;
           edOrigin = getExistentialDeposit(origin, currency);
           if (edOrigin) {
-            _context.next = 23;
+            _context.next = 31;
             break;
           }
           throw new InvalidParameterError("Existential deposit not found for ".concat(origin, " with currency ").concat(JSON.stringify(currency)));
-        case 23:
+        case 31:
           edOriginBn = BigInt(edOrigin);
           edDest = getExistentialDeposit(destination, destCurrency);
           if (edDest) {
-            _context.next = 27;
+            _context.next = 35;
             break;
           }
           throw new InvalidParameterError("Existential deposit not found for ".concat(destination, " with currency ").concat(JSON.stringify(currency)));
-        case 27:
+        case 35:
           edDestBn = BigInt(edDest);
-          _context.next = 30;
+          _context.next = 38;
           return getXcmFee({
             api: api,
             tx: tx,
@@ -8908,9 +8970,10 @@ var getTransferInfo = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             address: address,
             currency: currency,
+            feeAsset: feeAsset,
             disableFallback: false
           });
-        case 30:
+        case 38:
           _yield$getXcmFee = _context.sent;
           _yield$getXcmFee$orig = _yield$getXcmFee.origin;
           originFee = _yield$getXcmFee$orig.fee;
@@ -8919,39 +8982,42 @@ var getTransferInfo = /*#__PURE__*/function () {
           destFee = _yield$getXcmFee$dest.fee;
           destFeeCurrency = _yield$getXcmFee$dest.currency;
           if (!(originFee === undefined)) {
-            _context.next = 39;
+            _context.next = 47;
             break;
           }
           throw new Error("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(origin, "."));
-        case 39:
+        case 47:
           isDestFeeInNativeCurrency = destFeeCurrency === getNativeAssetSymbol(destination);
           if (!isDestFeeInNativeCurrency) {
-            _context.next = 47;
+            _context.next = 55;
             break;
           }
-          _context.next = 43;
+          _context.next = 51;
           return getBalanceNativeInternal({
             address: address,
             node: destination,
             api: destApi
           });
-        case 43:
+        case 51:
           destRecipientNativeBalance = _context.sent;
           destXcmFeeBalance = destRecipientNativeBalance;
-          _context.next = 48;
+          _context.next = 56;
           break;
-        case 47:
+        case 55:
           destXcmFeeBalance = destBalance;
-        case 48:
+        case 56:
+          isFeeAssetAh = origin === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, destAsset);
           originBalanceAfter = originBalance - BigInt(currency.amount);
-          originBalanceNativeAfter = originBalanceNative - originFee;
-          originBalanceNativeSufficient = originBalanceNative >= originFee;
+          originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - BigInt(currency.amount) : originBalanceFee - originFee;
+          originBalanceNativeSufficient = originBalanceFee >= originFee;
           originBalanceSufficient = originBalanceAfter >= edOriginBn;
-          destBalanceSufficient = BigInt(currency.amount) - destFee > (destBalance < edDestBn ? edDestBn : 0);
+          destAmount = isFeeAssetAh ? BigInt(currency.amount) - originFee : BigInt(currency.amount);
+          destBalanceSufficient = destAmount - destFee > (destBalance < edDestBn ? edDestBn : 0);
           destBalanceSufficientResult = destFeeCurrency !== destAsset.symbol ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceSufficient;
-          destBalanceAfter = destBalance - (destFeeCurrency === destAsset.symbol ? destFee : 0n) + BigInt(currency.amount);
+          destBalanceAfter = destBalance - (destFeeCurrency === destAsset.symbol ? destFee : 0n) + destAmount;
           destbalanceAfterResult = destFeeCurrency !== destAsset.symbol ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceAfter;
-          destXcmFeeBalanceAfter = destXcmFeeBalance - destFee + (destFeeCurrency === destAsset.symbol ? BigInt(currency.amount) : 0n);
+          receivedAmount = destbalanceAfterResult instanceof UnableToComputeError ? destbalanceAfterResult : destbalanceAfterResult - destBalance;
+          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFee + (destFeeCurrency === destAsset.symbol ? BigInt(currency.amount) : 0n);
           return _context.abrupt("return", {
             chain: {
               origin: origin,
@@ -8969,14 +9035,15 @@ var getTransferInfo = /*#__PURE__*/function () {
               xcmFee: {
                 sufficient: originBalanceNativeSufficient,
                 fee: originFee,
-                balance: originBalanceNative,
-                balanceAfter: originBalanceNativeAfter,
+                balance: originBalanceFee,
+                balanceAfter: originBalanceFeeAfter,
                 currencySymbol: originFeeCurrency
               }
             },
             destination: {
               receivedCurrency: {
                 sufficient: destBalanceSufficientResult,
+                receivedAmount: receivedAmount,
                 balance: destBalance,
                 balanceAfter: destbalanceAfterResult,
                 currencySymbol: destAsset.symbol,
@@ -8990,22 +9057,22 @@ var getTransferInfo = /*#__PURE__*/function () {
               }
             }
           });
-        case 58:
-          _context.prev = 58;
+        case 69:
+          _context.prev = 69;
           api.setDisconnectAllowed(true);
           destApi.setDisconnectAllowed(true);
-          _context.next = 63;
+          _context.next = 74;
           return api.disconnect();
-        case 63:
-          _context.next = 65;
+        case 74:
+          _context.next = 76;
           return destApi.disconnect();
-        case 65:
-          return _context.finish(58);
-        case 66:
+        case 76:
+          return _context.finish(69);
+        case 77:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[8,, 58, 66]]);
+    }, _callee, null, [[9,, 69, 77]]);
   }));
   return function getTransferInfo(_x) {
     return _ref2.apply(this, arguments);
@@ -9014,11 +9081,11 @@ var getTransferInfo = /*#__PURE__*/function () {
 
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, address, senderAddress, currency, destApi, asset, destCurrency, ed, edBN, balance, _yield$getXcmFee, dryRunError, _yield$getXcmFee$dest, destFee, destFeeCurrency, destDryRunError;
+    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, edBN, balance, _yield$getXcmFee, dryRunError, _yield$getXcmFee$dest, destFee, destFeeCurrency, destDryRunError;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, address = _ref.address, senderAddress = _ref.senderAddress, currency = _ref.currency;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, address = _ref.address, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset, currency = _ref.currency;
           validateAddress(address, destination);
           destApi = api.clone();
           _context.next = 5;
@@ -9056,6 +9123,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             address: address,
             currency: currency,
+            feeAsset: feeAsset,
             disableFallback: false
           });
         case 16:
@@ -9447,11 +9515,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "dryRun",
     value: function () {
       var _dryRun2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$_options2, to, address, senderAddress, tx;
+        var _this$_options2, to, address, senderAddress, feeAsset, tx;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _this$_options2 = this._options, to = _this$_options2.to, address = _this$_options2.address, senderAddress = _this$_options2.senderAddress;
+              _this$_options2 = this._options, to = _this$_options2.to, address = _this$_options2.address, senderAddress = _this$_options2.senderAddress, feeAsset = _this$_options2.feeAsset;
               _context3.next = 3;
               return this.build();
             case 3:
@@ -9481,7 +9549,8 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 origin: this._options.from,
                 destination: to,
                 currency: this._options.currency,
-                senderAddress: this._options.senderAddress
+                senderAddress: this._options.senderAddress,
+                feeAsset: feeAsset
               }));
             case 11:
             case "end":
@@ -9510,6 +9579,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
           to,
           address,
           senderAddress,
+          feeAsset,
           tx,
           _args4 = arguments;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -9518,7 +9588,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
               _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {
                 disableFallback: false
               }, disableFallback = _ref.disableFallback;
-              _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, address = _this$_options3.address, senderAddress = _this$_options3.senderAddress;
+              _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, address = _this$_options3.address, senderAddress = _this$_options3.senderAddress, feeAsset = _this$_options3.feeAsset;
               assertToIsStringAndNoEthereum(to);
               assertAddressIsString(address);
               _context4.next = 6;
@@ -9535,6 +9605,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 senderAddress: senderAddress,
                 address: address,
                 currency: this._options.currency,
+                feeAsset: feeAsset,
                 disableFallback: disableFallback
               });
             case 10:
@@ -9572,6 +9643,8 @@ var GeneralBuilder = /*#__PURE__*/function () {
           from,
           to,
           senderAddress,
+          currency,
+          feeAsset,
           tx,
           _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -9580,7 +9653,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
               _ref2 = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {
                 disableFallback: false
               }, disableFallback = _ref2.disableFallback;
-              _this$_options4 = this._options, from = _this$_options4.from, to = _this$_options4.to, senderAddress = _this$_options4.senderAddress;
+              _this$_options4 = this._options, from = _this$_options4.from, to = _this$_options4.to, senderAddress = _this$_options4.senderAddress, currency = _this$_options4.currency, feeAsset = _this$_options4.feeAsset;
               assertToIsStringAndNoEthereum(to);
               _context5.next = 5;
               return this.build();
@@ -9594,6 +9667,8 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 origin: from,
                 destination: to,
                 senderAddress: senderAddress,
+                currency: currency,
+                feeAsset: feeAsset,
                 disableFallback: disableFallback
               });
             case 9:
@@ -9724,26 +9799,29 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getTransferableAmount",
     value: (function () {
       var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$_options7, from, senderAddress, currency, tx;
+        var _this$_options7, from, to, senderAddress, currency, feeAsset, tx;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _this$_options7 = this._options, from = _this$_options7.from, senderAddress = _this$_options7.senderAddress, currency = _this$_options7.currency;
-              _context8.next = 3;
+              _this$_options7 = this._options, from = _this$_options7.from, to = _this$_options7.to, senderAddress = _this$_options7.senderAddress, currency = _this$_options7.currency, feeAsset = _this$_options7.feeAsset;
+              assertToIsStringAndNoEthereum(to);
+              _context8.next = 4;
               return this.build();
-            case 3:
+            case 4:
               tx = _context8.sent;
-              _context8.next = 6;
+              _context8.next = 7;
               return getTransferableAmount({
                 api: this.api,
                 tx: tx,
-                node: from,
+                origin: from,
+                destination: to,
                 senderAddress: senderAddress,
+                feeAsset: feeAsset,
                 currency: currency
               });
-            case 6:
-              return _context8.abrupt("return", _context8.sent);
             case 7:
+              return _context8.abrupt("return", _context8.sent);
+            case 8:
             case "end":
               return _context8.stop();
           }
@@ -9764,11 +9842,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "verifyEdOnDestination",
     value: (function () {
       var _verifyEdOnDestination2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var _this$_options8, from, to, address, currency, senderAddress, tx;
+        var _this$_options8, from, to, address, currency, senderAddress, feeAsset, tx;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _this$_options8 = this._options, from = _this$_options8.from, to = _this$_options8.to, address = _this$_options8.address, currency = _this$_options8.currency, senderAddress = _this$_options8.senderAddress;
+              _this$_options8 = this._options, from = _this$_options8.from, to = _this$_options8.to, address = _this$_options8.address, currency = _this$_options8.currency, senderAddress = _this$_options8.senderAddress, feeAsset = _this$_options8.feeAsset;
               assertToIsStringAndNoEthereum(to);
               assertAddressIsString(address);
               _context9.next = 5;
@@ -9782,6 +9860,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 destination: to,
                 address: address,
                 senderAddress: senderAddress,
+                feeAsset: feeAsset,
                 currency: currency
               }));
             case 7:
@@ -9805,11 +9884,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getTransferInfo",
     value: (function () {
       var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0() {
-        var _this$_options9, from, to, address, currency, senderAddress, tx;
+        var _this$_options9, from, to, address, currency, senderAddress, feeAsset, tx;
         return _regeneratorRuntime().wrap(function _callee0$(_context0) {
           while (1) switch (_context0.prev = _context0.next) {
             case 0:
-              _this$_options9 = this._options, from = _this$_options9.from, to = _this$_options9.to, address = _this$_options9.address, currency = _this$_options9.currency, senderAddress = _this$_options9.senderAddress;
+              _this$_options9 = this._options, from = _this$_options9.from, to = _this$_options9.to, address = _this$_options9.address, currency = _this$_options9.currency, senderAddress = _this$_options9.senderAddress, feeAsset = _this$_options9.feeAsset;
               assertToIsStringAndNoEthereum(to);
               assertAddressIsString(address);
               _context0.next = 5;
@@ -9823,7 +9902,8 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 destination: to,
                 address: address,
                 senderAddress: senderAddress,
-                currency: currency
+                currency: currency,
+                feeAsset: feeAsset
               }));
             case 7:
             case "end":