@paraspell/sdk-core 10.11.6 → 10.11.7

package/dist/index.cjs

@@ -700,6 +700,7 @@ var convertSs58 = function convertSs58(api, address, node) {
   return encodeSs58(deriveAccountId(publicKey), ss58Prefix);
 };
 
+var MIN_FEE = 1000n;
 var DEFAULT_FEE_ASSET = 0;
 var ETH_PARA_ID = 1;
 var ETH_CHAIN_ID = BigInt(ETH_PARA_ID);
@@ -715,6 +716,12 @@ var DOT_MULTILOCATION = {
   parents: sdkCommon.Parents.ONE,
   interior: 'Here'
 };
+var RELAY_LOCATION = {
+  parents: sdkCommon.Parents.ONE,
+  interior: {
+    Here: null
+  }
+};
 var CHAINS_DOT_RESERVE_AH = new Set(['Polimec', 'Moonbeam', 'AssetHubPolkadot', 'AssetHubKusama', 'AssetHubWestend', 'AssetHubPaseo', 'BifrostPolkadot', 'BifrostKusama', 'PeoplePolkadot', 'PeopleKusama', 'Ajuna']);
 var ASSET_HUB_EXECUTION_FEE = 2200000000n; // 0.22 DOT
 var TX_CLIENT_TIMEOUT_MS = 20 * 60 * 1000; // 20 minutes
@@ -738,7 +745,7 @@ var assertToIsString = function assertToIsString(to, overrideMsg) {
 };
 var assertAddressIsString = function assertAddressIsString(address) {
   if (sdkCommon.isTMultiLocation(address)) {
-    throw new InvalidParameterError('Multi-Location address is not supported for XCM fee calculation.');
+    throw new InvalidParameterError('Multi-Location address is not supported for this transfer type.');
   }
 };
 var assertHasLocation = function assertHasLocation(asset) {
@@ -6192,136 +6199,307 @@ var send = /*#__PURE__*/function () {
   };
 }();
 
