@paraspell/sdk 13.1.0 → 13.2.0

package/dist/index.mjs

@@ -1,16 +1,16 @@
-import { getNativeAssetSymbol, getOtherAssets, isSenderSigner, getEvmPrivateKeyHex, NumberFormatError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, InvalidAddressError, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, PolkadotApi, resolveChainApi, DEFAULT_TTL_MS, isExternalChain, Parents, findAssetInfoOrThrow, hasXcmPaymentApiSupport, replaceBigInt, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, localizeLocation, isAssetXcEqual, addXcmVersionHeader, RELAY_LOCATION, getRelayChainOf, isRelayChain, padValueBy, isAssetEqual, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, getXcmFee as getXcmFee$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1 } from '@paraspell/sdk-core';
+import { getNativeAssetSymbol, getOtherAssets, isSenderSigner, getEvmPrivateKeyHex, NumberFormatError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, InvalidAddressError, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, PolkadotApi, resolveChainApi, DEFAULT_TTL_MS, isExternalChain, Parents, findAssetInfoOrThrow, hasXcmPaymentApiSupport, replaceBigInt, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, RuntimeApiError, localizeLocation, isAssetXcEqual, createAssetId, addXcmVersionHeader, RELAY_LOCATION, getRelayChainOf, isRelayChain, padValueBy, isAssetEqual, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, getXcmFee as getXcmFee$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { secp256k1 } from '@noble/curves/secp256k1.js';
 import { keccak_256 } from '@noble/hashes/sha3.js';
 import { bytesToHex, hexToBytes } from '@noble/hashes/utils.js';
 import { sr25519CreateDerive } from '@polkadot-labs/hdkd';
 import { entropyToMiniSecret, mnemonicToEntropy, DEV_PHRASE } from '@polkadot-labs/hdkd-helpers';
-import { AccountId, Binary, FixedSizeBinary, getSs58AddressInfo, createClient } from 'polkadot-api';
+import { AccountId, Binary, getSs58AddressInfo } from 'polkadot-api';
 import { getPolkadotSigner } from 'polkadot-api/signer';
 import { blake2b } from '@noble/hashes/blake2.js';
-import { withLegacy } from '@polkadot-api/legacy-provider';
-import { withPolkadotSdkCompat } from 'polkadot-api/polkadot-sdk-compat';
-import { getWsProvider } from 'polkadot-api/ws-provider';
+import { XcmVersionedLocation, XcmV5Junctions } from '@polkadot-api/descriptors';
+import { toHex } from 'polkadot-api/utils';
+import { createWsClient } from 'polkadot-api/ws';
 import { isAddress, isHex } from 'viem';
 
 function _arrayLikeToArray(r, a) {
@@ -450,8 +450,6 @@ var deriveAddress = function deriveAddress(sender) {
   return AccountId().dec(keyPair.publicKey);
 };
 
-var LEGACY_CHAINS = ['Interlay', 'CrustShadow', 'Kintsugi', 'Pendulum'];
-
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
@@ -527,7 +525,7 @@ var _transform = function transform(obj) {
             network: value.network === 'any' ? {
               type: 'Any'
             } : undefined,
-            id: FixedSizeBinary.fromHex(value.id)
+            id: value.id
           }
         };
       } else if (key === 'Id') {
@@ -576,13 +574,13 @@ var _transform = function transform(obj) {
             network: value.network === 'any' ? {
               type: 'Any'
             } : undefined,
-            key: FixedSizeBinary.fromHex(value.key)
+            key: value.key
           }
         };
       } else if (key === 'SetTopic') {
         return {
           type: key,
-          value: FixedSizeBinary.fromHex(value)
+          value: value
         };
       } else if (key === 'SetFeesMode') {
         var _value$jit_withdraw;
@@ -669,7 +667,7 @@ var _transform = function transform(obj) {
           if (typeof v === 'string' && isAddress(v)) {
             newObj[k] = v;
           } else if (typeof v === 'string' && v.startsWith('0x')) {
-            newObj[k] = FixedSizeBinary.fromHex(v);
+            newObj[k] = v;
           } else if (typeof v === 'string') {
             newObj[k] = {
               type: v
@@ -709,14 +707,7 @@ var clientPool = createClientCache(MAX_CLIENTS, /*#__PURE__*/function () {
 }(), function (_key, entry) {
   entry.client.destroy();
 }, EXTENSION_MS);
-var createPolkadotClient = function createPolkadotClient(ws, useLegacy) {
-  var options = useLegacy ? {
-    innerEnhancer: withLegacy()
-  } : {};
-  var provider = getWsProvider(ws, options);
-  return createClient(useLegacy ? provider : withPolkadotSdkCompat(provider));
-};
-var _createClientPoolHelp = createClientPoolHelpers(clientPool, createPolkadotClient),
+var _createClientPoolHelp = createClientPoolHelpers(clientPool, createWsClient),
   leaseClient = _createClientPoolHelp.leaseClient,
   releaseClient = _createClientPoolHelp.releaseClient;
 var extractDryRunXcmFailureReason = function extractDryRunXcmFailureReason(result) {
@@ -738,6 +729,8 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     _classCallCheck(this, PapiApi);
     _this = _callSuper(this, PapiApi, arguments);
     _this.type = 'PAPI';
+    _this._typedApi = null;
+    _this._untypedApi = null;
     return _this;
   }
   _inherits(PapiApi, _PolkadotApi);
@@ -761,8 +754,8 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               this._ttlMs = clientTtlMs;
               this._chain = chain;
               _context2.n = 2;
-              return resolveChainApi(this._config, chain, function (wsUrl, c) {
-                return _this2.createApiInstance(wsUrl, c);
+              return resolveChainApi(this._config, chain, function (wsUrl) {
+                return leaseClient(wsUrl, _this2._ttlMs);
               });
             case 2:
               this._api = _context2.v;
@@ -776,18 +769,29 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
       }
       return init;
     }()
+  }, {
+    key: "typedApi",
+    get: function get() {
+      if (!this._typedApi) this._typedApi = this.api.getUnsafeApi();
+      return this._typedApi;
+    }
+  }, {
+    key: "untypedApi",
+    get: function get() {
+      if (!this._untypedApi) this._untypedApi = this.api.getUnsafeApi();
+      return this._untypedApi;
+    }
   }, {
     key: "createApiInstance",
-    value: function createApiInstance(wsUrl, chain) {
-      var useLegacy = LEGACY_CHAINS.includes(chain);
-      return Promise.resolve(leaseClient(wsUrl, this._ttlMs, useLegacy));
+    value: function createApiInstance(wsUrl) {
+      return Promise.resolve(createWsClient(wsUrl));
     }
   }, {
     key: "accountToHex",
     value: function accountToHex(address) {
       var isPrefixed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       if (isHex(address)) return address;
-      var hex = FixedSizeBinary.fromAccountId32(address).asHex();
+      var hex = toHex(AccountId().enc(address));
       return isPrefixed ? hex : hex.slice(2);
     }
   }, {
@@ -812,49 +816,37 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
         method = _ref6.method,
         params = _ref6.params;
       var transformedParams = _transform(params);
-      return this.api.getUnsafeApi().tx[module][method](transformedParams);
+      return this.untypedApi.tx[module][method](transformedParams);
     }
   }, {
     key: "txFromHex",
-    value: function () {
-      var _txFromHex = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(hex) {
-        var callData;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
-            case 0:
-              callData = Binary.fromHex(hex);
-              return _context3.a(2, this.api.getUnsafeApi().txFromCallData(callData));
-          }
-        }, _callee3, this);
-      }));
-      function txFromHex(_x3) {
-        return _txFromHex.apply(this, arguments);
-      }
-      return txFromHex;
-    }()
+    value: function txFromHex(hex) {
+      var callData = Binary.fromHex(hex);
+      return this.untypedApi.txFromCallData(callData);
+    }
   }, {
     key: "queryState",
     value: function queryState(_ref7) {
-      var _this$api$getUnsafeAp;
+      var _this$untypedApi$quer;
       var module = _ref7.module,
         method = _ref7.method,
         params = _ref7.params;
-      return (_this$api$getUnsafeAp = this.api.getUnsafeApi().query[module][method]).getValue.apply(_this$api$getUnsafeAp, _toConsumableArray(params.map(_transform)));
+      return (_this$untypedApi$quer = this.untypedApi.query[module][method]).getValue.apply(_this$untypedApi$quer, _toConsumableArray(params.map(_transform)));
     }
   }, {
     key: "queryRuntimeApi",
     value: function queryRuntimeApi(_ref8) {
-      var _this$api$getUnsafeAp2;
+      var _this$untypedApi$apis;
       var module = _ref8.module,
         method = _ref8.method,
         params = _ref8.params;
-      return (_this$api$getUnsafeAp2 = this.api.getUnsafeApi().apis[module])[method].apply(_this$api$getUnsafeAp2, _toConsumableArray(params.map(_transform)));
+      return (_this$untypedApi$apis = this.untypedApi.apis[module])[method].apply(_this$untypedApi$apis, _toConsumableArray(params.map(_transform)));
     }
   }, {
     key: "callBatchMethod",
     value: function callBatchMethod(calls, mode) {
       var method = mode === BatchMode.BATCH_ALL ? 'batch_all' : 'batch';
-      return this.api.getUnsafeApi().tx.Utility[method]({
+      return this.untypedApi.tx.Utility[method]({
         calls: calls.map(function (_ref9) {
           var decodedCall = _ref9.decodedCall;
           return decodedCall;
@@ -872,7 +864,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
           value: address
         }
       };
-      return this.api.getUnsafeApi().tx.Utility.dispatch_as({
+      return this.untypedApi.tx.Utility.dispatch_as({
         as_origin: origin,
         call: decodedCall
       });
@@ -880,36 +872,31 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "objectToHex",
     value: function () {
-      var _objectToHex = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(obj, _typeName, version) {
+      var _objectToHex = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(obj, _typeName, version) {
         var transformedObj, tx, removeFirst5Bytes, encodedData;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
               transformedObj = _transform(obj);
-              tx = this.api.getUnsafeApi().tx.PolkadotXcm.send({
-                dest: {
-                  type: version,
-                  value: {
-                    parents: Parents.ZERO,
-                    interior: {
-                      type: 'Here'
-                    }
-                  }
-                },
+              tx = this.typedApi.tx.PolkadotXcm.send({
+                dest: XcmVersionedLocation[version]({
+                  parents: Parents.ZERO,
+                  interior: XcmV5Junctions.Here()
+                }),
                 message: transformedObj
               });
               removeFirst5Bytes = function removeFirst5Bytes(hexString) {
                 return '0x' + hexString.slice(12);
               };
-              _context4.n = 1;
+              _context3.n = 1;
               return tx.getEncodedData();
             case 1:
-              encodedData = _context4.v;
-              return _context4.a(2, removeFirst5Bytes(encodedData.asHex()));
+              encodedData = _context3.v;
+              return _context3.a(2, removeFirst5Bytes(toHex(encodedData)));
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
-      function objectToHex(_x4, _x5, _x6) {
+      function objectToHex(_x3, _x4, _x5) {
         return _objectToHex.apply(this, arguments);
       }
       return objectToHex;
@@ -917,12 +904,12 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "hexToUint8a",
     value: function hexToUint8a(hex) {
-      return Binary.fromHex(hex).asBytes();
+      return Binary.fromHex(hex);
     }
   }, {
     key: "stringToUint8a",
     value: function stringToUint8a(str) {
-      return Binary.fromText(str).asBytes();
+      return Binary.fromText(str);
     }
   }, {
     key: "blake2AsHex",
@@ -934,30 +921,30 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "hasMethod",
     value: function () {
-      var _hasMethod = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(pallet, method) {
+      var _hasMethod = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(pallet, method) {
         var _t;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.p = _context5.n) {
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.p = _context4.n) {
             case 0:
-              _context5.p = 0;
-              _context5.n = 1;
-              return this.api.getUnsafeApi().tx[pallet][method]().getEncodedData();
+              _context4.p = 0;
+              _context4.n = 1;
+              return this.untypedApi.tx[pallet][method]().getEncodedData();
             case 1:
-              return _context5.a(2, true);
+              return _context4.a(2, true);
             case 2:
-              _context5.p = 2;
-              _t = _context5.v;
+              _context4.p = 2;
+              _t = _context4.v;
               if (!(_t instanceof Error && _t.message.includes("Runtime entry Tx(".concat(pallet, ".").concat(method, ") not found")))) {
-                _context5.n = 3;
+                _context4.n = 3;
                 break;
               }
-              return _context5.a(2, false);
+              return _context4.a(2, false);
             case 3:
-              return _context5.a(2, true);
+              return _context4.a(2, true);
           }
-        }, _callee5, this, [[0, 2]]);
+        }, _callee4, this, [[0, 2]]);
       }));
-      function hasMethod(_x7, _x8) {
+      function hasMethod(_x6, _x7) {
         return _hasMethod.apply(this, arguments);
       }
       return hasMethod;
@@ -976,20 +963,20 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getPaymentInfo",
     value: function () {
-      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(tx, address) {
+      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(tx, address) {
         var _yield$tx$getPaymentI, partial_fee, _yield$tx$getPaymentI2, proof_size, ref_time;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
-              _context6.n = 1;
+              _context5.n = 1;
               return tx.getPaymentInfo(address);
             case 1:
-              _yield$tx$getPaymentI = _context6.v;
+              _yield$tx$getPaymentI = _context5.v;
               partial_fee = _yield$tx$getPaymentI.partial_fee;
               _yield$tx$getPaymentI2 = _yield$tx$getPaymentI.weight;
               proof_size = _yield$tx$getPaymentI2.proof_size;
               ref_time = _yield$tx$getPaymentI2.ref_time;
-              return _context6.a(2, {
+              return _context5.a(2, {
                 partialFee: partial_fee,
                 weight: {
                   proofSize: proof_size,
@@ -997,9 +984,9 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 }
               });
           }
-        }, _callee6);
+        }, _callee5);
       }));
-      function getPaymentInfo(_x9, _x0) {
+      function getPaymentInfo(_x8, _x9) {
         return _getPaymentInfo.apply(this, arguments);
       }
       return getPaymentInfo;
@@ -1007,27 +994,27 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "quoteAhPrice",
     value: function () {
-      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(fromMl, toMl, amountIn) {
+      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(fromMl, toMl, amountIn) {
         var includeFee,
           transformedFromMl,
           transformedToMl,
           response,
-          _args6 = arguments;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.n) {
+          _args5 = arguments;
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.n) {
             case 0:
-              includeFee = _args6.length > 3 && _args6[3] !== undefined ? _args6[3] : true;
+              includeFee = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : true;
               transformedFromMl = _transform(fromMl);
               transformedToMl = _transform(toMl);
-              _context7.n = 1;
-              return this.api.getUnsafeApi().apis.AssetConversionApi.quote_price_exact_tokens_for_tokens(transformedFromMl, transformedToMl, amountIn, includeFee);
+              _context6.n = 1;
+              return this.typedApi.apis.AssetConversionApi.quote_price_exact_tokens_for_tokens(transformedFromMl, transformedToMl, amountIn, includeFee);
             case 1:
-              response = _context7.v;
-              return _context7.a(2, response ? BigInt(response) : undefined);
+              response = _context6.v;
+              return _context6.a(2, response ? BigInt(response) : undefined);
           }
-        }, _callee7, this);
+        }, _callee6, this);
       }));
-      function quoteAhPrice(_x1, _x10, _x11) {
+      function quoteAhPrice(_x0, _x1, _x10) {
         return _quoteAhPrice.apply(this, arguments);
       }
       return quoteAhPrice;
@@ -1035,25 +1022,25 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getEvmStorage",
     value: function getEvmStorage(contract, slot) {
-      return this.api.getUnsafeApi().query.EVM.AccountStorages.getKey(FixedSizeBinary.fromHex(contract), FixedSizeBinary.fromHex(slot));
+      return this.untypedApi.query.EVM.AccountStorages.getKey(contract, slot);
     }
   }, {
     key: "getFromRpc",
     value: function () {
-      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(module, method, key) {
+      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(module, method, key) {
         var value;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.n) {
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
             case 0:
-              _context8.n = 1;
+              _context7.n = 1;
               return this.api._request("".concat(module, "_").concat(method), [module === 'system' && isHex(key) && !isAddress(key) ? AccountId().dec(key) : key]);
             case 1:
-              value = _context8.v;
-              return _context8.a(2, isHex(value) ? value : '0x' + value.toString(16).padStart(8, '0'));
+              value = _context7.v;
+              return _context7.a(2, isHex(value) ? value : '0x' + value.toString(16).padStart(8, '0'));
           }
-        }, _callee8, this);
+        }, _callee7, this);
       }));
