@paraspell/sdk-core 12.9.7 → 12.10.0-rc.0

package/dist/index.mjs

@@ -718,6 +718,26 @@ var ScenarioNotSupportedError = /*#__PURE__*/function (_Error) {
   return _createClass(ScenarioNotSupportedError);
 }(/*#__PURE__*/_wrapNativeSuper(Error));
 
+/**
+ * Error thrown when a submitted transaction encounters a dispatch error on-chain.
+ */
+var SubmitTransactionError = /*#__PURE__*/function (_Error) {
+  /**
+   * Constructs a new SubmitTransactionError.
+   *
+   * @param message - The dispatch error details.
+   */
+  function SubmitTransactionError(message) {
+    var _this;
+    _classCallCheck(this, SubmitTransactionError);
+    _this = _callSuper(this, SubmitTransactionError, [message]);
+    _this.name = 'SubmitTransactionError';
+    return _this;
+  }
+  _inherits(SubmitTransactionError, _Error);
+  return _createClass(SubmitTransactionError);
+}(/*#__PURE__*/_wrapNativeSuper(Error));
+
 var TransferToAhNotSupported = /*#__PURE__*/function (_Error) {
   function TransferToAhNotSupported(message) {
     var _this;
@@ -2495,9 +2515,9 @@ var assertAddressIsString = function assertAddressIsString(address) {
     throw new InvalidAddressError('Location address is not supported for this transfer type.');
   }
 };
-var assertSenderAddress = function assertSenderAddress(address) {
+var assertSender = function assertSender(address) {
   if (!address) {
-    throw new MissingParameterError('senderAddress');
+    throw new MissingParameterError('sender');
   }
 };
 var assertHasId = function assertHasId(asset) {
@@ -2505,7 +2525,7 @@ var assertHasId = function assertHasId(asset) {
     throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset, replaceBigInt), " has no assetId"));
   }
 };
