@paraspell/sdk-pjs 11.9.2 → 11.10.0

package/dist/index.cjs

@@ -340,6 +340,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
     key: "resolveApi",
     value: function () {
       var _resolveApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(apiConfig, chain) {
+        var wsUrl;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
@@ -347,7 +348,8 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 _context2.n = 1;
                 break;
               }
-              return _context2.a(2, sdkCore.createChainClient(this, chain));
+              wsUrl = sdkCore.getChainProviders(chain);
+              return _context2.a(2, this.createApiInstance(wsUrl, chain));
             case 1:
               if (!(typeof apiConfig === 'string' || apiConfig instanceof Array)) {
                 _context2.n = 2;
@@ -418,7 +420,12 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "callDispatchAsMethod",
     value: function callDispatchAsMethod(call, address) {
-      return this.api.tx.utility.dispatchAs(address, call);
+      var origin = {
+        system: {
+          Signed: address
+        }
+      };
+      return this.api.tx.utility.dispatchAs(origin, call);
     }
   }, {
     key: "objectToHex",
@@ -777,13 +784,13 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(_ref4) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(options) {
         var _this = this;
-        var tx, address, feeAsset, chain, supportsDryRunApi, DEFAULT_XCM_VERSION, usedAsset, usedSymbol, performDryRunCall, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureReason, shouldRetryWithVersion, msg, _msg, executionFee, fee, actualWeight, weight, forwardedXcms, destParaId, _t, _t2;
+        var tx, address, feeAsset, chain, destination, _options$useRootOrigi, useRootOrigin, bypassOptions, supportsDryRunApi, DEFAULT_XCM_VERSION, basePayload, resolvedTx, usedAsset, usedSymbol, performDryRunCall, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureReason, shouldRetryWithVersion, msg, _msg, forwardedXcms, actualWeight, weight, nativeAsset, hasLocation, destParaId, xcmFee, executionFee, fee, _t, _t2, _t3;
         return _regenerator().w(function (_context16) {
           while (1) switch (_context16.p = _context16.n) {
             case 0:
-              tx = _ref4.tx, address = _ref4.address, feeAsset = _ref4.feeAsset, chain = _ref4.chain;
+              tx = options.tx, address = options.address, feeAsset = options.feeAsset, chain = options.chain, destination = options.destination, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi, bypassOptions = options.bypassOptions;
               supportsDryRunApi = sdkCore.getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context16.n = 1;
@@ -792,24 +799,45 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               throw new sdkCore.ChainNotSupportedError("DryRunApi is not available on chain ".concat(chain));
             case 1:
               DEFAULT_XCM_VERSION = 3;
+              basePayload = useRootOrigin ? {
+                system: {
+                  Root: null
+                }
+              } : {
+                system: {
+                  Signed: address
+                }
+              };
+              if (!useRootOrigin) {
+                _context16.n = 3;
+                break;
+              }
+              _context16.n = 2;
+              return sdkCore.wrapTxBypass(_objectSpread2(_objectSpread2({}, options), {}, {
+                api: this
+              }), bypassOptions);
+            case 2:
+              _t = _context16.v;
+              _context16.n = 4;
+              break;
+            case 3:
+              _t = tx;
+            case 4:
+              resolvedTx = _t;
               usedAsset = feeAsset !== null && feeAsset !== void 0 ? feeAsset : sdkCore.findNativeAssetInfoOrThrow(chain);
               usedSymbol = usedAsset.symbol;
               performDryRunCall = /*#__PURE__*/function () {
-                var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(includeVersion) {
+                var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(includeVersion) {
                   var _this$api$call$dryRun;
                   return _regenerator().w(function (_context15) {
                     while (1) switch (_context15.n) {
                       case 0:
-                        return _context15.a(2, (_this$api$call$dryRun = _this.api.call.dryRunApi).dryRunCall.apply(_this$api$call$dryRun, [{
-                          system: {
-                            Signed: address
-                          }
-                        }, tx].concat(_toConsumableArray(includeVersion ? [DEFAULT_XCM_VERSION] : []))));
+                        return _context15.a(2, (_this$api$call$dryRun = _this.api.call.dryRunApi).dryRunCall.apply(_this$api$call$dryRun, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [DEFAULT_XCM_VERSION] : []))));
                     }
                   }, _callee15);
                 }));
                 return function performDryRunCall(_x33) {
-                  return _ref5.apply(this, arguments);
+                  return _ref4.apply(this, arguments);
                 };
               }();
               getExecutionSuccessFromResult = function getExecutionSuccessFromResult(resultHuman) {
@@ -817,7 +845,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 return Boolean((resultHuman === null || resultHuman === void 0 ? void 0 : resultHuman.Ok) && ((_resultHuman$Ok$execu = resultHuman.Ok.executionResult) === null || _resultHuman$Ok$execu === void 0 ? void 0 : _resultHuman$Ok$execu.Ok));
               };
               extractFailureReasonFromResult = function extractFailureReasonFromResult(resultHuman, resultJson) {
-                var _resultHuman$Ok, _resultHuman$Ok2, _resultJson$ok, _ref6;
+                var _resultHuman$Ok, _resultHuman$Ok2, _resultJson$ok, _ref5;
                 var modErrHuman = resultHuman === null || resultHuman === void 0 || (_resultHuman$Ok = resultHuman.Ok) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.executionResult) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.Err) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.error) === null || _resultHuman$Ok === void 0 ? void 0 : _resultHuman$Ok.Module;
                 if (modErrHuman) {
                   return sdkCore.resolveModuleError(chain, modErrHuman);
@@ -833,15 +861,15 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 if (execErrJson !== null && execErrJson !== void 0 && execErrJson.other) {
                   return String(execErrJson.other);
                 }
-                return JSON.stringify((_ref6 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref6 !== void 0 ? _ref6 : 'Unknown error');
+                return JSON.stringify((_ref5 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref5 !== void 0 ? _ref5 : 'Unknown error');
               }; // Attempt 1: WITHOUT version
               isSuccess = false;
               failureReason = '';
               shouldRetryWithVersion = false;
-              _context16.p = 2;
-              _context16.n = 3;
+              _context16.p = 5;
+              _context16.n = 6;
               return performDryRunCall(false);
-            case 3:
+            case 6:
               response = _context16.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
@@ -852,35 +880,35 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                   shouldRetryWithVersion = true;
                 }
               }
-              _context16.n = 6;
+              _context16.n = 9;
               break;
-            case 4:
-              _context16.p = 4;
-              _t = _context16.v;
-              msg = _t instanceof Error ? _t.message : String(_t);
+            case 7:
+              _context16.p = 7;
+              _t2 = _context16.v;
+              msg = _t2 instanceof Error ? _t2.message : String(_t2);
               if (!msg.includes('Expected 3 arguments')) {
-                _context16.n = 5;
+                _context16.n = 8;
                 break;
               }
               shouldRetryWithVersion = true;
-              _context16.n = 6;
+              _context16.n = 9;
               break;
-            case 5:
+            case 8:
               return _context16.a(2, {
                 success: false,
                 failureReason: msg,
                 currency: usedSymbol,
                 asset: usedAsset
               });
-            case 6:
+            case 9:
               if (!shouldRetryWithVersion) {
-                _context16.n = 10;
+                _context16.n = 13;
                 break;
               }
-              _context16.p = 7;
-              _context16.n = 8;
+              _context16.p = 10;
+              _context16.n = 11;
               return performDryRunCall(true);
-            case 8:
+            case 11:
               response = _context16.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
@@ -888,12 +916,12 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               if (!isSuccess) {
                 failureReason = extractFailureReasonFromResult(resultHuman, resultJson);
               }
-              _context16.n = 10;
+              _context16.n = 13;
               break;
-            case 9:
-              _context16.p = 9;
-              _t2 = _context16.v;
-              _msg = _t2 instanceof Error ? _t2.message : String(_t2);
+            case 12:
+              _context16.p = 12;
+              _t3 = _context16.v;
+              _msg = _t3 instanceof Error ? _t3.message : String(_t3);
               failureReason = failureReason || _msg;
               return _context16.a(2, {
                 success: false,
@@ -901,9 +929,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 currency: usedSymbol,
                 asset: usedAsset
               });
-            case 10:
+            case 13:
               if (isSuccess) {
-                _context16.n = 11;
+                _context16.n = 14;
                 break;
               }
               return _context16.a(2, {
@@ -912,21 +940,45 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 currency: usedSymbol,
                 asset: usedAsset
               });
-            case 11:
-              _context16.n = 12;
-              return this.calculateTransactionFee(tx, address);
-            case 12:
-              executionFee = _context16.v;
-              fee = sdkCore.computeFeeFromDryRunPjs(resultHuman, chain, executionFee);
+            case 14:
+              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
               actualWeight = resultJson.ok.executionResult.ok.actualWeight;
               weight = actualWeight ? {
                 refTime: BigInt(actualWeight.refTime),
                 proofSize: BigInt(actualWeight.proofSize)
               } : undefined;
-              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref7) {
-                return i.here === null ? 0 : (_ref7 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref7 === void 0 ? void 0 : _ref7.parachain;
+              nativeAsset = sdkCore.findNativeAssetInfoOrThrow(chain);
+              hasLocation = feeAsset ? Boolean(feeAsset.location) : Boolean(nativeAsset === null || nativeAsset === void 0 ? void 0 : nativeAsset.location);
+              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref6) {
+                return i.here === null ? 0 : (_ref6 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref6 === void 0 ? void 0 : _ref6.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
+              if (!(sdkCore.hasXcmPaymentApiSupport(chain) && resultJson.ok.local_xcm && hasLocation && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum'))) {
+                _context16.n = 16;
+                break;
+              }
+              _context16.n = 15;
+              return this.getXcmPaymentApiFee(chain, resultJson.ok.local_xcm, forwardedXcms, feeAsset !== null && feeAsset !== void 0 ? feeAsset : nativeAsset);
+            case 15:
+              xcmFee = _context16.v;
+              if (!(typeof xcmFee === 'bigint')) {
+                _context16.n = 16;
+                break;
+              }
+              return _context16.a(2, Promise.resolve({
+                success: true,
+                fee: xcmFee,
+                currency: usedSymbol,
+                asset: usedAsset,
+                weight: weight,
+                forwardedXcms: forwardedXcms,
+                destParaId: destParaId
+              }));
+            case 16:
+              _context16.n = 17;
+              return this.calculateTransactionFee(tx, address);
+            case 17:
+              executionFee = _context16.v;
+              fee = sdkCore.computeFeeFromDryRunPjs(resultHuman, chain, executionFee);
               return _context16.a(2, {
                 success: true,
                 fee: fee,
@@ -937,7 +989,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 destParaId: destParaId
               });
           }
-        }, _callee16, this, [[7, 9], [2, 4]]);
+        }, _callee16, this, [[10, 12], [5, 7]]);
       }));
       function getDryRunCall(_x32) {
         return _getDryRunCall.apply(this, arguments);
@@ -947,27 +999,68 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(chain, xcm, asset) {
-        var weight, localizedLocation, feeResult, res;
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(chain, localXcm, forwardedXcm, asset) {
+        var _ref7, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref8, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
+        var weight, assetLocalizedLoc, feeResult, execFeeRes, execFee, deliveryFeeRes, deliveryFeeResJson, deliveryFeeResolved, nativeAsset, deliveryFee, res, _t4;
         return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+          while (1) switch (_context17.p = _context17.n) {
             case 0:
               _context17.n = 1;
-              return this.getXcmWeight(xcm);
+              return this.getXcmWeight(localXcm);
             case 1:
               weight = _context17.v;
               sdkCore.assertHasLocation(asset);
-              localizedLocation = chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama' || sdkCore.isRelayChain(chain) ? sdkCore.localizeLocation(chain, asset.location) : asset.location;
+              assetLocalizedLoc = sdkCore.localizeLocation(chain, asset.location);
               _context17.n = 2;
-              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, sdkCore.addXcmVersionHeader(localizedLocation, sdkCore.Version.V4));
+              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, sdkCore.addXcmVersionHeader(assetLocalizedLoc, sdkCore.Version.V4));
             case 2:
               feeResult = _context17.v;
-              res = feeResult.toJSON();
-              return _context17.a(2, BigInt(res.ok));
+              execFeeRes = feeResult.toJSON();
+              execFee = BigInt(execFeeRes.ok);
+              if (!(forwardedXcm.length > 0)) {
+                _context17.n = 4;
+                break;
+              }
+              _context17.n = 3;
+              return this.api.call.xcmPaymentApi.queryDeliveryFees(forwardedXcm[0], forwardedXcm[1][0]);
+            case 3:
+              _t4 = _context17.v;
+              _context17.n = 5;
+              break;
+            case 4:
+              _t4 = undefined;
+            case 5:
+              deliveryFeeRes = _t4;
+              deliveryFeeResJson = deliveryFeeRes === null || deliveryFeeRes === void 0 ? void 0 : deliveryFeeRes.toJSON();
+              deliveryFeeResolved = deliveryFeeRes && ((_ref7 = (_deliveryFeeResJson$o = (_deliveryFeeResJson$o2 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o2 === void 0 ? void 0 : _deliveryFeeResJson$o2.v4) !== null && _deliveryFeeResJson$o !== void 0 ? _deliveryFeeResJson$o : (_deliveryFeeResJson$o3 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o3 === void 0 ? void 0 : _deliveryFeeResJson$o3.v3) === null || _ref7 === void 0 ? void 0 : _ref7.length) > 0 ? BigInt((_ref8 = (_deliveryFeeResJson$o4 = deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o5 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o5 === void 0 ? void 0 : _deliveryFeeResJson$o5.v4) !== null && _deliveryFeeResJson$o4 !== void 0 ? _deliveryFeeResJson$o4 : deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o6 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o6 === void 0 ? void 0 : _deliveryFeeResJson$o6.v3) === null || _ref8 === void 0 || (_ref8 = _ref8[0]) === null || _ref8 === void 0 || (_ref8 = _ref8.fun) === null || _ref8 === void 0 ? void 0 : _ref8.fungible) : 0n;
+              nativeAsset = sdkCore.findNativeAssetInfoOrThrow(chain);
+              if (!sdkCore.isAssetXcEqual(asset, nativeAsset)) {
+                _context17.n = 6;
+                break;
+              }
+              deliveryFee = deliveryFeeResolved;
+              _context17.n = 9;
+              break;
+            case 6:
+              _context17.p = 6;
+              sdkCore.assertHasLocation(nativeAsset);
+              _context17.n = 7;
+              return this.quoteAhPrice(sdkCore.localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
+            case 7:
+              res = _context17.v;
+              deliveryFee = res !== null && res !== void 0 ? res : 0n;
+              _context17.n = 9;
+              break;
+            case 8:
+              _context17.p = 8;
+              _context17.v;
+              deliveryFee = 0n;
+            case 9:
+              return _context17.a(2, execFee + deliveryFee);
           }
-        }, _callee17, this);
+        }, _callee17, this, [[6, 8]]);
       }));
