@paraspell/sdk-core 11.6.1 → 11.7.2

package/dist/index.cjs

@@ -726,6 +726,11 @@ var assertAddressIsString = function assertAddressIsString(address) {
     throw new InvalidParameterError('Location address is not supported for this transfer type.');
   }
 };
+var assertSenderAddress = function assertSenderAddress(address) {
+  if (!address) {
+    throw new InvalidParameterError('Sender address parameter is required for this transfer.');
+  }
+};
 var assertHasLocation = function assertHasLocation(asset) {
   if (!asset.location) {
     throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset, sdkCommon.replaceBigInt), " is missing location"));
@@ -823,9 +828,55 @@ var sortAssets = function sortAssets(assets$1) {
 var isConfig = function isConfig(value) {
   return _typeof(value) === 'object' && value !== null && !Array.isArray(value) && (
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-  Object.keys(value).length < 3 || 'apiOverrides' in value || 'development' in value || 'abstractDecimals' in value);
+  Object.keys(value).length < 3 || 'apiOverrides' in value || 'development' in value || 'abstractDecimals' in value || 'xcmFormatCheck' in value);
 };
 
+var computeOverridenAmount = function computeOverridenAmount(options) {
+  var from = options.from,
+    to = options.to,
+    currency = options.currency,
+    api = options.api;
+  var config = api.getConfig();
+  if (isConfig(config) && config.abstractDecimals) {
+    return BYPASS_CURRENCY_AMOUNT;
+  } else {
+    assertToIsString(to);
+    var asset = assets.findAssetInfoOrThrow(from, currency, to);
+    return viem.parseUnits(BYPASS_CURRENCY_AMOUNT, asset.decimals);
+  }
+};
+var overrideTxAmount = function overrideTxAmount(options, builder) {
+  var modifiedBuilder = builder.currency(_objectSpread2(_objectSpread2({}, options.currency), {}, {
+    amount: computeOverridenAmount(options)
+  }));
+  return modifiedBuilder['buildInternal']();
+};
+var createTxs = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, builder) {
+    var tx, txBypass;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          _context.n = 1;
+          return builder['buildInternal']();
+        case 1:
+          tx = _context.v;
+          _context.n = 2;
+          return overrideTxAmount(options, builder);
+        case 2:
+          txBypass = _context.v;
+          return _context.a(2, {
+            tx: tx,
+            txBypass: txBypass
+          });
+      }
+    }, _callee);
+  }));
+  return function createTxs(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 /**
  * Retrieves the chain instance for a given chain.
  *
@@ -3552,12 +3603,7 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           api = options.api, senderAddress = options.senderAddress, paraIdTo = options.paraIdTo, assetInfo = options.assetInfo, currency = options.currency, feeCurrency = options.feeCurrency, address = options.address, feeAssetInfo = options.feeAssetInfo, version = options.version;
-          if (senderAddress) {
-            _context.n = 1;
-            break;
-          }
-          throw new InvalidParameterError('Please provide senderAddress');
-        case 1:
+          assertSenderAddress(senderAddress);
           assertAddressIsString(address);
           checkAmount = function checkAmount(fee) {
             if (assetInfo.amount <= fee) {
@@ -3588,7 +3634,7 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
               reserveFee: MIN_FEE
             }
           })), MAX_WEIGHT);
-          _context.n = 2;
+          _context.n = 1;
           return dryRunInternal({
             api: api,
             tx: api.callTxMethod(call),
@@ -3600,14 +3646,14 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             feeAsset: feeCurrency,
             useRootOrigin: true
           });
-        case 2:
+        case 1:
           dryRunResult = _context.v;
           if (dryRunResult.origin.success) {
-            _context.n = 3;
+            _context.n = 2;
             break;
           }
           throw new DryRunFailedError(dryRunResult.failureReason);
-        case 3:
+        case 2:
           originFeeEstimate = dryRunResult.origin.fee;
           originFee = padFeeBy(originFeeEstimate, FEE_PADDING_PERCENTAGE$2);
           reserveFeeEstimate = getReserveFeeFromHops(dryRunResult.hops);
@@ -3619,9 +3665,9 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
               reserveFee: reserveFee
             }
           }));
-          _context.n = 4;
+          _context.n = 3;
           return api.getXcmWeight(xcm);
-        case 4:
+        case 3:
           weight = _context.v;
           return _context.a(2, createExecuteCall(chain, xcm, weight));
       }
@@ -3659,7 +3705,7 @@ var getReverseTxFee = /*#__PURE__*/function () {
           _context.n = 1;
           return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
             amount: currency.amount
-          })).build();
+          }))['buildInternal']();
         case 1:
           tx = _context.v;
           _context.n = 2;
@@ -4152,7 +4198,7 @@ var getOriginFeeDetailsInternal = /*#__PURE__*/function () {
           return api.init(origin);
         case 1:
           _context.n = 2;
-          return Builder(api).from(origin).to(destination).currency(currency).address(accountDestination).senderAddress(account).ahAddress(ahAddress).build();
+          return Builder(api).from(origin).to(destination).currency(currency).address(accountDestination).senderAddress(account).ahAddress(ahAddress)['buildInternal']();
         case 2:
           tx = _context.v;
           _context.n = 3;
@@ -4694,9 +4740,7 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, message
     throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset, sdkCommon.replaceBigInt), " is not a foreign asset"));
   }
   assertHasLocation(asset);
-  if (!senderAddress) {
-    throw new InvalidParameterError("Please provide senderAddress");
-  }
+  assertSenderAddress(senderAddress);
   if (assets.isChainEvm(origin) && !ahAddress) {
     throw new InvalidParameterError("Please provide ahAddress");
   }
@@ -4966,18 +5010,13 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
             }
           });
           senderAddress = (_signer$account = signer.account) === null || _signer$account === void 0 ? void 0 : _signer$account.address;
-          if (senderAddress) {
-            _context.n = 8;
-            break;
-          }
-          throw new InvalidParameterError('Unable to get sender address');
+          assertSenderAddress(senderAddress);
+          _context.n = 8;
+          return api.init(from, TX_CLIENT_TIMEOUT_MS);
         case 8:
           _context.n = 9;