-var createTypeAndThenCall = function createTypeAndThenCall(chain, destChain, reserveChain, input, reserveFee) {
-  var api = input.api,
-    destination = input.destination,
-    asset = input.asset,
-    version = input.version,
-    address = input.address,
-    paraIdTo = input.paraIdTo;
-  assertHasLocation(asset);
+var buildTypeAndThenCall = function buildTypeAndThenCall(_ref, isDotAsset, customXcm, assets) {
+  var origin = _ref.origin,
+    reserve = _ref.reserve,
+    dest = _ref.dest,
+    asset = _ref.asset,
+    version = _ref.options.version;
+  var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : asset.multiLocation;
+  var finalDest = origin.chain === reserve.chain ? dest.chain : reserve.chain;
+  var destLocation = createDestination(version, origin.chain, finalDest, getParaId(finalDest));
+  var reserveType = origin.chain === reserve.chain ? 'LocalReserve' : 'DestinationReserve';
+  var feeMultiAsset = createMultiAsset(version, asset.amount, feeAssetLocation);
+  return {
+    module: 'PolkadotXcm',
+    method: 'transfer_assets_using_type_and_then',
+    parameters: {
+      dest: addXcmVersionHeader(destLocation, version),
+      assets: addXcmVersionHeader(assets, version),
+      assets_transfer_type: reserveType,
+      remote_fees_id: addXcmVersionHeader(feeMultiAsset.id, version),
+      fees_transfer_type: reserveType,
+      custom_xcm_on_dest: addXcmVersionHeader(customXcm, version),
+      weight_limit: 'Unlimited'
+    }
+  };
+};
+
+var FEE_PADDING_PERCENTAGE$2 = 20;
+var FEE_PADDING_HYDRATION = 150;
+var computeInstructionFee = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, version, xcm) {
+    var chain, api, _t, _t2, _t3;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          chain = _ref.chain, api = _ref.api;
+          _t = padFeeBy;
+          _context.n = 1;
+          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), {
+            multiLocation: DOT_MULTILOCATION
+          }, true);
+        case 1:
+          _t2 = _context.v;
+          _t3 = chain === 'Hydration' ? FEE_PADDING_HYDRATION : FEE_PADDING_PERCENTAGE$2;
+          return _context.a(2, _t(_t2, _t3));
+      }
+    }, _callee);
+  }));
+  return function computeInstructionFee(_x, _x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var computeAllFees = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref3, customXcm, isDotAsset, refundInstruction) {
+    var reserve, dest, version, _t4, _t5, _t6, _t7, _t8, _t9, _t0, _t1, _t10;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          reserve = _ref3.reserve, dest = _ref3.dest, version = _ref3.options.version;
+          if (!('DepositReserveAsset' in customXcm)) {
+            _context2.n = 6;
+            break;
+          }
+          _context2.n = 1;
+          return computeInstructionFee(reserve, version, [customXcm]);
+        case 1:
+          _t5 = _context2.v;
+          if (!refundInstruction) {
+            _context2.n = 3;
+            break;
+          }
+          _context2.n = 2;
+          return computeInstructionFee(reserve, version, [refundInstruction]);
+        case 2:
+          _t6 = _context2.v;
+          _context2.n = 4;
+          break;
+        case 3:
+          _t6 = 0n;
+        case 4:
+          _t7 = _t6;
+          _context2.n = 5;
+          return computeInstructionFee(assets.hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, customXcm.DepositReserveAsset.xcm);
+        case 5:
+          _t8 = _context2.v;
+          _t4 = {
+            reserveFee: _t5,
+            refundFee: _t7,
+            destFee: _t8
+          };
+          _context2.n = 13;
+          break;
+        case 6:
+          if (isDotAsset) {
+            _context2.n = 8;
+            break;
+          }
+          _context2.n = 7;
+          return computeInstructionFee(assets.hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, [customXcm]);
+        case 7:
+          _t9 = _context2.v;
+          _context2.n = 9;
+          break;
+        case 8:
+          _t9 = 0n;
+        case 9:
+          _t0 = _t9;
+          if (isDotAsset) {
+            _context2.n = 11;
+            break;
+          }
+          _context2.n = 10;
+          return computeInstructionFee(assets.hasXcmPaymentApiSupport(reserve.chain) ? reserve : dest, version, [refundInstruction]);
+        case 10:
+          _t1 = _context2.v;
+          _context2.n = 12;
+          break;
+        case 11:
+          _t1 = 0n;
+        case 12:
+          _t10 = _t1;
+          _t4 = {
+            reserveFee: 0n,
+            destFee: _t0,
+            refundFee: _t10
+          };
+        case 13:
+          return _context2.a(2, _t4);
+      }
+    }, _callee2);
+  }));
+  return function computeAllFees(_x4, _x5, _x6, _x7) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var createTypeAndThenCallContext = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
+    var api, paraIdTo, asset, destChain, reserveChain, destApi, reserveApi;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = options.api, paraIdTo = options.paraIdTo, asset = options.asset;
+          assertHasLocation(asset);
+          destChain = getTNode(paraIdTo, getRelayChainOf(chain).toLowerCase());
+          reserveChain = sdkCommon.isRelayChain(destChain) ? destChain : getAssetReserveChain(chain, chain, asset.multiLocation);
+          destApi = api.clone();
+          _context.n = 1;
+          return destApi.init(destChain);
+        case 1:
+          reserveApi = reserveChain !== chain ? api.clone() : destApi;
+          _context.n = 2;
+          return reserveApi.init(reserveChain);
+        case 2:
+          return _context.a(2, {
+            origin: {
+              api: api,
+              chain: chain
+            },
+            dest: {
+              api: destApi,
+              chain: destChain
+            },
+            reserve: {
+              api: reserveApi,
+              chain: reserveChain
+            },
+            asset: asset,
+            options: options
+          });
+      }
+    }, _callee);
+  }));
+  return function createTypeAndThenCallContext(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
+  var origin = _ref.origin,
+    dest = _ref.dest,
+    reserve = _ref.reserve,
+    asset = _ref.asset,
+    options = _ref.options;
+  var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+    reserveFee: MIN_FEE,
+    refundFee: 0n,
+    destFee: MIN_FEE
+  };
+  var destination = options.destination,
+    version = options.version,
+    address = options.address,
+    paraIdTo = options.paraIdTo;
+  var reserveFee = fees.reserveFee,
+    refundFee = fees.refundFee,
+    destFee = fees.destFee;
+  var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : asset.multiLocation;
+  var multiAsset = createMultiAsset(version, asset.amount, localizeLocation(dest.chain, asset.multiLocation));
   var depositInstruction = {
     DepositAsset: {
       assets: {
-        Wild: 'All'
+        Wild: {
+          AllOf: {
+            id: multiAsset.id,
+            fun: 'Fungible'
+          }
+        }
       },
       beneficiary: createBeneficiaryLocation({
-        api: api,
+        api: origin.api,
         address: address,
         version: version
       })
     }
   };
-  var customXcm = chain === reserveChain || destChain === reserveChain ? [depositInstruction] : [{
+  var assetsFilter = [];
+  if (!isDotAsset) assetsFilter.push(createMultiAsset(version, reserveFee + destFee, localizeLocation(reserve.chain, RELAY_LOCATION)));
+  assetsFilter.push(createMultiAsset(version, asset.amount, localizeLocation(reserve.chain, asset.multiLocation)));
+  return origin.chain !== reserve.chain && dest.chain !== reserve.chain ? {
     DepositReserveAsset: {
-      assets: {
+      assets: fees.destFee === MIN_FEE ? {
         Wild: 'All'
+      } : {
+        Definite: assetsFilter
       },
-      dest: createDestination(version, chain, destination, paraIdTo),
+      dest: createDestination(version, origin.chain, destination, paraIdTo),
       xcm: [{
         BuyExecution: {
-          fees: createMultiAsset(version, reserveFee, asset.multiLocation),
+          fees: createMultiAsset(version, !isDotAsset ? destFee : asset.amount - reserveFee - refundFee, feeAssetLocation),
           weight_limit: 'Unlimited'
         }
       }, depositInstruction]
     }
-  }];
-  var finalDest = chain === reserveChain ? destChain : reserveChain;
-  var dest = createVersionedDestination(version, chain, finalDest, getParaId(finalDest));
-  var multiAsset = createMultiAsset(version, asset.amount, asset.multiLocation);
-  var assets = addXcmVersionHeader([multiAsset], version);
-  var customXcmVersioned = addXcmVersionHeader(customXcm, version);
-  var feesLocation = addXcmVersionHeader(multiAsset.id, version);
-  var reserve = chain === reserveChain ? 'LocalReserve' : 'DestinationReserve';
-  return {
-    module: 'PolkadotXcm',
-    method: 'transfer_assets_using_type_and_then',
-    parameters: {
-      dest: dest,
-      assets: assets,
-      assets_transfer_type: reserve,
-      remote_fees_id: feesLocation,
-      fees_transfer_type: reserve,
-      custom_xcm_on_dest: customXcmVersioned,
-      weight_limit: 'Unlimited'
-    }
-  };
+  } : depositInstruction;
 };
 