-      function getXcmPaymentApiFee(_x34, _x35, _x36) {
+      function getXcmPaymentApiFee(_x34, _x35, _x36, _x37) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -989,7 +1082,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee18, this);
       }));
-      function getXcmWeight(_x37) {
+      function getXcmWeight(_x38) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -997,13 +1090,13 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(_ref8) {
-        var _ref9, _ref0, _ref1;
-        var originLocation, xcm, asset, chain, origin, supportsDryRunApi, response, result, resultJson, symbol, isSuccess, failureReason, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee, actualWeight, weight, forwardedXcms, destParaId;
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(_ref9) {
+        var _ref1, _ref10, _ref11;
+        var originLocation, xcm, asset, chain, origin, supportsDryRunApi, response, result, resultJson, symbol, isSuccess, failureReason, forwardedXcms, actualWeight, weight, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee;
         return _regenerator().w(function (_context19) {
           while (1) switch (_context19.n) {
             case 0:
-              originLocation = _ref8.originLocation, xcm = _ref8.xcm, asset = _ref8.asset, chain = _ref8.chain, origin = _ref8.origin;
+              originLocation = _ref9.originLocation, xcm = _ref9.xcm, asset = _ref9.asset, chain = _ref9.chain, origin = _ref9.origin;
               supportsDryRunApi = sdkCore.getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context19.n = 1;
@@ -1031,24 +1124,55 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 asset: asset
               });
             case 3:
+              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
+              actualWeight = resultJson.ok.executionResult.used;
+              weight = actualWeight ? {
+                refTime: BigInt(actualWeight.refTime),
+                proofSize: BigInt(actualWeight.proofSize)
+              } : undefined;
+              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref0) {
+                return i.Here ? 0 : (_ref0 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref0 === void 0 ? void 0 : _ref0.parachain;
+              }(Object.values(forwardedXcms[0])[0].interior);
+              if (!(sdkCore.hasXcmPaymentApiSupport(chain) && asset)) {
+                _context19.n = 5;
+                break;
+              }
+              _context19.n = 4;
+              return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset);
+            case 4:
+              _fee = _context19.v;
+              if (!(typeof _fee === 'bigint')) {
+                _context19.n = 5;
+                break;
+              }
+              return _context19.a(2, {
+                success: true,
+                fee: _fee,
+                currency: symbol,
+                asset: asset,
+                weight: weight,
+                forwardedXcms: forwardedXcms,
+                destParaId: destParaId
+              });
+            case 5:
               emitted = result.Ok.emittedEvents; // We want to look for the last event
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['balances', 'foreignAssets', 'assets'];
-              feeEvent = (_ref9 = (_ref0 = (_ref1 = origin === 'Mythos' ? reversedEvents.find(function (event) {
+              feeEvent = (_ref1 = (_ref10 = (_ref11 = origin === 'Mythos' ? reversedEvents.find(function (event) {
                 return event.section === 'assetConversion' && event.method === 'SwapCreditExecuted';
-              }) : undefined) !== null && _ref1 !== void 0 ? _ref1 :
+              }) : undefined) !== null && _ref11 !== void 0 ? _ref11 :
               // Prefer an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.section) && event.method === 'Issued';
-              })) !== null && _ref0 !== void 0 ? _ref0 :
+              })) !== null && _ref10 !== void 0 ? _ref10 :
               // Fallback to Minted event
               reversedEvents.find(function (event) {
                 return ['balances', 'foreignAssets'].includes(event.section) && event.method === 'Minted';
-              })) !== null && _ref9 !== void 0 ? _ref9 : reversedEvents.find(function (event) {
+              })) !== null && _ref1 !== void 0 ? _ref1 : reversedEvents.find(function (event) {
                 return ['currencies', 'tokens'].includes(event.section) && event.method === 'Deposited';
               });
               if (feeEvent) {
-                _context19.n = 4;
+                _context19.n = 6;
                 break;
               }
               return _context19.a(2, Promise.resolve({
@@ -1057,18 +1181,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 currency: symbol,
                 asset: asset
               }));
