@paraspell/sdk 12.0.3 → 12.0.5

package/README.md

@@ -85,7 +85,7 @@ For full documentation on XCM Transfers head over to [official documentation](ht
 
 ```ts
 const builder = Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-      .from(TChain)
+      .from(TSubstrateChain)
       .to(TChain /*,customParaId - optional*/ | Location object /*Only works for PolkadotXCM pallet*/) 
       .currency({id: currencyID, amount: amount} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection /*for example symbol: symbol or id: id, or location: location*/, amount: amount /*Use "ALL" to transfer everything*/}, {currencySelection}, ..]) 
       .address(address | Location object /*If you are sending through xTokens, you need to pass the destination and address Location in one object (x2)*/)
@@ -156,7 +156,7 @@ await builder.disconnect()
 
 ```ts
 const builder = Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-      .from(TChain)
+      .from(TSubstrateChain)
       .to(TRelaychain) // Kusama | Polkadot | Westend | Paseo
       .currency({symbol: 'DOT', amount: amount /*Use "ALL" to transfer everything*/})
       .address(address | Location object)
@@ -190,7 +190,7 @@ await builder.disconnect()
 
 ```ts
 const builder = Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-      .from(TChain)
+      .from(TSubstrateChain)
       .to(TChain) //Has to be the same as the origin (from)
       .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection /*for example symbol: symbol or id: id, or location: location*/, amount: amount /*Use "ALL" to transfer everything*/}, {currencySelection}, ..])
       .address(address)
@@ -222,13 +222,13 @@ await builder.disconnect()
 
 ```ts
 const builder = Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-      .from(TChain) //Ensure, that origin chain is the same in all batched XCM Calls.
+      .from(TSubstrateChain) //Ensure, that origin chain is the same in all batched XCM Calls.
       .to(TChain2) //Any compatible Parachain
       .currency({currencySelection, amount}) //Currency to transfer - options as in scenarios above
       .address(address | Location object)
       .addToBatch()
 
-      .from(TChain) //Ensure, that origin chain is the same in all batched XCM Calls.
+      .from(TSubstrateChain) //Ensure, that origin chain is the same in all batched XCM Calls.
       .to(TChain3) //Any compatible Parachain
       .currency({currencySelection, amount}) //Currency to transfer - options as in scenarios above
       .address(address | Location object)
@@ -248,7 +248,7 @@ await builder.disconnect()
 ```ts
 //Claim XCM trapped assets from the selected chain
 const builder = Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-      .claimFrom(TChain)
+      .claimfrom(TSubstrateChain)
       .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection /*for example symbol: symbol or id: id, or location: location*/, amount: amount /*Use "ALL" to transfer everything*/}, {currencySelection}, ..]
 )
       .address(address | Location object)
@@ -265,7 +265,7 @@ await builder.disconnect()
 ```ts
 //Builder pattern
 const result = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-        .from(TChain)
+        .from(TSubstrateChain)
         .to(TChain)
         .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | {[{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}]})
         /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in same fee asset as selected currency.*/
@@ -284,7 +284,7 @@ const result = hasDryRunSupport(TChain)
 ```ts
 //Builder pattern
 const result = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-        .from(TChain)
+        .from(TSubstrateChain)
         .to(TChain)
         .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | {[{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}]})
         /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in same fee asset as selected currency.*/
@@ -306,7 +306,7 @@ const builder = await Builder({
     //ChainName: ...
   }
 })
-  .from(TChain)
+  .from(TSubstrateChain)
   .to(TChain)
   .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}])
   .address(address)
@@ -323,7 +323,7 @@ For full documentation with output examples of XCM Fee queries, head to [officia
 #### XCM Transfer info
 ```ts
 const info = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-          .from(TChain)
+          .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
@@ -335,7 +335,7 @@ const info = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array
 #### Transferable amount
 ```ts
 const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-          .from(TChain)
+          .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
@@ -347,7 +347,7 @@ const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_u
 #### Minimal transferable amount
 ```ts
 const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-          .from(TChain)
+          .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
@@ -359,7 +359,7 @@ const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_u
 #### Receivable amount
 ```ts
 const receivable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-          .from(TChain)
+          .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
@@ -371,7 +371,7 @@ const receivable = await Builder(/*chain api/builder_config/ws_url_string/ws_url
 #### Verify ED on destination
 ```ts
 const ed = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-          .from(TChain)
