@paraspell/sdk-core 10.4.1 → 10.4.3

package/dist/index.cjs

@@ -2873,61 +2873,55 @@ var getBalanceForeignPolkadotXcm = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           if (!(node === 'Moonbeam' || node === 'Moonriver')) {
-            _context.n = 3;
+            _context.n = 2;
             break;
           }
-          if (!(!assets.isForeignAsset(asset) || !asset.assetId)) {
+          if (!(!assets.isForeignAsset(asset) || !asset.assetId || !asset.multiLocation)) {
             _context.n = 1;
             break;
           }
-          throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
+          throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multi-location or assetId"));
         case 1:
-          if (!(asset.multiLocation && sdkCommon.hasJunction(asset.multiLocation, 'GlobalConsensus'))) {
-            _context.n = 2;
-            break;
-          }
           return _context.a(2, getMoonbeamErc20Balance(node, asset.assetId, address));
         case 2:
-          return _context.a(2, api.getBalanceAssetsPallet(address, BigInt(asset.assetId)));
-        case 3:
           if (!(node === 'Mythos')) {
-            _context.n = 4;
+            _context.n = 3;
             break;
           }
           return _context.a(2, api.getMythosForeignBalance(address));
-        case 4:
+        case 3:
           if (assets.isForeignAsset(asset)) {
-            _context.n = 5;
+            _context.n = 4;
             break;
           }
           throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
-        case 5:
+        case 4:
           if (!(node === 'Polimec')) {
-            _context.n = 7;
+            _context.n = 6;
             break;
           }
           if (!(asset.multiLocation === undefined)) {
-            _context.n = 6;
+            _context.n = 5;
             break;
           }
           throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multi-location"));
-        case 6:
+        case 5:
           return _context.a(2, api.getBalanceForeignAssetsPallet(address, asset.multiLocation));
-        case 7:
+        case 6:
           if (!(node === 'AssetHubPolkadot')) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           ASSETS_PALLET_ID = 50;
           hasRequiredJunctions = asset.multiLocation && sdkCommon.hasJunction(asset.multiLocation, 'PalletInstance', ASSETS_PALLET_ID) && sdkCommon.hasJunction(asset.multiLocation, 'GeneralIndex');
           if (!(!asset.multiLocation || hasRequiredJunctions)) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
           return _context.a(2, api.getBalanceAssetsPallet(address, Number(asset.assetId)));
-        case 8:
+        case 7:
           return _context.a(2, api.getBalanceForeignAssetsPallet(address, asset.multiLocation));
-        case 9:
+        case 8:
           return _context.a(2, api.getBalanceForeignPolkadotXcm(address, asset.assetId));
       }
     }, _callee);
@@ -6713,6 +6707,22 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
+var createExecuteCall = function createExecuteCall(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+xcm, maxWeight) {
+  return {
+    module: 'PolkadotXcm',
+    method: 'execute',
+    parameters: {
+      message: xcm,
+      max_weight: {
+        ref_time: maxWeight.refTime,
+        proof_size: maxWeight.proofSize
+      }
+    }
+  };
+};
+
 var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, weight, originExecutionFee, destExecutionFee) {
   var api = input.api,
     _input$version = input.version,
@@ -6810,15 +6820,15 @@ var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, weight,
   return api.callTxMethod(call);
 };
 