-            case 4:
+            case 6:
               feeAmount = feeEvent.section === 'assetConversion' ? feeEvent.data.amountIn : feeEvent.data.amount;
               fee = BigInt(feeAmount.replace(/,/g, ''));
-              actualWeight = resultJson.ok.executionResult.used;
-              weight = actualWeight ? {
-                refTime: BigInt(actualWeight.refTime),
-                proofSize: BigInt(actualWeight.proofSize)
-              } : undefined;
-              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref10) {
-                return i.Here ? 0 : (_ref10 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref10 === void 0 ? void 0 : _ref10.parachain;
-              }(Object.values(forwardedXcms[0])[0].interior);
               return _context19.a(2, {
                 success: true,
                 fee: fee,
@@ -1081,7 +1196,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee19, this);
       }));
-      function getDryRunXcm(_x38) {
+      function getDryRunXcm(_x39) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1134,7 +1249,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee21, this);
       }));
-      function convertLocationToAccount(_x39) {
+      function convertLocationToAccount(_x40) {
         return _convertLocationToAccount.apply(this, arguments);
       }
       return convertLocationToAccount;
@@ -1183,8 +1298,8 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }]);
 }();
 
-var createChainClient = function createChainClient(chain) {
-  var pjsApi = new PolkadotJsApi();
+var createChainClient = function createChainClient(chain, builderOptions) {
+  var pjsApi = new PolkadotJsApi(builderOptions);
   return sdkCore.createChainClient(pjsApi, chain);
 };
 var createPolkadotJsApiCall = function createPolkadotJsApiCall(apiCall) {

package/dist/index.d.ts

@@ -282,7 +282,7 @@ declare namespace transfer {
   };
 }
 
-declare const createChainClient: (chain: TSubstrateChain) => Promise<_polkadot_api.ApiPromise>;
+declare const createChainClient: (chain: TSubstrateChain, builderOptions?: TBuilderOptions<TPjsApiOrUrl>) => Promise<_polkadot_api.ApiPromise>;
 
 export { Builder, EvmBuilder, approveToken, assets, claimAssets, convertSs58, createChainClient, depositToken, dryRun, dryRunOrigin, getAssetBalance, getBalanceForeign, getBalanceNative, getBridgeStatus, getOriginFeeDetails, getParaEthTransferFees, getTokenBalance, send, transferEthToPolkadot, transfer as xcmPallet };
 export type { Extrinsic, GeneralBuilder, TBalanceResponse, TPjsApi, TPjsApiOrUrl, TPjsEvmBuilderOptions };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { isConfig, BatchMode, MissingChainApiError, createChainClient as createChainClient$1, assertHasId, getChain, isForeignAsset, InvalidParameterError, computeFeeFromDryRunPjs, findNativeAssetInfoOrThrow, resolveModuleError, getAssetsObject, ChainNotSupportedError, assertHasLocation, localizeLocation, isRelayChain, addXcmVersionHeader, Version, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, getParaId, ETH_CHAIN_ID, findAssetInfoOrThrow, abstractDecimals, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress, Builder as Builder$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, getBridgeStatus as getBridgeStatus$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
+import { isConfig, BatchMode, MissingChainApiError, getChainProviders, assertHasId, getChain, isForeignAsset, InvalidParameterError, computeFeeFromDryRunPjs, findNativeAssetInfoOrThrow, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, ChainNotSupportedError, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, addXcmVersionHeader, Version, createChainClient as createChainClient$1, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, getParaId, ETH_CHAIN_ID, findAssetInfoOrThrow, abstractDecimals, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress, Builder as Builder$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, getBridgeStatus as getBridgeStatus$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { WsProvider, ApiPromise } from '@polkadot/api';
 import { u32 } from '@polkadot/types';
@@ -339,6 +339,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
     key: "resolveApi",
     value: function () {
       var _resolveApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(apiConfig, chain) {
+        var wsUrl;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
@@ -346,7 +347,8 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 _context2.n = 1;
                 break;
               }
-              return _context2.a(2, createChainClient$1(this, chain));
+              wsUrl = getChainProviders(chain);
+              return _context2.a(2, this.createApiInstance(wsUrl, chain));
             case 1:
               if (!(typeof apiConfig === 'string' || apiConfig instanceof Array)) {
                 _context2.n = 2;
@@ -417,7 +419,12 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "callDispatchAsMethod",
     value: function callDispatchAsMethod(call, address) {
-      return this.api.tx.utility.dispatchAs(address, call);
+      var origin = {
+        system: {
+          Signed: address
+        }
+      };
+      return this.api.tx.utility.dispatchAs(origin, call);
     }
   }, {
     key: "objectToHex",
@@ -776,13 +783,13 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(_ref4) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(options) {
         var _this = this;
-        var tx, address, feeAsset, chain, supportsDryRunApi, DEFAULT_XCM_VERSION, usedAsset, usedSymbol, performDryRunCall, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureReason, shouldRetryWithVersion, msg, _msg, executionFee, fee, actualWeight, weight, forwardedXcms, destParaId, _t, _t2;
+        var tx, address, feeAsset, chain, destination, _options$useRootOrigi, useRootOrigin, bypassOptions, supportsDryRunApi, DEFAULT_XCM_VERSION, basePayload, resolvedTx, usedAsset, usedSymbol, performDryRunCall, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureReason, shouldRetryWithVersion, msg, _msg, forwardedXcms, actualWeight, weight, nativeAsset, hasLocation, destParaId, xcmFee, executionFee, fee, _t, _t2, _t3;
         return _regenerator().w(function (_context16) {
           while (1) switch (_context16.p = _context16.n) {
             case 0:
-              tx = _ref4.tx, address = _ref4.address, feeAsset = _ref4.feeAsset, chain = _ref4.chain;
+              tx = options.tx, address = options.address, feeAsset = options.feeAsset, chain = options.chain, destination = options.destination, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi, bypassOptions = options.bypassOptions;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context16.n = 1;
@@ -791,24 +798,45 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               throw new ChainNotSupportedError("DryRunApi is not available on chain ".concat(chain));
             case 1:
               DEFAULT_XCM_VERSION = 3;
+              basePayload = useRootOrigin ? {
+                system: {
+                  Root: null
+                }
+              } : {
+                system: {
+                  Signed: address
+                }
+              };
+              if (!useRootOrigin) {
+                _context16.n = 3;
+                break;
+              }
+              _context16.n = 2;
+              return wrapTxBypass(_objectSpread2(_objectSpread2({}, options), {}, {
+                api: this
+              }), bypassOptions);
+            case 2:
+              _t = _context16.v;
+              _context16.n = 4;
+              break;
+            case 3:
+              _t = tx;
+            case 4:
+              resolvedTx = _t;
               usedAsset = feeAsset !== null && feeAsset !== void 0 ? feeAsset : findNativeAssetInfoOrThrow(chain);
               usedSymbol = usedAsset.symbol;
               performDryRunCall = /*#__PURE__*/function () {
-                var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(includeVersion) {
+                var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(includeVersion) {
                   var _this$api$call$dryRun;
                   return _regenerator().w(function (_context15) {
                     while (1) switch (_context15.n) {
                       case 0:
-                        return _context15.a(2, (_this$api$call$dryRun = _this.api.call.dryRunApi).dryRunCall.apply(_this$api$call$dryRun, [{
-                          system: {
-                            Signed: address
-                          }
-                        }, tx].concat(_toConsumableArray(includeVersion ? [DEFAULT_XCM_VERSION] : []))));
+                        return _context15.a(2, (_this$api$call$dryRun = _this.api.call.dryRunApi).dryRunCall.apply(_this$api$call$dryRun, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [DEFAULT_XCM_VERSION] : []))));
                     }
                   }, _callee15);
                 }));
                 return function performDryRunCall(_x33) {
-                  return _ref5.apply(this, arguments);
+                  return _ref4.apply(this, arguments);
                 };
               }();
               getExecutionSuccessFromResult = function getExecutionSuccessFromResult(resultHuman) {
@@ -816,7 +844,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 return Boolean((resultHuman === null || resultHuman === void 0 ? void 0 : resultHuman.Ok) && ((_resultHuman$Ok$execu = resultHuman.Ok.executionResult) === null || _resultHuman$Ok$execu === void 0 ? void 0 : _resultHuman$Ok$execu.Ok));
               };
               extractFailureReasonFromResult = function extractFailureReasonFromResult(resultHuman, resultJson) {
-                var _resultHuman$Ok, _resultHuman$Ok2, _resultJson$ok, _ref6;
+                var _resultHuman$Ok, _resultHuman$Ok2, _resultJson$ok, _ref5;
                 var modErrHuman = resultHuman === null || resultHuman === void 0 || (_resultHuman$Ok = resultHuman.Ok) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.executionResult) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.Err) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.error) === null || _resultHuman$Ok === void 0 ? void 0 : _resultHuman$Ok.Module;
                 if (modErrHuman) {
                   return resolveModuleError(chain, modErrHuman);
@@ -832,15 +860,15 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 if (execErrJson !== null && execErrJson !== void 0 && execErrJson.other) {
                   return String(execErrJson.other);
                 }
-                return JSON.stringify((_ref6 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref6 !== void 0 ? _ref6 : 'Unknown error');
+                return JSON.stringify((_ref5 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref5 !== void 0 ? _ref5 : 'Unknown error');
               }; // Attempt 1: WITHOUT version
               isSuccess = false;
               failureReason = '';
               shouldRetryWithVersion = false;
-              _context16.p = 2;
-              _context16.n = 3;
+              _context16.p = 5;
+              _context16.n = 6;
               return performDryRunCall(false);
-            case 3:
+            case 6:
               response = _context16.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
@@ -851,35 +879,35 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                   shouldRetryWithVersion = true;
                 }
               }
-              _context16.n = 6;
+              _context16.n = 9;
               break;
-            case 4:
-              _context16.p = 4;
-              _t = _context16.v;
-              msg = _t instanceof Error ? _t.message : String(_t);
+            case 7:
+              _context16.p = 7;
+              _t2 = _context16.v;
+              msg = _t2 instanceof Error ? _t2.message : String(_t2);
               if (!msg.includes('Expected 3 arguments')) {
-                _context16.n = 5;
+                _context16.n = 8;
                 break;
               }
               shouldRetryWithVersion = true;
-              _context16.n = 6;
+              _context16.n = 9;
               break;
-            case 5:
+            case 8:
               return _context16.a(2, {
                 success: false,
                 failureReason: msg,
                 currency: usedSymbol,
                 asset: usedAsset
               });
-            case 6:
+            case 9:
               if (!shouldRetryWithVersion) {
-                _context16.n = 10;
+                _context16.n = 13;
                 break;
               }
-              _context16.p = 7;
-              _context16.n = 8;
+              _context16.p = 10;
+              _context16.n = 11;
               return performDryRunCall(true);
-            case 8:
+            case 11:
               response = _context16.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
@@ -887,12 +915,12 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               if (!isSuccess) {
                 failureReason = extractFailureReasonFromResult(resultHuman, resultJson);
               }
-              _context16.n = 10;
+              _context16.n = 13;
               break;
-            case 9:
-              _context16.p = 9;
-              _t2 = _context16.v;
-              _msg = _t2 instanceof Error ? _t2.message : String(_t2);
+            case 12:
+              _context16.p = 12;
+              _t3 = _context16.v;
+              _msg = _t3 instanceof Error ? _t3.message : String(_t3);
               failureReason = failureReason || _msg;
               return _context16.a(2, {
                 success: false,
@@ -900,9 +928,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 currency: usedSymbol,
                 asset: usedAsset
               });
-            case 10:
+            case 13:
               if (isSuccess) {
-                _context16.n = 11;
+                _context16.n = 14;
                 break;
               }
               return _context16.a(2, {
@@ -911,21 +939,45 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 currency: usedSymbol,
                 asset: usedAsset
               });
-            case 11:
-              _context16.n = 12;
-              return this.calculateTransactionFee(tx, address);
-            case 12:
-              executionFee = _context16.v;
-              fee = computeFeeFromDryRunPjs(resultHuman, chain, executionFee);
+            case 14:
+              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
               actualWeight = resultJson.ok.executionResult.ok.actualWeight;
               weight = actualWeight ? {
                 refTime: BigInt(actualWeight.refTime),
                 proofSize: BigInt(actualWeight.proofSize)
               } : undefined;
-              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref7) {
-                return i.here === null ? 0 : (_ref7 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref7 === void 0 ? void 0 : _ref7.parachain;
+              nativeAsset = findNativeAssetInfoOrThrow(chain);
+              hasLocation = feeAsset ? Boolean(feeAsset.location) : Boolean(nativeAsset === null || nativeAsset === void 0 ? void 0 : nativeAsset.location);
+              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref6) {
+                return i.here === null ? 0 : (_ref6 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref6 === void 0 ? void 0 : _ref6.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
+              if (!(hasXcmPaymentApiSupport(chain) && resultJson.ok.local_xcm && hasLocation && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum'))) {
+                _context16.n = 16;
+                break;
+              }
+              _context16.n = 15;
+              return this.getXcmPaymentApiFee(chain, resultJson.ok.local_xcm, forwardedXcms, feeAsset !== null && feeAsset !== void 0 ? feeAsset : nativeAsset);
+            case 15:
+              xcmFee = _context16.v;
+              if (!(typeof xcmFee === 'bigint')) {
+                _context16.n = 16;
+                break;
+              }
+              return _context16.a(2, Promise.resolve({
+                success: true,
+                fee: xcmFee,
+                currency: usedSymbol,
+                asset: usedAsset,
+                weight: weight,
+                forwardedXcms: forwardedXcms,
+                destParaId: destParaId
+              }));
+            case 16:
+              _context16.n = 17;
+              return this.calculateTransactionFee(tx, address);
+            case 17:
+              executionFee = _context16.v;
+              fee = computeFeeFromDryRunPjs(resultHuman, chain, executionFee);
               return _context16.a(2, {
                 success: true,
                 fee: fee,
@@ -936,7 +988,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 destParaId: destParaId
               });
           }
-        }, _callee16, this, [[7, 9], [2, 4]]);
+        }, _callee16, this, [[10, 12], [5, 7]]);
       }));
       function getDryRunCall(_x32) {
         return _getDryRunCall.apply(this, arguments);
@@ -946,27 +998,68 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(chain, xcm, asset) {
-        var weight, localizedLocation, feeResult, res;
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(chain, localXcm, forwardedXcm, asset) {
+        var _ref7, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref8, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
+        var weight, assetLocalizedLoc, feeResult, execFeeRes, execFee, deliveryFeeRes, deliveryFeeResJson, deliveryFeeResolved, nativeAsset, deliveryFee, res, _t4;
         return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+          while (1) switch (_context17.p = _context17.n) {
             case 0:
               _context17.n = 1;
-              return this.getXcmWeight(xcm);
+              return this.getXcmWeight(localXcm);
             case 1:
               weight = _context17.v;
               assertHasLocation(asset);
-              localizedLocation = chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama' || isRelayChain(chain) ? localizeLocation(chain, asset.location) : asset.location;
+              assetLocalizedLoc = localizeLocation(chain, asset.location);
               _context17.n = 2;
-              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, addXcmVersionHeader(localizedLocation, Version.V4));
+              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, addXcmVersionHeader(assetLocalizedLoc, Version.V4));
             case 2:
               feeResult = _context17.v;
-              res = feeResult.toJSON();
-              return _context17.a(2, BigInt(res.ok));
+              execFeeRes = feeResult.toJSON();
+              execFee = BigInt(execFeeRes.ok);
+              if (!(forwardedXcm.length > 0)) {
+                _context17.n = 4;
+                break;
+              }
+              _context17.n = 3;
+              return this.api.call.xcmPaymentApi.queryDeliveryFees(forwardedXcm[0], forwardedXcm[1][0]);
+            case 3:
+              _t4 = _context17.v;
+              _context17.n = 5;
+              break;
+            case 4:
+              _t4 = undefined;
+            case 5:
+              deliveryFeeRes = _t4;
+              deliveryFeeResJson = deliveryFeeRes === null || deliveryFeeRes === void 0 ? void 0 : deliveryFeeRes.toJSON();
+              deliveryFeeResolved = deliveryFeeRes && ((_ref7 = (_deliveryFeeResJson$o = (_deliveryFeeResJson$o2 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o2 === void 0 ? void 0 : _deliveryFeeResJson$o2.v4) !== null && _deliveryFeeResJson$o !== void 0 ? _deliveryFeeResJson$o : (_deliveryFeeResJson$o3 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o3 === void 0 ? void 0 : _deliveryFeeResJson$o3.v3) === null || _ref7 === void 0 ? void 0 : _ref7.length) > 0 ? BigInt((_ref8 = (_deliveryFeeResJson$o4 = deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o5 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o5 === void 0 ? void 0 : _deliveryFeeResJson$o5.v4) !== null && _deliveryFeeResJson$o4 !== void 0 ? _deliveryFeeResJson$o4 : deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o6 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o6 === void 0 ? void 0 : _deliveryFeeResJson$o6.v3) === null || _ref8 === void 0 || (_ref8 = _ref8[0]) === null || _ref8 === void 0 || (_ref8 = _ref8.fun) === null || _ref8 === void 0 ? void 0 : _ref8.fungible) : 0n;
+              nativeAsset = findNativeAssetInfoOrThrow(chain);
+              if (!isAssetXcEqual(asset, nativeAsset)) {
+                _context17.n = 6;
+                break;
+              }
+              deliveryFee = deliveryFeeResolved;
+              _context17.n = 9;
+              break;
+            case 6:
+              _context17.p = 6;
+              assertHasLocation(nativeAsset);
+              _context17.n = 7;
+              return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
+            case 7:
+              res = _context17.v;
+              deliveryFee = res !== null && res !== void 0 ? res : 0n;
+              _context17.n = 9;
+              break;
+            case 8:
+              _context17.p = 8;
+              _context17.v;
+              deliveryFee = 0n;
+            case 9:
+              return _context17.a(2, execFee + deliveryFee);
           }
-        }, _callee17, this);
+        }, _callee17, this, [[6, 8]]);
       }));