-      function getFromRpc(_x12, _x13, _x14) {
+      function getFromRpc(_x11, _x12, _x13) {
         return _getFromRpc.apply(this, arguments);
       }
       return getFromRpc;
@@ -1066,20 +1053,20 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "createApiForChain",
     value: function () {
-      var _createApiForChain = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(chain) {
+      var _createApiForChain = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(chain) {
         var api;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.n) {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
             case 0:
               api = new PapiApi(isConfig(this._config) ? this._config : undefined);
-              _context9.n = 1;
+              _context8.n = 1;
               return api.init(chain);
             case 1:
-              return _context9.a(2, api);
+              return _context8.a(2, api);
           }
-        }, _callee9, this);
+        }, _callee8, this);
       }));
-      function createApiForChain(_x15) {
+      function createApiForChain(_x14) {
         return _createApiForChain.apply(this, arguments);
       }
       return createApiForChain;
@@ -1094,44 +1081,44 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "resolveFeeAsset",
     value: function () {
-      var _resolveFeeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(options) {
+      var _resolveFeeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(options) {
         var chain, address, feeAsset, assetId;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.n) {
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
             case 0:
               chain = options.chain, address = options.address, feeAsset = options.feeAsset;
               if (!(!chain.startsWith('Hydration') || feeAsset)) {
-                _context0.n = 1;
+                _context9.n = 1;
                 break;
               }
-              return _context0.a(2, {
+              return _context9.a(2, {
                 isCustomAsset: false,
                 asset: this.resolveDefaultFeeAsset(options)
               });
             case 1:
-              _context0.n = 2;
-              return this.api.getUnsafeApi().query.MultiTransactionPayment.AccountCurrencyMap.getValue(address);
+              _context9.n = 2;
+              return this.untypedApi.query.MultiTransactionPayment.AccountCurrencyMap.getValue(address);
             case 2:
-              assetId = _context0.v;
+              assetId = _context9.v;
               if (!(assetId === undefined)) {
-                _context0.n = 3;
+                _context9.n = 3;
                 break;
               }
-              return _context0.a(2, {
+              return _context9.a(2, {
                 isCustomAsset: false,
                 asset: this.resolveDefaultFeeAsset(options)
               });
             case 3:
-              return _context0.a(2, {
+              return _context9.a(2, {
                 isCustomAsset: true,
                 asset: findAssetInfoOrThrow(chain, {
                   id: assetId
                 })
               });
           }
-        }, _callee0, this);
+        }, _callee9, this);
       }));
-      function resolveFeeAsset(_x16) {
+      function resolveFeeAsset(_x15) {
         return _resolveFeeAsset.apply(this, arguments);
       }
       return resolveFeeAsset;
@@ -1139,16 +1126,16 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(options) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(options) {
         var _this3 = this;
-        var tx, chain, destination, address, feeAsset, bypassOptions, version, _options$useRootOrigi, useRootOrigin, _getAssetsObject, supportsDryRunApi, basePayload, resolvedTx, performDryRunCall, getExecutionSuccessFromResult, findFailureObjectFromResult, extractFailureReasonFromResult, result, isSuccess, failureOutputReason, initialFailureReason, resolvedFeeAsset, actualWeight, weight, forwardedXcms, destParaId, USE_XCM_PAYMENT_API_CHAINS, overriddenWeight, xcmFee, _yield$this$getPaymen, executionFee, fee, _t2, _t3;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.n) {
+        var tx, chain, destination, address, feeAsset, bypassOptions, version, _options$useRootOrigi, useRootOrigin, _getAssetsObject, supportsDryRunApi, basePayload, resolvedTx, performDryRunCall, getExecutionSuccessFromResult, findFailureObjectFromResult, extractFailureReasonFromResult, result, message, isSuccess, resolvedFeeAsset, failureOutputReason, actualWeight, weight, forwardedXcms, destParaId, USE_XCM_PAYMENT_API_CHAINS, overriddenWeight, xcmFee, _yield$this$getPaymen, executionFee, fee, _t2, _t3, _t4;
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.p = _context0.n) {
             case 0:
               tx = options.tx, chain = options.chain, destination = options.destination, address = options.address, feeAsset = options.feeAsset, bypassOptions = options.bypassOptions, version = options.version, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi;
               _getAssetsObject = getAssetsObject(chain), supportsDryRunApi = _getAssetsObject.supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context10.n = 1;
+                _context0.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
@@ -1163,41 +1150,30 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 }
               };
               if (!useRootOrigin) {
-                _context10.n = 3;
+                _context0.n = 3;
                 break;
               }
-              _context10.n = 2;
+              _context0.n = 2;
               return wrapTxBypass(_objectSpread2(_objectSpread2({}, options), {}, {
                 api: this
               }), bypassOptions);
             case 2:
-              _t2 = _context10.v;
-              _context10.n = 4;
+              _t2 = _context0.v;
+              _context0.n = 4;
               break;
             case 3:
               _t2 = tx;
             case 4:
               resolvedTx = _t2;
-              performDryRunCall = /*#__PURE__*/function () {
-                var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(includeVersion) {
-                  var _this3$api$getUnsafeA;
-                  var callArgs, versionNum;
-                  return _regenerator().w(function (_context1) {
-                    while (1) switch (_context1.n) {
-                      case 0:
-                        callArgs = [basePayload, resolvedTx.decodedCall];
-                        if (includeVersion) {
-                          versionNum = Number(version.charAt(1));
-                          callArgs.push(versionNum);
-                        }
-                        return _context1.a(2, (_this3$api$getUnsafeA = _this3.api.getUnsafeApi().apis.DryRunApi).dry_run_call.apply(_this3$api$getUnsafeA, callArgs));
-                    }
-                  }, _callee1);
-                }));
-                return function performDryRunCall(_x18) {
-                  return _ref10.apply(this, arguments);
-                };
-              }();
+              performDryRunCall = function performDryRunCall(includeVersion) {
+                var _this3$untypedApi$api;
+                var callArgs = [basePayload, resolvedTx.decodedCall];
+                if (includeVersion) {
+                  var versionNum = Number(version.charAt(1));
+                  callArgs.push(versionNum);
+                }
+                return (_this3$untypedApi$api = _this3.untypedApi.apis.DryRunApi).dry_run_call.apply(_this3$untypedApi$api, callArgs);
+              };
               getExecutionSuccessFromResult = function getExecutionSuccessFromResult(result) {
                 var _result$value3;
                 var errorInEvents = findFailingEvent(result);
@@ -1227,7 +1203,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 return result;
               };
               extractFailureReasonFromResult = function extractFailureReasonFromResult(result) {
-                var _obj$value, _ref11, _result$value6;
+                var _obj$value, _ref10, _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 {
@@ -1241,91 +1217,85 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                   };
                 }
                 return {
-                  failureReason: JSON.stringify((_ref11 = (_result$value6 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value6 !== void 0 ? _result$value6 : result) !== null && _ref11 !== void 0 ? _ref11 : 'Unknown error structure', replaceBigInt)
+                  failureReason: JSON.stringify((_ref10 = (_result$value6 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value6 !== void 0 ? _result$value6 : result) !== null && _ref10 !== void 0 ? _ref10 : 'Unknown error structure', replaceBigInt)
                 };
               };
-              failureOutputReason = {
-                failureReason: ''
-              };
-              _context10.n = 5;
+              _context0.p = 5;
+              _context0.n = 6;
               return performDryRunCall(false);
-            case 5:
-              result = _context10.v;
-              isSuccess = getExecutionSuccessFromResult(result);
-              if (isSuccess) {
-                _context10.n = 7;
-                break;
-              }
-              initialFailureReason = extractFailureReasonFromResult(result);
-              failureOutputReason = initialFailureReason;
-              if (!(initialFailureReason.failureReason === 'VersionedConversionFailed')) {
-                _context10.n = 7;
+            case 6:
+              result = _context0.v;
+              _context0.n = 10;
+              break;
+            case 7:
+              _context0.p = 7;
+              _t3 = _context0.v;
+              message = _t3 instanceof Error ? _t3.message : String(_t3);
+              if (!message.includes('Incompatible runtime entry')) {
+                _context0.n = 9;
                 break;
               }
-              _context10.n = 6;
+              _context0.n = 8;
               return performDryRunCall(true);
-            case 6:
-              result = _context10.v;
+            case 8:
+              result = _context0.v;
+              _context0.n = 10;
+              break;
+            case 9:
+              throw _t3;
+            case 10:
               isSuccess = getExecutionSuccessFromResult(result);
-              if (!isSuccess) {
-                failureOutputReason = extractFailureReasonFromResult(result);
-              } else {
-                failureOutputReason = {
-                  failureReason: '',
-                  failureSubReason: undefined
-                };
-              }
-            case 7:
-              _context10.n = 8;
+              _context0.n = 11;
               return this.resolveFeeAsset(options);
-            case 8:
-              resolvedFeeAsset = _context10.v;
+            case 11:
+              resolvedFeeAsset = _context0.v;
               if (isSuccess) {
-                _context10.n = 9;
+                _context0.n = 12;
                 break;
               }
-              return _context10.a(2, Promise.resolve({
+              failureOutputReason = extractFailureReasonFromResult(result);
+              return _context0.a(2, Promise.resolve({
                 success: false,
                 failureReason: failureOutputReason.failureReason,
                 failureSubReason: failureOutputReason.failureSubReason,
                 asset: resolvedFeeAsset.asset
               }));
-            case 9:
+            case 12:
               actualWeight = result.value.execution_result.value.actual_weight;
               weight = actualWeight ? {
                 refTime: actualWeight.ref_time,
                 proofSize: actualWeight.proof_size
               } : 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;
+              destParaId = extractDestParaId(forwardedXcms);
               USE_XCM_PAYMENT_API_CHAINS = ['Astar'];
               if (!(hasXcmPaymentApiSupport(chain) && result.value.local_xcm && (feeAsset || USE_XCM_PAYMENT_API_CHAINS.includes(chain) || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
-                _context10.n = 15;
+                _context0.n = 18;
                 break;
               }
               if (result.value.local_xcm) {
-                _context10.n = 11;
+                _context0.n = 14;
                 break;
               }
-              _context10.n = 10;
+              _context0.n = 13;
               return this.getPaymentInfo(tx, address);
-            case 10:
-              _t3 = _context10.v.weight;
-              _context10.n = 12;
+            case 13:
+              _t4 = _context0.v.weight;
+              _context0.n = 15;
               break;
-            case 11:
-              _t3 = undefined;
-            case 12:
-              overriddenWeight = _t3;
-              _context10.n = 13;
+            case 14:
+              _t4 = undefined;
+            case 15:
+              overriddenWeight = _t4;
+              _context0.n = 16;
               return this.getXcmPaymentApiFee(chain, result.value.local_xcm, forwardedXcms, resolvedFeeAsset.asset, version, false, overriddenWeight);
-            case 13:
-              xcmFee = _context10.v;
+            case 16:
+              xcmFee = _context0.v;
               if (!(typeof xcmFee === 'bigint')) {
-                _context10.n = 14;
+                _context0.n = 17;
                 break;
               }
-              return _context10.a(2, Promise.resolve({
+              return _context0.a(2, Promise.resolve({
                 success: true,
                 fee: xcmFee,
                 asset: resolvedFeeAsset.asset,
@@ -1333,19 +1303,19 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 forwardedXcms: forwardedXcms,
                 destParaId: destParaId
               }));
-            case 14:
+            case 17:
               resolvedFeeAsset = {
                 isCustomAsset: false,
                 asset: this.resolveDefaultFeeAsset(options)
               };
-            case 15:
-              _context10.n = 16;
+            case 18:
+              _context0.n = 19;
               return this.getPaymentInfo(tx, address);
-            case 16:
-              _yield$this$getPaymen = _context10.v;
+            case 19:
+              _yield$this$getPaymen = _context0.v;
               executionFee = _yield$this$getPaymen.partialFee;
               fee = computeOriginFee(result, chain, executionFee, !!feeAsset);
-              return _context10.a(2, Promise.resolve({
+              return _context0.a(2, Promise.resolve({
                 success: true,
                 fee: fee,
                 asset: resolvedFeeAsset.asset,
@@ -1354,9 +1324,9 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 destParaId: destParaId
               }));
           }
-        }, _callee10, this);
+        }, _callee0, this, [[5, 7]]);
       }));
-      function getDryRunCall(_x17) {
+      function getDryRunCall(_x16) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -1364,24 +1334,32 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getXcmWeight",
     value: function () {
-      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(xcm) {
-        var weightResult, _weightResult$value, ref_time, proof_size;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(xcm) {
+        var _yield$this$typedApi$, success, value, ref_time, proof_size;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
             case 0:
-              _context11.n = 1;
-              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(!xcm.type ? _transform(xcm) : xcm);
+              _context1.n = 1;
+              return this.typedApi.apis.XcmPaymentApi.query_xcm_weight(!xcm.type ? _transform(xcm) : xcm);
             case 1:
-              weightResult = _context11.v;
-              _weightResult$value = weightResult.value, ref_time = _weightResult$value.ref_time, proof_size = _weightResult$value.proof_size;
-              return _context11.a(2, {
+              _yield$this$typedApi$ = _context1.v;
+              success = _yield$this$typedApi$.success;
+              value = _yield$this$typedApi$.value;
+              if (success) {
+                _context1.n = 2;
+                break;
+              }
+              throw new RuntimeApiError("Failed to get XCM weight for payment fee calculation. Reason: ".concat(JSON.stringify(value)));
+            case 2:
+              ref_time = value.ref_time, proof_size = value.proof_size;
+              return _context1.a(2, {
                 refTime: ref_time,
                 proofSize: proof_size
               });
           }
-        }, _callee11, this);
+        }, _callee1, this);
       }));
-      function getXcmWeight(_x19) {
+      function getXcmWeight(_x17) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -1389,76 +1367,82 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDeliveryFee",
     value: function () {
-      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
-        var _deliveryFeeRes, _deliveryFeeRes2;
-        var xcmPaymentApi, usedThirdParam, deliveryFeeRes, baseArgs, message, transformedAssetLoc, deliveryFeeResolved, nativeAsset, res, _t4, _t5;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.p = _context12.n) {
+      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
+        var _deliveryFeeRes, _deliveryFeeRes2, _deliveryFeeRes3;
+        var xcmPaymentApi, usedThirdParam, deliveryFeeRes, baseArgs, message, assetId, transformedAssetLoc, deliveryFeeResolved, nativeAsset, res, _t5, _t6;
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.p = _context10.n) {
             case 0:
-              xcmPaymentApi = this.api.getUnsafeApi().apis.XcmPaymentApi;
+              xcmPaymentApi = this.untypedApi.apis.XcmPaymentApi;
               usedThirdParam = false;
               if (!(forwardedXcm.length > 0)) {
-                _context12.n = 6;
+                _context10.n = 6;
                 break;
               }
               baseArgs = [forwardedXcm[0], forwardedXcm[1][0]];
-              _context12.p = 1;
-              _context12.n = 2;
+              _context10.p = 1;
+              _context10.n = 2;
               return xcmPaymentApi.query_delivery_fees.apply(xcmPaymentApi, baseArgs);
             case 2:
-              deliveryFeeRes = _context12.v;
-              _context12.n = 6;
+              deliveryFeeRes = _context10.v;
+              _context10.n = 6;
               break;
             case 3:
-              _context12.p = 3;
-              _t4 = _context12.v;
-              message = _t4 instanceof Error ? _t4.message : String(_t4); // Some runtimes require the 3rd arg; without it the runtime-api call can throw
-              // with a generic "Cannot read properties of undefined".
-              if (!message.includes('Cannot read properties of undefined')) {
-                _context12.n = 5;
+              _context10.p = 3;
+              _t5 = _context10.v;
+              message = _t5 instanceof Error ? _t5.message : String(_t5); // Some runtimes require the 3rd arg
+              if (!message.includes('Incompatible runtime entry')) {
+                _context10.n = 5;
                 break;
               }
               usedThirdParam = true;
-              transformedAssetLoc = _transform(addXcmVersionHeader(assetLocalizedLoc, version));
-              _context12.n = 4;
+              assetId = createAssetId(version, assetLocalizedLoc);
+              transformedAssetLoc = _transform(addXcmVersionHeader(assetId, version));
+              _context10.n = 4;
               return xcmPaymentApi.query_delivery_fees.apply(xcmPaymentApi, baseArgs.concat([transformedAssetLoc]));
             case 4:
-              deliveryFeeRes = _context12.v;
-              _context12.n = 6;
+              deliveryFeeRes = _context10.v;
+              _context10.n = 6;
               break;
             case 5:
-              throw _t4;
+              throw _t5;
             case 6:
-              deliveryFeeResolved = ((_deliveryFeeRes = deliveryFeeRes) === null || _deliveryFeeRes === void 0 || (_deliveryFeeRes = _deliveryFeeRes.value) === null || _deliveryFeeRes === void 0 ? void 0 : _deliveryFeeRes.value.length) > 0 ? (_deliveryFeeRes2 = deliveryFeeRes) === null || _deliveryFeeRes2 === void 0 || (_deliveryFeeRes2 = _deliveryFeeRes2.value) === null || _deliveryFeeRes2 === void 0 ? void 0 : _deliveryFeeRes2.value[0].fun.value : 0n;
+              if (!(((_deliveryFeeRes = deliveryFeeRes) === null || _deliveryFeeRes === void 0 || (_deliveryFeeRes = _deliveryFeeRes.value) === null || _deliveryFeeRes === void 0 ? void 0 : _deliveryFeeRes.type) === 'Unimplemented')) {
+                _context10.n = 7;
+                break;
+              }
+              return _context10.a(2, 0n);
+            case 7:
+              deliveryFeeResolved = ((_deliveryFeeRes2 = deliveryFeeRes) === null || _deliveryFeeRes2 === void 0 || (_deliveryFeeRes2 = _deliveryFeeRes2.value) === null || _deliveryFeeRes2 === void 0 ? void 0 : _deliveryFeeRes2.value.length) > 0 ? (_deliveryFeeRes3 = deliveryFeeRes) === null || _deliveryFeeRes3 === void 0 || (_deliveryFeeRes3 = _deliveryFeeRes3.value) === null || _deliveryFeeRes3 === void 0 ? void 0 : _deliveryFeeRes3.value[0].fun.value : 0n;
               nativeAsset = findNativeAssetInfoOrThrow(chain);
               if (!(isAssetXcEqual(asset, nativeAsset) || usedThirdParam)) {
-                _context12.n = 7;
+                _context10.n = 8;
                 break;
               }
-              return _context12.a(2, deliveryFeeResolved);
-            case 7:
-              _context12.p = 7;
-              _context12.n = 8;
-              return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
+              return _context10.a(2, deliveryFeeResolved);
             case 8:
-              res = _context12.v;
-              return _context12.a(2, res !== null && res !== void 0 ? res : 0n);
+              _context10.p = 8;
+              _context10.n = 9;
+              return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
             case 9:
-              _context12.p = 9;
-              _t5 = _context12.v;
-              if (!(_t5 instanceof Error && /Runtime entry RuntimeCall\(.+\) not found/.test(_t5.message))) {
-                _context12.n = 10;
+              res = _context10.v;
+              return _context10.a(2, res !== null && res !== void 0 ? res : 0n);
+            case 10:
+              _context10.p = 10;
+              _t6 = _context10.v;
+              if (!(_t6 instanceof Error && /Runtime entry RuntimeCall\(.+\) not found/.test(_t6.message))) {
+                _context10.n = 11;
                 break;
               }
-              return _context12.a(2, 0n);
-            case 10:
-              return _context12.a(2, 0n);
+              return _context10.a(2, 0n);
             case 11:
-              return _context12.a(2);
+              return _context10.a(2, 0n);
+            case 12:
+              return _context10.a(2);
           }
-        }, _callee12, this, [[7, 9], [1, 3]]);
+        }, _callee10, this, [[8, 10], [1, 3]]);
       }));