-var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
+var createExecuteXcm = function createExecuteXcm(input, executionFee, version) {
+  var _feeAsset$multiLocati;
   var api = input.api,
-    _input$version = input.version,
-    version = _input$version === void 0 ? exports.Version.V4 : _input$version,
     asset = input.asset,
     scenario = input.scenario,
     destination = input.destination,
     paraIdTo = input.paraIdTo,
-    address = input.address;
+    address = input.address,
+    feeAsset = input.feeAsset;
   var dest = createDestination(scenario, version, destination, paraIdTo);
   var beneficiary = createBeneficiary({
     api: api,
@@ -6828,77 +6838,74 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
     version: version,
     paraId: paraIdTo
   });
-  if (!asset.multiLocation) {
-    throw new InvalidParameterError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
+  if (!asset.multiLocation || feeAsset && !feeAsset.multiLocation) {
+    throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
   }
-  var transformedMultiLocation = transformMultiLocation(asset.multiLocation);
+  var assetML = transformMultiLocation(asset.multiLocation);
+  var feeML = transformMultiLocation((_feeAsset$multiLocati = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati !== void 0 ? _feeAsset$multiLocati : asset.multiLocation);
+  var sameFeeAsset = feeAsset && assets.isAssetEqual(asset, feeAsset);
   var amountWithoutFee = BigInt(asset.amount) - executionFee;
-  var call = {
-    module: 'PolkadotXcm',
-    method: 'execute',
-    parameters: {
-      message: _defineProperty({}, version, [{
-        WithdrawAsset: [{
-          id: transformedMultiLocation,
+  var xcm = [{
+    WithdrawAsset: [{
+      id: assetML,
+      fun: {
+        Fungible: BigInt(asset.amount)
+      }
+    }].concat(_toConsumableArray(!sameFeeAsset && feeAsset !== null && feeAsset !== void 0 && feeAsset.multiLocation ? [{
+      id: transformMultiLocation(feeAsset.multiLocation),
+      fun: {
+        Fungible: executionFee
+      }
+    }] : []))
+  }, {
+    BuyExecution: {
+      fees: {
+        id: feeML,
+        fun: {
+          Fungible: executionFee
+        }
+      },
+      weight_limit: {
+        Limited: {
+          ref_time: 150n,
+          proof_size: 0n
+        }
+      }
+    }
+  }, {
+    DepositReserveAsset: {
+      assets: {
+        Definite: [{
+          id: assetML,
           fun: {
-            Fungible: BigInt(asset.amount)
+            Fungible: sameFeeAsset ? amountWithoutFee : BigInt(asset.amount)
           }
         }]
-      }, {
+      },
+      dest: dest,
+      xcm: [{
         BuyExecution: {
           fees: {
-            id: transformedMultiLocation,
+            id: asset.multiLocation,
             fun: {
-              Fungible: executionFee
+              Fungible: sameFeeAsset ? amountWithoutFee - executionFee : BigInt(asset.amount)
             }
           },
-          weight_limit: {
-            Limited: {
-              ref_time: 150n,
-              proof_size: 0n
-            }
-          }
+          weight_limit: 'Unlimited'
         }
       }, {
-        DepositReserveAsset: {
+        DepositAsset: {
           assets: {
-            Definite: [{
-              id: transformedMultiLocation,
-              fun: {
-                Fungible: amountWithoutFee
-              }
-            }]
-          },
-          dest: dest,
-          xcm: [{
-            BuyExecution: {
-              fees: {
-                id: asset.multiLocation,
-                fun: {
-                  Fungible: amountWithoutFee - executionFee
-                }
-              },
-              weight_limit: 'Unlimited'
-            }
-          }, {
-            DepositAsset: {
-              assets: {
-                Wild: {
-                  AllCounted: 1
-                }
-              },
-              beneficiary: beneficiary
+            Wild: {
+              AllCounted: 1
             }
-          }]
+          },
+          beneficiary: beneficiary
         }
-      }]),
-      max_weight: {
-        ref_time: weight.refTime,
-        proof_size: weight.proofSize
-      }
+      }]
     }
-  };
-  return api.callTxMethod(call);
+  }];
+  return addXcmVersionHeader(xcm, version);
 };
 
 var handleToAhTeleport = /*#__PURE__*/function () {
@@ -6993,7 +7000,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     var _this;
     _classCallCheck(this, AssetHubPolkadot);
     _this = _callSuper(this, AssetHubPolkadot, ['AssetHubPolkadot', 'PolkadotAssetHub', 'polkadot', exports.Version.V3]);
-    _this.handleBifrostEthTransfer = function (input) {
+    _this.handleLocalReserveTransfer = function (input) {
       var useDOTAsFeeAsset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var api = input.api,
         scenario = input.scenario,
@@ -7260,11 +7267,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleExecuteTransfer",
     value: function () {
       var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, senderAddress, asset, feeAsset, decimals, multiplier, base, scaledMultiplier, MIN_FEE, dummyTx, dryRunResult, paddedFee;
+        var api, senderAddress, asset, feeAsset, _input$version4, version, decimals, multiplier, base, scaledMultiplier, MIN_FEE, call, dryRunResult, paddedFee, xcm, weight;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset;
+              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset, _input$version4 = input.version, version = _input$version4 === void 0 ? exports.Version.V4 : _input$version4;
               if (senderAddress) {
                 _context3.n = 1;
                 break;
@@ -7277,11 +7284,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               base = BigInt(Math.pow(10, decimals));
               scaledMultiplier = BigInt(Math.floor(multiplier * Math.pow(10, decimals)));
               MIN_FEE = base * scaledMultiplier / BigInt(Math.pow(10, decimals));
-              dummyTx = createExecuteXcm(input, MAX_WEIGHT, MIN_FEE);
+              call = createExecuteCall(createExecuteXcm(input, MIN_FEE, version), MAX_WEIGHT);
               _context3.n = 2;
               return api.getDryRunCall({
                 node: this.node,
-                tx: dummyTx,
+                tx: api.callTxMethod(call),
                 address: senderAddress,
                 isFeeAsset: !!feeAsset
               });
@@ -7293,14 +7300,13 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               }
               throw new DryRunFailedError(dryRunResult.failureReason);
             case 3:
-              if (dryRunResult.weight) {
-                _context3.n = 4;
-                break;
-              }
-              throw new DryRunFailedError('weight not found');
-            case 4:
               paddedFee = dryRunResult.fee * 120n / 100n;
-              return _context3.a(2, createExecuteXcm(input, dryRunResult.weight, paddedFee));
+              xcm = createExecuteXcm(input, paddedFee, version);
+              _context3.n = 4;
+              return api.getXcmWeight(xcm);
+            case 4:
+              weight = _context3.v;
+              return _context3.a(2, createExecuteCall(createExecuteXcm(input, paddedFee, version), weight));
           }
         }, _callee3, this);
       }));
@@ -7311,51 +7317,96 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     }()
   }, {
     key: "transferPolkadotXCM",
-    value: function transferPolkadotXCM(input) {
-      var scenario = input.scenario,
-        asset = input.asset,
-        destination = input.destination,
-        feeAsset = input.feeAsset,
-        overriddenAsset = input.overriddenAsset;
-      if (feeAsset) {
-        if (overriddenAsset) {
-          throw new assets.InvalidCurrencyError('Cannot use overridden multi-assets with XCM execute');
-        }
-        if (!assets.isAssetEqual(feeAsset, asset)) {
-          throw new assets.InvalidCurrencyError("Fee asset does not match transfer asset.");
-        }
-        var isNativeAsset = asset.symbol === this.getNativeAssetSymbol();
-        if (!isNativeAsset) {
-          return Promise.resolve(this.handleExecuteTransfer(input));
-        }
-      }
-      if (destination === 'AssetHubKusama') {
-        return Promise.resolve(this.handleBridgeTransfer(input, 'Kusama'));
-      }
-      if (destination === 'Ethereum') {
-        return Promise.resolve(this.handleEthBridgeTransfer(input));
-      }
-      if (destination === 'Mythos') {
-        return Promise.resolve(this.handleMythosTransfer(input));
-      }
-      var isEthereumAsset = asset.multiLocation && assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
-      if (destination === 'BifrostPolkadot' && isEthereumAsset) {
-        return Promise.resolve(this.handleBifrostEthTransfer(input));
-      }
-      if (isEthereumAsset) {
-        return Promise.resolve(this.handleBifrostEthTransfer(input, true));
-      }
-      var isSystemNode = !sdkCommon.isTMultiLocation(destination) && SYSTEM_NODES_POLKADOT.includes(destination);
-      if (scenario === 'ParaToPara' && asset.symbol === 'DOT' && !assets.isForeignAsset(asset) && destination !== 'Hydration' && destination !== 'Polimec' && destination !== 'Moonbeam' && destination !== 'BifrostPolkadot' && destination !== 'PeoplePolkadot' && destination !== 'Ajuna' && !isSystemNode) {
-        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.');
-      }
-      if (scenario === 'ParaToPara' && asset.symbol === 'KSM' && !assets.isForeignAsset(asset)) {
-        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>}.');
+    value: function () {
+      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(input) {
+        var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isEthereumAsset, isSystemNode, method, modifiedInput, _t, _t2;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
+            case 0:
+              api = input.api, scenario = input.scenario, asset = input.asset, destination = input.destination, feeAsset = input.feeAsset, overriddenAsset = input.overriddenAsset;
+              if (!feeAsset) {
+                _context4.n = 4;
+                break;
+              }
+              if (!overriddenAsset) {
+                _context4.n = 1;
+                break;
+              }
+              throw new assets.InvalidCurrencyError('Cannot use overridden multi-assets with XCM execute');
+            case 1:
+              if (!(assets.normalizeSymbol(asset.symbol) === assets.normalizeSymbol('KSM'))) {
+                _context4.n = 2;
+                break;
+              }
+              return _context4.a(2, this.handleLocalReserveTransfer(input));
+            case 2:
+              isNativeAsset = asset.symbol === this.getNativeAssetSymbol();
+              if (isNativeAsset) {
+                _context4.n = 4;
+                break;
+              }
+              _t = api;
+              _context4.n = 3;
+              return this.handleExecuteTransfer(input);
+            case 3:
+              _t2 = _context4.v;
+              return _context4.a(2, _t.callTxMethod.call(_t, _t2));
+            case 4:
+              if (!(destination === 'AssetHubKusama')) {
+                _context4.n = 5;
+                break;
+              }
+              return _context4.a(2, this.handleBridgeTransfer(input, 'Kusama'));
+            case 5:
+              if (!(destination === 'Ethereum')) {
+                _context4.n = 6;
+                break;
+              }
+              return _context4.a(2, this.handleEthBridgeTransfer(input));
+            case 6:
+              if (!(destination === 'Mythos')) {
+                _context4.n = 7;
+                break;
+              }
+              return _context4.a(2, this.handleMythosTransfer(input));
+            case 7:
+              isEthereumAsset = asset.multiLocation && assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
+              if (!(destination === 'BifrostPolkadot' && isEthereumAsset)) {
+                _context4.n = 8;
+                break;
+              }
+              return _context4.a(2, this.handleLocalReserveTransfer(input));
+            case 8:
+              if (!isEthereumAsset) {
+                _context4.n = 9;
+                break;
+              }
+              return _context4.a(2, this.handleLocalReserveTransfer(input, true));
+            case 9:
+              isSystemNode = !sdkCommon.isTMultiLocation(destination) && SYSTEM_NODES_POLKADOT.includes(destination);
+              if (!(scenario === 'ParaToPara' && asset.symbol === 'DOT' && !assets.isForeignAsset(asset) && destination !== 'Hydration' && destination !== 'Polimec' && destination !== 'Moonbeam' && destination !== 'BifrostPolkadot' && destination !== 'PeoplePolkadot' && destination !== 'Ajuna' && !isSystemNode)) {
+                _context4.n = 10;
+                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:
+              if (!(scenario === 'ParaToPara' && asset.symbol === 'KSM' && !assets.isForeignAsset(asset))) {
+                _context4.n = 11;
+                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:
+              method = this.getMethod(scenario, destination);
+              modifiedInput = this.patchInput(input);
+              return _context4.a(2, PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, method, 'Unlimited'));
+          }
+        }, _callee4, this);
+      }));
+      function transferPolkadotXCM(_x4) {
+        return _transferPolkadotXCM.apply(this, arguments);
       }
-      var method = this.getMethod(scenario, destination);
-      var modifiedInput = this.patchInput(input);
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, method, 'Unlimited'));
-    }
+      return transferPolkadotXCM;
+    }()
   }, {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {

package/dist/index.d.ts

@@ -938,6 +938,7 @@ interface IPolkadotApi<TApi, TRes> {
     getMethod(tx: TRes): string;
     calculateTransactionFee(tx: TRes, address: string): Promise<bigint>;
     quoteAhPrice(fromMl: TMultiLocation, toMl: TMultiLocation, amountIn: bigint, includeFee?: boolean): Promise<bigint | undefined>;
+    getXcmWeight(xcm: any): Promise<TWeight>;
     getBalanceNative(address: string): Promise<bigint>;
     getBalanceNativeAcala(address: string, symbol: string): Promise<bigint>;
     getBalanceForeignPolkadotXcm(address: string, id?: string): Promise<bigint>;
@@ -1298,7 +1299,7 @@ declare class AssetHubPolkadot<TApi, TRes> extends ParachainNode<TApi, TRes> imp
     handleEthBridgeNativeTransfer<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     handleEthBridgeTransfer<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     handleMythosTransfer<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): TRes;
-    handleBifrostEthTransfer: <TApi_1, TRes_1>(input: TPolkadotXCMTransferOptions<TApi_1, TRes_1>, useDOTAsFeeAsset?: boolean) => TRes_1;
+    handleLocalReserveTransfer: <TApi_1, TRes_1>(input: TPolkadotXCMTransferOptions<TApi_1, TRes_1>, useDOTAsFeeAsset?: boolean) => TRes_1;
     patchInput<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): TPolkadotXCMTransferOptions<TApi, TRes>;
     private getMethod;
     private handleExecuteTransfer;

package/dist/index.mjs

@@ -2874,61 +2874,55 @@ var getBalanceForeignPolkadotXcm = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           if (!(node === 'Moonbeam' || node === 'Moonriver')) {
-            _context.n = 3;
+            _context.n = 2;
             break;
           }
-          if (!(!isForeignAsset(asset) || !asset.assetId)) {
+          if (!(!isForeignAsset(asset) || !asset.assetId || !asset.multiLocation)) {
             _context.n = 1;
             break;
           }
-          throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
+          throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multi-location or assetId"));
         case 1:
-          if (!(asset.multiLocation && hasJunction(asset.multiLocation, 'GlobalConsensus'))) {
-            _context.n = 2;
-            break;
-          }
           return _context.a(2, getMoonbeamErc20Balance(node, asset.assetId, address));
         case 2:
-          return _context.a(2, api.getBalanceAssetsPallet(address, BigInt(asset.assetId)));
-        case 3:
           if (!(node === 'Mythos')) {
-            _context.n = 4;
+            _context.n = 3;
             break;
           }
           return _context.a(2, api.getMythosForeignBalance(address));
-        case 4:
+        case 3:
           if (isForeignAsset(asset)) {
-            _context.n = 5;
+            _context.n = 4;
             break;
           }
           throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
-        case 5:
+        case 4:
           if (!(node === 'Polimec')) {
-            _context.n = 7;
+            _context.n = 6;
             break;
           }
           if (!(asset.multiLocation === undefined)) {
-            _context.n = 6;
+            _context.n = 5;
             break;
           }
           throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multi-location"));
-        case 6:
+        case 5:
           return _context.a(2, api.getBalanceForeignAssetsPallet(address, asset.multiLocation));
-        case 7:
+        case 6:
           if (!(node === 'AssetHubPolkadot')) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           ASSETS_PALLET_ID = 50;
           hasRequiredJunctions = asset.multiLocation && hasJunction(asset.multiLocation, 'PalletInstance', ASSETS_PALLET_ID) && hasJunction(asset.multiLocation, 'GeneralIndex');
           if (!(!asset.multiLocation || hasRequiredJunctions)) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
           return _context.a(2, api.getBalanceAssetsPallet(address, Number(asset.assetId)));
-        case 8:
+        case 7:
           return _context.a(2, api.getBalanceForeignAssetsPallet(address, asset.multiLocation));
-        case 9:
+        case 8:
           return _context.a(2, api.getBalanceForeignPolkadotXcm(address, asset.assetId));
       }
     }, _callee);