-      function getXcmPaymentApiFee(_x34, _x35, _x36) {
+      function getXcmPaymentApiFee(_x34, _x35, _x36, _x37) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -988,7 +1081,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee18, this);
       }));
-      function getXcmWeight(_x37) {
+      function getXcmWeight(_x38) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -996,13 +1089,13 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(_ref8) {
-        var _ref9, _ref0, _ref1;
-        var originLocation, xcm, asset, chain, origin, supportsDryRunApi, response, result, resultJson, symbol, isSuccess, failureReason, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee, actualWeight, weight, forwardedXcms, destParaId;
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(_ref9) {
+        var _ref1, _ref10, _ref11;
+        var originLocation, xcm, asset, chain, origin, supportsDryRunApi, response, result, resultJson, symbol, isSuccess, failureReason, forwardedXcms, actualWeight, weight, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee;
         return _regenerator().w(function (_context19) {
           while (1) switch (_context19.n) {
             case 0:
-              originLocation = _ref8.originLocation, xcm = _ref8.xcm, asset = _ref8.asset, chain = _ref8.chain, origin = _ref8.origin;
+              originLocation = _ref9.originLocation, xcm = _ref9.xcm, asset = _ref9.asset, chain = _ref9.chain, origin = _ref9.origin;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context19.n = 1;
@@ -1030,24 +1123,55 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 asset: asset
               });
             case 3:
+              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
+              actualWeight = resultJson.ok.executionResult.used;
+              weight = actualWeight ? {
+                refTime: BigInt(actualWeight.refTime),
+                proofSize: BigInt(actualWeight.proofSize)
+              } : undefined;
+              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref0) {
+                return i.Here ? 0 : (_ref0 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref0 === void 0 ? void 0 : _ref0.parachain;
+              }(Object.values(forwardedXcms[0])[0].interior);
+              if (!(hasXcmPaymentApiSupport(chain) && asset)) {
+                _context19.n = 5;
+                break;
+              }
+              _context19.n = 4;
+              return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset);
+            case 4:
+              _fee = _context19.v;
+              if (!(typeof _fee === 'bigint')) {
+                _context19.n = 5;
+                break;
+              }
+              return _context19.a(2, {
+                success: true,
+                fee: _fee,
+                currency: symbol,
+                asset: asset,
+                weight: weight,
+                forwardedXcms: forwardedXcms,
+                destParaId: destParaId
+              });
+            case 5:
               emitted = result.Ok.emittedEvents; // We want to look for the last event
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['balances', 'foreignAssets', 'assets'];
-              feeEvent = (_ref9 = (_ref0 = (_ref1 = origin === 'Mythos' ? reversedEvents.find(function (event) {
+              feeEvent = (_ref1 = (_ref10 = (_ref11 = origin === 'Mythos' ? reversedEvents.find(function (event) {
                 return event.section === 'assetConversion' && event.method === 'SwapCreditExecuted';
-              }) : undefined) !== null && _ref1 !== void 0 ? _ref1 :
+              }) : undefined) !== null && _ref11 !== void 0 ? _ref11 :
               // Prefer an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.section) && event.method === 'Issued';
-              })) !== null && _ref0 !== void 0 ? _ref0 :
+              })) !== null && _ref10 !== void 0 ? _ref10 :
               // Fallback to Minted event
               reversedEvents.find(function (event) {
                 return ['balances', 'foreignAssets'].includes(event.section) && event.method === 'Minted';
-              })) !== null && _ref9 !== void 0 ? _ref9 : reversedEvents.find(function (event) {
+              })) !== null && _ref1 !== void 0 ? _ref1 : reversedEvents.find(function (event) {
                 return ['currencies', 'tokens'].includes(event.section) && event.method === 'Deposited';
               });
               if (feeEvent) {
-                _context19.n = 4;
+                _context19.n = 6;
                 break;
               }
               return _context19.a(2, Promise.resolve({
@@ -1056,18 +1180,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 currency: symbol,
                 asset: asset
               }));