-          return api.init(from, TX_CLIENT_TIMEOUT_MS);
-        case 9:
-          _context.n = 10;
           return generateMessageId(api, senderAddress, getParaId(from), ethAsset.assetId, address, amount);
-        case 10:
+        case 9:
           messageId = _context.v;
           customXcm = createCustomXcmOnDest({
             api: api,
@@ -4989,17 +5028,17 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
             }),
             version: sdkCommon.Version.V4
           }, from, messageId);
-          _context.n = 11;
+          _context.n = 10;
           return api.objectToHex(customXcm, 'XcmVersionedXcm');
-        case 11:
+        case 10:
           customXcmOnDest = _context.v;
-          _context.n = 12;
+          _context.n = 11;
           return api.createApiForChain('AssetHubPolkadot');
-        case 12:
+        case 11:
           assetHubApi = _context.v;
-          _context.n = 13;
+          _context.n = 12;
           return getParaEthTransferFees(assetHubApi);
-        case 13:
+        case 12:
           _yield$getParaEthTran = _context.v;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
           bridgeFee = _yield$getParaEthTran2[0];
@@ -5014,7 +5053,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 = 14;
+          _context.n = 13;
           return createTx('transferAssetsUsingTypeAndThenAddress', [
           // This represents (1,X1(Parachain(1000)))
           [1, ['0x00' + numberToHex32(getParaId('AssetHubPolkadot')).slice(2)]],
@@ -5026,7 +5065,7 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           0,
           // The TransferType corresponding to fee asset
           2, customXcmOnDest]);
-        case 14:
+        case 13:
           tx = _context.v;
           return _context.a(2, tx);
       }
@@ -5765,13 +5804,8 @@ var handleToAhTeleport = /*#__PURE__*/function () {
           }
           throw new InvalidParameterError('Location address is not supported for this scenario');
         case 2:
-          if (senderAddress) {
-            _context.n = 3;
-            break;
-          }
-          throw new InvalidParameterError("Please provide senderAddress");
-        case 3:
-          _context.n = 4;
+          assertSenderAddress(senderAddress);
+          _context.n = 3;
           return dryRunInternal({
             api: api,
             tx: defaultTx,
@@ -5781,20 +5815,20 @@ var handleToAhTeleport = /*#__PURE__*/function () {
             address: address,
             currency: currency
           });
-        case 4:
+        case 3:
           dryRunResult = _context.v;
           if (!((_dryRunResult$destina = dryRunResult.destination) !== null && _dryRunResult$destina !== void 0 && _dryRunResult$destina.success)) {
-            _context.n = 5;
+            _context.n = 4;
             break;
           }
           return _context.a(2, defaultTx);
-        case 5:
+        case 4:
           // If the default tx dry run failed, we need to create execute transaction
           dummyTx = createExecuteExchangeXcm(input, origin, MAX_WEIGHT,
           // Enter dummy fee values just to get the dry run to pass
           asset.amount, asset.amount / 2n);
-          _context.n = 6;
-          return getXcmFee({
+          _context.n = 5;
+          return getXcmFeeInternal({
             api: api,
             tx: dummyTx,
             origin: origin,
@@ -5802,9 +5836,10 @@ var handleToAhTeleport = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             address: address,
             currency: currency,
-            disableFallback: false
+            disableFallback: false,
+            useRootOrigin: true
           });
-        case 6:
+        case 5:
           feeResult = _context.v;
           originExecutionFee = padFeeBy(feeResult.origin.fee, 20); // Pad by 20%
           destinationExecutionFee = padFeeBy(
@@ -6396,20 +6431,15 @@ var Parachain = /*#__PURE__*/function () {
             case 2:
               assertHasLocation(asset);
               assertAddressIsString(address);
-              if (!(senderAddress === undefined)) {
-                _context3.n = 3;
-                break;
-              }
-              throw new InvalidParameterError('Sender address is required for transfers to Ethereum');
-            case 3:
+              assertSenderAddress(senderAddress);
               ethAsset = createAsset(version, asset.amount, asset.location);
-              _context3.n = 4;
+              _context3.n = 3;
               return api.createApiForChain('AssetHubPolkadot');
-            case 4:
+            case 3:
               ahApi = _context3.v;
-              _context3.n = 5;
+              _context3.n = 4;
               return getParaEthTransferFees(ahApi);
-            case 5:
+            case 4:
               _yield$getParaEthTran = _context3.v;
               _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
               bridgeFee = _yield$getParaEthTran2[0];
@@ -6418,13 +6448,13 @@ var Parachain = /*#__PURE__*/function () {
               fee = useOnlyDepositInstruction ? PARA_TO_PARA_FEE_DOT : bridgeFee + executionFee;
               ethAssetInfo = assets.findAssetInfoByLoc(assets.getOtherAssets('Ethereum'), asset.location);
               if (ethAssetInfo) {
-                _context3.n = 6;
+                _context3.n = 5;
                 break;
               }
               throw new assets.InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(asset, sdkCommon.replaceBigInt)));
-            case 6:
+            case 5:
               if (!useOnlyDepositInstruction) {
-                _context3.n = 7;
+                _context3.n = 6;
                 break;
               }
               customXcmOnDest = addXcmVersionHeader([{
@@ -6441,16 +6471,16 @@ var Parachain = /*#__PURE__*/function () {
                   })
                 }
               }], version);
-              _context3.n = 9;
+              _context3.n = 8;
               break;
-            case 7:
+            case 6:
               assertHasId(ethAssetInfo);
-              _context3.n = 8;
+              _context3.n = 7;
               return generateMessageId(api, senderAddress, getParaId(this.chain), ethAssetInfo.assetId, address, asset.amount);
-            case 8:
+            case 7:
               messageId = _context3.v;
               customXcmOnDest = createCustomXcmOnDest(input, this.chain, messageId);
-            case 9:
+            case 8:
               call = {
                 module: 'PolkadotXcm',
                 method: 'transfer_assets_using_type_and_then',
@@ -6863,23 +6893,18 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
               }
               throw new BridgeHaltedError();
             case 2:
-              if (!(senderAddress === undefined)) {
-                _context.n = 3;
-                break;
-              }
-              throw new InvalidParameterError('Sender address is required for transfers to Ethereum');
-            case 3:
+              assertSenderAddress(senderAddress);
               if (!sdkCommon.isTLocation(address)) {
-                _context.n = 4;
+                _context.n = 3;
                 break;
               }
               throw new InvalidParameterError('Location address is not supported for Ethereum transfers');
-            case 4:
+            case 3:
               assertIsForeign(asset);
               assertHasLocation(asset);
-              _context.n = 5;
+              _context.n = 4;
               return generateMessageId(api, senderAddress, getParaId(this.chain), JSON.stringify(asset.location), address, asset.amount);
-            case 5:
+            case 4:
               messageId = _context.v;
               location = asset.symbol === this.getNativeAssetSymbol() ? DOT_LOCATION : asset.location;
               call = {
@@ -8825,43 +8850,38 @@ var createTypeAndThenTransfer = /*#__PURE__*/function () {
           api = options.api, asset = options.assetInfo, senderAddress = options.senderAddress, address = options.address, destination = options.destination;
           assertHasLocation(asset);
           assertAddressIsString(address);
-          if (senderAddress) {
-            _context.n = 1;
-            break;
-          }
-          throw new assets.InvalidCurrencyError("Sender address is required for Mythos transfer");
-        case 1:
+          assertSenderAddress(senderAddress);
           if (!(!assets.isForeignAsset(asset) || !asset.assetId)) {
-            _context.n = 2;
+            _context.n = 1;
             break;
           }
           throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset, sdkCommon.replaceBigInt), " is not a foreign asset"));
-        case 2:
-          _context.n = 3;
+        case 1:
+          _context.n = 2;
           return generateMessageId(api, senderAddress, getParaId(chain), asset.assetId, address, asset.amount);
-        case 3:
+        case 2:
           messageId = _context.v;
           ahApi = api.clone();
-          _context.n = 4;
+          _context.n = 3;
           return ahApi.init('AssetHubPolkadot');
-        case 4:
-          _context.n = 5;
+        case 3:
+          _context.n = 4;
           return getParaEthTransferFees(ahApi);
-        case 5:
+        case 4:
           _yield$getParaEthTran = _context.v;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
           bridgeFee = _yield$getParaEthTran2[0];
           ahExecutionFee = _yield$getParaEthTran2[1];
-          _context.n = 6;
+          _context.n = 5;
           return ahApi.quoteAhPrice(DOT_LOCATION, assets.getNativeAssets(chain)[0].location, bridgeFee + ahExecutionFee);
-        case 6:
+        case 5:
           feeConverted = _context.v;
           if (feeConverted) {
-            _context.n = 7;
+            _context.n = 6;
             break;
           }
           throw new InvalidParameterError("Pool DOT -> ".concat(asset.symbol, " not found."));
-        case 7:
+        case 6:
           nativeMythAmount = padFeeBy(feeConverted, 10);
           return _context.a(2, {
             module: 'PolkadotXcm',
@@ -10309,18 +10329,21 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var forced, real;
+    var _options$txs, tx, txBypass, forced, real;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          _options$txs = options.txs, tx = _options$txs.tx, txBypass = _options$txs.txBypass;
           _context.n = 1;
           return getOriginXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
+            tx: txBypass,
             useRootOrigin: true
           }));
         case 1:
           forced = _context.v;
           _context.n = 2;
           return getOriginXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