-      function getDeliveryFee(_x20, _x21, _x22, _x23, _x24) {
+      function getDeliveryFee(_x18, _x19, _x20, _x21, _x22) {
         return _getDeliveryFee.apply(this, arguments);
       }
       return getDeliveryFee;
@@ -1466,7 +1450,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(chain, localXcm, forwardedXcm, asset, version) {
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(chain, localXcm, forwardedXcm, asset, version) {
         var _this4 = this,
           _execFeeRes$value;
         var transformXcm,
@@ -1475,85 +1459,92 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
           queryWeight,
           weight,
           assetLocalizedLoc,
+          assetId,
+          versionedAssetId,
           transformedAssetLoc,
           execFeeRes,
           execFee,
           bridgeHubExecFee,
           deliveryFee,
-          _args13 = arguments,
-          _t6;
-        return _regenerator().w(function (_context14) {
-          while (1) switch (_context14.n) {
+          _args11 = arguments,
+          _t7;
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              transformXcm = _args13.length > 5 && _args13[5] !== undefined ? _args13[5] : false;
-              overridenWeight = _args13.length > 6 ? _args13[6] : undefined;
+              transformXcm = _args11.length > 5 && _args11[5] !== undefined ? _args11[5] : false;
+              overridenWeight = _args11.length > 6 ? _args11[6] : undefined;
               transformedXcm = transformXcm ? _transform(localXcm) : localXcm;
               queryWeight = /*#__PURE__*/function () {
-                var _ref12 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13() {
+                var _ref11 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
                   var weightRes;
-                  return _regenerator().w(function (_context13) {
-                    while (1) switch (_context13.n) {
+                  return _regenerator().w(function (_context11) {
+                    while (1) switch (_context11.n) {
                       case 0:
-                        _context13.n = 1;
-                        return _this4.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(transformedXcm);
+                        _context11.n = 1;
+                        return _this4.typedApi.apis.XcmPaymentApi.query_xcm_weight(transformedXcm);
                       case 1:
-                        weightRes = _context13.v;
-                        return _context13.a(2, weightRes.value);
+                        weightRes = _context11.v;
+                        if (weightRes.success) {
+                          _context11.n = 2;
+                          break;
+                        }
+                        throw new RuntimeApiError("Failed to get XCM weight for payment fee calculation. Reason: ".concat(JSON.stringify(weightRes.value)));
+                      case 2:
+                        return _context11.a(2, weightRes.value);
                     }
-                  }, _callee13);
+                  }, _callee11);
                 }));
                 return function queryWeight() {
-                  return _ref12.apply(this, arguments);
+                  return _ref11.apply(this, arguments);
                 };
               }();
               if (!overridenWeight) {
-                _context14.n = 1;
+                _context12.n = 1;
                 break;
               }
-              _t6 = {
+              _t7 = {
                 proof_size: overridenWeight === null || overridenWeight === void 0 ? void 0 : overridenWeight.proofSize,
                 ref_time: overridenWeight === null || overridenWeight === void 0 ? void 0 : overridenWeight.refTime
               };
-              _context14.n = 3;
+              _context12.n = 3;
               break;
             case 1:
-              _context14.n = 2;
+              _context12.n = 2;
               return queryWeight();
             case 2:
-              _t6 = _context14.v;
+              _t7 = _context12.v;
             case 3:
-              weight = _t6;
+              weight = _t7;
               assetLocalizedLoc = localizeLocation(chain, asset.location);
-              transformedAssetLoc = _transform(assetLocalizedLoc);
-              _context14.n = 4;
-              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_weight_to_asset_fee(weight, {
-                type: version,
-                value: transformedAssetLoc
-              });
+              assetId = createAssetId(version, assetLocalizedLoc);
+              versionedAssetId = addXcmVersionHeader(assetId, version);
+              transformedAssetLoc = _transform(versionedAssetId);
+              _context12.n = 4;
+              return this.typedApi.apis.XcmPaymentApi.query_weight_to_asset_fee(weight, transformedAssetLoc);
             case 4:
-              execFeeRes = _context14.v;
+              execFeeRes = _context12.v;
               execFee = typeof (execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.value) === 'bigint' ? execFeeRes.value : 0n;
               if (!(chain.startsWith('BridgeHub') && (execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.success) === false && (execFeeRes === null || execFeeRes === void 0 || (_execFeeRes$value = execFeeRes.value) === null || _execFeeRes$value === void 0 ? void 0 : _execFeeRes$value.type) === 'AssetNotFound')) {
-                _context14.n = 6;
+                _context12.n = 6;
                 break;
               }
-              _context14.n = 5;
+              _context12.n = 5;
               return this.getBridgeHubFallbackExecFee(chain, weight, asset, version);
             case 5:
-              bridgeHubExecFee = _context14.v;
+              bridgeHubExecFee = _context12.v;
               if (typeof bridgeHubExecFee === 'bigint') {
                 execFee = bridgeHubExecFee;
               }
             case 6:
-              _context14.n = 7;
+              _context12.n = 7;
               return this.getDeliveryFee(chain, forwardedXcm, asset, assetLocalizedLoc, version);
             case 7:
-              deliveryFee = _context14.v;
-              return _context14.a(2, execFee + deliveryFee);
+              deliveryFee = _context12.v;
+              return _context12.a(2, execFee + deliveryFee);
           }
-        }, _callee14, this);
+        }, _callee12, this);
       }));