-            case 4:
+            case 6:
               feeAmount = feeEvent.section === 'assetConversion' ? feeEvent.data.amountIn : feeEvent.data.amount;
               fee = BigInt(feeAmount.replace(/,/g, ''));
-              actualWeight = resultJson.ok.executionResult.used;
-              weight = actualWeight ? {
-                refTime: BigInt(actualWeight.refTime),
-                proofSize: BigInt(actualWeight.proofSize)
-              } : undefined;
-              forwardedXcms = resultJson.ok.forwardedXcms.length > 0 ? resultJson.ok.forwardedXcms[0] : [];
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref10) {
-                return i.Here ? 0 : (_ref10 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref10 === void 0 ? void 0 : _ref10.parachain;
-              }(Object.values(forwardedXcms[0])[0].interior);
               return _context19.a(2, {
                 success: true,
                 fee: fee,
@@ -1080,7 +1195,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee19, this);
       }));
-      function getDryRunXcm(_x38) {
+      function getDryRunXcm(_x39) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1133,7 +1248,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee21, this);
       }));
-      function convertLocationToAccount(_x39) {
+      function convertLocationToAccount(_x40) {
         return _convertLocationToAccount.apply(this, arguments);
       }
       return convertLocationToAccount;
@@ -1182,8 +1297,8 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }]);
 }();
 
-var createChainClient = function createChainClient(chain) {
-  var pjsApi = new PolkadotJsApi();
+var createChainClient = function createChainClient(chain, builderOptions) {
+  var pjsApi = new PolkadotJsApi(builderOptions);
   return createChainClient$1(pjsApi, chain);
 };
 var createPolkadotJsApiCall = function createPolkadotJsApiCall(apiCall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-pjs",
-  "version": "11.9.2",
+  "version": "11.10.0",
   "description": "Polkadot.js based SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "@snowbridge/contract-types": "0.2.0",
     "ethers": "^6.15.0",
     "viem": "^2.37.9",
-    "@paraspell/sdk-core": "11.9.2"
+    "@paraspell/sdk-core": "11.10.0"
   },
   "peerDependencies": {
     "@polkadot/api": ">= 16.0 < 17",