+          .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
@@ -384,7 +384,7 @@ const ed = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array -
 
 ```ts
 const fee = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-          .from(TChain)
+          .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
@@ -397,7 +397,7 @@ const fee = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array
 
 ```ts
 const fee = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-          .from(TChain)
+          .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { NumberFormatError, isConfig, InvalidAddressError, BatchMode, getChainProviders, MissingChainApiError, Parents, Version, computeFeeFromDryRun, findNativeAssetInfoOrThrow, hasXcmPaymentApiSupport, replaceBigInt, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, padValueBy, isRelayChain, isAssetEqual, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1, getParaEthTransferFees as getParaEthTransferFees$1, getBridgeStatus as getBridgeStatus$1, getXcmFee as getXcmFee$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1 } from '@paraspell/sdk-core';
+import { NumberFormatError, isConfig, InvalidAddressError, BatchMode, findNativeAssetInfoOrThrow, getChainProviders, MissingChainApiError, Parents, Version, findAssetInfoOrThrow, computeFeeFromDryRun, hasXcmPaymentApiSupport, replaceBigInt, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, padValueBy, isRelayChain, isAssetEqual, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1, getParaEthTransferFees as getParaEthTransferFees$1, getBridgeStatus as getBridgeStatus$1, getXcmFee as getXcmFee$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { blake2b } from '@noble/hashes/blake2.js';
 import { bytesToHex } from '@noble/hashes/utils.js';
@@ -1147,19 +1147,71 @@ var PapiApi = /*#__PURE__*/function () {
       }
       return createApiForChain;
     }()
+  }, {
+    key: "resolveDefaultFeeAsset",
+    value: function resolveDefaultFeeAsset(_ref8) {
+      var chain = _ref8.chain,
+        feeAsset = _ref8.feeAsset;
+      return feeAsset !== null && feeAsset !== void 0 ? feeAsset : findNativeAssetInfoOrThrow(chain);
+    }
+  }, {
+    key: "resolveFeeAsset",
+    value: function () {
+      var _resolveFeeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(options) {
+        var chain, address, assetId;
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
+            case 0:
+              chain = options.chain, address = options.address;
+              if (chain.startsWith('Hydration')) {
+                _context9.n = 1;
+                break;
+              }
+              return _context9.a(2, {
+                isCustomAsset: false,
+                asset: this.resolveDefaultFeeAsset(options)
+              });
+            case 1:
+              _context9.n = 2;
+              return this.api.getUnsafeApi().query.MultiTransactionPayment.AccountCurrencyMap.getValue(address);
+            case 2:
+              assetId = _context9.v;
+              if (!(assetId === undefined)) {
+                _context9.n = 3;
+                break;
+              }
+              return _context9.a(2, {
+                isCustomAsset: false,
+                asset: this.resolveDefaultFeeAsset(options)
+              });
+            case 3:
+              return _context9.a(2, {
+                isCustomAsset: true,
+                asset: findAssetInfoOrThrow(chain, {
+                  id: assetId
+                }, null)
+              });
+          }
+        }, _callee9, this);
+      }));
+      function resolveFeeAsset(_x14) {
+        return _resolveFeeAsset.apply(this, arguments);
+      }
+      return resolveFeeAsset;
+    }()
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(options) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(options) {
         var _this = this;
-        var tx, chain, destination, address, feeAsset, bypassOptions, _options$useRootOrigi, useRootOrigin, supportsDryRunApi, DEFAULT_XCM_VERSION, basePayload, resolvedTx, performDryRunCall, getExecutionSuccessFromResult, findFailureObjectFromResult, extractFailureReasonFromResult, result, isSuccess, failureOutputReason, initialFailureReason, usedAsset, actualWeight, weight, forwardedXcms, destParaId, nativeAsset, hasLocation, xcmFee, executionFee, fee, _t2;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.n) {
+        var tx, chain, destination, address, feeAsset, bypassOptions, _options$useRootOrigi, useRootOrigin, supportsDryRunApi, DEFAULT_XCM_VERSION, basePayload, resolvedTx, performDryRunCall, getExecutionSuccessFromResult, findFailureObjectFromResult, extractFailureReasonFromResult, result, isSuccess, failureOutputReason, initialFailureReason, resolvedFeeAsset, actualWeight, weight, forwardedXcms, destParaId, hasLocation, xcmFee, executionFee, fee, _t2;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
             case 0:
               tx = options.tx, chain = options.chain, destination = options.destination, address = options.address, feeAsset = options.feeAsset, bypassOptions = options.bypassOptions, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context0.n = 1;
+                _context1.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
@@ -1175,38 +1227,38 @@ var PapiApi = /*#__PURE__*/function () {
                 }
               };
               if (!useRootOrigin) {
-                _context0.n = 3;
+                _context1.n = 3;
                 break;
               }