+            tx: tx,
             useRootOrigin: false
           }));
         case 2:
@@ -10559,12 +10582,12 @@ var getFailureInfo = function getFailureInfo(chains, hops) {
   return {};
 };
 var getXcmFeeInternal = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref, useRootOrigin) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, asset, amount, _yield$getOriginXcmFe, originFee, originCurrency, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, assetHubChain, processedBridgeHub, bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, useRootOrigin, asset, amount, _yield$getOriginXcmFe, originFee, originCurrency, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, assetHubChain, processedBridgeHub, bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          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, swapConfig = _ref.swapConfig;
+          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, swapConfig = _ref.swapConfig, useRootOrigin = _ref.useRootOrigin;
           asset = assets.findAssetInfoOrThrow(origin, currency, destination);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           _context2.n = 1;
@@ -10708,7 +10731,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                 }
               }, _callee);
             }));
-            return function processHop(_x3) {
+            return function processHop(_x2) {
               return _ref3.apply(this, arguments);
             };
           }();
@@ -10881,7 +10904,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[2,, 5, 7]]);
   }));
-  return function getXcmFeeInternal(_x, _x2) {
+  return function getXcmFeeInternal(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -10889,16 +10912,23 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
 var getXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _real$assetHub, _real$bridgeHub;
-    var forced, real, api;
+    var _options$txs, tx, txBypass, forced, real, api;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          _options$txs = options.txs, tx = _options$txs.tx, txBypass = _options$txs.txBypass;
           _context.n = 1;
-          return getXcmFeeInternal(options, true);
+          return getXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
+            tx: txBypass,
+            useRootOrigin: true
+          }));
         case 1:
           forced = _context.v;
           _context.n = 2;
-          return getXcmFeeInternal(options, false);
+          return getXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
+            tx: tx,
+            useRootOrigin: false
+          }));
         case 2:
           real = _context.v;
           api = options.api;