-var validateHops$1 = function validateHops(hops) {
-  var _iterator = _createForOfIteratorHelper(hops),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var hop = _step.value;
-      if (!hop.result.success) {
-        throw new DryRunFailedError("Dry run failed on an intermediate hop (".concat(hop.chain, "). Reason: ").concat(hop.result.failureReason || 'Unknown'));
+var createRefundInstruction = function createRefundInstruction(api, senderAddress, version) {
+  return {
+    SetAppendix: [{
+      DepositAsset: {
+        assets: {
+          Wild: 'All'
+        },
+        beneficiary: createBeneficiaryLocation({
+          api: api,
+          address: senderAddress,
+          version: version
+        })
       }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
+    }]
+  };
 };
-var getReserveFeeFromHops$1 = function getReserveFeeFromHops(hops) {
-  if (!hops || hops.length === 0 || !hops[0].result.success) {
-    return MIN_FEE$2;
+
+var buildAssets = function buildAssets(asset, feeAmount, isDotAsset, version) {
+  var assets = [];
+  if (!isDotAsset) {
+    assets.push(createMultiAsset(version, feeAmount, RELAY_LOCATION));
   }
-  return hops[0].result.fee;
+  assets.push(createMultiAsset(version, asset.amount, asset.multiLocation));
+  return assets;
 };
-var MIN_FEE$2 = 1000n;
-var FEE_PADDING_PERCENTAGE$2 = 40;
-var createTypeAndThenTransfer$2 = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, input) {
-    var api, address, paraIdTo, senderAddress, currency, asset, destChain, reserveChain, call, dryRunResult, reserveFeeEstimate, reserveFee;
+/**
+ * Creates a type and then call for transferring assets using XCM. Works only for DOT and snowbridge assets so far.
+ */
+var createTypeAndThenCall = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
+    var api, senderAddress, version, context, asset, isDotAsset, customXcm, refundInstruction, fees, finalCustomXcm, totalFee, assets;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = input.api, address = input.address, paraIdTo = input.paraIdTo, senderAddress = input.senderAddress, currency = input.currency, asset = input.asset;
-          if (senderAddress) {
-            _context.n = 1;
-            break;
-          }
-          throw new InvalidParameterError('Please provide senderAddress');
+          api = options.api, senderAddress = options.senderAddress, version = options.version;
+          _context.n = 1;
+          return createTypeAndThenCallContext(chain, options);
         case 1:
-          assertHasLocation(asset);
-          assertAddressIsString(address);
-          destChain = getTNode(paraIdTo, getRelayChainOf(chain).toLowerCase());
-          reserveChain = sdkCommon.isRelayChain(destChain) ? destChain : getAssetReserveChain(chain, chain, asset.multiLocation);
-          call = createTypeAndThenCall(chain, destChain, reserveChain, input, MIN_FEE$2);
-          if (!(chain === reserveChain || destChain === reserveChain)) {
-            _context.n = 2;
-            break;
-          }
-          return _context.a(2, call);
-        case 2:
-          _context.n = 3;
-          return dryRunInternal({
-            api: api,
-            tx: api.callTxMethod(call),
-            origin: chain,
-            destination: destChain,
-            senderAddress: senderAddress,
-            address: address,
-            currency: currency
+          context = _context.v;
+          asset = context.asset;
+          isDotAsset = sdkCommon.deepEqual(asset.multiLocation, RELAY_LOCATION) || sdkCommon.deepEqual(asset.multiLocation, {
+            parents: 2,
+            interior: {
+              X1: [{
+                GlobalConsensus: {
+                  Kusama: null
+                }
+              }]
+            }
           });
-        case 3:
-          dryRunResult = _context.v;
-          if (dryRunResult.origin.success) {
-            _context.n = 4;
-            break;
-          }
-          throw new DryRunFailedError(dryRunResult.failureReason);
-        case 4:
-          validateHops$1(dryRunResult.hops);
-          reserveFeeEstimate = getReserveFeeFromHops$1(dryRunResult.hops);
-          reserveFee = padFeeBy(reserveFeeEstimate, FEE_PADDING_PERCENTAGE$2);
-          return _context.a(2, createTypeAndThenCall(chain, destChain, reserveChain, input, reserveFee));
+          customXcm = createCustomXcm(context, isDotAsset);
+          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version) : null;
+          _context.n = 2;
+          return computeAllFees(context, customXcm, isDotAsset, refundInstruction);
+        case 2:
+          fees = _context.v;
+          finalCustomXcm = [];
+          if (refundInstruction) finalCustomXcm.push(refundInstruction);
+          finalCustomXcm.push(createCustomXcm(context, isDotAsset, fees));
+          totalFee = fees.reserveFee + fees.destFee + fees.refundFee;
+          assets = buildAssets(asset, totalFee, isDotAsset, version);
+          return _context.a(2, buildTypeAndThenCall(context, isDotAsset, finalCustomXcm, assets));
       }
     }, _callee);
   }));