@@ -6714,6 +6708,22 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
+var createExecuteCall = function createExecuteCall(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+xcm, maxWeight) {
+  return {
+    module: 'PolkadotXcm',
+    method: 'execute',
+    parameters: {
+      message: xcm,
+      max_weight: {
+        ref_time: maxWeight.refTime,
+        proof_size: maxWeight.proofSize
+      }
+    }
+  };
+};
+
 var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, weight, originExecutionFee, destExecutionFee) {
   var api = input.api,
     _input$version = input.version,
@@ -6811,15 +6821,15 @@ var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, weight,
   return api.callTxMethod(call);
 };
 
-var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
+var createExecuteXcm = function createExecuteXcm(input, executionFee, version) {
+  var _feeAsset$multiLocati;
   var api = input.api,
-    _input$version = input.version,
-    version = _input$version === void 0 ? Version.V4 : _input$version,
     asset = input.asset,
     scenario = input.scenario,
     destination = input.destination,
     paraIdTo = input.paraIdTo,
-    address = input.address;
+    address = input.address,
+    feeAsset = input.feeAsset;
   var dest = createDestination(scenario, version, destination, paraIdTo);
   var beneficiary = createBeneficiary({
     api: api,
@@ -6829,77 +6839,74 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
     version: version,
     paraId: paraIdTo
   });
-  if (!asset.multiLocation) {
-    throw new InvalidParameterError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
+  if (!asset.multiLocation || feeAsset && !feeAsset.multiLocation) {
+    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
   }
-  var transformedMultiLocation = transformMultiLocation(asset.multiLocation);
+  var assetML = transformMultiLocation(asset.multiLocation);
+  var feeML = transformMultiLocation((_feeAsset$multiLocati = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati !== void 0 ? _feeAsset$multiLocati : asset.multiLocation);
+  var sameFeeAsset = feeAsset && isAssetEqual(asset, feeAsset);
   var amountWithoutFee = BigInt(asset.amount) - executionFee;
-  var call = {
-    module: 'PolkadotXcm',
-    method: 'execute',
-    parameters: {
-      message: _defineProperty({}, version, [{
-        WithdrawAsset: [{
-          id: transformedMultiLocation,
+  var xcm = [{
+    WithdrawAsset: [{
+      id: assetML,
+      fun: {
+        Fungible: BigInt(asset.amount)
+      }
+    }].concat(_toConsumableArray(!sameFeeAsset && feeAsset !== null && feeAsset !== void 0 && feeAsset.multiLocation ? [{
+      id: transformMultiLocation(feeAsset.multiLocation),
+      fun: {
+        Fungible: executionFee
+      }
+    }] : []))
+  }, {
+    BuyExecution: {
+      fees: {
+        id: feeML,
+        fun: {
+          Fungible: executionFee
+        }
+      },
+      weight_limit: {
+        Limited: {
+          ref_time: 150n,
+          proof_size: 0n
+        }
+      }
+    }
+  }, {
+    DepositReserveAsset: {
+      assets: {
+        Definite: [{
+          id: assetML,
           fun: {
-            Fungible: BigInt(asset.amount)
+            Fungible: sameFeeAsset ? amountWithoutFee : BigInt(asset.amount)
           }
         }]
-      }, {
+      },
+      dest: dest,
+      xcm: [{
         BuyExecution: {
           fees: {
-            id: transformedMultiLocation,
+            id: asset.multiLocation,
             fun: {
-              Fungible: executionFee
+              Fungible: sameFeeAsset ? amountWithoutFee - executionFee : BigInt(asset.amount)
             }
           },
-          weight_limit: {
-            Limited: {
-              ref_time: 150n,
-              proof_size: 0n
-            }
-          }
+          weight_limit: 'Unlimited'
         }
       }, {
-        DepositReserveAsset: {
+        DepositAsset: {
           assets: {
-            Definite: [{
-              id: transformedMultiLocation,
-              fun: {
-                Fungible: amountWithoutFee
-              }
-            }]
-          },
-          dest: dest,
-          xcm: [{
-            BuyExecution: {
-              fees: {
-                id: asset.multiLocation,
-                fun: {
-                  Fungible: amountWithoutFee - executionFee
-                }
-              },
-              weight_limit: 'Unlimited'
-            }
-          }, {
-            DepositAsset: {
-              assets: {
-                Wild: {
-                  AllCounted: 1
-                }
-              },
-              beneficiary: beneficiary
+            Wild: {
+              AllCounted: 1
             }
-          }]
+          },
+          beneficiary: beneficiary
         }
-      }]),
-      max_weight: {
-        ref_time: weight.refTime,
-        proof_size: weight.proofSize
-      }
+      }]
     }
-  };
-  return api.callTxMethod(call);
+  }];
+  return addXcmVersionHeader(xcm, version);
 };
 
 var handleToAhTeleport = /*#__PURE__*/function () {
@@ -6994,7 +7001,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     var _this;
     _classCallCheck(this, AssetHubPolkadot);
     _this = _callSuper(this, AssetHubPolkadot, ['AssetHubPolkadot', 'PolkadotAssetHub', 'polkadot', Version.V3]);
-    _this.handleBifrostEthTransfer = function (input) {
+    _this.handleLocalReserveTransfer = function (input) {
       var useDOTAsFeeAsset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var api = input.api,
         scenario = input.scenario,
@@ -7261,11 +7268,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleExecuteTransfer",
     value: function () {
       var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, senderAddress, asset, feeAsset, decimals, multiplier, base, scaledMultiplier, MIN_FEE, dummyTx, dryRunResult, paddedFee;
+        var api, senderAddress, asset, feeAsset, _input$version4, version, decimals, multiplier, base, scaledMultiplier, MIN_FEE, call, dryRunResult, paddedFee, xcm, weight;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset;
+              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset, _input$version4 = input.version, version = _input$version4 === void 0 ? Version.V4 : _input$version4;
               if (senderAddress) {
                 _context3.n = 1;
                 break;
@@ -7278,11 +7285,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               base = BigInt(Math.pow(10, decimals));
               scaledMultiplier = BigInt(Math.floor(multiplier * Math.pow(10, decimals)));
               MIN_FEE = base * scaledMultiplier / BigInt(Math.pow(10, decimals));
-              dummyTx = createExecuteXcm(input, MAX_WEIGHT, MIN_FEE);
+              call = createExecuteCall(createExecuteXcm(input, MIN_FEE, version), MAX_WEIGHT);
               _context3.n = 2;
               return api.getDryRunCall({
                 node: this.node,
-                tx: dummyTx,
+                tx: api.callTxMethod(call),
                 address: senderAddress,
                 isFeeAsset: !!feeAsset
               });
@@ -7294,14 +7301,13 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               }
               throw new DryRunFailedError(dryRunResult.failureReason);
             case 3:
-              if (dryRunResult.weight) {
-                _context3.n = 4;
-                break;
-              }
-              throw new DryRunFailedError('weight not found');
-            case 4:
               paddedFee = dryRunResult.fee * 120n / 100n;
-              return _context3.a(2, createExecuteXcm(input, dryRunResult.weight, paddedFee));
+              xcm = createExecuteXcm(input, paddedFee, version);
+              _context3.n = 4;
+              return api.getXcmWeight(xcm);
+            case 4:
+              weight = _context3.v;
+              return _context3.a(2, createExecuteCall(createExecuteXcm(input, paddedFee, version), weight));
           }
         }, _callee3, this);
       }));
@@ -7312,51 +7318,96 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     }()
   }, {
     key: "transferPolkadotXCM",
-    value: function transferPolkadotXCM(input) {
-      var scenario = input.scenario,
-        asset = input.asset,
-        destination = input.destination,
-        feeAsset = input.feeAsset,
-        overriddenAsset = input.overriddenAsset;
-      if (feeAsset) {
-        if (overriddenAsset) {
-          throw new InvalidCurrencyError('Cannot use overridden multi-assets with XCM execute');
-        }
-        if (!isAssetEqual(feeAsset, asset)) {
-          throw new InvalidCurrencyError("Fee asset does not match transfer asset.");
-        }
-        var isNativeAsset = asset.symbol === this.getNativeAssetSymbol();
-        if (!isNativeAsset) {
-          return Promise.resolve(this.handleExecuteTransfer(input));
-        }
-      }
-      if (destination === 'AssetHubKusama') {
-        return Promise.resolve(this.handleBridgeTransfer(input, 'Kusama'));
-      }
-      if (destination === 'Ethereum') {
-        return Promise.resolve(this.handleEthBridgeTransfer(input));
-      }
-      if (destination === 'Mythos') {
-        return Promise.resolve(this.handleMythosTransfer(input));
-      }
-      var isEthereumAsset = asset.multiLocation && findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
-      if (destination === 'BifrostPolkadot' && isEthereumAsset) {
-        return Promise.resolve(this.handleBifrostEthTransfer(input));
-      }
-      if (isEthereumAsset) {
-        return Promise.resolve(this.handleBifrostEthTransfer(input, true));
-      }
-      var isSystemNode = !isTMultiLocation(destination) && SYSTEM_NODES_POLKADOT.includes(destination);
-      if (scenario === 'ParaToPara' && asset.symbol === 'DOT' && !isForeignAsset(asset) && destination !== 'Hydration' && destination !== 'Polimec' && destination !== 'Moonbeam' && destination !== 'BifrostPolkadot' && destination !== 'PeoplePolkadot' && destination !== 'Ajuna' && !isSystemNode) {
-        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.');
-      }
-      if (scenario === 'ParaToPara' && asset.symbol === 'KSM' && !isForeignAsset(asset)) {
-        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>}.');
+    value: function () {
+      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(input) {
+        var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isEthereumAsset, isSystemNode, method, modifiedInput, _t, _t2;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
+            case 0:
+              api = input.api, scenario = input.scenario, asset = input.asset, destination = input.destination, feeAsset = input.feeAsset, overriddenAsset = input.overriddenAsset;
+              if (!feeAsset) {
+                _context4.n = 4;
+                break;
+              }
+              if (!overriddenAsset) {
+                _context4.n = 1;
+                break;
+              }
+              throw new InvalidCurrencyError('Cannot use overridden multi-assets with XCM execute');
+            case 1:
+              if (!(normalizeSymbol(asset.symbol) === normalizeSymbol('KSM'))) {
+                _context4.n = 2;
+                break;
+              }
+              return _context4.a(2, this.handleLocalReserveTransfer(input));
+            case 2:
+              isNativeAsset = asset.symbol === this.getNativeAssetSymbol();
+              if (isNativeAsset) {
+                _context4.n = 4;
+                break;
+              }
+              _t = api;
+              _context4.n = 3;
+              return this.handleExecuteTransfer(input);
+            case 3:
+              _t2 = _context4.v;
+              return _context4.a(2, _t.callTxMethod.call(_t, _t2));
+            case 4:
+              if (!(destination === 'AssetHubKusama')) {
+                _context4.n = 5;
+                break;
+              }
+              return _context4.a(2, this.handleBridgeTransfer(input, 'Kusama'));
+            case 5:
+              if (!(destination === 'Ethereum')) {
+                _context4.n = 6;
+                break;
+              }
+              return _context4.a(2, this.handleEthBridgeTransfer(input));
+            case 6:
+              if (!(destination === 'Mythos')) {
+                _context4.n = 7;
+                break;
+              }
+              return _context4.a(2, this.handleMythosTransfer(input));
+            case 7:
+              isEthereumAsset = asset.multiLocation && findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
+              if (!(destination === 'BifrostPolkadot' && isEthereumAsset)) {
+                _context4.n = 8;
+                break;
+              }
+              return _context4.a(2, this.handleLocalReserveTransfer(input));
+            case 8:
+              if (!isEthereumAsset) {
+                _context4.n = 9;
+                break;
+              }
+              return _context4.a(2, this.handleLocalReserveTransfer(input, true));
+            case 9:
+              isSystemNode = !isTMultiLocation(destination) && SYSTEM_NODES_POLKADOT.includes(destination);
+              if (!(scenario === 'ParaToPara' && asset.symbol === 'DOT' && !isForeignAsset(asset) && destination !== 'Hydration' && destination !== 'Polimec' && destination !== 'Moonbeam' && destination !== 'BifrostPolkadot' && destination !== 'PeoplePolkadot' && destination !== 'Ajuna' && !isSystemNode)) {
+                _context4.n = 10;
+                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:
+              if (!(scenario === 'ParaToPara' && asset.symbol === 'KSM' && !isForeignAsset(asset))) {
+                _context4.n = 11;
+                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:
+              method = this.getMethod(scenario, destination);
+              modifiedInput = this.patchInput(input);
+              return _context4.a(2, PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, method, 'Unlimited'));
+          }
+        }, _callee4, this);
+      }));
+      function transferPolkadotXCM(_x4) {
+        return _transferPolkadotXCM.apply(this, arguments);
       }
-      var method = this.getMethod(scenario, destination);
-      var modifiedInput = this.patchInput(input);
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, method, 'Unlimited'));
-    }
+      return transferPolkadotXCM;
+    }()
   }, {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "10.4.1",
+  "version": "10.4.3",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "@noble/hashes": "^1.8.0",
     "@scure/base": "^1.2.6",
     "viem": "^2.30.5",
-    "@paraspell/pallets": "10.4.1",
-    "@paraspell/assets": "10.4.1",
-    "@paraspell/sdk-common": "10.4.1"
+    "@paraspell/pallets": "10.4.3",
+    "@paraspell/assets": "10.4.3",
+    "@paraspell/sdk-common": "10.4.3"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",