-var assertSender = function assertSender(sender) {
+var assertSenderSource = function assertSenderSource(sender) {
   if (sender === undefined) {
     throw new InvalidAddressError('Sender address needs to be a derivation path or signer to sign and submit transaction using this method.');
   }
@@ -2708,7 +2728,7 @@ var resolveAssets = function resolveAssets(_ref, version) {
     chain = _ref.chain,
     currency = _ref.currency;
   var normalizeAsset = function normalizeAsset(amount, currency) {
-    var asset = findAssetInfoOrThrow(chain, currency, null);
+    var asset = findAssetInfoOrThrow(chain, currency);
     var abstracted = abstractDecimals(amount, asset.decimals, api);
     return createAsset(version, abstracted, localizeLocation(chain, asset.location));
   };
@@ -2732,6 +2752,9 @@ var resolveAssets = function resolveAssets(_ref, version) {
   return [normalizeAsset(currency.amount, currency)];
 };
 
+/**
+ * @deprecated Asset claim functionality is deprecated and will be removed in v14.
+ */
 var claimAssets = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var api, chain, address, pallets, supportedPallet, version, assets, params, call;
@@ -3017,8 +3040,8 @@ var validateTransact = function validateTransact(_ref) {
   var api = _ref.api,
     from = _ref.from,
     to = _ref.to,
-    senderAddress = _ref.senderAddress,
-    address = _ref.address,
+    sender = _ref.sender,
+    address = _ref.recipient,
     transactOptions = _ref.transactOptions;
   var call = transactOptions === null || transactOptions === void 0 ? void 0 : transactOptions.call;
   if (!call) return;
@@ -3031,7 +3054,7 @@ var validateTransact = function validateTransact(_ref) {
   if (isChainEvm(from) || typeof to === 'string' && isChainEvm(to)) {
     throw new UnsupportedOperationError('Transact option is only supported for Substrate to Substrate scenarios.');
   }
-  if (typeof address === 'string' && senderAddress && !compareAddresses(api, address, senderAddress)) {
+  if (typeof address === 'string' && sender && !compareAddresses(api, address, sender)) {
     return new ValidationError('Sender address must match the destination address for transact to work.');
   }
 };
@@ -3041,15 +3064,15 @@ var resolveTransferParams = function resolveTransferParams(options) {
     origin = options.from,
     currency = options.currency,
     feeAsset = options.feeAsset,
-    address = options.address,
+    address = options.recipient,
     destination = options.to,
     version = options.version,
-    senderAddress = options.senderAddress;
+    sender = options.sender;
   validateCurrency(currency, feeAsset);
   validateDestination(origin, destination);
   validateTransact(options);
   validateDestinationAddress(address, destination, api);
-  if (senderAddress) validateAddress(api, senderAddress, origin, false);
+  if (sender) validateAddress(api, sender, origin, false);
   var isBridge = !isTLocation(destination) && isSubstrateBridge(origin, destination);
   var assetCheckEnabled = shouldPerformAssetCheck(origin, currency);
   validateAssetSpecifiers(assetCheckEnabled, currency);
@@ -3092,11 +3115,11 @@ var resolveTransferParams = function resolveTransferParams(options) {
 };
 var createTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, origin, currency, feeAsset, address, destination, paraIdTo, senderAddress, ahAddress, pallet, method, transactOptions, isAmountAll, keepAlive, _resolveTransferParam, resolvedFeeAsset, resolvedVersion, overriddenAsset, normalizedAsset;
+    var api, origin, currency, feeAsset, recipient, destination, paraIdTo, sender, ahAddress, pallet, method, transactOptions, isAmountAll, keepAlive, _resolveTransferParam, resolvedFeeAsset, resolvedVersion, overriddenAsset, normalizedAsset;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method, transactOptions = options.transactOptions, isAmountAll = options.isAmountAll, keepAlive = options.keepAlive;
+          api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, recipient = options.recipient, destination = options.to, paraIdTo = options.paraIdTo, sender = options.sender, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method, transactOptions = options.transactOptions, isAmountAll = options.isAmountAll, keepAlive = options.keepAlive;
           _resolveTransferParam = resolveTransferParams(options), resolvedFeeAsset = _resolveTransferParam.resolvedFeeAsset, resolvedVersion = _resolveTransferParam.resolvedVersion, overriddenAsset = _resolveTransferParam.overriddenAsset, normalizedAsset = _resolveTransferParam.normalizedAsset;
           _context.n = 1;
           return api.init(origin, TX_CLIENT_TIMEOUT_MS);
@@ -3107,12 +3130,12 @@ var createTransfer = /*#__PURE__*/function () {
             currency: currency,
             feeAsset: resolvedFeeAsset,
             feeCurrency: feeAsset,
-            address: address,
+            recipient: recipient,
             to: destination,
             paraIdTo: paraIdTo,
             overriddenAsset: overriddenAsset,
             version: resolvedVersion,
-            senderAddress: senderAddress,
+            sender: sender,
             ahAddress: ahAddress,
             pallet: pallet,
             method: method,
@@ -3208,6 +3231,8 @@ var getMythosOriginFee = /*#__PURE__*/function () {
 
 /**
  * Builder class for constructing asset claim transactions.
+ *
+ * @deprecated Asset claim functionality is deprecated and will be removed in v14.
  */
 var AssetClaimBuilder = /*#__PURE__*/function () {
   function AssetClaimBuilder(api, options) {
@@ -3235,14 +3260,14 @@ var AssetClaimBuilder = /*#__PURE__*/function () {
      * @returns
      */
   }, {
-    key: "senderAddress",
-    value: function senderAddress(sender) {
-      var isPath = typeof sender === 'string' && sender.startsWith('//');
-      var isPathOrSigner = isPath || isSenderSigner(sender);
-      var address = isPathOrSigner ? this.api.deriveAddress(sender) : sender;
+    key: "sender",
+    value: function sender(_sender) {
+      var isPath = typeof _sender === 'string' && _sender.startsWith('//');
+      var isPathOrSigner = isPath || isSenderSigner(_sender);
+      var address = isPathOrSigner ? this.api.deriveAddress(_sender) : _sender;
       return new AssetClaimBuilder(this.api, _objectSpread2(_objectSpread2({}, this._options), {}, {
-        senderAddress: address,
-        sender: isPathOrSigner ? sender : undefined
+        sender: address,
+        senderSource: isPathOrSigner ? _sender : undefined
       }));
     }
     /**
@@ -3293,8 +3318,8 @@ var AssetClaimBuilder = /*#__PURE__*/function () {
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              sender = this._options.sender;
-              assertSender(sender);
+              sender = this._options.senderSource;
+              assertSenderSource(sender);
               _context.n = 1;
               return claimAssets(_objectSpread2({
                 api: this.api
@@ -3481,7 +3506,7 @@ var normalizeAmountAll = /*#__PURE__*/function () {
           }));
           buildTx = builderWithMinAmount['createTxFactory']();
           assertToIsString(options.to);
-          assertSenderAddress(options.senderAddress);
+          assertSender(options.sender);
           if (!swapOptions) {
             _context.n = 3;
             break;
@@ -3504,7 +3529,7 @@ var normalizeAmountAll = /*#__PURE__*/function () {
             buildTx: buildTx,
             origin: options.from,
             destination: options.to,
-            senderAddress: options.senderAddress,
+            sender: options.sender,
             feeAsset: options.feeAsset,
             version: options.version,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
@@ -3628,8 +3653,7 @@ var BatchTransactionManager = /*#__PURE__*/function () {
  */
 var buildDryRun = function buildDryRun(api, tx, options, bypassOptions) {
   var to = options.to,
-    address = options.address,
-    senderAddress = options.senderAddress,
+    sender = options.sender,
     feeAsset = options.feeAsset,
     from = options.from,
     currency = options.currency,
@@ -3637,17 +3661,13 @@ var buildDryRun = function buildDryRun(api, tx, options, bypassOptions) {
   if (isTLocation(to)) {
     throw new InvalidAddressError('Location destination is not supported for XCM fee calculation.');
   }
-  if (isTLocation(address)) {
-    throw new InvalidAddressError('Location address is not supported for XCM fee calculation.');
-  }
   return dryRun({
     api: api,
     tx: tx,
-    address: senderAddress,
+    sender: sender,
     origin: from,
     destination: to,
     currency: currency,
-    senderAddress: senderAddress,
     feeAsset: feeAsset,
     version: version,
     bypassOptions: bypassOptions
@@ -3695,6 +3715,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
     /**
      * Initiates the process to claim assets from a specified chain.
      *
+     * @deprecated Asset claim functionality is deprecated and will be removed in v14.
      * @param chain - The chain from which to claim assets.
      * @returns An instance of Builder
      */
@@ -3721,33 +3742,33 @@ var GeneralBuilder = /*#__PURE__*/function () {
     /**
      * Sets the recipient address.
      *
-     * @param address - The destination address.
+     * @param address - The recipient address on the destination chain.
      * @returns An instance of Builder
      */
   }, {
-    key: "address",
-    value: function address(_address) {
-      var isPath = typeof _address === 'string' && _address.startsWith('//');
-      var resolvedAddress = isPath ? this.api.deriveAddress(_address) : _address;
+    key: "recipient",
+    value: function recipient(address) {
+      var isPath = typeof address === 'string' && address.startsWith('//');
+      var resolvedAddress = isPath ? this.api.deriveAddress(address) : address;
       return new GeneralBuilder(this.api, this.batchManager, _objectSpread2(_objectSpread2({}, this._options), {}, {
-        address: resolvedAddress
+        recipient: resolvedAddress
       }));
     }
     /**
      * Sets the sender address.
      *
-     * @param address - The sender address.
-     * @returns
+     * @param sender - The sender address or signer.
+     * @returns An instance of Builder
      */
   }, {
-    key: "senderAddress",
-    value: function senderAddress(sender) {
-      var isPath = typeof sender === 'string' && sender.startsWith('//');
-      var isPathOrSigner = isPath || isSenderSigner(sender);
-      var address = isPathOrSigner ? this.api.deriveAddress(sender) : sender;
+    key: "sender",
+    value: function sender(_sender) {
+      var isPath = typeof _sender === 'string' && _sender.startsWith('//');
+      var isPathOrSigner = isPath || isSenderSigner(_sender);
+      var address = isPathOrSigner ? this.api.deriveAddress(_sender) : _sender;
       return new GeneralBuilder(this.api, this.batchManager, _objectSpread2(_objectSpread2({}, this._options), {}, {
-        senderAddress: address,
-        sender: isPathOrSigner ? sender : undefined
+        sender: address,
+        senderSource: isPathOrSigner ? _sender : undefined
       }));
     }
     /**
@@ -4059,20 +4080,20 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "maybePerformXcmFormatCheck",
     value: function () {
       var _maybePerformXcmFormatCheck = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(tx, options, isCalledInternally) {
-        var senderAddress, config, dryRunResult;
+        var sender, config, dryRunResult;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
             case 0:
-              senderAddress = options.senderAddress;
+              sender = options.sender;
               config = this.api.getConfig();
               if (!(isConfig(config) && config.xcmFormatCheck && !isCalledInternally)) {
                 _context7.n = 2;
                 break;
               }
-              assertSenderAddress(senderAddress);
+              assertSender(sender);
               _context7.n = 1;
               return buildDryRun(this.api, tx, _objectSpread2(_objectSpread2({}, options), {}, {
-                senderAddress: senderAddress
+                sender: sender
               }), {
                 sentAssetMintMode: 'bypass'
               });
@@ -4176,7 +4197,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
     value: (function () {
       var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(options) {
         var _options$disableFallb;
-        var disableFallback, _yield$this$prepareNo3, normalizedOptions, buildTx, api, from, to, senderAddress, address, currency, feeAsset, version, swapOptions;
+        var disableFallback, _yield$this$prepareNo3, normalizedOptions, buildTx, api, from, to, sender, recipient, currency, feeAsset, version, swapOptions;
         return _regenerator().w(function (_context0) {
           while (1) switch (_context0.n) {
             case 0:
@@ -4187,9 +4208,9 @@ var GeneralBuilder = /*#__PURE__*/function () {
               _yield$this$prepareNo3 = _context0.v;
               normalizedOptions = _yield$this$prepareNo3.normalizedOptions;
               buildTx = _yield$this$prepareNo3.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, address = normalizedOptions.address, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, sender = normalizedOptions.sender, recipient = normalizedOptions.recipient, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
               assertToIsString(to);
-              assertAddressIsString(address);
+              assertAddressIsString(recipient);
               if (!swapOptions) {
                 _context0.n = 2;
                 break;
@@ -4205,8 +4226,8 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 buildTx: buildTx,
                 origin: from,
                 destination: to,
-                senderAddress: senderAddress,
-                address: address,
+                sender: sender,
+                recipient: recipient,
                 version: version,
                 currency: currency,
                 feeAsset: feeAsset,
@@ -4238,7 +4259,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
           api,
           from,
           to,
-          senderAddress,
+          sender,
           currency,
           feeAsset,
           version,
@@ -4256,7 +4277,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
               _yield$this$prepareNo4 = _context1.v;
               normalizedOptions = _yield$this$prepareNo4.normalizedOptions;
               buildTx = _yield$this$prepareNo4.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, sender = normalizedOptions.sender, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
               assertToIsString(to);
               assertSwapSupport(swapOptions);
               _context1.p = 2;
@@ -4266,7 +4287,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 buildTx: buildTx,
                 origin: from,
                 destination: to,
-                senderAddress: senderAddress,
+                sender: sender,
                 version: version,
                 currency: currency,
                 feeAsset: feeAsset,
@@ -4291,24 +4312,18 @@ var GeneralBuilder = /*#__PURE__*/function () {
       return getOriginXcmFee$1;
     }()
     /**
-     * Estimates the origin and destination XCM fee using the `paymentInfo` function.
-     *
-     * @deprecated This function is deprecated and will be removed in a future version.
-     * Please use `builder.getXcmFee()` instead, where `builder` is an instance of `Builder()`.
-     * Will be removed in v13.
-     * For more details, see the documentation:
-     * {@link https://paraspell.github.io/docs/sdk/xcmPallet.html#xcm-fee-origin-and-dest}
+     * Returns the max transferable amount for the transfer
      *
-     * @returns An origin and destination fee estimate.
+     * @returns The max transferable amount.
      */
     )
   }, {
-    key: "getXcmFeeEstimate",
+    key: "getTransferableAmount",
     value: (function () {
-      var _getXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
-        var _yield$this$prepareNo5, normalizedOptions, buildTx, api, from, to, address, senderAddress, currency, swapOptions, tx;
+      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+        var _yield$this$prepareNo5, normalizedOptions, buildTx, api, from, to, sender, currency, feeAsset, version, swapOptions;
         return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.p = _context10.n) {
+          while (1) switch (_context10.n) {
             case 0:
               _context10.n = 1;
               return this.prepareNormalizedOptions(this._options);
@@ -4316,148 +4331,30 @@ var GeneralBuilder = /*#__PURE__*/function () {
               _yield$this$prepareNo5 = _context10.v;
               normalizedOptions = _yield$this$prepareNo5.normalizedOptions;
               buildTx = _yield$this$prepareNo5.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, address = normalizedOptions.address, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency, swapOptions = normalizedOptions.swapOptions;
-              assertToIsString(to);
-              assertAddressIsString(address);
-              assertSwapSupport(swapOptions);
-              _context10.n = 2;
-              return buildTx();
-            case 2:
-              tx = _context10.v;
-              _context10.p = 3;
-              _context10.n = 4;
-              return getXcmFeeEstimate({
-                api: api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                address: address,
-                senderAddress: senderAddress,
-                currency: currency
-              });
-            case 4:
-              return _context10.a(2, _context10.v);
-            case 5:
-              _context10.p = 5;
-              _context10.n = 6;
-              return this.api.disconnect();
-            case 6:
-              return _context10.f(5);
-            case 7:
-              return _context10.a(2);
-          }
-        }, _callee10, this, [[3,, 5, 7]]);
-      }));
-      function getXcmFeeEstimate$1() {
-        return _getXcmFeeEstimate2.apply(this, arguments);
-      }
-      return getXcmFeeEstimate$1;
-    }()
-    /**
-     * Estimates the origin XCM fee using paymentInfo function.
-     *
-     * @deprecated This function is deprecated and will be removed in a future version.
-     * Please use `builder.getOriginXcmFee()` instead, where `builder` is an instance of `Builder()`.
-     * Will be removed in v13.
-     * For more details, see the documentation:
-     * {@link https://paraspell.github.io/docs/sdk/xcmPallet.html#xcm-fee-origin-and-dest}
-     *
-     * @returns An origin fee estimate.
-     */
-    )
-  }, {
-    key: "getOriginXcmFeeEstimate",
-    value: (function () {
-      var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
-        var _yield$this$prepareNo6, normalizedOptions, buildTx, api, from, to, senderAddress, currency, swapOptions, tx;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.p = _context11.n) {
-            case 0:
-              _context11.n = 1;
-              return this.prepareNormalizedOptions(this._options);
-            case 1:
-              _yield$this$prepareNo6 = _context11.v;
-              normalizedOptions = _yield$this$prepareNo6.normalizedOptions;
-              buildTx = _yield$this$prepareNo6.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency, swapOptions = normalizedOptions.swapOptions;
-              assertToIsString(to);
-              assertSwapSupport(swapOptions);
-              _context11.n = 2;
-              return buildTx();
-            case 2:
-              tx = _context11.v;
-              _context11.p = 3;
-              _context11.n = 4;
-              return getOriginXcmFeeEstimate({
-                api: api,
-                tx: tx,
-                origin: from,
-                destination: to,
-                currency: currency,
-                senderAddress: senderAddress
-              });
-            case 4:
-              return _context11.a(2, _context11.v);
-            case 5:
-              _context11.p = 5;
-              _context11.n = 6;
-              return this.api.disconnect();
-            case 6:
-              return _context11.f(5);
-            case 7:
-              return _context11.a(2);
-          }
-        }, _callee11, this, [[3,, 5, 7]]);
-      }));
-      function getOriginXcmFeeEstimate$1() {
-        return _getOriginXcmFeeEstimate2.apply(this, arguments);
-      }
-      return getOriginXcmFeeEstimate$1;
-    }()
-    /**
-     * Returns the max transferable amount for the transfer
-     *
-     * @returns The max transferable amount.
-     */
-    )
-  }, {
-    key: "getTransferableAmount",
-    value: (function () {
-      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
-        var _yield$this$prepareNo7, normalizedOptions, buildTx, api, from, to, senderAddress, currency, feeAsset, version, swapOptions;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.n) {
-            case 0:
-              _context12.n = 1;
-              return this.prepareNormalizedOptions(this._options);
-            case 1:
-              _yield$this$prepareNo7 = _context12.v;
-              normalizedOptions = _yield$this$prepareNo7.normalizedOptions;
-              buildTx = _yield$this$prepareNo7.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, sender = normalizedOptions.sender, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
               assertToIsString(to);
               if (!swapOptions) {
-                _context12.n = 2;
+                _context10.n = 2;
                 break;
               }
-              return _context12.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, normalizedOptions), {}, {
+              return _context10.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, normalizedOptions), {}, {
                 swapOptions: swapOptions
               }), function (builder) {
                 return builder.getTransferableAmount();
               }));
             case 2:
-              return _context12.a(2, getTransferableAmount({
+              return _context10.a(2, getTransferableAmount({
                 api: api,
                 buildTx: buildTx,
                 origin: from,
                 destination: to,
-                senderAddress: senderAddress,
+                sender: sender,
                 feeAsset: feeAsset,
                 version: version,
                 currency: currency
               }));
           }
-        }, _callee12, this);
+        }, _callee10, this);
       }));
       function getTransferableAmount$1() {
         return _getTransferableAmount2.apply(this, arguments);
@@ -4473,44 +4370,44 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getMinTransferableAmount",
     value: (function () {
-      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13() {
-        var _yield$this$prepareNo8, normalizedOptions, buildTx, api, from, to, senderAddress, address, currency, feeAsset, version, swapOptions;
-        return _regenerator().w(function (_context13) {
-          while (1) switch (_context13.n) {
+      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
+        var _yield$this$prepareNo6, normalizedOptions, buildTx, api, from, to, sender, recipient, currency, feeAsset, version, swapOptions;
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             case 0:
-              _context13.n = 1;
+              _context11.n = 1;
               return this.prepareNormalizedOptions(this._options);
             case 1:
-              _yield$this$prepareNo8 = _context13.v;
-              normalizedOptions = _yield$this$prepareNo8.normalizedOptions;
-              buildTx = _yield$this$prepareNo8.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, address = normalizedOptions.address, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
+              _yield$this$prepareNo6 = _context11.v;
+              normalizedOptions = _yield$this$prepareNo6.normalizedOptions;
+              buildTx = _yield$this$prepareNo6.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, sender = normalizedOptions.sender, recipient = normalizedOptions.recipient, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
               assertToIsString(to);
-              assertAddressIsString(address);
+              assertAddressIsString(recipient);
               if (!swapOptions) {
-                _context13.n = 2;
+                _context11.n = 2;
                 break;
               }
-              return _context13.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, normalizedOptions), {}, {
+              return _context11.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, normalizedOptions), {}, {
                 swapOptions: swapOptions
               }), function (builder) {
                 return builder.getMinTransferableAmount();
               }));
             case 2:
-              return _context13.a(2, getMinTransferableAmount({
+              return _context11.a(2, getMinTransferableAmount({
                 api: api,
                 buildTx: buildTx,
                 origin: from,
                 destination: to,
-                senderAddress: senderAddress,
-                address: address,
+                sender: sender,
+                recipient: recipient,
                 feeAsset: feeAsset,
                 version: version,
                 currency: currency,
                 builder: this
               }));
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
       function getMinTransferableAmount$1() {
         return _getMinTransferableAmount2.apply(this, arguments);
@@ -4526,34 +4423,34 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "verifyEdOnDestination",
     value: (function () {
-      var _verifyEdOnDestination2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14() {
-        var _yield$this$prepareNo9, normalizedOptions, buildTx, api, from, to, address, currency, senderAddress, feeAsset, version, swapOptions;
-        return _regenerator().w(function (_context14) {
-          while (1) switch (_context14.n) {
+      var _verifyEdOnDestination2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
+        var _yield$this$prepareNo7, normalizedOptions, buildTx, api, from, to, sender, recipient, currency, feeAsset, version, swapOptions;
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _context14.n = 1;
+              _context12.n = 1;
               return this.prepareNormalizedOptions(this._options);
             case 1:
-              _yield$this$prepareNo9 = _context14.v;
-              normalizedOptions = _yield$this$prepareNo9.normalizedOptions;
-              buildTx = _yield$this$prepareNo9.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, address = normalizedOptions.address, currency = normalizedOptions.currency, senderAddress = normalizedOptions.senderAddress, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
+              _yield$this$prepareNo7 = _context12.v;
+              normalizedOptions = _yield$this$prepareNo7.normalizedOptions;
+              buildTx = _yield$this$prepareNo7.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, sender = normalizedOptions.sender, recipient = normalizedOptions.recipient, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
               assertToIsString(to);
-              assertAddressIsString(address);
+              assertAddressIsString(recipient);
               assertSwapSupport(swapOptions);
-              return _context14.a(2, verifyEdOnDestination({
+              return _context12.a(2, verifyEdOnDestination({
                 api: api,
                 buildTx: buildTx,
                 origin: from,
                 destination: to,
-                address: address,
+                sender: sender,
+                recipient: recipient,
                 version: version,
-                senderAddress: senderAddress,
                 feeAsset: feeAsset,
                 currency: currency
               }));
           }
-        }, _callee14, this);
+        }, _callee12, this);
       }));
       function verifyEdOnDestination$1() {
         return _verifyEdOnDestination2.apply(this, arguments);
@@ -4569,35 +4466,35 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getTransferInfo",
     value: (function () {
-      var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
-        var _yield$this$prepareNo0, normalizedOptions, buildTx, api, from, to, address, currency, ahAddress, senderAddress, feeAsset, version, swapOptions;
-        return _regenerator().w(function (_context15) {
-          while (1) switch (_context15.n) {
+      var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13() {
+        var _yield$this$prepareNo8, normalizedOptions, buildTx, api, from, to, recipient, currency, ahAddress, sender, feeAsset, version, swapOptions;
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
-              _context15.n = 1;
+              _context13.n = 1;
               return this.prepareNormalizedOptions(this._options);
             case 1:
-              _yield$this$prepareNo0 = _context15.v;
-              normalizedOptions = _yield$this$prepareNo0.normalizedOptions;
-              buildTx = _yield$this$prepareNo0.buildTx;
-              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, address = normalizedOptions.address, currency = normalizedOptions.currency, ahAddress = normalizedOptions.ahAddress, senderAddress = normalizedOptions.senderAddress, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
+              _yield$this$prepareNo8 = _context13.v;
+              normalizedOptions = _yield$this$prepareNo8.normalizedOptions;
+              buildTx = _yield$this$prepareNo8.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, recipient = normalizedOptions.recipient, currency = normalizedOptions.currency, ahAddress = normalizedOptions.ahAddress, sender = normalizedOptions.sender, feeAsset = normalizedOptions.feeAsset, version = normalizedOptions.version, swapOptions = normalizedOptions.swapOptions;
               assertToIsString(to);
-              assertAddressIsString(address);
+              assertAddressIsString(recipient);
               assertSwapSupport(swapOptions);
-              return _context15.a(2, getTransferInfo({
+              return _context13.a(2, getTransferInfo({
                 api: api,
                 buildTx: buildTx,
                 origin: from,
                 destination: to,
-                address: address,
-                senderAddress: senderAddress,
+                sender: sender,
+                recipient: recipient,
                 ahAddress: ahAddress,
                 version: version,
                 currency: currency,
                 feeAsset: feeAsset
               }));
           }
-        }, _callee15, this);
+        }, _callee13, this);
       }));
       function getTransferInfo$1() {
         return _getTransferInfo2.apply(this, arguments);
@@ -4614,25 +4511,25 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getReceivableAmount",
     value: (function () {
-      var _getReceivableAmount = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
+      var _getReceivableAmount = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14() {
         var _yield$this$getTransf, receivedAmount;
-        return _regenerator().w(function (_context16) {
-          while (1) switch (_context16.n) {
+        return _regenerator().w(function (_context14) {
+          while (1) switch (_context14.n) {
             case 0:
-              _context16.n = 1;
+              _context14.n = 1;
               return this.getTransferInfo();
             case 1:
-              _yield$this$getTransf = _context16.v;
+              _yield$this$getTransf = _context14.v;
               receivedAmount = _yield$this$getTransf.destination.receivedCurrency.receivedAmount;
               if (!(receivedAmount instanceof UnableToComputeError)) {
-                _context16.n = 2;
+                _context14.n = 2;
                 break;
               }
               throw receivedAmount;
             case 2:
-              return _context16.a(2, receivedAmount);
+              return _context14.a(2, receivedAmount);
           }
-        }, _callee16, this);
+        }, _callee14, this);
       }));
       function getReceivableAmount() {
         return _getReceivableAmount.apply(this, arguments);
@@ -4642,20 +4539,20 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getBestAmountOut",
     value: function () {
-      var _getBestAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17() {
+      var _getBestAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
         var swapOptions;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+        return _regenerator().w(function (_context15) {
+          while (1) switch (_context15.n) {
             case 0:
               swapOptions = this._options.swapOptions;
-              return _context17.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, this._options), {}, {
+              return _context15.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, this._options), {}, {
                 api: this.api,
                 swapOptions: swapOptions
               }), function (builder) {
                 return builder.getBestAmountOut();
               }));
           }
-        }, _callee17, this);
+        }, _callee15, this);
       }));
       function getBestAmountOut() {
         return _getBestAmountOut.apply(this, arguments);
@@ -4665,52 +4562,93 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "signAndSubmit",
     value: function () {
-      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18() {
-        var _this$_options, sender, swapOptions, _yield$this$buildInte3, tx;
-        return _regenerator().w(function (_context18) {
-          while (1) switch (_context18.n) {
+      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
+        var _this$_options, senderSource, swapOptions, txHashes, _yield$this$buildInte3, tx;
+        return _regenerator().w(function (_context16) {
+          while (1) switch (_context16.n) {
             case 0:
-              _this$_options = this._options, sender = _this$_options.sender, swapOptions = _this$_options.swapOptions;
-              assertSender(sender);
+              _this$_options = this._options, senderSource = _this$_options.senderSource, swapOptions = _this$_options.swapOptions;
+              assertSenderSource(senderSource);
               if (!swapOptions) {
-                _context18.n = 3;
+                _context16.n = 3;
                 break;
               }
-              if (isSenderSigner(sender)) {
-                _context18.n = 1;
+              if (isSenderSigner(senderSource)) {
+                _context16.n = 1;
                 break;
               }
               throw new UnsupportedOperationError('Swap operations do not support local accounts yet. Please provider a signer');
             case 1:
-              _context18.n = 2;
+              _context16.n = 2;
               return executeWithRouter(_objectSpread2(_objectSpread2({}, this._options), {}, {
                 swapOptions: swapOptions,
                 api: this.api
               }), function (builder) {
-                return (
-                  // We need to cast this sender because RouterBuilder expects a PAPI signer but this part of sdk-core is generic
-                  // Will be removed in the future when we gradually move parts of swap package to sdk-core
-                  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
-                  builder.signer(sender).build()
-                );
+                return builder.signer(senderSource).signAndSubmit();
               });
             case 2:
-              return _context18.a(2, '');
+              txHashes = _context16.v;
+              return _context16.a(2, txHashes[0]);
             case 3:
-              _context18.n = 4;
+              _context16.n = 4;
               return this.buildInternal();
             case 4:
-              _yield$this$buildInte3 = _context18.v;
+              _yield$this$buildInte3 = _context16.v;
               tx = _yield$this$buildInte3.tx;
-              return _context18.a(2, this.api.signAndSubmit(tx, sender));
+              return _context16.a(2, this.api.signAndSubmit(tx, senderSource));
           }
-        }, _callee18, this);
+        }, _callee16, this);
       }));
       function signAndSubmit() {
         return _signAndSubmit.apply(this, arguments);
       }
       return signAndSubmit;
     }()
+  }, {
+    key: "signAndSubmitAll",
+    value: function () {
+      var _signAndSubmitAll = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17() {
+        var _this$_options2, senderSource, swapOptions, _yield$this$buildInte4, tx, txHash;
+        return _regenerator().w(function (_context17) {
+          while (1) switch (_context17.n) {
+            case 0:
+              _this$_options2 = this._options, senderSource = _this$_options2.senderSource, swapOptions = _this$_options2.swapOptions;
+              assertSenderSource(senderSource);
+              if (!swapOptions) {
+                _context17.n = 2;
+                break;
+              }
+              if (isSenderSigner(senderSource)) {
+                _context17.n = 1;
+                break;
+              }
+              throw new UnsupportedOperationError('Swap operations do not support local accounts yet. Please provider a signer');
+            case 1:
+              return _context17.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, this._options), {}, {
+                swapOptions: swapOptions,
+                api: this.api
+              }), function (builder) {
+                return builder.signer(senderSource).signAndSubmit();
+              }));
+            case 2:
+              _context17.n = 3;
+              return this.buildInternal();
+            case 3:
+              _yield$this$buildInte4 = _context17.v;
+              tx = _yield$this$buildInte4.tx;
+              _context17.n = 4;
+              return this.api.signAndSubmit(tx, senderSource);
+            case 4:
+              txHash = _context17.v;
+              return _context17.a(2, [txHash]);
+          }
+        }, _callee17, this);
+      }));
+      function signAndSubmitAll() {
+        return _signAndSubmitAll.apply(this, arguments);
+      }
+      return signAndSubmitAll;
+    }()
     /**
      * Returns the API instance used by the builder.
      *
@@ -4743,29 +4681,29 @@ var Builder = function Builder(api) {
   return new GeneralBuilder(api, new BatchTransactionManager());
 };
 
-var determineAddress = function determineAddress(chain, address, senderAddress) {
+var determineAddress = function determineAddress(chain, recipient, sender) {
   if (isChainEvm(chain)) {
-    return isAddress(address) ? address : senderAddress;
+    return isAddress(recipient) ? recipient : sender;
   }
-  return isAddress(address) ? senderAddress : address;
+  return isAddress(recipient) ? sender : recipient;
 };
 var getReverseTxFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, currencyInput) {
-    var api, origin, destination, senderAddress, address, skipReverseFeeCalculation, toAddress, fromAddress, _yield$Builder$from$t, tx, _yield$api$getPayment, partialFee;
+    var api, origin, destination, sender, recipient, skipReverseFeeCalculation, toAddress, fromAddress, _yield$Builder$from$t, tx, _yield$api$getPayment, partialFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, skipReverseFeeCalculation = _ref.skipReverseFeeCalculation;
+          api = _ref.api, origin = _ref.origin, destination = _ref.destination, sender = _ref.sender, recipient = _ref.recipient, skipReverseFeeCalculation = _ref.skipReverseFeeCalculation;
           if (!skipReverseFeeCalculation) {
             _context.n = 1;
             break;
           }
           return _context.a(2, 0n);
         case 1:
-          toAddress = determineAddress(origin, address, senderAddress);
-          fromAddress = determineAddress(destination, address, senderAddress);
+          toAddress = determineAddress(origin, recipient, sender);
+          fromAddress = determineAddress(destination, recipient, sender);
           _context.n = 2;
-          return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(currencyInput)['buildInternal']();
+          return Builder(api).from(destination).to(origin).sender(fromAddress).recipient(toAddress).currency(currencyInput)['buildInternal']();
         case 2:
           _yield$Builder$from$t = _context.v;
           tx = _yield$Builder$from$t.tx;
@@ -5219,7 +5157,7 @@ var resolveId = function resolveId(asset, chain) {
     var isEthAsset = !asset.isNative && ((_asset$assetId = asset.assetId) === null || _asset$assetId === void 0 ? void 0 : _asset$assetId.startsWith('0x'));
     var resolvedAsset = isEthAsset ? findAssetInfoOrThrow(chain, {
       location: asset.location
-    }, null) : asset;
+    }) : asset;
     return getChain(chain).getCustomCurrencyId(resolvedAsset);
   } else {
     assertHasId(asset);
@@ -5398,7 +5336,7 @@ var getBalanceInternal = /*#__PURE__*/function () {
       while (1) switch (_context2.n) {
         case 0:
           chain = options.chain, currency = options.currency;
-          asset = currency ? findAssetInfoOrThrow(chain, currency, null) : findNativeAssetInfoOrThrow(chain);
+          asset = currency ? findAssetInfoOrThrow(chain, currency) : findNativeAssetInfoOrThrow(chain);
           return _context2.a(2, getAssetBalanceInternal(_objectSpread2(_objectSpread2({}, options), {}, {
             asset: asset
           })));
@@ -5479,7 +5417,7 @@ var getMoonbeamErc20Balance = /*#__PURE__*/function () {
 }();
 
 var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, senderAddress, feeNative, currency, asset, feeAsset) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, sender, feeNative, currency, asset, feeAsset) {
     var edNative, balanceNative, isNativeAssetToOrigin, isNativeAssetToDest, isSufficientNative, balanceAsset, edAsset, isSufficientAsset;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
@@ -5495,7 +5433,7 @@ var isSufficientOrigin = /*#__PURE__*/function () {
           return getBalanceInternal({
             api: api,
             chain: origin,
-            address: senderAddress
+            address: sender
           });
         case 2:
           balanceNative = _context.v;
@@ -5516,7 +5454,7 @@ var isSufficientOrigin = /*#__PURE__*/function () {
           return getAssetBalanceInternal({
             api: api,
             chain: origin,
-            address: senderAddress,
+            address: sender,
             asset: asset
           });
         case 4:
@@ -5579,11 +5517,11 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
 };
 var getDestXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, tx, version, disableFallback, swapConfig, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
+    var api, origin, hopChain, destination, currency, forwardedXcms, asset, recipient, feeAsset, originFee, tx, version, disableFallback, swapConfig, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
-          api = options.api, origin = options.origin, hopChain = options.prevChain, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, tx = options.tx, version = options.version, disableFallback = options.disableFallback, swapConfig = options.swapConfig;
+          api = options.api, origin = options.origin, hopChain = options.prevChain, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, recipient = options.recipient, feeAsset = options.feeAsset, originFee = options.originFee, tx = options.tx, version = options.version, disableFallback = options.disableFallback, swapConfig = options.swapConfig;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           calcPaymentInfoFee = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
@@ -5675,7 +5613,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
         case 1:
           _fee = _context3.v;
           _context3.n = 2;
-          return isSufficientDestination(api, destination, address, currency.amount, asset, _fee);
+          return isSufficientDestination(api, destination, recipient, currency.amount, asset, _fee);
         case 2:
           sufficient = _context3.v;
           return _context3.a(2, {
@@ -5977,11 +5915,11 @@ var abi$1 = [{
 }];
 var transferMoonbeamLocal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(client, assetInfo, _ref) {
-    var signer, address, contract;
+    var signer, recipient, contract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          signer = _ref.signer, address = _ref.address;
+          signer = _ref.signer, recipient = _ref.recipient;
           assertHasId(assetInfo);
           contract = getContract({
             abi: abi$1,
@@ -5991,7 +5929,7 @@ var transferMoonbeamLocal = /*#__PURE__*/function () {
               wallet: signer
             }
           });
-          return _context.a(2, contract.write.transfer([address, assetInfo.amount]));
+          return _context.a(2, contract.write.transfer([recipient, assetInfo.amount]));
       }
     }, _callee);
   }));
@@ -6007,11 +5945,11 @@ var NATIVE_ASSET_ID = '0x0000000000000000000000000000000000000802';
 var transferMoonbeamEvm = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _usdtAsset$assetId;
-    var api, from, to, signer, address, currency, foundAsset, amount, client, contract, asset, destLocation, weight, createTx, multiCurrencySymbols, useMultiAssets, usdtAsset, tx, _t;
+    var api, from, to, signer, recipient, currency, foundAsset, amount, client, contract, asset, destLocation, weight, createTx, multiCurrencySymbols, useMultiAssets, usdtAsset, tx, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, from = options.from, to = options.to, signer = options.signer, address = options.address, currency = options.currency;
+          api = options.api, from = options.from, to = options.to, signer = options.signer, recipient = options.recipient, currency = options.currency;
           if (!Array.isArray(currency)) {
             _context.n = 1;
             break;
@@ -6062,7 +6000,7 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
         case 5:
           asset = formatAssetIdToERC20(foundAsset.assetId);
         case 6:
-          destLocation = getDestinationLocation(api, address, to);
+          destLocation = getDestinationLocation(api, recipient, to);
           weight = U_64_MAX; // Partially inspired by Moonbeam XCM-SDK
           // https://github.com/moonbeam-foundation/xcm-sdk/blob/ab835c15bf41612604b1c858d956a9f07705ed65/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts#L53
           createTx = function createTx(func, args) {
@@ -6131,22 +6069,22 @@ var createAccountPayload = function createAccountPayload(api, address) {
 };
 var createBeneficiaryLocXTokens = function createBeneficiaryLocXTokens(_ref) {
   var api = _ref.api,
-    recipientAddress = _ref.address,
+    recipient = _ref.recipient,
     origin = _ref.origin,
     destination = _ref.destination,
     version = _ref.version,
     paraId = _ref.paraId;
-  if (isTLocation(recipientAddress)) {
-    return recipientAddress;
+  if (isTLocation(recipient)) {
+    return recipient;
   }
   var scenario = resolveScenario(origin, destination);
-  var accountPayload = createAccountPayload(api, recipientAddress);
+  var accountPayload = createAccountPayload(api, recipient);
   if (scenario === 'ParaToRelay') {
     return {
       parents: Parents.ONE,
       interior: createX1Payload(version, {
         AccountId32: {
-          id: api.accountToHex(recipientAddress)
+          id: api.accountToHex(recipient)
         }
       })
     };
@@ -6337,7 +6275,7 @@ var reverseTransformLocation = function reverseTransformLocation(location) {
   });
 };
 
-var createMainInstruction = function createMainInstruction(origin, asset, ethAsset, address, messageId) {
+var createMainInstruction = function createMainInstruction(origin, asset, ethAsset, recipient, messageId) {
   assertHasId(ethAsset);
   var interiorSb = ethAsset.symbol === 'ETH' ? {
     Here: null
@@ -6361,7 +6299,7 @@ var createMainInstruction = function createMainInstruction(origin, asset, ethAss
       X1: [{
         AccountKey20: {
           network: null,
-          key: address
+          key: recipient
         }
       }]
     }
@@ -6454,12 +6392,12 @@ var createMainInstruction = function createMainInstruction(origin, asset, ethAss
 };
 var createEthereumBridgeInstructions = function createEthereumBridgeInstructions(_ref, origin, messageId, ethAsset) {
   var api = _ref.api,
-    address = _ref.address,
+    sender = _ref.sender,
+    recipient = _ref.recipient,
     assetInfo = _ref.assetInfo,
-    senderAddress = _ref.senderAddress,
     ahAddress = _ref.ahAddress,
     version = _ref.version;
-  assertSenderAddress(senderAddress);
+  assertSender(sender);
   if (isChainEvm(origin) && !ahAddress) {
     throw new MissingParameterError('ahAddress');
   }
@@ -6471,27 +6409,28 @@ var createEthereumBridgeInstructions = function createEthereumBridgeInstructions
         },
         beneficiary: createBeneficiaryLocation({
           api: api,
-          address: isChainEvm(origin) ? ahAddress : senderAddress,
+          address: isChainEvm(origin) ? ahAddress : sender,
           version: version
         })
       }
     }]
-  }, createMainInstruction(origin, assetInfo, ethAsset, address, messageId), {
+  }, createMainInstruction(origin, assetInfo, ethAsset, recipient, messageId), {
     SetTopic: messageId
   }];
 };
 var createCustomXcmOnDest = function createCustomXcmOnDest(options, origin, messageId, ethAsset) {
   var api = options.api,
-    address = options.address,
+    sender = options.sender,
+    recipient = options.recipient,
     assetInfo = options.assetInfo,
-    senderAddress = options.senderAddress,
     ahAddress = options.ahAddress,
     version = options.version;
+  assertSender(sender);
   var instructions = createEthereumBridgeInstructions({
     api: api,
-    address: address,
+    sender: sender,
+    recipient: recipient,
     assetInfo: assetInfo,
-    senderAddress: senderAddress,
     ahAddress: ahAddress,
     version: version
   }, origin, messageId, ethAsset);
@@ -6499,7 +6438,7 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(options, origin, mess
 };
 
 var generateMessageId = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, senderAddress, sourceParaId, tokenAddress, recipientAddress, amount) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, senderAddress, sourceParaId, tokenAddress, recipient, amount) {
     var accountNextId, sourceAccountHex, entropy;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
@@ -6509,7 +6448,7 @@ var generateMessageId = /*#__PURE__*/function () {
         case 1:
           accountNextId = _context.v;
           sourceAccountHex = api.accountToHex(senderAddress);
-          entropy = new Uint8Array([].concat(_toConsumableArray(api.stringToUint8a(sourceParaId.toString())), _toConsumableArray(api.hexToUint8a(sourceAccountHex)), _toConsumableArray(api.stringToUint8a(accountNextId)), _toConsumableArray(api.hexToUint8a(tokenAddress)), _toConsumableArray(api.stringToUint8a(recipientAddress)), _toConsumableArray(api.stringToUint8a(amount.toString()))));
+          entropy = new Uint8Array([].concat(_toConsumableArray(api.stringToUint8a(sourceParaId.toString())), _toConsumableArray(api.hexToUint8a(sourceAccountHex)), _toConsumableArray(api.stringToUint8a(accountNextId)), _toConsumableArray(api.hexToUint8a(tokenAddress)), _toConsumableArray(api.stringToUint8a(recipient)), _toConsumableArray(api.stringToUint8a(amount.toString()))));
           return _context.a(2, api.blake2AsHex(entropy));
       }
     }, _callee);
@@ -6620,11 +6559,11 @@ var XCDOT = '0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080';
 var transferMoonbeamToEth = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(from, _ref) {
     var _signer$account;
-    var api, to, signer, address, ahAddress, currency, bridgeStatus, foundAsset, amount, ethAsset, contract, senderAddress, messageId, version, customXcm, customXcmOnDest, assetHubApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, transferFee, createTx, numberToHex32, tx;
+    var api, to, signer, recipient, ahAddress, currency, bridgeStatus, foundAsset, amount, ethAsset, contract, sender, messageId, version, customXcm, customXcmOnDest, assetHubApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, transferFee, createTx, numberToHex32, tx;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, to = _ref.to, signer = _ref.signer, address = _ref.address, ahAddress = _ref.ahAddress, currency = _ref.currency;
+          api = _ref.api, to = _ref.to, signer = _ref.signer, recipient = _ref.recipient, ahAddress = _ref.ahAddress, currency = _ref.currency;
           if (ahAddress) {
             _context.n = 1;
             break;
@@ -6657,7 +6596,7 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           amount = abstractDecimals(currency.amount, foundAsset.decimals, api);
           ethAsset = findAssetInfoOrThrow('Ethereum', {
             symbol: foundAsset.symbol
-          }, null);
+          });
           contract = getContract({
             abi: abi,
             address: xcmInterfacePrecompile,
@@ -6669,21 +6608,21 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
               wallet: signer
             }
           });
-          senderAddress = (_signer$account = signer.account) === null || _signer$account === void 0 ? void 0 : _signer$account.address;
-          assertSenderAddress(senderAddress);
+          sender = (_signer$account = signer.account) === null || _signer$account === void 0 ? void 0 : _signer$account.address;
+          assertSender(sender);
           assertHasId(ethAsset);
           _context.n = 6;
           return api.init(from, TX_CLIENT_TIMEOUT_MS);
         case 6:
           _context.n = 7;
-          return generateMessageId(api, senderAddress, getParaId(from), ethAsset.assetId, address, amount);
+          return generateMessageId(api, sender, getParaId(from), ethAsset.assetId, recipient, amount);
         case 7:
           messageId = _context.v;
           version = Version.V4;
           customXcm = createCustomXcmOnDest({
             api: api,
-            address: address,
-            senderAddress: senderAddress,
+            recipient: recipient,
+            sender: sender,
             ahAddress: ahAddress,
             assetInfo: _objectSpread2(_objectSpread2({}, foundAsset), {}, {
               amount: amount
@@ -6749,7 +6688,7 @@ var traverseXcmHops = /*#__PURE__*/function () {
           forwardedXcms = initialForwardedXcms;
           nextParaId = initialDestParaId;
           asset = findAssetInfoOrThrow(origin, currency, destination);
-          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? findAssetInfoOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
+          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? findAssetInfoOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo) : asset;
           hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
           hops = [];
         case 1:
@@ -6868,11 +6807,11 @@ var addEthereumBridgeFees = /*#__PURE__*/function () {
 
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, version, bypassOptions, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, resolvedVersion, originDryRun, isMythosToEthereum, originDryModified, initialForwardedXcms, initialDestParaId, processHop, traversalResult, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, result, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
+    var api, origin, destination, currency, tx, sender, feeAsset, swapConfig, version, bypassOptions, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, resolvedVersion, originDryRun, isMythosToEthereum, originDryModified, initialForwardedXcms, initialDestParaId, processHop, traversalResult, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, result, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig, version = options.version, bypassOptions = options.bypassOptions, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi;
+          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, tx = options.tx, sender = options.sender, feeAsset = options.feeAsset, swapConfig = options.swapConfig, version = options.version, bypassOptions = options.bypassOptions, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           asset = findAssetInfoOrThrow(origin, currency, destination);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
@@ -6882,7 +6821,7 @@ var dryRunInternal = /*#__PURE__*/function () {
             tx: tx,
             chain: origin,
             destination: destination,
-            address: senderAddress,
+            address: sender,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
             }),
@@ -7061,12 +7000,12 @@ var dryRunInternal = /*#__PURE__*/function () {
 
 var dryRun = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, senderAddress, origin;
+    var api, sender, origin;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
-          api = options.api, senderAddress = options.senderAddress, origin = options.origin;
-          validateAddress(api, senderAddress, origin, false);
+          api = options.api, sender = options.sender, origin = options.origin;
+          validateAddress(api, sender, origin, false);
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -7151,7 +7090,7 @@ var createRequiredMintTxs = function createRequiredMintTxs(chain, asset, amountH
   }), balance, address, api);
 };
 var createOptionalMintTxs = function createOptionalMintTxs(chain, currency, amountHuman, balance, address, api) {
-  var asset = findAssetInfo(chain, currency, null);
+  var asset = findAssetInfo(chain, currency);
   if (!asset) return null;
   var amount = parseUnits(amountHuman, asset.decimals);
   return createMintTxs(chain, _objectSpread2(_objectSpread2({}, asset), {}, {
@@ -7240,7 +7179,7 @@ var wrapTxBypass = /*#__PURE__*/function () {
             }
           };
           nativeInfo = mintFeeAssets ? findNativeAssetInfo(chain) : null;
-          relayInfo = mintFeeAssets ? findAssetInfo(chain, relayCurrency, null) : null;
+          relayInfo = mintFeeAssets ? findAssetInfo(chain, relayCurrency) : null;
           sameNativeRelay = !!(nativeInfo && relayInfo && isAssetXcEqual(nativeInfo, relayInfo));
           if (!mintFeeAssets) {
             _context.n = 2;
@@ -7542,11 +7481,11 @@ var getBypassResultWithRetries = /*#__PURE__*/function () {
 
 var getOriginXcmFeeInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, version, _ref$useRootOrigin, useRootOrigin, asset, amount, resolvedFeeAsset, _yield$api$getPayment, rawFee, paddedFee, sufficient, resolvedVersion, dryRunResult, _yield$api$getPayment2, _rawFee, _paddedFee, fee, forwardedXcms, destParaId, weight;
+    var api, tx, origin, destination, sender, disableFallback, feeAsset, currency, version, _ref$useRootOrigin, useRootOrigin, asset, amount, resolvedFeeAsset, _yield$api$getPayment, rawFee, paddedFee, sufficient, resolvedVersion, dryRunResult, _yield$api$getPayment2, _rawFee, _paddedFee, fee, forwardedXcms, destParaId, weight;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency, version = _ref.version, _ref$useRootOrigin = _ref.useRootOrigin, useRootOrigin = _ref$useRootOrigin === void 0 ? false : _ref$useRootOrigin;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, sender = _ref.sender, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency, version = _ref.version, _ref$useRootOrigin = _ref.useRootOrigin, useRootOrigin = _ref$useRootOrigin === void 0 ? false : _ref$useRootOrigin;
           asset = findAssetInfoOrThrow(origin, currency, destination);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
@@ -7558,13 +7497,13 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
             break;
           }
           _context.n = 2;
-          return api.getPaymentInfo(tx, senderAddress);
+          return api.getPaymentInfo(tx, sender);
         case 2:
           _yield$api$getPayment = _context.v;
           rawFee = _yield$api$getPayment.partialFee;
           paddedFee = padFee(rawFee, origin, destination, 'origin');
           _context.n = 3;
-          return isSufficientOrigin(api, origin, destination, senderAddress, paddedFee, _objectSpread2(_objectSpread2({}, currency), {}, {
+          return isSufficientOrigin(api, origin, destination, sender, paddedFee, _objectSpread2(_objectSpread2({}, currency), {}, {
             amount: amount
           }), asset, resolvedFeeAsset);
         case 3:
@@ -7582,7 +7521,7 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
             tx: tx,
             chain: origin,
             destination: destination,
-            address: senderAddress,
+            address: sender,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
             }),
@@ -7608,7 +7547,7 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
           });
         case 6:
           _context.n = 7;
-          return api.getPaymentInfo(tx, senderAddress);
+          return api.getPaymentInfo(tx, sender);
         case 7:
           _yield$api$getPayment2 = _context.v;
           _rawFee = _yield$api$getPayment2.partialFee;
@@ -7690,49 +7629,6 @@ var getOriginXcmFee = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * @deprecated This function is deprecated and will be removed in a future version.
- * Please use `builder.getOriginXcmFee()` instead, where `builder` is an instance of `Builder()`.
- * Will be removed in v13.
- * For more details, see the documentation:
- * {@link https://paraspell.github.io/docs/sdk/xcmPallet.html#xcm-fee-origin-and-dest}
- */
-var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, currency, senderAddress, feeAsset, originAsset, amount, _yield$api$getPayment, rawOriginFee, originFee, resolvedFeeAsset, sufficient, asset;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, currency = _ref.currency, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset;
-          originAsset = findAssetInfoOrThrow(origin, currency, destination);
-          amount = abstractDecimals(currency.amount, originAsset.decimals, api);
-          _context.n = 1;
-          return api.getPaymentInfo(tx, senderAddress);
-        case 1:
-          _yield$api$getPayment = _context.v;
-          rawOriginFee = _yield$api$getPayment.partialFee;
-          originFee = padFee(rawOriginFee, origin, destination, 'origin');
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          _context.n = 2;
-          return isSufficientOrigin(api, origin, destination, senderAddress, originFee, _objectSpread2(_objectSpread2({}, currency), {}, {
-            amount: amount
-          }), originAsset, resolvedFeeAsset);
-        case 2:
-          sufficient = _context.v;
-          asset = resolvedFeeAsset !== null && resolvedFeeAsset !== void 0 ? resolvedFeeAsset : originAsset;
-          return _context.a(2, {
-            fee: originFee,
-            asset: asset,
-            sufficient: sufficient
-          });
-      }
-    }, _callee);
-  }));
-  return function getOriginXcmFeeEstimate(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
 var getFailureInfo = function getFailureInfo(chains, hops) {
   var _chains$origin, _chains$destination;
   // Check standard chains first for backwards compatibility
@@ -7769,11 +7665,11 @@ var getFailureInfo = function getFailureInfo(chains, hops) {
 };
 var getXcmFeeOnce = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, version, disableFallback, swapConfig, useRootOrigin, skipReverseFeeCalculation, asset, amount, resolvedVersion, _yield$getOriginXcmFe, originFeeRaw, originAsset, originFeeType, originDryRunError, originDryRunSubError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destAsset, destFeeType, destDryRunError, destDryRunSubError, destSufficient, destResult, _destApi, destFallback, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, _bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason, _t, _t2, _t3, _t4;
+    var api, tx, origin, destination, sender, recipient, currency, feeAsset, version, disableFallback, swapConfig, useRootOrigin, skipReverseFeeCalculation, asset, amount, resolvedVersion, _yield$getOriginXcmFe, originFeeRaw, originAsset, originFeeType, originDryRunError, originDryRunSubError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destAsset, destFeeType, destDryRunError, destDryRunSubError, destSufficient, destResult, _destApi, destFallback, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, _bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason, _t, _t2, _t3, _t4;
     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, version = _ref.version, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig, useRootOrigin = _ref.useRootOrigin, skipReverseFeeCalculation = _ref.skipReverseFeeCalculation;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, sender = _ref.sender, recipient = _ref.recipient, currency = _ref.currency, feeAsset = _ref.feeAsset, version = _ref.version, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig, useRootOrigin = _ref.useRootOrigin, skipReverseFeeCalculation = _ref.skipReverseFeeCalculation;
           asset = findAssetInfoOrThrow(origin, currency, destination);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           resolvedVersion = pickCompatibleXcmVersion(origin, destination, version);
@@ -7783,7 +7679,7 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
             tx: tx,
             origin: origin,
             destination: destination,
-            senderAddress: senderAddress,
+            sender: sender,
             feeAsset: feeAsset,
             currency: currency,
             version: resolvedVersion,
@@ -7839,12 +7735,12 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
               amount: amount
             }),
-            address: address,
+            sender: sender,
+            recipient: recipient,
             asset: asset,
             version: resolvedVersion,
             tx: tx,
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
-            senderAddress: senderAddress,
             disableFallback: disableFallback,
             swapConfig: swapConfig,
             skipReverseFeeCalculation: skipReverseFeeCalculation
@@ -7921,8 +7817,8 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
                       currency: _objectSpread2(_objectSpread2({}, currency), {}, {
                         amount: amount
                       }),
-                      address: address,
-                      senderAddress: senderAddress,
+                      sender: sender,
+                      recipient: recipient,
                       asset: hopAsset,
                       version: resolvedVersion,
                       feeAsset: feeAsset,
@@ -7998,12 +7894,12 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
               amount: amount
             }),
-            address: address,
+            sender: sender,
+            recipient: recipient,
             asset: asset,
             version: resolvedVersion,
             tx: tx,
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
-            senderAddress: senderAddress,
             disableFallback: disableFallback,
             swapConfig: swapConfig,
             skipReverseFeeCalculation: skipReverseFeeCalculation
@@ -8211,113 +8107,13 @@ var getXcmFee = /*#__PURE__*/function () {
   };
 }();
 
-var BRIDGE_FEE_DOT = 682395810n; // 0.068239581 DOT
-var BRIDGE_FEE_KSM = 12016807000n; // 0.012016807 KSM
-/**
- * @deprecated This function is deprecated and will be removed in a future version.
- * Please use `builder.getXcmFee()` instead, where `builder` is an instance of `Builder()`.
- * Will be removed in v13.
- * For more details, see the documentation:
- * {@link https://paraspell.github.io/docs/sdk/xcmPallet.html#xcm-fee-origin-and-dest}
- */
-var getXcmFeeEstimate = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, origin, destination, currency, feeAsset, address, senderAddress, originAsset, destAsset, amount, resolvedFeeAsset, destApi, _ref2, _ref3, fixedOriginFee, fixedDestinationFee, originSufficient, _destinationSufficient, originFeeDetails, destinationFee, destinationSufficient, destFeeDetails, _t;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, feeAsset = options.feeAsset, address = options.address, senderAddress = options.senderAddress;
-          originAsset = findAssetInfoOrThrow(origin, currency, destination);
-          destAsset = findAssetOnDestOrThrow(origin, destination, currency);
-          amount = abstractDecimals(currency.amount, originAsset.decimals, api);
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          _context.n = 1;
-          return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 1:
-          destApi = api.clone();
-          _context.n = 2;
-          return destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 2:
-          if (!(origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama' || origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot')) {
-            _context.n = 5;
-            break;
-          }
-          _ref2 = origin === 'AssetHubPolkadot' ? [BRIDGE_FEE_DOT, BRIDGE_FEE_KSM] : [BRIDGE_FEE_KSM, BRIDGE_FEE_DOT], _ref3 = _slicedToArray(_ref2, 2), fixedOriginFee = _ref3[0], fixedDestinationFee = _ref3[1];
-          _context.n = 3;
-          return isSufficientOrigin(api, origin, destination, senderAddress, fixedOriginFee, _objectSpread2(_objectSpread2({}, currency), {}, {
-            amount: amount
-          }), originAsset, resolvedFeeAsset);
-        case 3:
-          originSufficient = _context.v;
-          _context.n = 4;
-          return isSufficientDestination(destApi, destination, address, amount, originAsset, fixedDestinationFee);
-        case 4:
-          _destinationSufficient = _context.v;
-          return _context.a(2, {
-            origin: {
-              fee: fixedOriginFee,
-              asset: resolvedFeeAsset !== null && resolvedFeeAsset !== void 0 ? resolvedFeeAsset : originAsset,
-              sufficient: originSufficient
-            },
-            destination: {
-              fee: fixedDestinationFee,
-              asset: destAsset,
-              sufficient: _destinationSufficient
-            }
-          });
-        case 5:
-          _context.n = 6;
-          return getOriginXcmFeeEstimate(options);
-        case 6:
-          originFeeDetails = _context.v;
-          if (!isExternalChain(destination)) {
-            _context.n = 7;
-            break;
-          }
-          _t = 0n;
-          _context.n = 9;
-          break;
-        case 7:
-          _context.n = 8;
-          return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-            api: destApi,
-            destination: destination
-          }), {
-            location: originAsset.location,
-            amount: amount
-          });
-        case 8:
-          _t = _context.v;
-        case 9:
-          destinationFee = _t;
-          _context.n = 10;
-          return isSufficientDestination(destApi, destination, address, amount, originAsset, destinationFee);
-        case 10:
-          destinationSufficient = _context.v;
-          destFeeDetails = {
-            fee: destinationFee,
-            asset: destAsset,
-            sufficient: destinationSufficient
-          };
-          return _context.a(2, {
-            origin: originFeeDetails,
-            destination: destFeeDetails
-          });
-      }
-    }, _callee);
-  }));
-  return function getXcmFeeEstimate(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 var buildDestInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, origin, destination, address, currency, originFee, isFeeAssetAh, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, destFeeAssetEqual, effectiveDestFee, effectiveAmountForBalance, destBalanceSufficient, destBalanceAfter, createUnableToComputeError, isUnableToCompute, destbalanceAfterResult, destBalanceSufficientResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
+    var api, origin, destination, recipient, currency, originFee, isFeeAssetAh, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, destFeeAssetEqual, effectiveDestFee, effectiveAmountForBalance, destBalanceSufficient, destBalanceAfter, createUnableToComputeError, isUnableToCompute, destbalanceAfterResult, destBalanceSufficientResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, destination = _ref.destination, address = _ref.address, currency = _ref.currency, originFee = _ref.originFee, isFeeAssetAh = _ref.isFeeAssetAh, destFeeDetail = _ref.destFeeDetail, totalHopFee = _ref.totalHopFee, bridgeFee = _ref.bridgeFee;
+          api = _ref.api, origin = _ref.origin, destination = _ref.destination, recipient = _ref.recipient, currency = _ref.currency, originFee = _ref.originFee, isFeeAssetAh = _ref.isFeeAssetAh, destFeeDetail = _ref.destFeeDetail, totalHopFee = _ref.totalHopFee, bridgeFee = _ref.bridgeFee;
           destApi = api.clone();
           _context.n = 1;
           return destApi.init(destination);
@@ -8327,7 +8123,7 @@ var buildDestInfo = /*#__PURE__*/function () {
           _context.n = 2;
           return getAssetBalanceInternal({
             api: destApi,
-            address: address,
+            address: recipient,
             chain: destination,
             asset: destAsset
           });
@@ -8375,7 +8171,7 @@ var buildDestInfo = /*#__PURE__*/function () {
           }
           _context.n = 3;
           return getBalanceInternal({
-            address: address,
+            address: recipient,
             chain: destination,
             api: destApi
           });
@@ -8467,11 +8263,11 @@ var buildHopInfo = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, buildTx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, version, resolvedFeeAsset, originAsset, amount, originBalance, edOrigin, _yield$getXcmFeeInter, _yield$getXcmFeeInter2, originFee, originFeeAsset, destFeeDetail, hops, originBalanceFee, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, builtHops, totalHopFee, bridgeHop, destinationInfo;
+    var api, buildTx, origin, destination, sender, ahAddress, recipient, currency, feeAsset, version, resolvedFeeAsset, originAsset, amount, originBalance, edOrigin, _yield$getXcmFeeInter, _yield$getXcmFeeInter2, originFee, originFeeAsset, destFeeDetail, hops, originBalanceFee, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, builtHops, totalHopFee, bridgeHop, destinationInfo;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          api = _ref.api, buildTx = _ref.buildTx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, version = _ref.version;
+          api = _ref.api, buildTx = _ref.buildTx, origin = _ref.origin, destination = _ref.destination, sender = _ref.sender, ahAddress = _ref.ahAddress, recipient = _ref.recipient, currency = _ref.currency, feeAsset = _ref.feeAsset, version = _ref.version;
           if (!(isChainEvm(origin) && !ahAddress)) {
             _context2.n = 1;
             break;
@@ -8489,7 +8285,7 @@ var getTransferInfo = /*#__PURE__*/function () {
           _context2.n = 4;
           return getAssetBalanceInternal({
             api: api,
-            address: senderAddress,
+            address: sender,
             chain: origin,
             asset: originAsset
           });
@@ -8502,8 +8298,8 @@ var getTransferInfo = /*#__PURE__*/function () {
             buildTx: buildTx,
             origin: origin,
             destination: destination,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
+            recipient: recipient,
             currency: currency,
             feeAsset: feeAsset,
             version: version,
@@ -8519,7 +8315,7 @@ var getTransferInfo = /*#__PURE__*/function () {
           _context2.n = 6;
           return getAssetBalanceInternal({
             api: api,
-            address: senderAddress,
+            address: sender,
             chain: origin,
             asset: originFeeAsset
           });
@@ -8550,7 +8346,7 @@ var getTransferInfo = /*#__PURE__*/function () {
                       originChain: origin,
                       currency: currency,
                       asset: hop.result.asset,
-                      senderAddress: senderAddress,
+                      sender: sender,
                       ahAddress: ahAddress
                     });
                   case 1:
@@ -8580,7 +8376,7 @@ var getTransferInfo = /*#__PURE__*/function () {
             api: api,
             origin: origin,
             destination: destination,
-            address: address,
+            recipient: recipient,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
               amount: amount
             }),
@@ -8645,13 +8441,13 @@ var sumHopFees = function sumHopFees(result, _ref) {
 };
 var computeAllFees = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, buildTx) {
-    var origin, dest, _context$options, senderAddress, address, currency, feeCurrency, version, result, hopFees, destFee;
+    var origin, dest, _context$options, sender, recipient, currency, feeCurrency, version, result, hopFees, destFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          origin = context.origin, dest = context.dest, _context$options = context.options, senderAddress = _context$options.senderAddress, address = _context$options.address, currency = _context$options.currency, feeCurrency = _context$options.feeCurrency, version = _context$options.version;
-          assertSenderAddress(senderAddress);
-          assertAddressIsString(address);
+          origin = context.origin, dest = context.dest, _context$options = context.options, sender = _context$options.sender, recipient = _context$options.recipient, currency = _context$options.currency, feeCurrency = _context$options.feeCurrency, version = _context$options.version;
+          assertSender(sender);
+          assertAddressIsString(recipient);
           if (hasDryRunSupport(context.origin.chain)) {
             _context.n = 1;
             break;
@@ -8664,8 +8460,8 @@ var computeAllFees = /*#__PURE__*/function () {
             buildTx: buildTx,
             origin: origin.chain,
             destination: dest.chain,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
+            recipient: recipient,
             version: version,
             currency: currency,
             feeAsset: feeCurrency,
@@ -8690,14 +8486,14 @@ var computeAllFees = /*#__PURE__*/function () {
 
 var getMinTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, origin, senderAddress, address, chain, destination, currency, feeAsset, buildTx, builder, version, resolvedFeeAsset, asset, destAsset, destApi, destBalance, destEd, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, amount, result, originFee, hopFeeTotal, destinationFee, edComponent, minAmount, createTx, tx, dryRunResult, _t;
+    var api, origin, sender, recipient, chain, destination, currency, feeAsset, buildTx, builder, version, resolvedFeeAsset, asset, destAsset, destApi, destBalance, destEd, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, amount, result, originFee, hopFeeTotal, destinationFee, edComponent, minAmount, createTx, tx, dryRunResult, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, senderAddress = _ref.senderAddress, address = _ref.address, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, feeAsset = _ref.feeAsset, buildTx = _ref.buildTx, builder = _ref.builder, version = _ref.version;
-          validateAddress(api, senderAddress, chain, false);
+          api = _ref.api, origin = _ref.origin, sender = _ref.sender, recipient = _ref.recipient, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, feeAsset = _ref.feeAsset, buildTx = _ref.buildTx, builder = _ref.builder, version = _ref.version;
+          validateAddress(api, sender, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
-          asset = findAssetInfoOrThrow(chain, currency, null);
+          asset = findAssetInfoOrThrow(chain, currency);
           destAsset = findAssetOnDestOrThrow(origin, destination, currency);
           destApi = api.clone();
           _context2.n = 1;
@@ -8706,7 +8502,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
           _context2.n = 2;
           return getAssetBalanceInternal({
             api: destApi,
-            address: address,
+            address: recipient,
             chain: destination,
             asset: destAsset
           });
@@ -8723,8 +8519,8 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
             origin: origin,
             destination: destination,
             buildTx: buildTx,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
+            recipient: recipient,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
               amount: amount
             }),
@@ -8800,8 +8596,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
             tx: tx,
             origin: chain,
             destination: destination,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
             version: version,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
               amount: minAmount
@@ -8856,19 +8651,19 @@ var getMinTransferableAmount = /*#__PURE__*/function () {
 
 var getTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, senderAddress, chain, destination, currency, buildTx, feeAsset, version, resolvedFeeAsset, asset, amount, balance, ed, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
+    var api, sender, chain, destination, currency, buildTx, feeAsset, version, 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, buildTx = _ref.buildTx, feeAsset = _ref.feeAsset, version = _ref.version;
-          validateAddress(api, senderAddress, chain, false);
+          api = _ref.api, sender = _ref.sender, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, buildTx = _ref.buildTx, feeAsset = _ref.feeAsset, version = _ref.version;
+          validateAddress(api, sender, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
-          asset = findAssetInfoOrThrow(chain, currency, null);
+          asset = findAssetInfoOrThrow(chain, currency);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           _context.n = 1;
           return getAssetBalanceInternal({
             api: api,
-            address: senderAddress,
+            address: sender,
             chain: chain,
             asset: asset
           });
@@ -8889,7 +8684,7 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
             buildTx: buildTx,
             origin: chain,
             destination: chain,
-            senderAddress: senderAddress,
+            sender: sender,
             feeAsset: feeAsset,
             version: version,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
@@ -9115,8 +8910,8 @@ var createCustomXcm = /*#__PURE__*/function () {
       options,
       destination,
       version,
-      address,
-      senderAddress,
+      sender,
+      recipient,
       paraIdTo,
       hopFees,
       destFee,
@@ -9141,7 +8936,7 @@ var createCustomXcm = /*#__PURE__*/function () {
             destFee: 0n
           };
           origin = context.origin, dest = context.dest, reserve = context.reserve, isSubBridge = context.isSubBridge, isSnowbridge = context.isSnowbridge, isRelayAsset = context.isRelayAsset, assetInfo = context.assetInfo, options = context.options;
-          destination = options.destination, version = options.version, address = options.address, senderAddress = options.senderAddress, paraIdTo = options.paraIdTo;
+          destination = options.destination, version = options.version, sender = options.sender, recipient = options.recipient, paraIdTo = options.paraIdTo;
           hopFees = fees.hopFees, destFee = fees.destFee;
           feeAssetLocation = !isRelayAsset ? RELAY_LOCATION : assetInfo.location;
           feeLocLocalized = localizeLocation(dest.chain, feeAssetLocation, origin.chain);
@@ -9162,7 +8957,7 @@ var createCustomXcm = /*#__PURE__*/function () {
               },
               beneficiary: createBeneficiaryLocation({
                 api: isSubBridge ? dest.api : origin.api,
-                address: address,
+                address: recipient,
                 version: version
               })
             }
@@ -9226,9 +9021,9 @@ var createCustomXcm = /*#__PURE__*/function () {
             _context.n = 6;
             break;
           }
-          assertSenderAddress(senderAddress);
+          assertSender(sender);
           _context.n = 5;
-          return generateMessageId(origin.api, senderAddress, getParaId(origin.chain), JSON.stringify(assetInfo.location), JSON.stringify(address), assetInfo.amount);
+          return generateMessageId(origin.api, sender, getParaId(origin.chain), JSON.stringify(assetInfo.location), JSON.stringify(recipient), assetInfo.amount);
         case 5:
           messageId = _context.v;
           return _context.a(2, [depositInstruction, {
@@ -9244,7 +9039,7 @@ var createCustomXcm = /*#__PURE__*/function () {
   };
 }();
 
-var createRefundInstruction = function createRefundInstruction(api, senderAddress, version, assetCount) {
+var createRefundInstruction = function createRefundInstruction(api, address, version, assetCount) {
   return {
     SetAppendix: [{
       DepositAsset: {
@@ -9255,7 +9050,7 @@ var createRefundInstruction = function createRefundInstruction(api, senderAddres
         },
         beneficiary: createBeneficiaryLocation({
           api: api,
-          address: senderAddress,
+          address: address,
           version: version
         })
       }
@@ -9293,7 +9088,7 @@ var constructTypeAndThenCall = /*#__PURE__*/function () {
       isSubBridge,
       isRelayAsset,
       options,
-      senderAddress,
+      sender,
       version,
       assetCount,
       refundInstruction,
@@ -9308,9 +9103,9 @@ var constructTypeAndThenCall = /*#__PURE__*/function () {
         case 0:
           fees = _args.length > 1 && _args[1] !== undefined ? _args[1] : null;
           origin = context.origin, assetInfo = context.assetInfo, isSubBridge = context.isSubBridge, isRelayAsset = context.isRelayAsset, options = context.options;
-          senderAddress = options.senderAddress, version = options.version;
+          sender = options.sender, version = options.version;
           assetCount = isRelayAsset ? 1 : 2;
-          refundInstruction = senderAddress && !isSubBridge ? createRefundInstruction(origin.api, senderAddress, version, assetCount) : null;
+          refundInstruction = sender && !isSubBridge ? createRefundInstruction(origin.api, sender, version, assetCount) : null;
           resolvedFees = fees !== null && fees !== void 0 ? fees : {
             hopFees: 0n,
             destFee: 0n
@@ -9407,20 +9202,20 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
 
 var createCallForReserve = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, reserveChain, options) {
-    var api, destination, address, senderAddress, currency, feeCurrency, version, serialized, tx, dryRunResult, success;
+    var api, destination, sender, recipient, currency, feeCurrency, version, serialized, tx, dryRunResult, success;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, destination = options.destination, address = options.address, senderAddress = options.senderAddress, currency = options.currency, feeCurrency = options.feeCurrency, version = options.version;
+          api = options.api, destination = options.destination, sender = options.sender, recipient = options.recipient, currency = options.currency, feeCurrency = options.feeCurrency, version = options.version;
           _context.n = 1;
           return createTypeAndThenCall(options, {
             reserveChain: reserveChain
           });
         case 1:
           serialized = _context.v;
-          assertAddressIsString(address);
+          assertSender(sender);
+          assertAddressIsString(recipient);
           assertToIsString(destination, 'Location destination is not supported for reserve auto-selection.');
-          assertSenderAddress(senderAddress);
           tx = api.deserializeExtrinsics(serialized);
           _context.n = 2;
           return dryRunInternal({
@@ -9428,8 +9223,7 @@ var createCallForReserve = /*#__PURE__*/function () {
             tx: tx,
             origin: chain,
             destination: destination,
-            address: address,
-            senderAddress: senderAddress,
+            sender: sender,
             currency: currency,
             version: version,
             feeAsset: feeCurrency,
@@ -9512,18 +9306,18 @@ var calculateTotalXcmFee = function calculateTotalXcmFee(asset, feeResult) {
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, buildTx, origin, destination, currency, address, senderAddress, feeAsset, version, isSubBridge, destApi, asset, amount, destAsset, ed, balance, xcmFeeResult, dryRunError, hops, _xcmFeeResult$destina, destFee, destFeeType, destFeeAsset, destDryRunError, erroredHop, hopError, isUnableToCompute, tx, totalFee, method, feeToSubtract;
+    var api, buildTx, origin, destination, currency, sender, recipient, feeAsset, version, isSubBridge, destApi, asset, amount, destAsset, ed, balance, xcmFeeResult, dryRunError, hops, _xcmFeeResult$destina, destFee, destFeeType, destFeeAsset, destDryRunError, erroredHop, hopError, isUnableToCompute, tx, totalFee, method, feeToSubtract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, buildTx = options.buildTx, origin = options.origin, destination = options.destination, currency = options.currency, address = options.address, senderAddress = options.senderAddress, feeAsset = options.feeAsset, version = options.version;
+          api = options.api, buildTx = options.buildTx, origin = options.origin, destination = options.destination, currency = options.currency, sender = options.sender, recipient = options.recipient, feeAsset = options.feeAsset, version = options.version;
           if (!isExternalChain(destination)) {
             _context.n = 1;
             break;
           }
           return _context.a(2, true);
         case 1:
-          validateAddress(api, address, destination, true);
+          validateAddress(api, recipient, destination, true);
           isSubBridge = isSubstrateBridge(origin, destination);
           if (!isSubBridge) {
             _context.n = 2;
@@ -9541,7 +9335,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           ed = getEdFromAssetOrThrow(destAsset);
           _context.n = 4;
           return getAssetBalanceInternal({
-            address: address,
+            address: recipient,
             chain: destination,
             api: destApi,
             asset: destAsset
@@ -9554,8 +9348,8 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
             buildTx: buildTx,
             origin: origin,
             destination: destination,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
+            recipient: recipient,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
               amount: amount
             }),
@@ -9691,9 +9485,6 @@ var createRouterBuilder = function createRouterBuilder(options) {
   if ((_options$transactOpti = options.transactOptions) !== null && _options$transactOpti !== void 0 && _options$transactOpti.call) {
     throw new UnsupportedOperationError('Cannot use transact options together with swap options.');
   }
-  if (api.getType() !== 'PAPI') {
-    throw new UnsupportedOperationError('Swaps are only supported when using PAPI SDK.');
-  }
   var _getSwapExtensionOrTh = getSwapExtensionOrThrow(),
     RouterBuilder = _getSwapExtensionOrTh.RouterBuilder;
   var from = options.from,
@@ -9705,21 +9496,16 @@ var createRouterBuilder = function createRouterBuilder(options) {
     exchange = _options$swapOptions.exchange,
     slippage = _options$swapOptions.slippage,
     onStatusChange = _options$swapOptions.onStatusChange,
-    senderAddress = options.senderAddress,
-    address = options.address;
+    sender = options.sender,
+    address = options.recipient;
   assertToIsString(to);
   assertAddressIsString(address);
-  assertSenderAddress(senderAddress);
+  assertSender(sender);
   if (Array.isArray(currency)) {
     throw new UnsupportedOperationError('Swaps with multiple currencies are not supported.');
   }
-  var config = api.getConfig();
-  var routerConfig = convertBuilderConfig(config);
-  var builder = RouterBuilder(routerConfig).from(from).exchange(exchange).to(to).currencyFrom(currency).currencyTo(currencyTo).amount(currency.amount).senderAddress(senderAddress).evmSenderAddress(evmSenderAddress).recipientAddress(address).slippagePct((_slippage$toString = slippage === null || slippage === void 0 ? void 0 : slippage.toString()) !== null && _slippage$toString !== void 0 ? _slippage$toString : DEFAULT_SWAP_SLIPPAGE.toString());
+  var builder = RouterBuilder(api).from(from).exchange(exchange).to(to).currencyFrom(currency).currencyTo(currencyTo).amount(currency.amount).sender(sender).evmSenderAddress(evmSenderAddress).recipient(address).slippagePct((_slippage$toString = slippage === null || slippage === void 0 ? void 0 : slippage.toString()) !== null && _slippage$toString !== void 0 ? _slippage$toString : DEFAULT_SWAP_SLIPPAGE.toString());
   if (onStatusChange) {
-    // We cast because router types are bind to specific PAPI types
-    // Will be resolved when we make RouterBuilder generic
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
     builder = builder.onStatusChange(onStatusChange);
   }
   return builder;
@@ -9758,7 +9544,7 @@ var computeOverridenAmount = function computeOverridenAmount(options, increaseAm
     api = options.api;
   var amount = options.currency.amount;
   var config = api.getConfig();
-  if (isConfig(config) && config.abstractDecimals && typeof amount !== 'bigint') {
+  if (!(isConfig(config) && config.abstractDecimals === false) && typeof amount !== 'bigint') {
     var base = relative ? Number(amount) : 0;
     return Number(increaseAmount) + base;
   } else {
@@ -9820,30 +9606,26 @@ var createTxOverrideAmount = /*#__PURE__*/function () {
 }();
 var createTransferOrSwapAll = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var api, from, swapOptions, transactions, _t, _t2, _t3, _t4;
+    var api, from, swapOptions, _t, _t2, _t3, _t4;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
           api = options.api, from = options.from, swapOptions = options.swapOptions;
           if (!swapOptions) {
-            _context3.n = 2;
+            _context3.n = 1;
             break;
           }
-          _context3.n = 1;
-          return executeWithRouter(_objectSpread2(_objectSpread2({}, options), {}, {
+          return _context3.a(2, executeWithRouter(_objectSpread2(_objectSpread2({}, options), {}, {
             swapOptions: swapOptions
           }), function (builder) {
-            return builder.buildTransactions();
-          });
+            return builder.build();
+          }));
         case 1:
-          transactions = _context3.v;
-          return _context3.a(2, transactions);
-        case 2:
           _t = api.getApi();
           _t2 = from;
-          _context3.n = 3;
+          _context3.n = 2;
           return createTransfer(options);
-        case 3:
+        case 2:
           _t3 = _context3.v;
           _t4 = {
             type: 'TRANSFER',
@@ -9960,7 +9742,7 @@ var resolveParaId = function resolveParaId(paraId, destination) {
 
 var abstractDecimals = function abstractDecimals(amount, decimals, api) {
   var config = api.getConfig();
-  var abstractDecimals = isConfig(config) && config.abstractDecimals ? true : false;
+  var abstractDecimals = !(isConfig(config) && config.abstractDecimals === false);
   return applyDecimalAbstraction(amount, decimals, abstractDecimals);
 };
 var applyDecimalAbstraction = function applyDecimalAbstraction(amount, decimals, shouldAbstract) {
@@ -10184,11 +9966,11 @@ var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, origin,
     asset = input.assetInfo,
     destination = input.destination,
     paraIdTo = input.paraIdTo,
-    address = input.address;
+    recipient = input.recipient;
   var dest = createDestination(version, origin, destination, paraIdTo);
   var beneficiary = createBeneficiaryLocation({
     api: api,
-    address: address,
+    address: recipient,
     version: version
   });
   var transformedLocation = localizeLocation(origin, asset.location);
@@ -10271,7 +10053,7 @@ var prepareCommonExecuteXcm = function prepareCommonExecuteXcm(options, assetToD
   var api = options.api,
     feeAsset = options.feeAssetInfo,
     useJitWithdraw = options.useJitWithdraw,
-    recipientAddress = options.recipientAddress,
+    recipient = options.recipient,
     version = options.version;
   var context = prepareExecuteContext(options);
   var assetLocalized = context.assetLocalized,
@@ -10296,7 +10078,7 @@ var prepareCommonExecuteXcm = function prepareCommonExecuteXcm(options, assetToD
   }
   var beneficiary = createBeneficiaryLocation({
     api: api,
-    address: recipientAddress,
+    address: recipient,
     version: version
   });
   var depositInstruction = {
@@ -10313,18 +10095,18 @@ var prepareCommonExecuteXcm = function prepareCommonExecuteXcm(options, assetToD
 
 var createDirectExecuteXcm = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, version, transactOptions, destChain, recipientAddress, _prepareCommonExecute, prefix, depositInstruction, transact, baseXcm, fullXcm, _t;
+    var api, version, transactOptions, destChain, recipient, _prepareCommonExecute, prefix, depositInstruction, transact, baseXcm, fullXcm, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, version = options.version, transactOptions = options.transactOptions, destChain = options.destChain, recipientAddress = options.recipientAddress;
+          api = options.api, version = options.version, transactOptions = options.transactOptions, destChain = options.destChain, recipient = options.recipient;
           _prepareCommonExecute = prepareCommonExecuteXcm(options), prefix = _prepareCommonExecute.prefix, depositInstruction = _prepareCommonExecute.depositInstruction;
           if (!(transactOptions !== null && transactOptions !== void 0 && transactOptions.call)) {
             _context.n = 2;
             break;
           }
           _context.n = 1;
-          return createTransactInstructions(api, transactOptions, version, destChain, recipientAddress);
+          return createTransactInstructions(api, transactOptions, version, destChain, recipient);
         case 1:
           _t = _context.v;
           _context.n = 3;
@@ -10355,13 +10137,13 @@ var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
 var FEE_PADDING_PERCENTAGE$1 = 40;
 var handleExecuteTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, chain, senderAddress, paraIdTo, destChain, assetInfo, currency, feeCurrency, address, feeAssetInfo, version, transactOptions, checkAmount, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight, _t, _t2;
+    var api, chain, sender, paraIdTo, destChain, assetInfo, currency, feeCurrency, recipient, feeAssetInfo, version, transactOptions, checkAmount, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight, _t, _t2;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, chain = options.chain, senderAddress = options.senderAddress, paraIdTo = options.paraIdTo, destChain = options.destChain, assetInfo = options.assetInfo, currency = options.currency, feeCurrency = options.feeCurrency, address = options.address, feeAssetInfo = options.feeAssetInfo, version = options.version, transactOptions = options.transactOptions;
-          assertSenderAddress(senderAddress);
-          assertAddressIsString(address);
+          api = options.api, chain = options.chain, sender = options.sender, paraIdTo = options.paraIdTo, destChain = options.destChain, assetInfo = options.assetInfo, currency = options.currency, feeCurrency = options.feeCurrency, recipient = options.recipient, feeAssetInfo = options.feeAssetInfo, version = options.version, transactOptions = options.transactOptions;
+          assertSender(sender);
+          assertAddressIsString(recipient);
           checkAmount = function checkAmount(fee) {
             if (assetInfo.amount <= fee) throw new AmountTooLowError();
           };
@@ -10376,13 +10158,12 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             api: api,
             chain: chain,
             destChain: destChain,
-            address: address,
             assetInfo: assetInfo,
             currency: currency,
             feeAssetInfo: feeAssetInfo,
             feeCurrency: feeCurrency,
-            recipientAddress: address,
-            senderAddress: senderAddress,
+            sender: sender,
+            recipient: recipient,
             version: version,
             paraIdTo: paraIdTo,
             transactOptions: transactOptions
@@ -10406,8 +10187,7 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             tx: api.deserializeExtrinsics(call),
             origin: chain,
             destination: destChain,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
             currency: currency,
             version: version,
             feeAsset: feeCurrency,
@@ -10465,7 +10245,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
           needsMultiHop = isMultiHopSwap(exchangeChain, assetInfoFrom, assetInfoTo);
           nativeAsset = findAssetInfoOrThrow(exchangeChain, {
             symbol: Native(nativeSymbol)
-          }, null);
+          });
           if (needsMultiHop) {
             _context.n = 1;
             break;
@@ -10506,11 +10286,11 @@ var createExchangeInstructions = /*#__PURE__*/function () {
 var createSwapExecuteXcm = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
     var _ref3, _ref4;
-    var api, chain, exchangeChain, destChain, assetInfoFrom, assetInfoTo, feeAssetInfo, _options$fees2, originFee, originReserveFee, destReserveFee, senderAddress, recipientAddress, version, paraIdTo, isEthereumDest, resolvedDestChain, assetFrom, amountOut, assetTo, assetToLocalizedToDest, ethFeeAssetInfo, ethBridgeFee, isMainAssetDot, nativeFeeAssetInfo, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, resolvedFeeAssetInfo, hasSeparateFeeAsset, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, ethAsset, messageId, snowbridgeInstructions, finalXcm, fullXcm;
+    var api, chain, exchangeChain, destChain, assetInfoFrom, assetInfoTo, feeAssetInfo, _options$fees2, originFee, originReserveFee, destReserveFee, sender, recipient, version, paraIdTo, isEthereumDest, resolvedDestChain, assetFrom, amountOut, assetTo, assetToLocalizedToDest, ethFeeAssetInfo, ethBridgeFee, isMainAssetDot, nativeFeeAssetInfo, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, resolvedFeeAssetInfo, hasSeparateFeeAsset, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, ethAsset, messageId, snowbridgeInstructions, finalXcm, fullXcm;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetInfoFrom = options.assetInfoFrom, assetInfoTo = options.assetInfoTo, feeAssetInfo = options.feeAssetInfo, _options$fees2 = options.fees, originFee = _options$fees2.originFee, originReserveFee = _options$fees2.originReserveFee, destReserveFee = _options$fees2.destReserveFee, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, version = options.version, paraIdTo = options.paraIdTo;
+          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetInfoFrom = options.assetInfoFrom, assetInfoTo = options.assetInfoTo, feeAssetInfo = options.feeAssetInfo, _options$fees2 = options.fees, originFee = _options$fees2.originFee, originReserveFee = _options$fees2.originReserveFee, destReserveFee = _options$fees2.destReserveFee, sender = options.sender, recipient = options.recipient, version = options.version, paraIdTo = options.paraIdTo;
           isEthereumDest = destChain !== undefined && isExternalChain(destChain); // For Ethereum destination, the actual hop target is AssetHub (bridge hub)
           resolvedDestChain = isEthereumDest ? "AssetHub".concat(getRelayChainOf(chain !== null && chain !== void 0 ? chain : exchangeChain)) : undefined;
           assetFrom = createAsset(version, assetInfoFrom.amount, localizeLocation(exchangeChain, assetInfoFrom.location));
@@ -10551,7 +10331,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
             assetInfo: assetInfoFrom,
             feeAssetInfo: resolvedFeeAssetInfo,
             useJitWithdraw: isEthereumDest,
-            recipientAddress: recipientAddress,
+            recipient: recipient,
             fees: {
               originFee: hasSeparateFeeAsset ? ethBridgeFee || originFee : originFee,
               reserveFee: originReserveFee
@@ -10568,16 +10348,16 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
           }
           ethAsset = findAssetInfoOrThrow('Ethereum', {
             symbol: assetInfoTo.symbol
-          }, null);
+          });
           _context2.n = 5;
-          return generateMessageId(api, senderAddress, getParaId(chain !== null && chain !== void 0 ? chain : exchangeChain), ethAsset.assetId, recipientAddress, amountOut);
+          return generateMessageId(api, sender, getParaId(chain !== null && chain !== void 0 ? chain : exchangeChain), ethAsset.assetId, recipient, amountOut);
         case 5:
           messageId = _context2.v;
           snowbridgeInstructions = createEthereumBridgeInstructions({
             api: api,
-            address: recipientAddress,
+            sender: sender,
+            recipient: recipient,
             assetInfo: assetInfoTo,
-            senderAddress: senderAddress,
             version: version
           }, chain !== null && chain !== void 0 ? chain : exchangeChain, messageId, ethAsset); // If exchange chain is already AssetHub, instructions run directly there
           // Otherwise, route from exchange chain to AssetHub with bridge instructions as suffix
@@ -10800,11 +10580,11 @@ var createXcmAndCall = /*#__PURE__*/function () {
 }();
 var handleSwapExecuteTransfer = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, feeAssetInfo, senderAddress, recipientAddress, calculateMinAmountOut, version, isEthereumDest, hasSeparateFeeAsset, internalOptions, dryRunParams, FEE_ASSET_AMOUNT, dummyOriginFee, fees, totalFeesPre, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, extractedFees, totalFees, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, finalCall;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, feeAssetInfo, sender, recipient, calculateMinAmountOut, version, isEthereumDest, hasSeparateFeeAsset, internalOptions, dryRunParams, FEE_ASSET_AMOUNT, dummyOriginFee, fees, totalFeesPre, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, extractedFees, totalFees, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, finalCall;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
-          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetInfoFrom, assetTo = options.assetInfoTo, currencyTo = options.currencyTo, feeAssetInfo = options.feeAssetInfo, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, calculateMinAmountOut = options.calculateMinAmountOut;
+          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetInfoFrom, assetTo = options.assetInfoTo, currencyTo = options.currencyTo, feeAssetInfo = options.feeAssetInfo, sender = options.sender, recipient = options.recipient, calculateMinAmountOut = options.calculateMinAmountOut;
           _context3.n = 1;
           return api.init(chain !== null && chain !== void 0 ? chain : exchangeChain);
         case 1:
@@ -10821,8 +10601,8 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             api: api,
             origin: chain !== null && chain !== void 0 ? chain : exchangeChain,
             destination: destChain !== null && destChain !== void 0 ? destChain : exchangeChain,
-            senderAddress: senderAddress,
-            address: recipientAddress,
+            sender: sender,
+            recipient: recipient,
             version: version,
             currency: {
               location: assetFrom.location,
@@ -10939,27 +10719,26 @@ var getLocalTransferAmount = function getLocalTransferAmount(_ref) {
 var handleToAhTeleport = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(origin, input, defaultTx) {
     var _dryRunResult$destina, _feeResult$origin$wei;
-    var api, destination, address, senderAddress, asset, currency, version, dryRunResult, dummyTx, feeResult, originExecutionFee, destinationExecutionFee;
+    var api, destination, sender, recipient, asset, currency, version, dryRunResult, dummyTx, feeResult, originExecutionFee, destinationExecutionFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = input.api, destination = input.destination, address = input.address, senderAddress = input.senderAddress, asset = input.assetInfo, currency = input.currency, version = input.version;
+          api = input.api, destination = input.destination, sender = input.sender, recipient = input.recipient, asset = input.assetInfo, currency = input.currency, version = input.version;
           assertToIsString(destination, 'Location destination is not supported for AH teleport.');
-          if (!isTLocation(address)) {
+          if (!isTLocation(recipient)) {
             _context.n = 1;
             break;
           }
           throw new InvalidAddressError('Location address is not supported for this scenario');
         case 1:
-          assertSenderAddress(senderAddress);
+          assertSender(sender);
           _context.n = 2;
           return dryRunInternal({
             api: api,
             tx: defaultTx,
             origin: origin,
             destination: destination,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
             currency: currency,
             version: version
           });
@@ -10981,8 +10760,8 @@ var handleToAhTeleport = /*#__PURE__*/function () {
             tx: dummyTx,
             origin: origin,
             destination: destination,
-            senderAddress: senderAddress,
-            address: address,
+            sender: sender,
+            recipient: recipient,
             version: version,
             currency: currency,
             disableFallback: false,
@@ -11016,11 +10795,11 @@ var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, chain
 
 var handleTransactUsingSend = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, version, chain, destination, destChain, address, paraIdTo, asset, transactOptions, dest, transactInstructions, message;
+    var api, version, chain, destination, destChain, recipient, paraIdTo, asset, transactOptions, dest, transactInstructions, message;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, version = _ref.version, chain = _ref.chain, destination = _ref.destination, destChain = _ref.destChain, address = _ref.address, paraIdTo = _ref.paraIdTo, asset = _ref.asset, transactOptions = _ref.transactOptions;
+          api = _ref.api, version = _ref.version, chain = _ref.chain, destination = _ref.destination, destChain = _ref.destChain, recipient = _ref.recipient, paraIdTo = _ref.paraIdTo, asset = _ref.asset, transactOptions = _ref.transactOptions;
           dest = createDestination(version, chain, destination, paraIdTo);
           if (transactOptions !== null && transactOptions !== void 0 && transactOptions.call) {
             _context.n = 1;
@@ -11034,9 +10813,9 @@ var handleTransactUsingSend = /*#__PURE__*/function () {
           }
           throw new UnsupportedOperationError('destChain must be provided when using handleTransactUsingSend');
         case 2:
-          assertAddressIsString(address);
+          assertAddressIsString(recipient);
           _context.n = 3;
-          return createTransactInstructions(api, transactOptions, version, destChain, address);
+          return createTransactInstructions(api, transactOptions, version, destChain, recipient);
         case 3:
           transactInstructions = _context.v;
           message = [{
@@ -11052,7 +10831,7 @@ var handleTransactUsingSend = /*#__PURE__*/function () {
               },
               beneficiary: createBeneficiaryLocation({
                 api: api,
-                address: address,
+                address: recipient,
                 version: version
               })
             }
@@ -11223,7 +11002,7 @@ var buildXTokensCall = function buildXTokensCall(input, currencySelection, fees)
     origin = input.origin,
     destination = input.destination,
     overriddenAsset = input.overriddenAsset,
-    address = input.address,
+    recipient = input.recipient,
     asset = input.asset,
     pallet = input.pallet,
     version = input.version,
@@ -11236,7 +11015,7 @@ var buildXTokensCall = function buildXTokensCall(input, currencySelection, fees)
     api: api,
     origin: origin,
     destination: destination,
-    address: address,
+    recipient: recipient,
     version: version,
     paraId: paraIdTo
   });
@@ -11295,12 +11074,12 @@ var Chain = /*#__PURE__*/function () {
   }, {
     key: "transfer",
     value: function () {
-      var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(sendOptions) {
-        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, keepAlive, transactOptions, scenario, paraId, destChain, isLocalTransfer, isRelayAsset, mythAsset, isMythAsset, assetNeedsTypeThen, supportsTypeThen, isSubBridge, useTypeAndThen, options, promise, shouldUseTeleport, isAhToOtherPara, isOtherParaToAh, isAllowedAhTransfer, isAHOrigin, isAHDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, call, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, _t;
+      var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(transferOptions) {
+        var api, asset, currency, feeAsset, feeCurrency, recipient, destination, paraIdTo, overriddenAsset, version, sender, ahAddress, pallet, method, keepAlive, transactOptions, scenario, paraId, destChain, isLocalTransfer, isRelayAsset, mythAsset, isMythAsset, assetNeedsTypeThen, supportsTypeThen, isSubBridge, useTypeAndThen, options, promise, shouldUseTeleport, isAhToOtherPara, isOtherParaToAh, isAllowedAhTransfer, isAHOrigin, isAHDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, call, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, useMultiAssets, input, _t;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              api = sendOptions.api, asset = sendOptions.assetInfo, currency = sendOptions.currency, feeAsset = sendOptions.feeAsset, feeCurrency = sendOptions.feeCurrency, address = sendOptions.address, destination = sendOptions.to, paraIdTo = sendOptions.paraIdTo, overriddenAsset = sendOptions.overriddenAsset, version = sendOptions.version, senderAddress = sendOptions.senderAddress, ahAddress = sendOptions.ahAddress, pallet = sendOptions.pallet, method = sendOptions.method, keepAlive = sendOptions.keepAlive, transactOptions = sendOptions.transactOptions;
+              api = transferOptions.api, asset = transferOptions.assetInfo, currency = transferOptions.currency, feeAsset = transferOptions.feeAsset, feeCurrency = transferOptions.feeCurrency, recipient = transferOptions.recipient, destination = transferOptions.to, paraIdTo = transferOptions.paraIdTo, overriddenAsset = transferOptions.overriddenAsset, version = transferOptions.version, sender = transferOptions.sender, ahAddress = transferOptions.ahAddress, pallet = transferOptions.pallet, method = transferOptions.method, keepAlive = transferOptions.keepAlive, transactOptions = transferOptions.transactOptions;
               scenario = resolveScenario(this.chain, destination);
               paraId = resolveParaId(paraIdTo, destination);
               destChain = resolveDestChain(this.chain, paraId);
@@ -11309,7 +11088,7 @@ var Chain = /*#__PURE__*/function () {
                 _context.n = 1;
                 break;
               }
-              return _context.a(2, this.transferLocal(_objectSpread2(_objectSpread2({}, sendOptions), {}, {
+              return _context.a(2, this.transferLocal(_objectSpread2(_objectSpread2({}, transferOptions), {}, {
                 keepAlive: keepAlive !== null && keepAlive !== void 0 ? keepAlive : true
               })));
             case 1:
@@ -11319,7 +11098,7 @@ var Chain = /*#__PURE__*/function () {
               }
               throw new UnsupportedOperationError('Keep alive option is not yet supported for XCM transfers.');
             case 2:
-              this.throwIfTempDisabled(sendOptions, destChain);
+              this.throwIfTempDisabled(transferOptions, destChain);
               this.throwIfCantReceive(destChain);
               isRelayAsset = deepEqual(asset.location, RELAY_LOCATION) && isSymbolMatch(getRelayChainSymbol(this.chain), asset.symbol);
               mythAsset = findNativeAssetInfoOrThrow('Mythos');
@@ -11346,10 +11125,11 @@ var Chain = /*#__PURE__*/function () {
                 chain: this.chain,
                 beneficiaryLocation: createBeneficiaryLocation({
                   api: api,
-                  address: address,
+                  address: recipient,
                   version: version
                 }),
-                address: address,
+                sender: sender,
+                recipient: recipient,
                 asset: this.createAsset(asset, version),
                 overriddenAsset: overriddenAsset,
                 assetInfo: asset,
@@ -11361,7 +11141,6 @@ var Chain = /*#__PURE__*/function () {
                 destChain: destChain,
                 paraIdTo: paraId,
                 version: version,
-                senderAddress: senderAddress,
                 ahAddress: ahAddress,
                 pallet: pallet,
                 method: method,
@@ -11385,7 +11164,7 @@ var Chain = /*#__PURE__*/function () {
             case 6:
               return _context.a(2, _t.deserializeExtrinsics.call(_t, _context.v));
             case 7:
-              shouldUseTeleport = this.shouldUseNativeAssetTeleport(sendOptions);
+              shouldUseTeleport = this.shouldUseNativeAssetTeleport(transferOptions);
               isAhToOtherPara = this.chain.startsWith('AssetHub') && destChain && !isTrustedChain(destChain);
               isOtherParaToAh = (destChain === null || destChain === void 0 ? void 0 : destChain.startsWith('AssetHub')) && !isTrustedChain(this.chain);
               isAllowedAhTransfer = function isAllowedAhTransfer(chain) {
@@ -11440,7 +11219,7 @@ var Chain = /*#__PURE__*/function () {
               input = {
                 api: api,
                 asset: asset,
-                address: address,
+                recipient: recipient,
                 origin: this.chain,
                 scenario: scenario,
                 paraIdTo: paraId,
@@ -11534,7 +11313,7 @@ var Chain = /*#__PURE__*/function () {
       var assetHubChain = "AssetHub".concat(getRelayChainOf(this.chain));
       var isRegisteredOnAh = findAssetInfo(assetHubChain, {
         location: asset.location
-      }, null);
+      });
       return Boolean(isNativeAsset) && Boolean(isRegisteredOnAh) && (isAHPOrigin || isAHPDest);
     }
   }, {
@@ -11553,12 +11332,12 @@ var Chain = /*#__PURE__*/function () {
     key: "transferLocal",
     value: function () {
       var _transferLocal = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-        var api, asset, feeAsset, address, senderAddress, isAmountAll, validatedOptions, isNativeAsset, balance, localOptions;
+        var api, asset, feeAsset, recipient, sender, isAmountAll, validatedOptions, isNativeAsset, balance, localOptions;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              api = options.api, asset = options.assetInfo, feeAsset = options.feeAsset, address = options.address, senderAddress = options.senderAddress, isAmountAll = options.isAmountAll;
-              if (!isTLocation(address)) {
+              api = options.api, asset = options.assetInfo, feeAsset = options.feeAsset, recipient = options.recipient, sender = options.sender, isAmountAll = options.isAmountAll;
+              if (!isTLocation(recipient)) {
                 _context2.n = 1;
                 break;
               }
@@ -11571,19 +11350,19 @@ var Chain = /*#__PURE__*/function () {
               throw new UnsupportedOperationError('Fee asset is not supported for local transfers');
             case 2:
               validatedOptions = _objectSpread2(_objectSpread2({}, options), {}, {
-                address: address
+                recipient: recipient
               });
               isNativeAsset = asset.symbol === this.getNativeAssetSymbol() && asset.isNative;
               if (!isAmountAll) {
                 _context2.n = 4;
                 break;
               }
-              assertSenderAddress(senderAddress);
+              assertSender(sender);
               _context2.n = 3;
               return getAssetBalanceInternal({
                 api: api,
                 chain: this.chain,
-                address: senderAddress,
+                address: sender,
                 asset: asset
               });
             case 3:
@@ -11618,11 +11397,11 @@ var Chain = /*#__PURE__*/function () {
     value: function transferLocalNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
-      var dest = isChainEvm(this.chain) ? address : {
-        Id: address
+      var dest = isChainEvm(this.chain) ? recipient : {
+        Id: recipient
       };
       if (isAmountAll) {
         return Promise.resolve(api.deserializeExtrinsics({
@@ -11648,12 +11427,12 @@ var Chain = /*#__PURE__*/function () {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
       var dest = {
-        Id: address
+        Id: recipient
       };
       var currencyId = BigInt(asset.assetId);
       if (isAmountAll) {
@@ -11686,8 +11465,8 @@ var Chain = /*#__PURE__*/function () {
           api,
           asset,
           version,
-          address,
-          senderAddress,
+          sender,
+          recipient,
           feeAsset,
           bridgeStatus,
           ethAsset,
@@ -11710,7 +11489,7 @@ var Chain = /*#__PURE__*/function () {
           while (1) switch (_context3.n) {
             case 0:
               useOnlyDepositInstruction = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : false;
-              api = input.api, asset = input.assetInfo, version = input.version, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAssetInfo;
+              api = input.api, asset = input.assetInfo, version = input.version, sender = input.sender, recipient = input.recipient, feeAsset = input.feeAssetInfo;
               _context3.n = 1;
               return getBridgeStatus(api.clone());
             case 1:
@@ -11721,8 +11500,8 @@ var Chain = /*#__PURE__*/function () {
               }
               throw new BridgeHaltedError();
             case 2:
-              assertAddressIsString(address);
-              assertSenderAddress(senderAddress);
+              assertAddressIsString(recipient);
+              assertSender(sender);
               ethAsset = createAsset(version, asset.amount, asset.location);
               _context3.n = 3;
               return api.createApiForChain('AssetHubPolkadot');
@@ -11739,7 +11518,7 @@ var Chain = /*#__PURE__*/function () {
               fee = useOnlyDepositInstruction ? PARA_TO_PARA_FEE_DOT : bridgeFee + executionFee;
               ethAssetInfo = findAssetInfoOrThrow('Ethereum', {
                 symbol: asset.symbol
-              }, null);
+              });
               systemAssetInfo = findNativeAssetInfoOrThrow(getRelayChainOf(this.chain));
               shouldIncludeFeeAsset = feeAsset && !isAssetEqual(feeAsset, asset) || !isAssetEqual(asset, systemAssetInfo);
               if (!useOnlyDepositInstruction) {
@@ -11755,7 +11534,7 @@ var Chain = /*#__PURE__*/function () {
                   },
                   beneficiary: createBeneficiaryLocation({
                     api: api,
-                    address: address,
+                    address: recipient,
                     version: version
                   })
                 }
@@ -11765,7 +11544,7 @@ var Chain = /*#__PURE__*/function () {
             case 5:
               assertHasId(ethAssetInfo);
               _context3.n = 6;
-              return generateMessageId(api, senderAddress, getParaId(this.chain), ethAssetInfo.assetId, address, asset.amount);
+              return generateMessageId(api, sender, getParaId(this.chain), ethAssetInfo.assetId, recipient, asset.amount);
             case 6:
               messageId = _context3.v;
               customXcmOnDest = createCustomXcmOnDest(input, this.chain, messageId, ethAssetInfo);
@@ -11899,18 +11678,18 @@ var Acala = /*#__PURE__*/function (_Chain) {
     key: "transferLocalNativeAsset",
     value: function () {
       var _transferLocalNativeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-        var api, address, senderAddress, isAmountAll, keepAlive, createTx, fee, _yield$api$getPayment, partialFee, amount;
+        var api, recipient, sender, isAmountAll, keepAlive, createTx, fee, _yield$api$getPayment, partialFee, amount;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              api = options.api, address = options.address, senderAddress = options.senderAddress, isAmountAll = options.isAmountAll, keepAlive = options.keepAlive;
+              api = options.api, recipient = options.recipient, sender = options.sender, isAmountAll = options.isAmountAll, keepAlive = options.keepAlive;
               createTx = function createTx(amount) {
                 return api.deserializeExtrinsics({
                   module: 'Currencies',
                   method: 'transfer_native_currency',
                   params: {
                     dest: {
-                      Id: address
+                      Id: recipient
                     },
                     amount: amount
                   }
@@ -11921,9 +11700,9 @@ var Acala = /*#__PURE__*/function (_Chain) {
                 _context.n = 2;
                 break;
               }
-              assertSenderAddress(senderAddress);
+              assertSender(sender);
               _context.n = 1;
-              return api.getPaymentInfo(createTx(MIN_AMOUNT), senderAddress);
+              return api.getPaymentInfo(createTx(MIN_AMOUNT), sender);
             case 1:
               _yield$api$getPayment = _context.v;
               partialFee = _yield$api$getPayment.partialFee;
@@ -11944,7 +11723,7 @@ var Acala = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address;
+        recipient = options.recipient;
       if (asset.symbol.toLowerCase() === 'lcdot') {
         throw new InvalidCurrencyError('LcDOT local transfers are not supported');
       }
@@ -11954,7 +11733,7 @@ var Acala = /*#__PURE__*/function (_Chain) {
         method: 'transfer',
         params: {
           dest: {
-            Id: address
+            Id: recipient
           },
           currency_id: this.getCustomCurrencyId(asset),
           amount: amount
@@ -12007,13 +11786,13 @@ var Ajuna = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
       var assetId = Number(asset.assetId);
       var dest = {
-        Id: address
+        Id: recipient
       };
       if (isAmountAll) {
         return api.deserializeExtrinsics({
@@ -12091,14 +11870,14 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Chain) {
     key: "handleEthBridgeNativeTransfer",
     value: function () {
       var _handleEthBridgeNativeTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(input) {
-        var api, version, destination, senderAddress, address, paraIdTo, asset, messageId, location, call;
+        var api, version, destination, sender, recipient, paraIdTo, asset, messageId, location, call;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              api = input.api, version = input.version, destination = input.destination, senderAddress = input.senderAddress, address = input.address, paraIdTo = input.paraIdTo, asset = input.assetInfo;
-              assertSenderAddress(senderAddress);
+              api = input.api, version = input.version, destination = input.destination, sender = input.sender, recipient = input.recipient, paraIdTo = input.paraIdTo, asset = input.assetInfo;
+              assertSender(sender);
               _context.n = 1;
-              return generateMessageId(api, senderAddress, getParaId(this.chain), JSON.stringify(asset.location), JSON.stringify(address), asset.amount);
+              return generateMessageId(api, sender, getParaId(this.chain), JSON.stringify(asset.location), JSON.stringify(recipient), asset.amount);
             case 1:
               messageId = _context.v;
               location = asset.symbol === this.getNativeAssetSymbol() ? DOT_LOCATION : asset.location;
@@ -12120,7 +11899,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Chain) {
                       },
                       beneficiary: createBeneficiaryLocation({
                         api: api,
-                        address: address,
+                        address: recipient,
                         version: version
                       })
                     }
@@ -12190,13 +11969,13 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       if (asset.assetId !== undefined) {
         var assetId = Number(asset.assetId);
         var dest = {
-          Id: address
+          Id: recipient
         };
         if (isAmountAll) {
           return api.deserializeExtrinsics({
@@ -12226,7 +12005,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Chain) {
           params: {
             id: asset.location,
             dest: {
-              Id: address
+              Id: recipient
             },
             keep_alive: keepAlive
           }
@@ -12238,7 +12017,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Chain) {
         params: {
           id: asset.location,
           target: {
-            Id: address
+            Id: recipient
           },
           amount: asset.amount
         }
@@ -12300,13 +12079,13 @@ var Astar = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
       var assetId = Number(asset.assetId);
       var dest = {
-        Id: address
+        Id: recipient
       };
       if (isAmountAll) {
         return api.deserializeExtrinsics({
@@ -12415,7 +12194,7 @@ var Hydration = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       if (isAmountAll) {
@@ -12423,7 +12202,7 @@ var Hydration = /*#__PURE__*/function (_Chain) {
           module: 'Balances',
           method: 'transfer_all',
           params: {
-            dest: address,
+            dest: recipient,
             keep_alive: keepAlive
           }
         }));
@@ -12432,7 +12211,7 @@ var Hydration = /*#__PURE__*/function (_Chain) {
         module: 'Balances',
         method: keepAlive ? 'transfer_keep_alive' : 'transfer_allow_death',
         params: {
-          dest: address,
+          dest: recipient,
           value: asset.amount
         }
       }));
@@ -12442,7 +12221,7 @@ var Hydration = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
@@ -12452,7 +12231,7 @@ var Hydration = /*#__PURE__*/function (_Chain) {
           module: 'Tokens',
           method: 'transfer_all',
           params: {
-            dest: address,
+            dest: recipient,
             currency_id: currencyId,
             keep_alive: keepAlive
           }
@@ -12462,7 +12241,7 @@ var Hydration = /*#__PURE__*/function (_Chain) {
         module: 'Tokens',
         method: keepAlive ? 'transfer_keep_alive' : 'transfer',
         params: {
-          dest: address,
+          dest: recipient,
           currency_id: currencyId,
           amount: asset.amount
         }
@@ -12539,11 +12318,11 @@ var BifrostPolkadot = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       var dest = {
-        Id: address
+        Id: recipient
       };
       var currencyId = this.getCustomCurrencyId(asset);
       if (isAmountAll) {
@@ -12674,11 +12453,11 @@ var Centrifuge = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       var dest = {
-        Id: address
+        Id: recipient
       };
       var currencyId = this.getCustomCurrencyId(asset);
       if (isAmountAll) {
@@ -12861,13 +12640,13 @@ var Crust = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
       var assetId = BigInt(asset.assetId);
       var dest = {
-        Id: address
+        Id: recipient
       };
       if (isAmountAll) {
         return api.deserializeExtrinsics({
@@ -12949,7 +12728,7 @@ var Darwinia = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
@@ -12960,7 +12739,7 @@ var Darwinia = /*#__PURE__*/function (_Chain) {
           method: 'transfer_all',
           params: {
             id: assetId,
-            dest: address,
+            dest: recipient,
             keep_alive: keepAlive
           }
         });
@@ -12970,7 +12749,7 @@ var Darwinia = /*#__PURE__*/function (_Chain) {
         method: keepAlive ? 'transfer_keep_alive' : 'transfer',
         params: {
           id: assetId,
-          target: address,
+          target: recipient,
           amount: asset.amount
         }
       });
@@ -13143,7 +12922,7 @@ var Interlay = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       var currencyId = this.getCustomCurrencyId(asset);
@@ -13152,7 +12931,7 @@ var Interlay = /*#__PURE__*/function (_Chain) {
           module: 'Tokens',
           method: 'transfer_all',
           params: {
-            dest: address,
+            dest: recipient,
             currency_id: currencyId,
             keep_alive: keepAlive
           }
@@ -13162,7 +12941,7 @@ var Interlay = /*#__PURE__*/function (_Chain) {
         module: 'Tokens',
         method: keepAlive ? 'transfer_keep_alive' : 'transfer',
         params: {
-          dest: address,
+          dest: recipient,
           currency_id: currencyId,
           value: asset.amount
         }
@@ -13206,7 +12985,7 @@ var Jamton = /*#__PURE__*/function (_Chain) {
       if (isSymbolMatch(assetInfo.symbol, 'WUD')) {
         var usdt = findAssetInfoOrThrow(this.chain, {
           symbol: 'USDt'
-        }, null);
+        });
         var MIN_USDT_AMOUNT = 180000n; // 0.18 USDt
         return transferPolkadotXcm(_objectSpread2(_objectSpread2({}, input), {}, {
           overriddenAsset: [_objectSpread2(_objectSpread2({}, createAsset(version, MIN_USDT_AMOUNT, usdt.location)), {}, {
@@ -13260,7 +13039,7 @@ var Kintsugi = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       var currencyId = this.getCustomCurrencyId(asset);
@@ -13269,7 +13048,7 @@ var Kintsugi = /*#__PURE__*/function (_Chain) {
           module: 'Tokens',
           method: 'transfer_all',
           params: {
-            dest: address,
+            dest: recipient,
             currency_id: currencyId,
             keep_alive: keepAlive
           }
@@ -13279,7 +13058,7 @@ var Kintsugi = /*#__PURE__*/function (_Chain) {
         module: 'Tokens',
         method: keepAlive ? 'transfer_keep_alive' : 'transfer',
         params: {
-          dest: address,
+          dest: recipient,
           currency_id: currencyId,
           value: asset.amount
         }
@@ -13394,7 +13173,7 @@ var Manta = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         balance = options.balance,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
@@ -13407,7 +13186,7 @@ var Manta = /*#__PURE__*/function (_Chain) {
         params: {
           id: assetId,
           target: {
-            Id: address
+            Id: recipient
           },
           amount: amount
         }
@@ -13486,19 +13265,19 @@ var Moonriver = /*#__PURE__*/function (_Chain) {
 
 var createTypeAndThenTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, chain, version) {
-    var api, asset, senderAddress, address, ethAsset, messageId, nativeMythAmount, hopDestination;
+    var api, asset, sender, recipient, ethAsset, messageId, nativeMythAmount, hopDestination;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, asset = options.assetInfo, senderAddress = options.senderAddress, address = options.address;
+          api = options.api, asset = options.assetInfo, sender = options.sender, recipient = options.recipient;
           ethAsset = findAssetInfoOrThrow('Ethereum', {
             symbol: asset.symbol
-          }, null);
+          });
           assertHasId(ethAsset);
-          assertAddressIsString(address);
-          assertSenderAddress(senderAddress);
+          assertAddressIsString(recipient);
+          assertSender(sender);
           _context.n = 1;
-          return generateMessageId(api, senderAddress, getParaId(chain), ethAsset.assetId, address, asset.amount);
+          return generateMessageId(api, sender, getParaId(chain), ethAsset.assetId, recipient, asset.amount);
         case 1:
           messageId = _context.v;
           _context.n = 2;
@@ -13613,7 +13392,7 @@ var NeuroWeb = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       if (isAmountAll) {
@@ -13621,7 +13400,7 @@ var NeuroWeb = /*#__PURE__*/function (_Chain) {
           module: 'Balances',
           method: 'transfer_all',
           params: {
-            dest: address,
+            dest: recipient,
             keep_alive: keepAlive
           }
         }));
@@ -13630,7 +13409,7 @@ var NeuroWeb = /*#__PURE__*/function (_Chain) {
         module: 'Balances',
         method: keepAlive ? 'transfer_keep_alive' : 'transfer_allow_death',
         params: {
-          dest: address,
+          dest: recipient,
           value: asset.amount
         }
       }));
@@ -13640,7 +13419,7 @@ var NeuroWeb = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         balance = options.balance,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
@@ -13652,7 +13431,7 @@ var NeuroWeb = /*#__PURE__*/function (_Chain) {
         method: keepAlive ? 'transfer_keep_alive' : 'transfer',
         params: {
           id: assetId,
-          target: address,
+          target: recipient,
           amount: amount
         }
       });
@@ -13708,13 +13487,13 @@ var Peaq = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
       var assetId = BigInt(asset.assetId);
       var dest = {
-        Id: address
+        Id: recipient
       };
       if (isAmountAll) {
         return api.deserializeExtrinsics({
@@ -13880,13 +13659,13 @@ var RobonomicsPolkadot = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address,
+        recipient = options.recipient,
         isAmountAll = options.isAmountAll,
         keepAlive = options.keepAlive;
       assertHasId(asset);
       var assetId = BigInt(asset.assetId);
       var dest = {
-        Id: address
+        Id: recipient
       };
       if (isAmountAll) {
         return api.deserializeExtrinsics({
@@ -14044,7 +13823,7 @@ var Zeitgeist = /*#__PURE__*/function (_Chain) {
     value: function transferLocalNonNativeAsset(options) {
       var api = options.api,
         asset = options.assetInfo,
-        address = options.address;
+        recipient = options.recipient;
       assertHasId(asset);
       var amount = getLocalTransferAmount(options);
       return api.deserializeExtrinsics({
@@ -14052,7 +13831,7 @@ var Zeitgeist = /*#__PURE__*/function (_Chain) {
         method: 'transfer',
         params: {
           dest: {
-            Id: address
+            Id: recipient
           },
           currency_id: this.getCustomCurrencyId(asset),
           amount: amount
@@ -14392,4 +14171,4 @@ var createClientCache = function createClientCache(maxSize, pingClient, onEvicti
   };
 };
 
-export { API_TYPES, AmountTooLowError, AssetClaimBuilder, BaseAssetsPallet, BatchMode, BatchValidationError, BridgeHaltedError, Builder, DEFAULT_TTL_MS, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETH_MAINNET_CHAIN_ID, ETH_TESTNET_CHAIN_ID, EXCHANGE_CHAINS, EXTENSION_MS, ExtensionNotInstalledError, FeatureTemporarilyDisabledError, GeneralBuilder, InvalidAddressError, MAX_CLIENTS, MissingChainApiError, MissingParameterError, NoXCMSupportImplementedError, NumberFormatError, OverrideConflictError, PolkadotXcmError, PolkadotXcmExecutionError, ProviderUnavailableError, RELAY_LOCATION, RoutingResolutionError, RuntimeApiUnavailableError, ScenarioNotSupportedError, TRANSACT_ORIGINS, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, TypeAndThenUnavailableError, UnableToComputeError, UnsupportedOperationError, ValidationError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, applyDecimalAbstraction, assertAddressIsString, assertHasId, assertSender, assertSenderAddress, assertSwapSupport, assertToIsString, blake2b256, blake2b512, calcPreviewMintAmount, claimAssets, compareAddresses, computeOverridenAmount, constructTypeAndThenCall, convertSs58, createAsset, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createClientCache, createClientPoolHelpers, createDestination, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createId, createRouterBuilder, createTransfer, createTransferOrSwap, createTransferOrSwapAll, createTxOverrideAmount, createTypeAndThenCall, createTypeThenAutoReserve, createVersionedAssets, createVersionedDestination, createX1Payload, deriveAccountId, dryRun, dryRunInternal, dryRunOrigin, encodeSs58, executeWithRouter, formatAssetIdToERC20, formatUnits, getAssetBalanceInternal, getAssetReserveChain, getBalance, getBalanceInternal, getBridgeStatus, getChain, getChainConfig, getChainLocation, getChainProviders, getChainVersion, getEthErc20Balance, getEvmPrivateKeyHex, getFailureInfo$1 as getFailureInfo, getLocalTransferAmount, getMinTransferableAmount, getMinTransferableAmountInternal, getMoonbeamErc20Balance, getOriginXcmFee, getOriginXcmFeeEstimate, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getRelayChainOf, getSwapExtensionOrThrow, getTChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, getXcmFeeInternal, getXcmFeeOnce, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, isSenderSigner, keyFromWs, localizeLocation, maybeOverrideAsset, maybeOverrideAssets, normalizeAmount, normalizeExchange, overrideTxAmount, padFee, padValueBy, parseUnits, pickCompatibleXcmVersion, pickRouterCompatibleXcmVersion, registerSwapExtension, resolveChainApi, resolveDestChain, resolveModuleError, resolveParaId, resolveTransferParams, reverseTransformLocation, selectXcmVersion, sortAssets, throwUnsupportedCurrency, transferMoonbeamEvm, transferMoonbeamToEth, traverseXcmHops, validateAddress, validateAssetSpecifiers, validateCurrency, validateDestination, validateDestinationAddress, validateTransact, verifyEdOnDestination, wrapTxBypass };
+export { API_TYPES, AmountTooLowError, AssetClaimBuilder, BaseAssetsPallet, BatchMode, BatchValidationError, BridgeHaltedError, Builder, DEFAULT_TTL_MS, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETH_MAINNET_CHAIN_ID, ETH_TESTNET_CHAIN_ID, EXCHANGE_CHAINS, EXTENSION_MS, ExtensionNotInstalledError, FeatureTemporarilyDisabledError, GeneralBuilder, InvalidAddressError, MAX_CLIENTS, MissingChainApiError, MissingParameterError, NoXCMSupportImplementedError, NumberFormatError, OverrideConflictError, PolkadotXcmError, PolkadotXcmExecutionError, ProviderUnavailableError, RELAY_LOCATION, RoutingResolutionError, RuntimeApiUnavailableError, ScenarioNotSupportedError, SubmitTransactionError, TRANSACT_ORIGINS, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, TypeAndThenUnavailableError, UnableToComputeError, UnsupportedOperationError, ValidationError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, applyDecimalAbstraction, assertAddressIsString, assertHasId, assertSender, assertSenderSource, assertSwapSupport, assertToIsString, blake2b256, blake2b512, calcPreviewMintAmount, claimAssets, compareAddresses, computeOverridenAmount, constructTypeAndThenCall, convertBuilderConfig, convertSs58, createAsset, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createClientCache, createClientPoolHelpers, createDestination, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createId, createRouterBuilder, createTransfer, createTransferOrSwap, createTransferOrSwapAll, createTxOverrideAmount, createTypeAndThenCall, createTypeThenAutoReserve, createVersionedAssets, createVersionedDestination, createX1Payload, deriveAccountId, dryRun, dryRunInternal, dryRunOrigin, encodeSs58, executeWithRouter, formatAssetIdToERC20, formatUnits, getAssetBalanceInternal, getAssetReserveChain, getBalance, getBalanceInternal, getBridgeStatus, getChain, getChainConfig, getChainLocation, getChainProviders, getChainVersion, getEthErc20Balance, getEvmPrivateKeyHex, getFailureInfo$1 as getFailureInfo, getLocalTransferAmount, getMinTransferableAmount, getMinTransferableAmountInternal, getMoonbeamErc20Balance, getOriginXcmFee, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getRelayChainOf, getSwapExtensionOrThrow, getTChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeInternal, getXcmFeeOnce, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, isSenderSigner, keyFromWs, localizeLocation, maybeOverrideAsset, maybeOverrideAssets, normalizeAmount, normalizeExchange, overrideTxAmount, padFee, padValueBy, parseUnits, pickCompatibleXcmVersion, pickRouterCompatibleXcmVersion, registerSwapExtension, resolveChainApi, resolveDestChain, resolveModuleError, resolveParaId, resolveTransferParams, reverseTransformLocation, selectXcmVersion, sortAssets, throwUnsupportedCurrency, transferMoonbeamEvm, transferMoonbeamToEth, traverseXcmHops, validateAddress, validateAssetSpecifiers, validateCurrency, validateDestination, validateDestinationAddress, validateTransact, verifyEdOnDestination, wrapTxBypass };