-  return function createTypeAndThenTransfer(_x, _x2) {
+  return function createTypeAndThenCall(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -7051,11 +7229,10 @@ var validateHops = function validateHops(hops) {
 };
 var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
   if (!hops || hops.length === 0 || !hops[0].result.success) {
-    return MIN_FEE$1;
+    return MIN_FEE;
   }
   return hops[0].result.fee;
 };
-var MIN_FEE$1 = 1000n;
 var FEE_PADDING_PERCENTAGE$1 = 40;
 var handleExecuteTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
@@ -7095,7 +7272,7 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
               throw new InvalidParameterError("Asset amount is too low, please increase the amount or use a different fee asset.");
             }
           };
-          checkAmount(MIN_FEE$1);
+          checkAmount(MIN_FEE);
           destChain = getTNode(paraIdTo, getRelayChainOf(chain).toLowerCase());
           internalOptions = {
             api: api,
@@ -7113,8 +7290,8 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           };
           call = createExecuteCall(chain, createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
-              originFee: feeAssetBalance && feeAssetBalance > 1n ? feeAssetBalance : MIN_FEE$1,
-              reserveFee: MIN_FEE$1
+              originFee: feeAssetBalance && feeAssetBalance > 1n ? feeAssetBalance : MIN_FEE,
+              reserveFee: MIN_FEE
             }
           })), MAX_WEIGHT);
           _context.n = 5;
@@ -7285,7 +7462,6 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
   };
 }();
 