-      function getXcmPaymentApiFee(_x25, _x26, _x27, _x28, _x29) {
+      function getXcmPaymentApiFee(_x23, _x24, _x25, _x26, _x27) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1561,45 +1552,45 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getBridgeHubFallbackExecFee",
     value: function () {
-      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(chain, weightValue, asset, version) {
+      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(chain, weightValue, asset, version) {
         var fallbackExecFeeRes, ahApi, assetHubChain, ahLocalizedLoc, convertedExecFee;
-        return _regenerator().w(function (_context15) {
-          while (1) switch (_context15.n) {
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
-              _context15.n = 1;
-              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_weight_to_asset_fee(weightValue, {
+              _context13.n = 1;
+              return this.typedApi.apis.XcmPaymentApi.query_weight_to_asset_fee(weightValue, {
                 type: version,
                 value: _transform(RELAY_LOCATION)
               });
             case 1:
-              fallbackExecFeeRes = _context15.v;
+              fallbackExecFeeRes = _context13.v;
               if (!(typeof (fallbackExecFeeRes === null || fallbackExecFeeRes === void 0 ? void 0 : fallbackExecFeeRes.value) !== 'bigint')) {
-                _context15.n = 2;
+                _context13.n = 2;
                 break;
               }
-              return _context15.a(2, undefined);
+              return _context13.a(2, undefined);
             case 2:
               ahApi = this.clone();
               assetHubChain = "AssetHub".concat(getRelayChainOf(chain));
-              _context15.n = 3;
+              _context13.n = 3;
               return ahApi.init(assetHubChain);
             case 3:
               ahLocalizedLoc = localizeLocation(assetHubChain, asset.location);
-              _context15.n = 4;
+              _context13.n = 4;
               return ahApi.quoteAhPrice(RELAY_LOCATION, ahLocalizedLoc, fallbackExecFeeRes.value, false);
             case 4:
-              convertedExecFee = _context15.v;
+              convertedExecFee = _context13.v;
               if (!(typeof convertedExecFee === 'bigint')) {
-                _context15.n = 5;
+                _context13.n = 5;
                 break;
               }
-              return _context15.a(2, convertedExecFee);
+              return _context13.a(2, convertedExecFee);
             case 5:
-              return _context15.a(2, undefined);
+              return _context13.a(2, undefined);
           }
-        }, _callee15, this);
+        }, _callee13, this);
       }));
-      function getBridgeHubFallbackExecFee(_x30, _x31, _x32, _x33) {
+      function getBridgeHubFallbackExecFee(_x28, _x29, _x30, _x31) {
         return _getBridgeHubFallbackExecFee.apply(this, arguments);
       }
       return getBridgeHubFallbackExecFee;
@@ -1607,57 +1598,57 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(_ref13) {
-        var _ref14, _processAssetsDeposit, _ref15, _ref16, _ref17, _ref18, _ref19;
-        var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, version, _getAssetsObject2, supportsDryRunApi, transformedOriginLocation, result, isSuccess, failureReason, actualWeight, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, fee, processedFee;
-        return _regenerator().w(function (_context16) {
-          while (1) switch (_context16.n) {
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(_ref12) {
+        var _ref13, _processAssetsDeposit, _ref14, _ref15, _ref16, _ref17, _ref18;
+        var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, version, _getAssetsObject2, supportsDryRunApi, transformedOriginLocation, result, isSuccess, failureReason, execResult, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, feeEventValue, fee, processedFee;
+        return _regenerator().w(function (_context14) {
+          while (1) switch (_context14.n) {
             case 0:
-              originLocation = _ref13.originLocation, xcm = _ref13.xcm, chain = _ref13.chain, origin = _ref13.origin, asset = _ref13.asset, feeAsset = _ref13.feeAsset, originFee = _ref13.originFee, amount = _ref13.amount, version = _ref13.version;
+              originLocation = _ref12.originLocation, xcm = _ref12.xcm, chain = _ref12.chain, origin = _ref12.origin, asset = _ref12.asset, feeAsset = _ref12.feeAsset, originFee = _ref12.originFee, amount = _ref12.amount, version = _ref12.version;
               _getAssetsObject2 = getAssetsObject(chain), supportsDryRunApi = _getAssetsObject2.supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context16.n = 1;
+                _context14.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
             case 1:
               transformedOriginLocation = _transform(originLocation);
-              _context16.n = 2;
-              return this.api.getUnsafeApi().apis.DryRunApi.dry_run_xcm(transformedOriginLocation, xcm);
+              _context14.n = 2;
+              return this.typedApi.apis.DryRunApi.dry_run_xcm(transformedOriginLocation, xcm);
             case 2:
-              result = _context16.v;
+              result = _context14.v;
               isSuccess = result.success && result.value.execution_result.type === 'Complete';
               if (isSuccess) {
-                _context16.n = 3;
+                _context14.n = 3;
                 break;
               }
               failureReason = extractDryRunXcmFailureReason(result);
-              return _context16.a(2, {
+              return _context14.a(2, {
                 success: false,
                 failureReason: failureReason,
                 asset: asset
               });
             case 3:
-              actualWeight = result.value.execution_result.value.used;
-              weight = actualWeight ? {
-                refTime: actualWeight.ref_time,
-                proofSize: actualWeight.proof_size
+              execResult = result.value.execution_result;
+              weight = execResult.type === 'Complete' ? {
+                refTime: execResult.value.used.ref_time,
+                proofSize: execResult.value.used.proof_size
               } : 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;
+              destParaId = extractDestParaId(forwardedXcms);
               if (!(hasXcmPaymentApiSupport(chain) && asset)) {
-                _context16.n = 5;
+                _context14.n = 5;
                 break;
               }
-              _context16.n = 4;
+              _context14.n = 4;
               return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset, version);
             case 4:
-              _fee = _context16.v;
+              _fee = _context14.v;
               if (!(typeof _fee === 'bigint')) {
-                _context16.n = 5;
+                _context14.n = 5;
                 break;
               }
-              return _context16.a(2, {
+              return _context14.a(2, {
                 success: true,
                 fee: _fee,
                 asset: asset,
@@ -1670,15 +1661,15 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['Balances', 'ForeignAssets', 'Assets'];
               isFeeAsset = origin === 'AssetHubPolkadot' && feeAsset && asset && isAssetEqual(feeAsset, asset);
-              feeAssetFeeEvent = (_ref14 = isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
+              feeAssetFeeEvent = (_ref13 = isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
                 return (event.type === 'ForeignAssets' || event.type === 'Assets') && event.value.type === 'Issued';
-              }) : undefined) !== null && _ref14 !== void 0 ? _ref14 : isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
+              }) : undefined) !== null && _ref13 !== void 0 ? _ref13 : 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 = (_ref15 = (_ref16 = (_ref17 = (_ref18 = (_ref19 = feeAssetFeeEvent !== null && feeAssetFeeEvent !== void 0 ? feeAssetFeeEvent : chain === 'Mythos' ? reversedEvents.find(function (event) {
+              feeEvent = (_ref14 = (_ref15 = (_ref16 = (_ref17 = (_ref18 = feeAssetFeeEvent !== null && feeAssetFeeEvent !== void 0 ? feeAssetFeeEvent : chain === 'Mythos' ? reversedEvents.find(function (event) {
                 return event.type === 'Balances' && event.value.type === 'Issued';
-              }) : undefined) !== null && _ref19 !== void 0 ? _ref19 : processedAssetsAmount !== undefined ? {
+              }) : undefined) !== null && _ref18 !== void 0 ? _ref18 : processedAssetsAmount !== undefined ? {
                 type: 'Assets',
                 value: {
                   type: 'Deposited',
@@ -1686,35 +1677,36 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                     amount: processedAssetsAmount
                   }
                 }
-              } : undefined) !== null && _ref18 !== void 0 ? _ref18 : origin === 'Mythos' || chain === 'AssetHubPolkadot' && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== 'DOT' ? reversedEvents.find(function (event) {
+              } : undefined) !== null && _ref17 !== void 0 ? _ref17 : 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 && _ref17 !== void 0 ? _ref17 :
+              }) : undefined) !== null && _ref16 !== void 0 ? _ref16 :
               // Prefer to Minted event
               reversedEvents.find(function (event) {
                 return ['Balances', 'ForeignAssets'].includes(event.type) && event.value.type === 'Minted';
-              })) !== null && _ref16 !== void 0 ? _ref16 :
+              })) !== null && _ref15 !== void 0 ? _ref15 :
               // Fallback an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.type) && event.value.type === 'Issued';
-              })) !== null && _ref15 !== void 0 ? _ref15 : reversedEvents.find(function (event) {
+              })) !== null && _ref14 !== void 0 ? _ref14 : reversedEvents.find(function (event) {
                 return ['Currencies', 'Tokens'].includes(event.type) && event.value.type === 'Deposited';
               });
               if (feeEvent) {
-                _context16.n = 6;
+                _context14.n = 6;
                 break;
               }
-              return _context16.a(2, Promise.resolve({
+              return _context14.a(2, Promise.resolve({
                 success: false,
                 failureReason: 'Cannot determine destination fee. No fee event found',
                 asset: asset
               }));
             case 6:
-              fee = feeEvent.type === 'AssetConversion' ? feeEvent.value.value.amount_in : feeEvent.value.value.amount;
+              feeEventValue = feeEvent.value.value;
+              fee = feeEvent.type === 'AssetConversion' ? feeEventValue.amount_in : feeEventValue.amount;
               if (feeAssetFeeEvent) {
-                fee = amount - originFee - feeEvent.value.value.amount;
+                fee = amount - originFee - feeEventValue.amount;
               }
               processedFee = (isRelayChain(chain) || chain.includes('AssetHub')) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT' ? padValueBy(fee, 30) : fee;
-              return _context16.a(2, Promise.resolve({
+              return _context14.a(2, Promise.resolve({
                 success: true,
                 fee: processedFee,
                 asset: asset,
@@ -1723,9 +1715,9 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 destParaId: destParaId
               }));
           }
-        }, _callee16, this);
+        }, _callee14, this);
       }));
-      function getDryRunXcm(_x34) {
+      function getDryRunXcm(_x32) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1733,18 +1725,18 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getBridgeStatus",
     value: function () {
-      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17() {
-        var outboundOperatingMode;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
+        var mode;
+        return _regenerator().w(function (_context15) {
+          while (1) switch (_context15.n) {
             case 0:
-              _context17.n = 1;
-              return this.api.getUnsafeApi().query.EthereumOutboundQueue.OperatingMode.getValue();
+              _context15.n = 1;
+              return this.untypedApi.query.EthereumOutboundQueue.OperatingMode.getValue();
             case 1:
-              outboundOperatingMode = _context17.v;
-              return _context17.a(2, outboundOperatingMode.type);
+              mode = _context15.v;
+              return _context15.a(2, mode.type);
           }
-        }, _callee17, this);
+        }, _callee15, this);
       }));
       function getBridgeStatus() {
         return _getBridgeStatus.apply(this, arguments);
@@ -1782,22 +1774,22 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "signAndSubmit",
     value: function () {
-      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(tx, sender) {
+      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(tx, sender) {
         var signer, _yield$tx$signAndSubm, txHash;
-        return _regenerator().w(function (_context18) {
-          while (1) switch (_context18.n) {
+        return _regenerator().w(function (_context16) {
+          while (1) switch (_context16.n) {
             case 0:
               signer = isSenderSigner(sender) ? sender : createDevSigner(sender);
-              _context18.n = 1;
+              _context16.n = 1;
               return tx.signAndSubmit(signer);
             case 1:
-              _yield$tx$signAndSubm = _context18.v;
+              _yield$tx$signAndSubm = _context16.v;
               txHash = _yield$tx$signAndSubm.txHash;
-              return _context18.a(2, txHash);
+              return _context16.a(2, txHash);
           }
-        }, _callee18);
+        }, _callee16);
       }));
-      function signAndSubmit(_x35, _x36) {
+      function signAndSubmit(_x33, _x34) {
         return _signAndSubmit.apply(this, arguments);
       }
       return signAndSubmit;
@@ -1805,13 +1797,13 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "signAndSubmitFinalized",
     value: function () {
-      var _signAndSubmitFinalized = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(tx, sender) {
+      var _signAndSubmitFinalized = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(tx, sender) {
         var signer;
-        return _regenerator().w(function (_context19) {
-          while (1) switch (_context19.n) {
+        return _regenerator().w(function (_context17) {
+          while (1) switch (_context17.n) {
             case 0:
               signer = isSenderSigner(sender) ? sender : createDevSigner(sender);
-              return _context19.a(2, new Promise(function (resolve, reject) {
+              return _context17.a(2, new Promise(function (resolve, reject) {
                 tx.signSubmitAndWatch(signer).subscribe({
                   next: function next(event) {
                     if (event.type === 'finalized' || event.type === 'txBestBlocksState' && event.found) {
@@ -1828,9 +1820,9 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 });
               }));
           }
-        }, _callee19);
+        }, _callee17);
       }));
-      function signAndSubmitFinalized(_x37, _x38) {
+      function signAndSubmitFinalized(_x35, _x36) {
         return _signAndSubmitFinalized.apply(this, arguments);
       }
       return signAndSubmitFinalized;
@@ -1862,6 +1854,15 @@ var createPapiApiCall = function createPapiApiCall(apiCall) {
     };
   }();
 };
+var extractDestParaId = function extractDestParaId(forwardedXcms) {
+  if (forwardedXcms.length === 0) return undefined;
+  var interior = forwardedXcms[0].value.interior;
+  if (interior.type === 'Here') return 0;
+  if (interior.type === 'X1' && interior.value.type === 'Parachain') {
+    return interior.value.value;
+  }
+  return undefined;
+};
 var findFailingEvent = function findFailingEvent(result) {
   var _result$value;
   return (_result$value = result.value) === null || _result$value === void 0 || (_result$value = _result$value.emitted_events) === null || _result$value === void 0 ? void 0 : _result$value.find(function (event) {