@@ -11375,11 +11405,11 @@ var buildHopInfo = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, originFeeAsset, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, totalHopFee, destinationInfo, _t;
+    var api, txs, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, originFeeAsset, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, totalHopFee, destinationInfo, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
+          api = _ref.api, txs = _ref.txs, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
           if (!(assets.isChainEvm(origin) && !ahAddress)) {
             _context2.n = 1;
             break;
@@ -11433,7 +11463,7 @@ var getTransferInfo = /*#__PURE__*/function () {
           _context2.n = 9;
           return getXcmFee({
             api: api,
-            tx: tx,
+            txs: txs,
             origin: origin,
             destination: destination,
             senderAddress: senderAddress,
@@ -11601,11 +11631,11 @@ var getTransferInfo = /*#__PURE__*/function () {
 
 var getMinTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, origin, senderAddress, address, chain, destination, currency, tx, feeAsset, builder, resolvedFeeAsset, asset, destAsset, destCurrency, destApi, destBalance, destEd, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, amount, result, originFee, hopFeeTotal, destinationFee, edComponent, minAmount, modifiedBuilder, dryRunResult, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
+    var api, origin, senderAddress, address, chain, destination, currency, feeAsset, txs, builder, resolvedFeeAsset, asset, destAsset, destCurrency, destApi, destBalance, destEd, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, amount, result, originFee, hopFeeTotal, destinationFee, edComponent, minAmount, modifiedBuilder, dryRunResult, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, senderAddress = _ref.senderAddress, address = _ref.address, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, tx = _ref.tx, feeAsset = _ref.feeAsset, builder = _ref.builder;
+          api = _ref.api, origin = _ref.origin, senderAddress = _ref.senderAddress, address = _ref.address, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, feeAsset = _ref.feeAsset, txs = _ref.txs, builder = _ref.builder;
           validateAddress(senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = assets.findAssetInfoOrThrow(chain, currency, null);
@@ -11634,11 +11664,11 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
           paysOriginInSendingAsset = !resolvedFeeAsset && isNativeAsset || resolvedFeeAsset && assets.isAssetEqual(resolvedFeeAsset, asset);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           _context.n = 3;
-          return getXcmFeeInternal({
+          return getXcmFee({
             api: api,
             origin: origin,
             destination: destination,
-            tx: tx,
+            txs: txs,
             senderAddress: senderAddress,
             address: address,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
@@ -11646,9 +11676,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
             }),
             feeAsset: feeAsset,
             disableFallback: false
-          },
-          // Use dryRun bypass
-          true);
+          });
         case 3:
           result = _context.v;
           originFee = result.origin && paysOriginInSendingAsset && assets.isAssetEqual(result.origin.asset, asset) ? result.origin.fee : 0n;
@@ -11665,7 +11693,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
           _t = dryRunInternal;
           _t2 = api;
           _context.n = 4;
-          return modifiedBuilder.build();
+          return modifiedBuilder['buildInternal']();
         case 4:
           _t3 = _context.v;
           _t4 = chain;
@@ -11735,11 +11763,11 @@ var getMinTransferableAmount = /*#__PURE__*/function () {
 
 var getTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, senderAddress, chain, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
+    var api, senderAddress, chain, destination, currency, txs, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, tx = _ref.tx, feeAsset = _ref.feeAsset;
+          api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, txs = _ref.txs, feeAsset = _ref.feeAsset;
           validateAddress(senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = assets.findAssetInfoOrThrow(chain, currency, null);
@@ -11765,7 +11793,7 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
           _context.n = 2;
           return getOriginXcmFee({
             api: api,
-            tx: tx,
+            txs: txs,
             origin: chain,
             destination: chain,
             senderAddress: senderAddress,
@@ -11852,7 +11880,7 @@ var buildTypeAndThenCall = function buildTypeAndThenCall(_ref, isDotAsset, custo
 };
 
 var FEE_PADDING_PERCENTAGE = 20;
-var FEE_PADDING_HYDRATION = 150;
+var FEE_PADDING_HYDRATION = 500;
 var computeInstructionFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, version, xcm) {
     var chain, api, _t;
@@ -12150,12 +12178,12 @@ var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
   return totalFee;
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, amount, destCurrency, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var api, txs, origin, destination, currency, address, senderAddress, feeAsset, destApi, asset, amount, destCurrency, ed, balance, tx, txBypass, 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:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, address = _ref.address, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset, currency = _ref.currency;
+          api = options.api, txs = options.txs, origin = options.origin, destination = options.destination, currency = options.currency, address = options.address, senderAddress = options.senderAddress, feeAsset = options.feeAsset;
           if (!(destination === 'Ethereum')) {
             _context.n = 1;
             break;
@@ -12196,10 +12224,11 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           });
         case 5:
           balance = _context.v;
+          tx = txs.tx, txBypass = txs.txBypass;
           _context.n = 6;
-          return getXcmFee({
+          return getXcmFeeInternal({
             api: api,
-            tx: tx,
+            tx: txBypass,
             origin: origin,
             destination: destination,
             senderAddress: senderAddress,
@@ -12208,42 +12237,37 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
               amount: amount
             }),
             feeAsset: feeAsset,
-            disableFallback: false
+            disableFallback: false,
+            useRootOrigin: true
           });
         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 = 7;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get destination xcm fee for currency ".concat(JSON.stringify(currency, sdkCommon.replaceBigInt), " on chain ").concat(destination, "."));
-        case 7:
           if (!dryRunError) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
           throw new DryRunFailedError(dryRunError, 'origin');
-        case 8:
+        case 7:
           hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
           if (!hopDryRunError) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
-        case 9:
+        case 8:
           if (!destDryRunError) {
-            _context.n = 10;
+            _context.n = 9;
             break;
           }
           throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
-        case 10:
+        case 9:
           if (!(assets.normalizeSymbol(asset.symbol) !== assets.normalizeSymbol(destFeeCurrency))) {
-            _context.n = 11;
+            _context.n = 10;
             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 11:
+        case 10:
           totalFee = calculateTotalXcmFee(xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
@@ -12256,7 +12280,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
     }, _callee);
   }));
   return function verifyEdOnDestinationInternal(_x) {
-    return _ref2.apply(this, arguments);
+    return _ref.apply(this, arguments);
   };
 }();
 
@@ -12651,85 +12675,131 @@ var GeneralBuilder = /*#__PURE__*/function () {
         return _buildBatch.apply(this, arguments);
       }
       return buildBatch;
-    }()
+    }())
+  }, {
+    key: "buildInternal",
+    value: function buildInternal() {
+      return this.buildCommon(true);
+    }
     /**
      * Builds and returns the transfer extrinsic.
      *
      * @returns A Promise that resolves to the transfer extrinsic.
      */
-    )
   }, {
     key: "build",
     value: (function () {
       var _build = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-        var _this$_options, from, to;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
+              return _context2.a(2, this.buildCommon());
+          }
+        }, _callee2, this);
+      }));
+      function build() {
+        return _build.apply(this, arguments);
+      }
+      return build;
+    }())
+  }, {
+    key: "buildCommon",
+    value: function () {
+      var _buildCommon = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+        var isCalledInternally,
+          _this$_options,
+          from,
+          to,
+          tx,
+          _args3 = arguments;
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
+            case 0:
+              isCalledInternally = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : false;
               if (this.batchManager.isEmpty()) {
-                _context2.n = 1;
+                _context3.n = 1;
                 break;
               }
               throw new InvalidParameterError('Transaction manager contains batched items. Use buildBatch() to process them.');
             case 1:
               _this$_options = this._options, from = _this$_options.from, to = _this$_options.to;
               if (!(!sdkCommon.isTLocation(to) && sdkCommon.isRelayChain(from) && sdkCommon.isRelayChain(to) && from !== to)) {
-                _context2.n = 2;
+                _context3.n = 2;
                 break;
               }
               throw new InvalidParameterError('Transfers between relay chains are not yet supported.');
             case 2:
-              return _context2.a(2, send(_objectSpread2({
+              _context3.n = 3;
+              return send(_objectSpread2({
                 api: this.api
-              }, this._options)));
+              }, this._options));
+            case 3:
+              tx = _context3.v;
+              _context3.n = 4;
+              return this.maybePerformXcmFormatCheck(tx, this._options, isCalledInternally);
+            case 4:
+              return _context3.a(2, tx);
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function build() {
-        return _build.apply(this, arguments);
+      function buildCommon() {
+        return _buildCommon.apply(this, arguments);
       }
-      return build;
-    }())
-  }, {
-    key: "computeOverridenAmount",
-    value: function computeOverridenAmount() {
-      var _this$_options2 = this._options,
-        from = _this$_options2.from,
-        to = _this$_options2.to,
-        currency = _this$_options2.currency;
-      var config = this.api.getConfig();
-      if (isConfig(config) && config.abstractDecimals) {
-        return BYPASS_CURRENCY_AMOUNT;
-      } else {
-        assertToIsString(to);
-        var asset = assets.findAssetInfoOrThrow(from, currency, to);
-        return viem.parseUnits(BYPASS_CURRENCY_AMOUNT, asset.decimals);
-      }
-    }
+      return buildCommon;
+    }()
   }, {
-    key: "overrideTxAmount",
-    value: function overrideTxAmount() {
-      var currency = this._options.currency;
-      var modifiedBuilder = this.currency(_objectSpread2(_objectSpread2({}, currency), {}, {
-        amount: this.computeOverridenAmount()
+    key: "maybePerformXcmFormatCheck",
+    value: function () {
+      var _maybePerformXcmFormatCheck = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(tx, options, isCalledInternally) {
+        var senderAddress, config, dryRunResult;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
+            case 0:
+              senderAddress = options.senderAddress;
+              config = this.api.getConfig();
+              if (!(isConfig(config) && config.xcmFormatCheck && !isCalledInternally)) {
+                _context4.n = 2;
+                break;
+              }
+              assertSenderAddress(senderAddress);
+              _context4.n = 1;
+              return buildDryRun(this.api, tx, _objectSpread2(_objectSpread2({}, options), {}, {
+                senderAddress: senderAddress
+              }), {
+                sentAssetMintMode: 'bypass'
+              });
+            case 1:
+              dryRunResult = _context4.v;
+              if (!dryRunResult.failureReason) {
+                _context4.n = 2;
+                break;
+              }
+              throw new DryRunFailedError(dryRunResult.failureReason, dryRunResult.failureChain);
+            case 2:
+              return _context4.a(2);
+          }
+        }, _callee4, this);
       }));
-      return modifiedBuilder.build();
-    }
+      function maybePerformXcmFormatCheck(_x2, _x3, _x4) {
+        return _maybePerformXcmFormatCheck.apply(this, arguments);
+      }
+      return maybePerformXcmFormatCheck;
+    }()
   }, {
     key: "dryRun",
     value: function () {
-      var _dryRun = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+      var _dryRun = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
         var tx;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
-              _context3.n = 1;
-              return this.build();
+              _context5.n = 1;
+              return this.buildInternal();
             case 1:
-              tx = _context3.v;
-              return _context3.a(2, buildDryRun(this.api, tx, this._options));
+              tx = _context5.v;
+              return _context5.a(2, buildDryRun(this.api, tx, this._options));
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }));
       function dryRun() {
         return _dryRun.apply(this, arguments);
@@ -12739,27 +12809,34 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "dryRunPreview",
     value: function () {
-      var _dryRunPreview = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(options) {
+      var _dryRunPreview = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(options) {
         var tx;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.n) {
             case 0:
-              _context4.n = 1;
-              return this.build();
+              _context6.n = 1;
+              return this.buildInternal();
             case 1:
-              tx = _context4.v;
-              return _context4.a(2, buildDryRun(this.api, tx, this._options, {
+              tx = _context6.v;
+              return _context6.a(2, buildDryRun(this.api, tx, this._options, {
                 sentAssetMintMode: 'preview',
                 mintFeeAssets: options === null || options === void 0 ? void 0 : options.mintFeeAssets
               }));
           }
-        }, _callee4, this);
+        }, _callee6, this);
       }));