-var MIN_FEE = 1000n;
 var FEE_PADDING_PERCENTAGE = 20;
 var validateAmount = function validateAmount(amount, requiredFee) {
   if (amount <= requiredFee) {
@@ -7864,7 +8040,7 @@ var ParachainNode = /*#__PURE__*/function () {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, scenario, paraId, isLocalTransfer, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest;
+        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, scenario, paraId, isLocalTransfer, isBifrostOrigin, isJamtonOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest, isEthAssetViaAh, isEthAssetToAh, call;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -7961,17 +8137,17 @@ var ParachainNode = /*#__PURE__*/function () {
               isAHPOrigin = this.node === 'AssetHubPolkadot' || this.node === 'AssetHubKusama';
               isAHPDest = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
               isEthDest = destination === 'Ethereum'; // Eth asset - Any origin to any dest via AH - DestinationReserve - multiple instructions
-              if (!(isEthAsset && !isAHPOrigin && !isAHPDest && !isEthDest && !feeAsset)) {
-                _context.n = 6;
-                break;
-              }
-              return _context.a(2, this.transferEthAssetViaAH(_options));
-            case 6:
-              if (!(isEthAsset && isAHPDest && !isAHPOrigin && !isEthDest && !feeAsset)) {
+              isEthAssetViaAh = isEthAsset && !isAHPOrigin && !isAHPDest && !isEthDest && !feeAsset; // Eth asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
+              isEthAssetToAh = isEthAsset && isAHPDest && !isAHPOrigin && !isEthDest && !feeAsset;
+              if (!(isEthAssetViaAh || isEthAssetToAh)) {
                 _context.n = 7;
                 break;
               }
-              return _context.a(2, this.transferToEthereum(_options, true));
+              _context.n = 6;
+              return createTypeAndThenCall(this.node, _options);
+            case 6:
+              call = _context.v;
+              return _context.a(2, api.callTxMethod(call));
             case 7:
               return _context.a(2, this.transferPolkadotXCM(_options));
             case 8:
@@ -8078,118 +8254,11 @@ var ParachainNode = /*#__PURE__*/function () {
         }
       });
     }
-  }, {
-    key: "transferEthAssetViaAH",
-    value: function () {
-      var _transferEthAssetViaAH = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(input) {
-        var _feeAsset$multiLocati;
-        var api, asset, version, destination, address, senderAddress, feeAsset, paraIdTo, ethMultiAsset, PARA_TO_PARA_FEE_DOT, AH_EXECUTION_FEE_PADDED, dryRunResult, dryRunFeePadded, dest, call;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
-            case 0:
-              api = input.api, asset = input.asset, version = input.version, destination = input.destination, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAsset, paraIdTo = input.paraIdTo;
-              assertHasLocation(asset);
-              if (!(senderAddress === undefined)) {
-                _context2.n = 1;
-                break;
-              }
-              throw new InvalidParameterError('Sender address is required for transfers to Ethereum');
-            case 1:
-              if (!sdkCommon.isTMultiLocation(address)) {
-                _context2.n = 2;
-                break;
-              }
-              throw new InvalidParameterError('Multi-location address is not supported for Ethereum transfers');
-            case 2:
-              ethMultiAsset = createMultiAsset(version, asset.amount, asset.multiLocation);
-              PARA_TO_PARA_FEE_DOT = 500000000n; // 0.5 DOT
-              // Pad by 25%
-              AH_EXECUTION_FEE_PADDED = ASSET_HUB_EXECUTION_FEE * 125n / 100n; // Perform a dry run AH -> dest to calculate the BuyExecution amount
-              _context2.n = 3;
-              return Builder(api.clone()).from('AssetHubPolkadot').to(destination).currency({
-                symbol: assets.Native('DOT'),
-                amount: AH_EXECUTION_FEE_PADDED
-              }).address(address).senderAddress(senderAddress).dryRun();
-            case 3:
-              dryRunResult = _context2.v;
-              if (dryRunResult.origin.success) {
-                _context2.n = 4;
-                break;
-              }
-              throw new DryRunFailedError(dryRunResult.origin.failureReason);
-            case 4:
-              // Pad fee by 50%
-              dryRunFeePadded = BigInt(dryRunResult.origin.fee) * 3n / 2n;
-              dest = createDestination(version, this.node, destination, paraIdTo);
-              call = {
-                module: 'PolkadotXcm',
-                method: 'transfer_assets_using_type_and_then',
-                parameters: {
-                  dest: createVersionedDestination(version, this.node, destination, getParaId('AssetHubPolkadot')),
-                  assets: addXcmVersionHeader([].concat(_toConsumableArray(!feeAsset ? [createMultiAsset(version, PARA_TO_PARA_FEE_DOT, DOT_MULTILOCATION)] : []), [ethMultiAsset]), version),
-                  assets_transfer_type: 'DestinationReserve',
-                  remote_fees_id: addXcmVersionHeader((_feeAsset$multiLocati = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati !== void 0 ? _feeAsset$multiLocati : DOT_MULTILOCATION, version),
-                  fees_transfer_type: 'DestinationReserve',
-                  custom_xcm_on_dest: addXcmVersionHeader([{
-                    SetAppendix: [{
-                      DepositAsset: {
-                        assets: {
-                          Wild: 'All'
-                        },
-                        beneficiary: createBeneficiaryLocation({
-                          api: api,
-                          address: senderAddress,
-                          version: version
-                        })
-                      }
-                    }]
-                  }, {
-                    DepositReserveAsset: {
-                      assets: {
-                        Wild: 'All'
-                      },
-                      dest: dest,
-                      xcm: [{
-                        BuyExecution: {
-                          fees: {
-                            id: DOT_MULTILOCATION,
-                            fun: {
-                              Fungible: dryRunFeePadded
-                            }
-                          },
-                          weight_limit: 'Unlimited'
-                        }
-                      }, {
-                        DepositAsset: {
-                          assets: {
-                            Wild: 'All'
-                          },
-                          beneficiary: createBeneficiaryLocation({
-                            api: api,
-                            address: address,
-                            version: version
-                          })
-                        }
-                      }]
-                    }
-                  }], version),
-                  weight_limit: 'Unlimited'
-                }
-              };
-              return _context2.a(2, api.callTxMethod(call));
-          }
-        }, _callee2, this);
-      }));
-      function transferEthAssetViaAH(_x2) {
-        return _transferEthAssetViaAH.apply(this, arguments);
-      }
-      return transferEthAssetViaAH;
-    }()
   }, {
     key: "transferToEthereum",
     value: function () {
-      var _transferToEthereum = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var _feeAsset$multiLocati2;
+      var _transferToEthereum = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(input) {
+        var _feeAsset$multiLocati;
         var useOnlyDepositInstruction,
           api,
           asset,
@@ -8211,44 +8280,39 @@ var ParachainNode = /*#__PURE__*/function () {
           customXcmOnDest,
           messageId,
           call,
-          _args3 = arguments;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+          _args2 = arguments;
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
             case 0:
-              useOnlyDepositInstruction = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : false;
+              useOnlyDepositInstruction = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : false;
               api = input.api, asset = input.asset, version = input.version, destination = input.destination, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAsset;
-              _context3.n = 1;
+              _context2.n = 1;
               return getBridgeStatus(api.clone());
             case 1:
-              bridgeStatus = _context3.v;
+              bridgeStatus = _context2.v;
               if (!(bridgeStatus !== 'Normal')) {
-                _context3.n = 2;
+                _context2.n = 2;
                 break;
               }
               throw new BridgeHaltedError();
             case 2:
               assertHasLocation(asset);
+              assertAddressIsString(address);
               if (!(senderAddress === undefined)) {
-                _context3.n = 3;
+                _context2.n = 3;
                 break;
               }
               throw new InvalidParameterError('Sender address is required for transfers to Ethereum');
             case 3:
-              if (!sdkCommon.isTMultiLocation(address)) {
-                _context3.n = 4;
-                break;
-              }
-              throw new InvalidParameterError('Multi-location address is not supported for Ethereum transfers');
-            case 4:
               ethMultiAsset = createMultiAsset(version, asset.amount, asset.multiLocation);
-              _context3.n = 5;
+              _context2.n = 4;
               return api.createApiForNode('AssetHubPolkadot');
-            case 5:
-              ahApi = _context3.v;
-              _context3.n = 6;
+            case 4:
+              ahApi = _context2.v;
+              _context2.n = 5;
               return getParaEthTransferFees(ahApi);
-            case 6:
-              _yield$getParaEthTran = _context3.v;
+            case 5:
+              _yield$getParaEthTran = _context2.v;
               _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
               bridgeFee = _yield$getParaEthTran2[0];
               executionFee = _yield$getParaEthTran2[1];
@@ -8256,13 +8320,13 @@ var ParachainNode = /*#__PURE__*/function () {
               fee = useOnlyDepositInstruction ? PARA_TO_PARA_FEE_DOT : bridgeFee + executionFee;
               ethAsset = assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
               if (ethAsset) {
-                _context3.n = 7;
+                _context2.n = 6;
                 break;
               }
               throw new assets.InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(asset, sdkCommon.replaceBigInt)));
-            case 7:
+            case 6:
               if (!useOnlyDepositInstruction) {
-                _context3.n = 8;
+                _context2.n = 7;
                 break;
               }
               customXcmOnDest = addXcmVersionHeader([{
@@ -8279,16 +8343,16 @@ var ParachainNode = /*#__PURE__*/function () {
                   })
                 }
               }], version);
-              _context3.n = 10;
+              _context2.n = 9;
               break;
-            case 8:
+            case 7:
               assertHasId(ethAsset);
-              _context3.n = 9;
+              _context2.n = 8;
               return generateMessageId(api, senderAddress, getParaId(this.node), ethAsset.assetId, address, asset.amount);
-            case 9:
-              messageId = _context3.v;
+            case 8:
+              messageId = _context2.v;
               customXcmOnDest = createCustomXcmOnDest(input, this.node, messageId);
-            case 10:
+            case 9:
               call = {
                 module: 'PolkadotXcm',
                 method: 'transfer_assets_using_type_and_then',
@@ -8296,17 +8360,17 @@ var ParachainNode = /*#__PURE__*/function () {
                   dest: createVersionedDestination(version, this.node, destination, getParaId('AssetHubPolkadot')),
                   assets: addXcmVersionHeader([].concat(_toConsumableArray(!feeAsset ? [createMultiAsset(version, fee, DOT_MULTILOCATION)] : []), [ethMultiAsset]), version),
                   assets_transfer_type: 'DestinationReserve',
-                  remote_fees_id: addXcmVersionHeader((_feeAsset$multiLocati2 = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati2 !== void 0 ? _feeAsset$multiLocati2 : DOT_MULTILOCATION, version),
+                  remote_fees_id: addXcmVersionHeader((_feeAsset$multiLocati = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati !== void 0 ? _feeAsset$multiLocati : DOT_MULTILOCATION, version),
                   fees_transfer_type: 'DestinationReserve',
                   custom_xcm_on_dest: customXcmOnDest,
                   weight_limit: 'Unlimited'
                 }
               };
-              return _context3.a(2, api.callTxMethod(call));
+              return _context2.a(2, api.callTxMethod(call));
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
-      function transferToEthereum(_x3) {
+      function transferToEthereum(_x2) {
         return _transferToEthereum.apply(this, arguments);
       }
       return transferToEthereum;
@@ -8412,7 +8476,7 @@ var Ajuna = /*#__PURE__*/function (_ParachainNode) {
               api = input.api;
               _t = api;
               _context.n = 1;
-              return createTypeAndThenTransfer$2(this.node, input);
+              return createTypeAndThenCall(this.node, input);
             case 1:
               _t2 = _context.v;
               return _context.a(2, _t.callTxMethod.call(_t, _t2));
@@ -8608,57 +8672,14 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
-var createCustomXcmToBifrost = function createCustomXcmToBifrost(_ref, version) {
-  var api = _ref.api,
-    address = _ref.address;
-  return _defineProperty({}, version, [{
-    DepositAsset: {
-      assets: {
-        Wild: 'All'
-      },
-      beneficiary: createBeneficiaryLocation({
-        api: api,
-        address: address,
-        version: version
-      })
-    }
-  }]);
-};
 var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
   function AssetHubPolkadot() {
-    var _this;
     var chain = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'AssetHubPolkadot';
     var info = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'PolkadotAssetHub';
     var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'polkadot';
     var version = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : sdkCommon.Version.V5;
     _classCallCheck(this, AssetHubPolkadot);
-    _this = _callSuper(this, AssetHubPolkadot, [chain, info, type, version]);
-    _this.handleLocalReserveTransfer = function (input) {
-      var useDOTAsFeeAsset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      var api = input.api,
-        version = input.version,
-        destination = input.destination,
-        asset = input.asset,
-        paraIdTo = input.paraIdTo;
-      assertIsForeign(asset);
-      assertHasLocation(asset);
-      var PARA_TO_PARA_FEE_DOT = 500000000n; // 0.5 DOT
-      var call = {
-        module: 'PolkadotXcm',
-        method: 'transfer_assets_using_type_and_then',
-        parameters: {
-          dest: createVersionedDestination(version, _this.node, destination, paraIdTo),
-          assets: addXcmVersionHeader([].concat(_toConsumableArray(useDOTAsFeeAsset ? [createMultiAsset(version, PARA_TO_PARA_FEE_DOT, DOT_MULTILOCATION)] : []), [createMultiAsset(version, asset.amount, asset.multiLocation)]), version),
-          assets_transfer_type: 'LocalReserve',
-          remote_fees_id: addXcmVersionHeader(useDOTAsFeeAsset ? DOT_MULTILOCATION : asset.multiLocation, version),
-          fees_transfer_type: 'LocalReserve',
-          custom_xcm_on_dest: createCustomXcmToBifrost(input, version),
-          weight_limit: 'Unlimited'
-        }
-      };
-      return api.callTxMethod(call);
-    };
-    return _this;
+    return _callSuper(this, AssetHubPolkadot, [chain, info, type, version]);
   }
   _inherits(AssetHubPolkadot, _ParachainNode);
   return _createClass(AssetHubPolkadot, [{
@@ -8863,14 +8884,14 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
   }, {
     key: "transferPolkadotXCM",
     value: function () {
-      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isNativeFeeAsset, isEthereumAsset, CHAINS_SUPPORT_DOT_TRANSFER, isTrusted, isDotReserveAh, method, modifiedInput, _t, _t2, _t3, _t4;
+      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
+        var api, scenario, asset, destination, feeAsset, overriddenAsset, call, isNativeAsset, isNativeFeeAsset, isEthereumAsset, _call, CHAINS_SUPPORT_DOT_TRANSFER, isTrusted, isDotReserveAh, method, modifiedInput, _t, _t2, _t3, _t4;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              api = input.api, scenario = input.scenario, asset = input.asset, destination = input.destination, feeAsset = input.feeAsset, overriddenAsset = input.overriddenAsset;
+              api = options.api, scenario = options.scenario, asset = options.asset, destination = options.destination, feeAsset = options.feeAsset, overriddenAsset = options.overriddenAsset;
               if (!feeAsset) {
-                _context3.n = 4;
+                _context3.n = 5;
                 break;
               }
               if (!overriddenAsset) {
@@ -8880,83 +8901,85 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               throw new assets.InvalidCurrencyError('Cannot use overridden multi-assets with XCM execute');
             case 1:
               if (!assets.isSymbolMatch(asset.symbol, 'KSM')) {
-                _context3.n = 2;
+                _context3.n = 3;
                 break;
               }
-              return _context3.a(2, this.handleLocalReserveTransfer(input));
+              _context3.n = 2;
+              return createTypeAndThenCall(this.node, options);
             case 2:
+              call = _context3.v;
+              return _context3.a(2, api.callTxMethod(call));
+            case 3:
               isNativeAsset = assets.isSymbolMatch(asset.symbol, this.getNativeAssetSymbol());
               isNativeFeeAsset = assets.isSymbolMatch(feeAsset.symbol, this.getNativeAssetSymbol());
               if (!(!isNativeAsset || !isNativeFeeAsset)) {
-                _context3.n = 4;
+                _context3.n = 5;
                 break;
               }
               _t = api;
-              _context3.n = 3;
-              return handleExecuteTransfer(this.node, input);
-            case 3:
+              _context3.n = 4;
+              return handleExecuteTransfer(this.node, options);
+            case 4:
               _t2 = _context3.v;
               return _context3.a(2, _t.callTxMethod.call(_t, _t2));
-            case 4:
-              if (!(destination === 'AssetHubKusama')) {
-                _context3.n = 5;
-                break;
-              }
-              return _context3.a(2, this.handleBridgeTransfer(input, 'Kusama'));
             case 5:
-              if (!(destination === 'Ethereum')) {
+              if (!(destination === 'AssetHubKusama')) {
                 _context3.n = 6;
                 break;
               }
-              return _context3.a(2, this.handleEthBridgeTransfer(input));
+              return _context3.a(2, this.handleBridgeTransfer(options, 'Kusama'));
             case 6:
-              if (!(destination === 'Mythos')) {
+              if (!(destination === 'Ethereum')) {
                 _context3.n = 7;
                 break;
               }
-              return _context3.a(2, this.handleMythosTransfer(input));
+              return _context3.a(2, this.handleEthBridgeTransfer(options));
             case 7:
-              isEthereumAsset = asset.multiLocation && assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
-              if (!(destination === 'BifrostPolkadot' && isEthereumAsset)) {
+              if (!(destination === 'Mythos')) {
                 _context3.n = 8;
                 break;
               }
-              return _context3.a(2, this.handleLocalReserveTransfer(input));
+              return _context3.a(2, this.handleMythosTransfer(options));
             case 8:
+              isEthereumAsset = asset.multiLocation && assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
               if (!isEthereumAsset) {
-                _context3.n = 9;
+                _context3.n = 10;
                 break;
               }
-              return _context3.a(2, this.handleLocalReserveTransfer(input, true));
+              _context3.n = 9;
+              return createTypeAndThenCall(this.node, options);
             case 9:
+              _call = _context3.v;
+              return _context3.a(2, api.callTxMethod(_call));
+            case 10:
               CHAINS_SUPPORT_DOT_TRANSFER = new Set(['Hydration', 'Polimec', 'Moonbeam', 'BifrostPolkadot', 'PeoplePolkadot', 'Ajuna']);
               isTrusted = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isSystemChain(destination);
               isDotReserveAh = !sdkCommon.isTMultiLocation(destination) && CHAINS_SUPPORT_DOT_TRANSFER.has(destination);
               if (!(scenario === 'ParaToPara' && asset.symbol === this.getNativeAssetSymbol() && !assets.isForeignAsset(asset) && !isDotReserveAh && !isTrusted)) {
-                _context3.n = 10;
+                _context3.n = 11;
                 break;
               }
               throw new ScenarioNotSupportedError(this.node, scenario, 'Some Parachains do not have a reserve for DOT on AssetHub. This can also include multihop transfers that have AssetHub as a hop chain and the call contains DOT. Chains that do not have a DOT reserve on AssetHub are not allowed to transfer DOT to it or through it because this transfer will result in asset loss.');
-            case 10:
+            case 11:
               if (!(scenario === 'ParaToPara' && asset.symbol === 'KSM' && !assets.isForeignAsset(asset))) {
-                _context3.n = 11;
+                _context3.n = 12;
                 break;
               }
               throw new ScenarioNotSupportedError(this.node, scenario, 'Bridged KSM cannot currently be transfered from AssetHubPolkadot, if you are sending different KSM asset, please specify {id: <KSMID>}.');
-            case 11:
+            case 12:
               method = this.getMethod(scenario, destination); // Patch transfer_assets to use type_and_then transfer
               if (!(method === 'transfer_assets' && assets.isSymbolMatch(asset.symbol, assets.getRelayChainSymbol(this.node)))) {
-                _context3.n = 13;
+                _context3.n = 14;
                 break;
               }
               _t3 = api;
-              _context3.n = 12;
-              return createTypeAndThenTransfer$2(this.node, input);
-            case 12:
+              _context3.n = 13;
+              return createTypeAndThenCall(this.node, options);
+            case 13:
               _t4 = _context3.v;
               return _context3.a(2, _t3.callTxMethod.call(_t3, _t4));
-            case 13:
-              modifiedInput = this.patchInput(input);
+            case 14:
+              modifiedInput = this.patchInput(options);
               return _context3.a(2, transferPolkadotXcm(modifiedInput, method, 'Unlimited'));
           }
         }, _callee3, this);
@@ -9202,7 +9225,7 @@ var BifrostPolkadot = /*#__PURE__*/function (_ParachainNode) {
               }
               _t = api;
               _context.n = 1;
-              return createTypeAndThenTransfer$2(this.node, input);
+              return createTypeAndThenCall(this.node, input);
             case 1:
               _t2 = _context.v;
               return _context.a(2, _t.callTxMethod.call(_t, _t2));
@@ -10557,7 +10580,7 @@ var Moonbeam = /*#__PURE__*/function (_ParachainNode) {
               }
               _t = api;
               _context.n = 2;
-              return createTypeAndThenTransfer$2(this.node, input);
+              return createTypeAndThenCall(this.node, input);
             case 2:
               _t2 = _context.v;
               return _context.a(2, _t.callTxMethod.call(_t, _t2));
@@ -12288,7 +12311,7 @@ exports.createDirectExecuteXcm = createDirectExecuteXcm;
 exports.createExecuteCall = createExecuteCall;
 exports.createExecuteExchangeXcm = createExecuteExchangeXcm;
 exports.createMultiAsset = createMultiAsset;
-exports.createTypeAndThenTransfer = createTypeAndThenTransfer$2;
+exports.createTypeAndThenCall = createTypeAndThenCall;
 exports.createVersionedMultiAssets = createVersionedMultiAssets;
 exports.createX1Payload = createX1Payload;
 exports.deriveAccountId = deriveAccountId;
@@ -12297,6 +12320,7 @@ exports.dryRunOrigin = dryRunOrigin;
 exports.encodeSs58 = encodeSs58;
 exports.getAssetBalance = getAssetBalance;
 exports.getAssetBalanceInternal = getAssetBalanceInternal;
+exports.getAssetReserveChain = getAssetReserveChain;
 exports.getBalanceForeign = getBalanceForeign;
 exports.getBalanceForeignInternal = getBalanceForeignInternal;
 exports.getBalanceNative = getBalanceNative;