-              _context0.n = 2;
+              _context1.n = 2;
               return wrapTxBypass(_objectSpread2(_objectSpread2({}, options), {}, {
                 api: this
               }), bypassOptions);
             case 2:
-              _t2 = _context0.v;
-              _context0.n = 4;
+              _t2 = _context1.v;
+              _context1.n = 4;
               break;
             case 3:
               _t2 = tx;
             case 4:
               resolvedTx = _t2;
               performDryRunCall = /*#__PURE__*/function () {
-                var _ref8 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(includeVersion) {
+                var _ref9 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(includeVersion) {
                   var _this$api$getUnsafeAp3;
                   var callArgs;
-                  return _regenerator().w(function (_context9) {
-                    while (1) switch (_context9.n) {
+                  return _regenerator().w(function (_context0) {
+                    while (1) switch (_context0.n) {
                       case 0:
                         callArgs = [basePayload, resolvedTx.decodedCall];
                         if (includeVersion) {
                           callArgs.push(DEFAULT_XCM_VERSION);
                         }
-                        return _context9.a(2, (_this$api$getUnsafeAp3 = _this.api.getUnsafeApi().apis.DryRunApi).dry_run_call.apply(_this$api$getUnsafeAp3, callArgs));
+                        return _context0.a(2, (_this$api$getUnsafeAp3 = _this.api.getUnsafeApi().apis.DryRunApi).dry_run_call.apply(_this$api$getUnsafeAp3, callArgs));
                     }
-                  }, _callee9);
+                  }, _callee0);
                 }));
-                return function performDryRunCall(_x15) {
-                  return _ref8.apply(this, arguments);
+                return function performDryRunCall(_x16) {
+                  return _ref9.apply(this, arguments);
                 };
               }();
               getExecutionSuccessFromResult = function getExecutionSuccessFromResult(result) {
@@ -1235,7 +1287,7 @@ var PapiApi = /*#__PURE__*/function () {
                 return result;
               };
               extractFailureReasonFromResult = function extractFailureReasonFromResult(result) {
-                var _obj$value, _ref9, _result$value6;
+                var _obj$value, _ref0, _result$value6;
                 var obj = findFailureObjectFromResult(result);
                 if (obj !== null && obj !== void 0 && obj.type && obj !== null && obj !== void 0 && (_obj$value = obj.value) !== null && _obj$value !== void 0 && (_obj$value = _obj$value.error) !== null && _obj$value !== void 0 && _obj$value.type) {
                   return {
@@ -1249,31 +1301,31 @@ var PapiApi = /*#__PURE__*/function () {
                   };
                 }
                 return {
-                  failureReason: JSON.stringify((_ref9 = (_result$value6 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value6 !== void 0 ? _result$value6 : result) !== null && _ref9 !== void 0 ? _ref9 : 'Unknown error structure', replaceBigInt)
+                  failureReason: JSON.stringify((_ref0 = (_result$value6 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value6 !== void 0 ? _result$value6 : result) !== null && _ref0 !== void 0 ? _ref0 : 'Unknown error structure', replaceBigInt)
                 };
               };
               failureOutputReason = {
                 failureReason: ''
               };
-              _context0.n = 5;
+              _context1.n = 5;
               return performDryRunCall(false);
             case 5:
-              result = _context0.v;
+              result = _context1.v;
               isSuccess = getExecutionSuccessFromResult(result);
               if (isSuccess) {
-                _context0.n = 7;
+                _context1.n = 7;
                 break;
               }
               initialFailureReason = extractFailureReasonFromResult(result);
               failureOutputReason = initialFailureReason;
               if (!(initialFailureReason.failureReason === 'VersionedConversionFailed')) {
-                _context0.n = 7;
+                _context1.n = 7;
                 break;
               }
-              _context0.n = 6;
+              _context1.n = 6;
               return performDryRunCall(true);
             case 6:
-              result = _context0.v;
+              result = _context1.v;
               isSuccess = getExecutionSuccessFromResult(result);
               if (!isSuccess) {
                 failureOutputReason = extractFailureReasonFromResult(result);
@@ -1284,18 +1336,21 @@ var PapiApi = /*#__PURE__*/function () {
                 };
               }
             case 7:
-              usedAsset = feeAsset !== null && feeAsset !== void 0 ? feeAsset : findNativeAssetInfoOrThrow(chain);
+              _context1.n = 8;
+              return this.resolveFeeAsset(options);
+            case 8:
+              resolvedFeeAsset = _context1.v;
               if (isSuccess) {
-                _context0.n = 8;
+                _context1.n = 9;
                 break;
               }
-              return _context0.a(2, Promise.resolve({
+              return _context1.a(2, Promise.resolve({
                 success: false,
                 failureReason: failureOutputReason.failureReason,
                 failureSubReason: failureOutputReason.failureSubReason,
-                asset: usedAsset
+                asset: resolvedFeeAsset.asset
               }));
-            case 8:
+            case 9:
               actualWeight = result.value.execution_result.value.actual_weight;
               weight = actualWeight ? {
                 refTime: actualWeight.ref_time,
@@ -1303,46 +1358,50 @@ var PapiApi = /*#__PURE__*/function () {
               } : undefined;
               forwardedXcms = result.value.forwarded_xcms.length > 0 ? result.value.forwarded_xcms[0] : [];
               destParaId = forwardedXcms.length === 0 ? undefined : forwardedXcms[0].value.interior.type === 'Here' ? 0 : forwardedXcms[0].value.interior.value.value;
-              nativeAsset = findNativeAssetInfoOrThrow(chain);
-              hasLocation = feeAsset ? Boolean(feeAsset.location) : Boolean(nativeAsset === null || nativeAsset === void 0 ? void 0 : nativeAsset.location);
-              if (!(hasXcmPaymentApiSupport(chain) && result.value.local_xcm && hasLocation && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum'))) {
-                _context0.n = 10;
+              hasLocation = resolvedFeeAsset.asset.location;
+              if (!(hasXcmPaymentApiSupport(chain) && result.value.local_xcm && hasLocation && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
+                _context1.n = 12;
                 break;
               }
-              _context0.n = 9;
-              return this.getXcmPaymentApiFee(chain, result.value.local_xcm, forwardedXcms, feeAsset !== null && feeAsset !== void 0 ? feeAsset : nativeAsset);
-            case 9:
-              xcmFee = _context0.v;
+              _context1.n = 10;
+              return this.getXcmPaymentApiFee(chain, result.value.local_xcm, forwardedXcms, resolvedFeeAsset.asset);
+            case 10:
+              xcmFee = _context1.v;
               if (!(typeof xcmFee === 'bigint')) {
-                _context0.n = 10;
+                _context1.n = 11;
                 break;
               }
-              return _context0.a(2, Promise.resolve({
+              return _context1.a(2, Promise.resolve({
                 success: true,
                 fee: xcmFee,
-                asset: usedAsset,
+                asset: resolvedFeeAsset.asset,
                 weight: weight,
                 forwardedXcms: forwardedXcms,
                 destParaId: destParaId
               }));
-            case 10:
-              _context0.n = 11;
-              return this.calculateTransactionFee(tx, address);
             case 11:
-              executionFee = _context0.v;
+              resolvedFeeAsset = {
+                isCustomAsset: false,
+                asset: this.resolveDefaultFeeAsset(options)
+              };
+            case 12:
+              _context1.n = 13;
+              return this.calculateTransactionFee(tx, address);
+            case 13:
+              executionFee = _context1.v;
               fee = computeFeeFromDryRun(result, chain, executionFee, !!feeAsset);
-              return _context0.a(2, Promise.resolve({
+              return _context1.a(2, Promise.resolve({
                 success: true,
                 fee: fee,
-                asset: usedAsset,
+                asset: resolvedFeeAsset.asset,
                 weight: weight,
                 forwardedXcms: forwardedXcms,
                 destParaId: destParaId
               }));
           }
-        }, _callee0, this);
+        }, _callee1, this);
       }));
-      function getDryRunCall(_x14) {
+      function getDryRunCall(_x15) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -1350,24 +1409,24 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmWeight",
     value: function () {
-      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(xcm) {
+      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(xcm) {
         var weightResult, _weightResult$value, ref_time, proof_size;
-        return _regenerator().w(function (_context1) {
-          while (1) switch (_context1.n) {
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.n) {
             case 0:
-              _context1.n = 1;
+              _context10.n = 1;
               return this.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(!xcm.type ? _transform(xcm) : xcm);
             case 1:
-              weightResult = _context1.v;
+              weightResult = _context10.v;
               _weightResult$value = weightResult.value, ref_time = _weightResult$value.ref_time, proof_size = _weightResult$value.proof_size;
-              return _context1.a(2, {
+              return _context10.a(2, {
                 refTime: ref_time,
                 proofSize: proof_size
               });
           }
-        }, _callee1, this);
+        }, _callee10, this);
       }));
-      function getXcmWeight(_x16) {
+      function getXcmWeight(_x17) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -1375,7 +1434,7 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(chain, localXcm, forwardedXcm, asset) {
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, localXcm, forwardedXcm, asset) {
         var _deliveryFeeRes$value, _deliveryFeeRes$value2;
         var transformXcm,
           transformedXcm,
@@ -1388,37 +1447,37 @@ var PapiApi = /*#__PURE__*/function () {
           nativeAsset,
           deliveryFee,
           res,
-          _args10 = arguments,
+          _args11 = arguments,
           _t3,
           _t4;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.p = _context10.n) {
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.p = _context11.n) {
             case 0:
-              transformXcm = _args10.length > 4 && _args10[4] !== undefined ? _args10[4] : false;
+              transformXcm = _args11.length > 4 && _args11[4] !== undefined ? _args11[4] : false;
               transformedXcm = transformXcm ? _transform(localXcm) : localXcm;
-              _context10.n = 1;
+              _context11.n = 1;
               return this.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(transformedXcm);
             case 1:
-              weight = _context10.v;
+              weight = _context11.v;
               assertHasLocation(asset);
               assetLocalizedLoc = localizeLocation(chain, asset.location);
               transformedAssetLoc = _transform(assetLocalizedLoc);
-              _context10.n = 2;
+              _context11.n = 2;
               return this.api.getUnsafeApi().apis.XcmPaymentApi.query_weight_to_asset_fee(weight.value, {
                 type: Version.V4,
                 value: transformedAssetLoc
               });
             case 2:
-              execFeeRes = _context10.v;
+              execFeeRes = _context11.v;
               if (!(forwardedXcm.length > 0)) {
-                _context10.n = 4;
+                _context11.n = 4;
                 break;
               }
-              _context10.n = 3;
+              _context11.n = 3;
               return this.api.getUnsafeApi().apis.XcmPaymentApi.query_delivery_fees(forwardedXcm[0], forwardedXcm[1][0]);
             case 3:
-              _t3 = _context10.v;
-              _context10.n = 5;
+              _t3 = _context11.v;
+              _context11.n = 5;
               break;
             case 4:
               _t3 = undefined;
@@ -1427,36 +1486,36 @@ var PapiApi = /*#__PURE__*/function () {
               deliveryFeeResolved = (deliveryFeeRes === null || deliveryFeeRes === void 0 || (_deliveryFeeRes$value = deliveryFeeRes.value) === null || _deliveryFeeRes$value === void 0 ? void 0 : _deliveryFeeRes$value.value.length) > 0 ? deliveryFeeRes === null || deliveryFeeRes === void 0 || (_deliveryFeeRes$value2 = deliveryFeeRes.value) === null || _deliveryFeeRes$value2 === void 0 ? void 0 : _deliveryFeeRes$value2.value[0].fun.value : 0n;
               nativeAsset = findNativeAssetInfoOrThrow(chain);
               if (!isAssetXcEqual(asset, nativeAsset)) {
-                _context10.n = 6;
+                _context11.n = 6;
                 break;
               }
               deliveryFee = deliveryFeeResolved;
-              _context10.n = 9;
+              _context11.n = 9;
               break;
             case 6:
-              _context10.p = 6;
+              _context11.p = 6;
               assertHasLocation(nativeAsset);
-              _context10.n = 7;
+              _context11.n = 7;
               return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
             case 7:
-              res = _context10.v;
+              res = _context11.v;
               deliveryFee = res !== null && res !== void 0 ? res : 0n;
-              _context10.n = 9;
+              _context11.n = 9;
               break;
             case 8:
-              _context10.p = 8;
-              _t4 = _context10.v;
+              _context11.p = 8;
+              _t4 = _context11.v;
               if (_t4 instanceof Error && /Runtime entry RuntimeCall\(.+\) not found/.test(_t4.message)) {
                 deliveryFee = 0n;
               } else {
                 deliveryFee = 0n;
               }
             case 9:
-              return _context10.a(2, execFeeRes.value + deliveryFee);
+              return _context11.a(2, execFeeRes.value + deliveryFee);
           }
-        }, _callee10, this, [[6, 8]]);
+        }, _callee11, this, [[6, 8]]);
       }));
-      function getXcmPaymentApiFee(_x17, _x18, _x19, _x20) {
+      function getXcmPaymentApiFee(_x18, _x19, _x20, _x21) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1464,32 +1523,32 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(_ref0) {
-        var _ref1, _processAssetsDeposit, _ref10, _ref11, _ref12, _ref13, _ref14;
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(_ref1) {
+        var _ref10, _processAssetsDeposit, _ref11, _ref12, _ref13, _ref14, _ref15;
         var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, supportsDryRunApi, transformedOriginLocation, result, isSuccess, failureReason, actualWeight, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, fee, processedFee;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              originLocation = _ref0.originLocation, xcm = _ref0.xcm, chain = _ref0.chain, origin = _ref0.origin, asset = _ref0.asset, feeAsset = _ref0.feeAsset, originFee = _ref0.originFee, amount = _ref0.amount;
+              originLocation = _ref1.originLocation, xcm = _ref1.xcm, chain = _ref1.chain, origin = _ref1.origin, asset = _ref1.asset, feeAsset = _ref1.feeAsset, originFee = _ref1.originFee, amount = _ref1.amount;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context11.n = 1;
+                _context12.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
             case 1:
               transformedOriginLocation = _transform(originLocation);
-              _context11.n = 2;
+              _context12.n = 2;
               return this.api.getUnsafeApi().apis.DryRunApi.dry_run_xcm(transformedOriginLocation, xcm);
             case 2:
-              result = _context11.v;
+              result = _context12.v;
               isSuccess = result.success && result.value.execution_result.type === 'Complete';
               if (isSuccess) {
-                _context11.n = 3;
+                _context12.n = 3;
                 break;
               }
               failureReason = extractDryRunXcmFailureReason(result);
-              return _context11.a(2, {
+              return _context12.a(2, {
                 success: false,
                 failureReason: failureReason,
                 asset: asset
@@ -1503,18 +1562,18 @@ var PapiApi = /*#__PURE__*/function () {
               forwardedXcms = result.value.forwarded_xcms.length > 0 ? result.value.forwarded_xcms[0] : [];
               destParaId = forwardedXcms.length === 0 ? undefined : forwardedXcms[0].value.interior.type === 'Here' ? 0 : forwardedXcms[0].value.interior.value.value;
               if (!(hasXcmPaymentApiSupport(chain) && asset)) {
-                _context11.n = 5;
+                _context12.n = 5;
                 break;
               }
-              _context11.n = 4;
+              _context12.n = 4;
               return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset);
             case 4:
-              _fee = _context11.v;
+              _fee = _context12.v;
               if (!(typeof _fee === 'bigint')) {
-                _context11.n = 5;
+                _context12.n = 5;
                 break;
               }
-              return _context11.a(2, {
+              return _context12.a(2, {
                 success: true,
                 fee: _fee,
                 asset: asset,
@@ -1527,13 +1586,13 @@ var PapiApi = /*#__PURE__*/function () {
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['Balances', 'ForeignAssets', 'Assets'];
               isFeeAsset = origin === 'AssetHubPolkadot' && feeAsset && asset && isAssetEqual(feeAsset, asset);
-              feeAssetFeeEvent = (_ref1 = isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
+              feeAssetFeeEvent = (_ref10 = isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
                 return (event.type === 'ForeignAssets' || event.type === 'Assets') && event.value.type === 'Issued';
-              }) : undefined) !== null && _ref1 !== void 0 ? _ref1 : isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
+              }) : undefined) !== null && _ref10 !== void 0 ? _ref10 : isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
                 return event.type === 'Tokens' && event.value.type === 'Deposited';
               }) : undefined;
               processedAssetsAmount = chain === 'AssetHubPolkadot' && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== 'DOT' ? processAssetsDepositedEvents(emitted, amount, 'Assets', 'Deposited', true) : (_processAssetsDeposit = processAssetsDepositedEvents(emitted, amount, 'Balances', 'Minted', false)) !== null && _processAssetsDeposit !== void 0 ? _processAssetsDeposit : processAssetsDepositedEvents(emitted, amount, 'Balances', 'Issued', false);
-              feeEvent = (_ref10 = (_ref11 = (_ref12 = (_ref13 = (_ref14 = feeAssetFeeEvent !== null && feeAssetFeeEvent !== void 0 ? feeAssetFeeEvent :
+              feeEvent = (_ref11 = (_ref12 = (_ref13 = (_ref14 = (_ref15 = feeAssetFeeEvent !== null && feeAssetFeeEvent !== void 0 ? feeAssetFeeEvent :
               //
               processedAssetsAmount !== undefined ? {
                 type: 'Assets',
@@ -1543,30 +1602,30 @@ var PapiApi = /*#__PURE__*/function () {
                     amount: processedAssetsAmount
                   }
                 }
-              } : undefined) !== null && _ref14 !== void 0 ? _ref14 :
+              } : undefined) !== null && _ref15 !== void 0 ? _ref15 :
               //
               chain === 'Mythos' ? reversedEvents.find(function (event) {
                 return event.type === 'Balances' && event.value.type === 'Issued';
-              }) : undefined) !== null && _ref13 !== void 0 ? _ref13 :
+              }) : undefined) !== null && _ref14 !== void 0 ? _ref14 :
               //
               origin === 'Mythos' || chain === 'AssetHubPolkadot' && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== 'DOT' ? reversedEvents.find(function (event) {
                 return event.type === 'AssetConversion' && event.value.type === 'SwapCreditExecuted';
-              }) : undefined) !== null && _ref12 !== void 0 ? _ref12 :
+              }) : undefined) !== null && _ref13 !== void 0 ? _ref13 :
               // Prefer to Minted event
               reversedEvents.find(function (event) {
                 return ['Balances', 'ForeignAssets'].includes(event.type) && event.value.type === 'Minted';
-              })) !== null && _ref11 !== void 0 ? _ref11 :
+              })) !== null && _ref12 !== void 0 ? _ref12 :
               // Fallback an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.type) && event.value.type === 'Issued';
-              })) !== null && _ref10 !== void 0 ? _ref10 : reversedEvents.find(function (event) {
+              })) !== null && _ref11 !== void 0 ? _ref11 : reversedEvents.find(function (event) {
                 return ['Currencies', 'Tokens'].includes(event.type) && event.value.type === 'Deposited';
               });
               if (feeEvent) {
-                _context11.n = 6;
+                _context12.n = 6;
                 break;
               }
-              return _context11.a(2, Promise.resolve({
+              return _context12.a(2, Promise.resolve({
                 success: false,
                 failureReason: 'Cannot determine destination fee. No fee event found',
                 asset: asset
@@ -1577,7 +1636,7 @@ var PapiApi = /*#__PURE__*/function () {
                 fee = amount - originFee - feeEvent.value.value.amount;
               }
               processedFee = (isRelayChain(chain) || chain.includes('AssetHub')) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT' ? padValueBy(fee, 30) : fee;
-              return _context11.a(2, Promise.resolve({
+              return _context12.a(2, Promise.resolve({
                 success: true,
                 fee: processedFee,
                 asset: asset,
@@ -1586,9 +1645,9 @@ var PapiApi = /*#__PURE__*/function () {
                 destParaId: destParaId
               }));
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
-      function getDryRunXcm(_x21) {
+      function getDryRunXcm(_x22) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1596,18 +1655,18 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBridgeStatus",
     value: function () {
-      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
+      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13() {
         var outboundOperatingMode;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.n) {
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
-              _context12.n = 1;
+              _context13.n = 1;
               return this.api.getUnsafeApi().query.EthereumOutboundQueue.OperatingMode.getValue();
             case 1:
-              outboundOperatingMode = _context12.v;
-              return _context12.a(2, outboundOperatingMode.type);
+              outboundOperatingMode = _context13.v;
+              return _context13.a(2, outboundOperatingMode.type);
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function getBridgeStatus() {
         return _getBridgeStatus.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk",
-  "version": "12.0.3",
+  "version": "12.0.5",
   "description": "SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@noble/hashes": "^2.0.1",
     "@polkadot-api/legacy-provider": "^0.3.6",
     "viem": "^2.40.3",
-    "@paraspell/sdk-core": "12.0.3"
+    "@paraspell/sdk-core": "12.0.5"
   },
   "peerDependencies": {
     "polkadot-api": ">= 1.22.0 < 2"