-      function dryRunPreview(_x2) {
+      function dryRunPreview(_x5) {
         return _dryRunPreview.apply(this, arguments);
       }
       return dryRunPreview;
     }()
+  }, {
+    key: "createTxs",
+    value: function createTxs$1() {
+      return createTxs(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        api: this.api
+      }), this);
+    }
     /**
      * Returns the XCM fee for the transfer using dryRun or paymentInfo function.
      *
@@ -12768,47 +12845,56 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getXcmFee",
     value: (function () {
-      var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(options) {
+      var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(options) {
         var _options$disableFallb;
-        var _this$_options3, from, to, address, senderAddress, feeAsset, currency, tx, disableFallback;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.p = _context5.n) {
+        var _this$_options2, from, to, address, senderAddress, feeAsset, currency, disableFallback, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0;
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.p = _context7.n) {
             case 0:
-              _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, address = _this$_options3.address, senderAddress = _this$_options3.senderAddress, feeAsset = _this$_options3.feeAsset, currency = _this$_options3.currency;
+              _this$_options2 = this._options, from = _this$_options2.from, to = _this$_options2.to, address = _this$_options2.address, senderAddress = _this$_options2.senderAddress, feeAsset = _this$_options2.feeAsset, currency = _this$_options2.currency;
               assertToIsString(to);
               assertAddressIsString(address);
-              _context5.n = 1;
-              return this.overrideTxAmount();
-            case 1:
-              tx = _context5.v;
               disableFallback = (_options$disableFallb = options === null || options === void 0 ? void 0 : options.disableFallback) !== null && _options$disableFallb !== void 0 ? _options$disableFallb : false;
-              _context5.p = 2;
-              _context5.n = 3;
-              return getXcmFee({
-                api: this.api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                senderAddress: senderAddress,
-                address: address,
-                currency: currency,
-                feeAsset: feeAsset,
-                disableFallback: disableFallback
+              _context7.p = 1;
+              _t = getXcmFee;
+              _t2 = this.api;
+              _context7.n = 2;
+              return this.createTxs();
+            case 2:
+              _t3 = _context7.v;
+              _t4 = from;
+              _t5 = to;
+              _t6 = senderAddress;
+              _t7 = address;
+              _t8 = currency;
+              _t9 = feeAsset;
+              _t0 = disableFallback;
+              _context7.n = 3;
+              return _t({
+                api: _t2,
+                txs: _t3,
+                origin: _t4,
+                destination: _t5,
+                senderAddress: _t6,
+                address: _t7,
+                currency: _t8,
+                feeAsset: _t9,
+                disableFallback: _t0
               });
             case 3:
-              return _context5.a(2, _context5.v);
+              return _context7.a(2, _context7.v);
             case 4:
-              _context5.p = 4;
-              _context5.n = 5;
+              _context7.p = 4;
+              _context7.n = 5;
               return this.api.disconnect();
             case 5:
-              return _context5.f(4);
+              return _context7.f(4);
             case 6:
-              return _context5.a(2);
+              return _context7.a(2);
           }
-        }, _callee5, this, [[2,, 4, 6]]);
+        }, _callee7, this, [[1,, 4, 6]]);
       }));
-      function getXcmFee$1(_x3) {
+      function getXcmFee$1(_x6) {
         return _getXcmFee2.apply(this, arguments);
       }
       return getXcmFee$1;
@@ -12822,53 +12908,71 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getOriginXcmFee",
     value: (function () {
-      var _getOriginXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
+      var _getOriginXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
         var _ref,
           disableFallback,
-          _this$_options4,
+          _this$_options3,
           from,
           to,
           senderAddress,
           currency,
           feeAsset,
-          tx,
-          _args6 = arguments;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.p = _context6.n) {
+          api,
+          _args8 = arguments,
+          _t1,
+          _t10,
+          _t11,
+          _t12,
+          _t13,
+          _t14,
+          _t15,
+          _t16,
+          _t17;
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.p = _context8.n) {
             case 0:
-              _ref = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {
+              _ref = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {
                 disableFallback: false
               }, disableFallback = _ref.disableFallback;
-              _this$_options4 = this._options, from = _this$_options4.from, to = _this$_options4.to, senderAddress = _this$_options4.senderAddress, currency = _this$_options4.currency, feeAsset = _this$_options4.feeAsset;
+              _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, senderAddress = _this$_options3.senderAddress, currency = _this$_options3.currency, feeAsset = _this$_options3.feeAsset;
               assertToIsString(to);
-              _context6.n = 1;
-              return this.overrideTxAmount();
-            case 1:
-              tx = _context6.v;
-              _context6.p = 2;
-              _context6.n = 3;
-              return getOriginXcmFee({
-                api: this.api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                senderAddress: senderAddress,
-                currency: currency,
-                feeAsset: feeAsset,
-                disableFallback: disableFallback
+              api = this.api;
+              _context8.p = 1;
+              _t1 = getOriginXcmFee;
+              _t10 = api;
+              _context8.n = 2;
+              return this.createTxs();
+            case 2:
+              _t11 = _context8.v;
+              _t12 = from;
+              _t13 = to;
+              _t14 = senderAddress;
+              _t15 = currency;
+              _t16 = feeAsset;
+              _t17 = disableFallback;
+              _context8.n = 3;
+              return _t1({
+                api: _t10,
+                txs: _t11,
+                origin: _t12,
+                destination: _t13,
+                senderAddress: _t14,
+                currency: _t15,
+                feeAsset: _t16,
+                disableFallback: _t17
               });
             case 3:
-              return _context6.a(2, _context6.v);
+              return _context8.a(2, _context8.v);
             case 4:
-              _context6.p = 4;
-              _context6.n = 5;
+              _context8.p = 4;
+              _context8.n = 5;
               return this.api.disconnect();
             case 5:
-              return _context6.f(4);
+              return _context8.f(4);
             case 6:
-              return _context6.a(2);
+              return _context8.a(2);
           }
-        }, _callee6, this, [[2,, 4, 6]]);
+        }, _callee8, this, [[1,, 4, 6]]);
       }));
       function getOriginXcmFee$1() {
         return _getOriginXcmFee2.apply(this, arguments);
@@ -12884,20 +12988,20 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getXcmFeeEstimate",
     value: (function () {
-      var _getXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
-        var _this$_options5, from, to, address, senderAddress, currency, tx;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.p = _context7.n) {
+      var _getXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
+        var _this$_options4, from, to, address, senderAddress, currency, tx;
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.p = _context9.n) {
             case 0:
-              _this$_options5 = this._options, from = _this$_options5.from, to = _this$_options5.to, address = _this$_options5.address, senderAddress = _this$_options5.senderAddress, currency = _this$_options5.currency;
+              _this$_options4 = this._options, from = _this$_options4.from, to = _this$_options4.to, address = _this$_options4.address, senderAddress = _this$_options4.senderAddress, currency = _this$_options4.currency;
               assertToIsString(to);
               assertAddressIsString(address);
-              _context7.n = 1;
-              return this.build();
+              _context9.n = 1;
+              return this.buildInternal();
             case 1:
-              tx = _context7.v;
-              _context7.p = 2;
-              _context7.n = 3;
+              tx = _context9.v;
+              _context9.p = 2;
+              _context9.n = 3;
               return getXcmFeeEstimate({
                 api: this.api,
                 tx: tx,
@@ -12908,17 +13012,17 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 currency: currency
               });
             case 3:
-              return _context7.a(2, _context7.v);
+              return _context9.a(2, _context9.v);
             case 4:
-              _context7.p = 4;
-              _context7.n = 5;
+              _context9.p = 4;
+              _context9.n = 5;
               return this.api.disconnect();
             case 5:
-              return _context7.f(4);
+              return _context9.f(4);
             case 6:
-              return _context7.a(2);
+              return _context9.a(2);
           }
-        }, _callee7, this, [[2,, 4, 6]]);
+        }, _callee9, this, [[2,, 4, 6]]);
       }));
       function getXcmFeeEstimate$1() {
         return _getXcmFeeEstimate2.apply(this, arguments);
@@ -12934,19 +13038,19 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getOriginXcmFeeEstimate",
     value: (function () {
-      var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
-        var _this$_options6, from, to, senderAddress, currency, tx;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.p = _context8.n) {
+      var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
+        var _this$_options5, from, to, senderAddress, currency, tx;
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.p = _context0.n) {
             case 0:
-              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress, currency = _this$_options6.currency;
+              _this$_options5 = this._options, from = _this$_options5.from, to = _this$_options5.to, senderAddress = _this$_options5.senderAddress, currency = _this$_options5.currency;
               assertToIsString(to);
-              _context8.n = 1;
-              return this.build();
+              _context0.n = 1;
+              return this.buildInternal();
             case 1:
-              tx = _context8.v;
-              _context8.p = 2;
-              _context8.n = 3;
+              tx = _context0.v;
+              _context0.p = 2;
+              _context0.n = 3;
               return getOriginXcmFeeEstimate({
                 api: this.api,
                 tx: tx,
@@ -12956,17 +13060,17 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 senderAddress: senderAddress
               });
             case 3:
-              return _context8.a(2, _context8.v);
+              return _context0.a(2, _context0.v);
             case 4:
-              _context8.p = 4;
-              _context8.n = 5;
+              _context0.p = 4;
+              _context0.n = 5;
               return this.api.disconnect();
             case 5:
-              return _context8.f(4);
+              return _context0.f(4);
             case 6:
-              return _context8.a(2);
+              return _context0.a(2);
           }
-        }, _callee8, this, [[2,, 4, 6]]);
+        }, _callee0, this, [[2,, 4, 6]]);
       }));
       function getOriginXcmFeeEstimate$1() {
         return _getOriginXcmFeeEstimate2.apply(this, arguments);
@@ -12982,28 +13086,36 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getTransferableAmount",
     value: (function () {
-      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
-        var _this$_options7, from, to, senderAddress, currency, feeAsset, tx;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.n) {
+      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+        var _this$_options6, from, to, senderAddress, currency, feeAsset, api, _t18, _t19, _t20, _t21, _t22, _t23, _t24, _t25;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
             case 0:
-              _this$_options7 = this._options, from = _this$_options7.from, to = _this$_options7.to, senderAddress = _this$_options7.senderAddress, currency = _this$_options7.currency, feeAsset = _this$_options7.feeAsset;
+              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress, currency = _this$_options6.currency, feeAsset = _this$_options6.feeAsset;
               assertToIsString(to);
-              _context9.n = 1;
-              return this.overrideTxAmount();
+              api = this.api;
+              _t18 = getTransferableAmount;
+              _t19 = api;
+              _context1.n = 1;
+              return this.createTxs();
             case 1:
-              tx = _context9.v;
-              return _context9.a(2, getTransferableAmount({
-                api: this.api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                senderAddress: senderAddress,
-                feeAsset: feeAsset,
-                currency: currency
+              _t20 = _context1.v;
+              _t21 = from;
+              _t22 = to;
+              _t23 = senderAddress;
+              _t24 = feeAsset;
+              _t25 = currency;
+              return _context1.a(2, _t18({
+                api: _t19,
+                txs: _t20,
+                origin: _t21,
+                destination: _t22,
+                senderAddress: _t23,
+                feeAsset: _t24,
+                currency: _t25
               }));
           }
-        }, _callee9, this);
+        }, _callee1, this);
       }));
       function getTransferableAmount$1() {
         return _getTransferableAmount2.apply(this, arguments);
@@ -13019,31 +13131,41 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getMinTransferableAmount",
     value: (function () {
-      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
-        var _this$_options8, from, to, senderAddress, address, currency, feeAsset, tx;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.n) {
+      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+        var _this$_options7, from, to, senderAddress, address, currency, feeAsset, api, _t26, _t27, _t28, _t29, _t30, _t31, _t32, _t33, _t34, _t35;
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.n) {
             case 0:
-              _this$_options8 = this._options, from = _this$_options8.from, to = _this$_options8.to, senderAddress = _this$_options8.senderAddress, address = _this$_options8.address, currency = _this$_options8.currency, feeAsset = _this$_options8.feeAsset;
+              _this$_options7 = this._options, from = _this$_options7.from, to = _this$_options7.to, senderAddress = _this$_options7.senderAddress, address = _this$_options7.address, currency = _this$_options7.currency, feeAsset = _this$_options7.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
-              _context0.n = 1;
-              return this.overrideTxAmount();
+              api = this.api;
+              _t26 = getMinTransferableAmount;
+              _t27 = api;
+              _context10.n = 1;
+              return this.createTxs();
             case 1:
-              tx = _context0.v;
-              return _context0.a(2, getMinTransferableAmount({
-                api: this.api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                senderAddress: senderAddress,
-                address: address,
-                feeAsset: feeAsset,
-                currency: currency,
-                builder: this
+              _t28 = _context10.v;
+              _t29 = from;
+              _t30 = to;
+              _t31 = senderAddress;
+              _t32 = address;
+              _t33 = feeAsset;
+              _t34 = currency;
+              _t35 = this;
+              return _context10.a(2, _t26({
+                api: _t27,
+                txs: _t28,
+                origin: _t29,
+                destination: _t30,
+                senderAddress: _t31,
+                address: _t32,
+                feeAsset: _t33,
+                currency: _t34,
+                builder: _t35
               }));
           }
-        }, _callee0, this);
+        }, _callee10, this);
       }));
       function getMinTransferableAmount$1() {
         return _getMinTransferableAmount2.apply(this, arguments);
@@ -13059,30 +13181,38 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "verifyEdOnDestination",
     value: (function () {
-      var _verifyEdOnDestination2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
-        var _this$_options9, from, to, address, currency, senderAddress, feeAsset, tx;
-        return _regenerator().w(function (_context1) {
-          while (1) switch (_context1.n) {
+      var _verifyEdOnDestination2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
+        var _this$_options8, from, to, address, currency, senderAddress, feeAsset, _t36, _t37, _t38, _t39, _t40, _t41, _t42, _t43, _t44;
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             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, feeAsset = _this$_options9.feeAsset;
+              _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;
               assertToIsString(to);
               assertAddressIsString(address);
-              _context1.n = 1;
-              return this.overrideTxAmount();
+              _t36 = verifyEdOnDestination;
+              _t37 = this.api;
+              _context11.n = 1;
+              return this.createTxs();
             case 1:
-              tx = _context1.v;
-              return _context1.a(2, verifyEdOnDestination({
-                api: this.api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                address: address,
-                senderAddress: senderAddress,
-                feeAsset: feeAsset,
-                currency: currency
+              _t38 = _context11.v;
+              _t39 = from;
+              _t40 = to;
+              _t41 = address;
+              _t42 = senderAddress;
+              _t43 = feeAsset;
+              _t44 = currency;
+              return _context11.a(2, _t36({
+                api: _t37,
+                txs: _t38,
+                origin: _t39,
+                destination: _t40,
+                address: _t41,
+                senderAddress: _t42,
+                feeAsset: _t43,
+                currency: _t44
               }));
           }
-        }, _callee1, this);
+        }, _callee11, this);
       }));
       function verifyEdOnDestination$1() {
         return _verifyEdOnDestination2.apply(this, arguments);
@@ -13098,31 +13228,40 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getTransferInfo",
     value: (function () {
-      var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
-        var _this$_options0, from, to, address, currency, ahAddress, senderAddress, feeAsset, tx;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.n) {
+      var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
+        var _this$_options9, from, to, address, currency, ahAddress, senderAddress, feeAsset, _t45, _t46, _t47, _t48, _t49, _t50, _t51, _t52, _t53, _t54;
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _this$_options0 = this._options, from = _this$_options0.from, to = _this$_options0.to, address = _this$_options0.address, currency = _this$_options0.currency, ahAddress = _this$_options0.ahAddress, senderAddress = _this$_options0.senderAddress, feeAsset = _this$_options0.feeAsset;
+              _this$_options9 = this._options, from = _this$_options9.from, to = _this$_options9.to, address = _this$_options9.address, currency = _this$_options9.currency, ahAddress = _this$_options9.ahAddress, senderAddress = _this$_options9.senderAddress, feeAsset = _this$_options9.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
-              _context10.n = 1;
-              return this.overrideTxAmount();
+              _t45 = getTransferInfo;
+              _t46 = this.api;
+              _context12.n = 1;
+              return this.createTxs();
             case 1:
-              tx = _context10.v;
-              return _context10.a(2, getTransferInfo({
-                api: this.api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                address: address,
-                senderAddress: senderAddress,
-                ahAddress: ahAddress,
-                currency: currency,
-                feeAsset: feeAsset
+              _t47 = _context12.v;
+              _t48 = from;
+              _t49 = to;
+              _t50 = address;
+              _t51 = senderAddress;
+              _t52 = ahAddress;
+              _t53 = currency;
+              _t54 = feeAsset;
+              return _context12.a(2, _t45({
+                api: _t46,
+                txs: _t47,
+                origin: _t48,
+                destination: _t49,
+                address: _t50,
+                senderAddress: _t51,
+                ahAddress: _t52,
+                currency: _t53,
+                feeAsset: _t54
               }));
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
       function getTransferInfo$1() {
         return _getTransferInfo2.apply(this, arguments);
@@ -13190,6 +13329,7 @@ exports.assertAddressIsString = assertAddressIsString;
 exports.assertHasId = assertHasId;
 exports.assertHasLocation = assertHasLocation;
 exports.assertIsForeign = assertIsForeign;
+exports.assertSenderAddress = assertSenderAddress;
 exports.assertToIsString = assertToIsString;
 exports.blake2b256 = blake2b256;
 exports.blake2b512 = blake2b512;
@@ -13197,6 +13337,7 @@ exports.calcPreviewMintAmount = calcPreviewMintAmount;
 exports.claimAssets = claimAssets;
 exports.computeFeeFromDryRun = computeFeeFromDryRun;
 exports.computeFeeFromDryRunPjs = computeFeeFromDryRunPjs;
+exports.computeOverridenAmount = computeOverridenAmount;
 exports.convertSs58 = convertSs58;
 exports.createAsset = createAsset;
 exports.createAssetsFilter = createAssetsFilter;
@@ -13207,6 +13348,7 @@ exports.createChainClient = createChainClient;
 exports.createDirectExecuteXcm = createDirectExecuteXcm;
 exports.createExecuteCall = createExecuteCall;
 exports.createExecuteExchangeXcm = createExecuteExchangeXcm;
+exports.createTxs = createTxs;
 exports.createTypeAndThenCall = createTypeAndThenCall;
 exports.createVersionedAssets = createVersionedAssets;
 exports.createX1Payload = createX1Payload;
@@ -13245,6 +13387,7 @@ exports.getTransferableAmount = getTransferableAmount;
 exports.getTransferableAmountInternal = getTransferableAmountInternal;
 exports.getXcmFee = getXcmFee;
 exports.getXcmFeeEstimate = getXcmFeeEstimate;
+exports.getXcmFeeInternal = getXcmFeeInternal;
 exports.handleExecuteTransfer = handleExecuteTransfer;
 exports.handleSwapExecuteTransfer = handleSwapExecuteTransfer;
 exports.handleToAhTeleport = handleToAhTeleport;
@@ -13252,6 +13395,7 @@ exports.isConfig = isConfig;
 exports.localizeLocation = localizeLocation;
 exports.maybeOverrideAsset = maybeOverrideAsset;
 exports.maybeOverrideAssets = maybeOverrideAssets;
+exports.overrideTxAmount = overrideTxAmount;
 exports.padFee = padFee;
 exports.padFeeBy = padFeeBy;
 exports.resolveDestChain = resolveDestChain;