@paraspell/sdk 13.11.0 → 14.1.0-rc

package/README.md

@@ -33,7 +33,7 @@ ParaSpell XCM SDK is the 🥇 in the ecosystem to support **PolkadotJS**, **Dedo
 
 ```bash
 #Polkadot API peer dependencies
-npm install | pnpm add | yarn add polkadot-api 
+npm install | pnpm add | yarn add polkadot-api @paraspell/descriptors
 ```
 
 ### Install SDK 
@@ -127,10 +127,7 @@ import * as paraspell from '@paraspell/sdk'
 
 > [!NOTE]
 > **Latest news:**
-> - V12 > V13 Migration guide: https://paraspell.github.io/docs/migration/v12-to-v13.html
-> - Swap extension is now available on every XCM SDK version: https://paraspell.github.io/docs/xcm-sdk/getting-started.html#install-swap-extension
-> - EVM extension is now available: https://paraspell.github.io/docs/xcm-sdk/getting-started.html#install-evm-extension
-> - Snowbridge extension is now available: https://paraspell.github.io/docs/xcm-sdk/getting-started.html#install-snowbridge-extension
+> - V13 > V14 Migration guide: https://paraspell.github.io/docs/migration/v13-to-v14.html
 
 
 
@@ -345,7 +342,7 @@ SDK features ability to add custom chain and/or custom assets simply by adding i
           {
             symbol: 'USDC',
             decimals: 6,
-            existentialDeposit: 0.1,
+            existentialDeposit: 100000000, //Needs to be in plancks
             location: {
               parents: 1,
               interior: { X3: [{ Parachain: 1000 }, { PalletInstance: 50 }, {
@@ -364,7 +361,7 @@ SDK features ability to add custom chain and/or custom assets simply by adding i
           symbol: 'MYNEWUSD',
           decimals: 6,
           assetId: '9999',
-          existentialDeposit: 0.1,
+          existentialDeposit: 100000000, //Needs to be in plancks
           location: {
             parents: 0,
             interior: { X2: [{ PalletInstance: 50 }, { GeneralIndex: 9999 }] }
@@ -375,7 +372,7 @@ SDK features ability to add custom chain and/or custom assets simply by adding i
           symbol: 'USDT',
           decimals: 6,
           assetId: '1984',
-          existentialDeposit: 0.1,
+          existentialDeposit: 100000000, //Needs to be in plancks
           location: {
             parents: 0,
             interior: { X2: [{ PalletInstance: 50 }, { GeneralIndex: 1984 }] }

package/dist/index.d.ts

@@ -1,14 +1,14 @@
 import * as _paraspell_sdk_core from '@paraspell/sdk-core';
-import { TChain, TSwapEvent as TSwapEvent$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, TSubstrateChain, TEvmTransferOptions, TCurrencyInputWithAmount, TBuilderOptions, TApiOrUrl, GeneralBuilder as GeneralBuilder$1, TCustomChainFrom, TTransferBaseOptions, TCustomChainInput, TChainAssetsInfo, TGetXcmFeeBaseOptions, TCreateBaseSwapXcmOptions } from '@paraspell/sdk-core';
+import { TSwapEvent as TSwapEvent$1, Foreign, ForeignAbstract, Native, findAssetInfo, getAllAssetsSymbols, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, isChainEvm, TSubstrateChain, TBuilderOptions, TApiOrUrl, GeneralBuilder as GeneralBuilder$1, TCustomChainFrom, TTransferBaseOptions, TCustomChainInput, TChainAssetsInfo, TGetXcmFeeBaseOptions, TCreateBaseSwapXcmOptions } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import * as polkadot_api from 'polkadot-api';
-import { PolkadotClient, Transaction, PolkadotSigner } from 'polkadot-api';
-import { WalletClient } from 'viem';
+import { PolkadotClient, Transaction } from 'polkadot-api';
+import { RawTxCreator } from 'polkadot-api/tx-creator';
+import * as _paraspell_descriptors from '@paraspell/descriptors';
 
 type TPapiApi = PolkadotClient;
-type TPapiSigner = PolkadotSigner;
-type TPapiTransaction = Transaction<any, any>;
-type TEvmChainFrom = Extract<TChain, 'Moonbeam' | 'Moonriver' | 'Darwinia'>;
+type TPapiSigner = RawTxCreator;
+type TPapiTransaction = Transaction;
 type TSwapEvent = TSwapEvent$1<TPapiApi, TPapiTransaction>;
 
 /**
@@ -25,11 +25,8 @@ declare const getBalance: (options: _paraspell_sdk_core.TGetBalanceCommonOptions
 declare const assets_Foreign: typeof Foreign;
 declare const assets_ForeignAbstract: typeof ForeignAbstract;
 declare const assets_Native: typeof Native;
-declare const assets_Override: typeof Override;
 declare const assets_findAssetInfo: typeof findAssetInfo;
 declare const assets_getAllAssetsSymbols: typeof getAllAssetsSymbols;
-declare const assets_getAssetDecimals: typeof getAssetDecimals;
-declare const assets_getAssetId: typeof getAssetId;
 declare const assets_getAssets: typeof getAssets;
 declare const assets_getAssetsObject: typeof getAssetsObject;
 declare const assets_getBalance: typeof getBalance;
@@ -40,18 +37,14 @@ declare const assets_getOtherAssets: typeof getOtherAssets;
 declare const assets_getRelayChainSymbol: typeof getRelayChainSymbol;
 declare const assets_getSupportedAssets: typeof getSupportedAssets;
 declare const assets_getTChain: typeof getTChain;
-declare const assets_hasSupportForAsset: typeof hasSupportForAsset;
 declare const assets_isChainEvm: typeof isChainEvm;
 declare namespace assets {
   export {
     assets_Foreign as Foreign,
     assets_ForeignAbstract as ForeignAbstract,
     assets_Native as Native,
-    assets_Override as Override,
     assets_findAssetInfo as findAssetInfo,
     assets_getAllAssetsSymbols as getAllAssetsSymbols,
-    assets_getAssetDecimals as getAssetDecimals,
-    assets_getAssetId as getAssetId,
     assets_getAssets as getAssets,
     assets_getAssetsObject as getAssetsObject,
     assets_getBalance as getBalance,
@@ -62,102 +55,26 @@ declare namespace assets {
     assets_getRelayChainSymbol as getRelayChainSymbol,
     assets_getSupportedAssets as getSupportedAssets,
     assets_getTChain as getTChain,
-    assets_hasSupportForAsset as hasSupportForAsset,
     assets_isChainEvm as isChainEvm,
   };
 }
 
 declare const convertSs58: (address: string, chain: TSubstrateChain) => string;
 
-/**
- * Builder class for constructing transfers from Ethereum to Polkadot.
- *
- * @deprecated EvmBuilder is deprecated. Please use the Builder class instead.
- */
-declare class EvmBuilderCore<TApi, TRes, TSigner, T extends Partial<TEvmTransferOptions<TApi, TRes, TSigner>> = object> {
-    protected readonly _options: T;
-    constructor(options: T);
-    from(chain: TEvmChainFrom): EvmBuilderCore<TApi, TRes, TSigner, T & {
-        from: TEvmChainFrom;
-    }>;
-    /**
-     * Specifies the destination chain on Polkadot.
-     *
-     * @param chain - The Polkadot chain to which the transfer will be made.
-     * @returns An instance of EvmBuilder
-     */
-    to(chain: TChain): EvmBuilderCore<TApi, TRes, TSigner, T & {
-        to: TChain;
-    }>;
-    /**
-     * Specifies the currency to transfer.
-     *
-     * @param currency - The currency to be transferred.
-     * @returns An instance of EvmBuilder
-     */
-    currency(currency: TCurrencyInputWithAmount): EvmBuilderCore<TApi, TRes, TSigner, T & {
-        currency: TCurrencyInputWithAmount;
-    }>;
-    /**
-     * Specifies the recipient address on Polkadot.
-     *
-     * @param address - The Polkadot address to receive the transfer.
-     * @returns An instance of EvmBuilder
-     */
-    recipient(address: string): EvmBuilderCore<TApi, TRes, TSigner, T & {
-        recipient: string;
-    }>;
-    /**
-     * Sets the asset hub address. This is used for transfers that go through the Asset Hub.
-     *
-     * @param address - The address to be used.
-     * @returns An instance of EvmBuilder
-     */
-    ahAddress(address: string | undefined): EvmBuilderCore<unknown, unknown, unknown, T & {
-        ahAddress: string | undefined;
-    }>;
-    /**
-     * Specifies the signer for the Ethereum transaction.
-     *
-     * @param signer - The Ethereum signer to authorize the transfer.
-     * @returns An instance of EvmBuilder
-     */
-    signer(signer: WalletClient): EvmBuilderCore<TApi, TRes, TSigner, T & {
-        signer: WalletClient;
-    }>;
-    /**
-     * Builds and executes the transfer from Ethereum to Polkadot.
-     *
-     * @throws Error if any required parameters are missing.
-     */
-    build(this: EvmBuilderCore<TApi, TRes, TSigner, TEvmTransferOptions<TApi, TRes, TSigner>>): Promise<string>;
-}
-
 /**
  * Creates a new Builder instance.
  *
  * @param options - Either an existing API instance, a WS URL, or a config object.
  * @returns A new Builder instance.
  */
-declare const Builder: <const TOpts extends TBuilderOptions<TApiOrUrl<TPapiApi>>>(options?: TOpts) => GeneralBuilder$1<PolkadotClient, TPapiTransaction, PolkadotSigner, object, TCustomChainFrom<TOpts>>;
-type GeneralBuilder<T extends Partial<TTransferBaseOptions<TPapiApi, TPapiTransaction, TPapiSigner>> = object, TCustomChain extends string = never> = GeneralBuilder$1<PolkadotClient, TPapiTransaction, PolkadotSigner, T, TCustomChain>;
-/** @deprecated EvmBuilder is deprecated. Please use the Builder class instead. */
-declare const EvmBuilder: (api?: TBuilderOptions<TApiOrUrl<TPapiApi>>) => EvmBuilderCore<unknown, unknown, unknown, {
-    api: _paraspell_sdk_core.PolkadotApi<PolkadotClient, polkadot_api.Transaction<any, Record<string, {
-        value: any;
-        additionalSigned: any;
-    } | {
-        value: any;
-    } | {
-        additionalSigned: any;
-    }> | Partial<any>>, any, never>;
-}>;
+declare const Builder: <const TOpts extends TBuilderOptions<TApiOrUrl<TPapiApi>>>(options?: TOpts) => GeneralBuilder$1<PolkadotClient, TPapiTransaction, RawTxCreator, object, TCustomChainFrom<TOpts>>;
+type GeneralBuilder<T extends Partial<TTransferBaseOptions<TPapiApi, TPapiTransaction, TPapiSigner>> = object, TCustomChain extends string = never> = GeneralBuilder$1<PolkadotClient, TPapiTransaction, RawTxCreator, T, TCustomChain>;
 
 declare const hydrateCustomChain: <TCustomChain extends string>(name: TCustomChain, input: TCustomChainInput) => Promise<TChainAssetsInfo>;
 
 declare const dryRun: (options: _paraspell_sdk_core.TDryRunBaseOptions<TPapiTransaction, never> & {
     api?: TApiOrUrl<TPapiApi>;
-}) => Promise<_paraspell_sdk_core.TDryRunResult>;
+}) => Promise<_paraspell_sdk_core.TDryRunResult<never>>;
 declare const dryRunOrigin: (options: _paraspell_sdk_core.TDryRunCallBaseOptions<TPapiTransaction, never> & {
     api?: TApiOrUrl<TPapiApi>;
 }) => Promise<_paraspell_sdk_core.TDryRunChainResult>;
@@ -169,15 +86,8 @@ declare const getBridgeStatus: (ahApi?: TApiOrUrl<TPapiApi>) => Promise<_paraspe
 declare const getOriginXcmFee: (options: _paraspell_sdk_core.TGetOriginXcmFeeBaseOptions<TPapiTransaction, boolean, never> & {
     api?: TApiOrUrl<TPapiApi>;
 }) => Promise<_paraspell_sdk_core.TXcmFeeDetailWithForwardedXcm<boolean>>;
-declare const getXcmFee: <TDisableFallback extends boolean>(options: TGetXcmFeeBaseOptions<TPapiTransaction, TDisableFallback>, builderOptions?: TBuilderOptions<TApiOrUrl<TPapiApi>>) => Promise<_paraspell_sdk_core.TGetXcmFeeResult<TDisableFallback>>;
-declare const handleSwapExecuteTransfer: (options: TCreateBaseSwapXcmOptions, builderOptions?: TBuilderOptions<TApiOrUrl<TPapiApi>>) => Promise<polkadot_api.Transaction<any, Record<string, {
-    value: any;
-    additionalSigned: any;
-} | {
-    value: any;
-} | {
-    additionalSigned: any;
-}> | Partial<any>>>;
+declare const getXcmFee: <TDisableFallback extends boolean>(options: TGetXcmFeeBaseOptions<TPapiTransaction, TDisableFallback>, builderOptions?: TBuilderOptions<TApiOrUrl<TPapiApi>>) => Promise<_paraspell_sdk_core.TGetXcmFeeResult<TDisableFallback, never>>;
+declare const handleSwapExecuteTransfer: (options: TCreateBaseSwapXcmOptions, builderOptions?: TBuilderOptions<TApiOrUrl<TPapiApi>>) => Promise<polkadot_api.Transaction<_paraspell_descriptors.Ahp>>;
 
 declare const transfer_dryRun: typeof dryRun;
 declare const transfer_dryRunOrigin: typeof dryRunOrigin;
@@ -199,9 +109,21 @@ declare namespace transfer {
 }
 
 declare const createChainClient: (chain: TSubstrateChain, api?: TBuilderOptions<TApiOrUrl<TPapiApi>>) => Promise<polkadot_api.PolkadotClient>;
+declare const getPaymentInfo: (tx: TPapiTransaction, address: string) => Promise<{
+    weight: {
+        ref_time: bigint;
+        proof_size: bigint;
+    };
+    class: polkadot_api.Enum<{
+        Normal: undefined;
+        Operational: undefined;
+        Mandatory: undefined;
+    }>;
+    partial_fee: bigint;
+}>;
 
 declare const checkAndConvertToNumberOrBigInt: (input: string) => number | bigint;
 declare const transform: (obj: any) => any;
 
-export { Builder, EvmBuilder, assets, checkAndConvertToNumberOrBigInt, convertSs58, createChainClient, dryRun, dryRunOrigin, getBalance, getBridgeStatus, getOriginXcmFee, getParaEthTransferFees, getXcmFee, handleSwapExecuteTransfer, hydrateCustomChain, transform, transfer as xcmPallet };
-export type { GeneralBuilder, TEvmChainFrom, TPapiApi, TPapiSigner, TPapiTransaction, TSwapEvent };
+export { Builder, assets, checkAndConvertToNumberOrBigInt, convertSs58, createChainClient, dryRun, dryRunOrigin, getBalance, getBridgeStatus, getOriginXcmFee, getParaEthTransferFees, getPaymentInfo, getXcmFee, handleSwapExecuteTransfer, hydrateCustomChain, transform, transfer as xcmPallet };
+export type { GeneralBuilder, TPapiApi, TPapiSigner, TPapiTransaction, TSwapEvent };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { getNativeAssetSymbol, getOtherAssets, isSenderSigner, getEvmPrivateKeyHex, NumberFormatError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, InvalidAddressError, BatchMode, isConfig, isCustomChain, PolkadotApi, Parents, getFailingInstruction, replaceBigInt, RuntimeApiUnavailableError, wrapTxBypass, RuntimeApiError, localizeLocation, isAssetEqual, createAssetId, addXcmVersionHeader, RELAY_LOCATION, isRelayChain, padValueBy, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, CustomChainInvalidError, 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, isCustomChain, PolkadotApi, Parents, buildDryRunError, replaceBigInt, RuntimeApiUnavailableError, wrapTxBypass, RuntimeApiError, localizeLocation, isAssetEqual, createAssetId, addXcmVersionHeader, RELAY_LOCATION, isRelayChain, padValueBy, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, findAssetInfo, getAllAssetsSymbols, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, isChainEvm, convertSs58 as convertSs58$1, Builder as Builder$1, CustomChainInvalidError, 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';
@@ -6,8 +6,9 @@ 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, getSs58AddressInfo } from 'polkadot-api';
-import { getPolkadotSigner } from 'polkadot-api/signer';
+import { getTxCreator, getFakeTxCreator } from 'polkadot-api/tx-creator';
 import { blake2b } from '@noble/hashes/blake2.js';
+import { hydration } from '@paraspell/descriptors';
 import { unifyMetadata, decAnyMetadata } from '@polkadot-api/substrate-bindings';
 import { toHex } from 'polkadot-api/utils';
 import { createWsClient } from 'polkadot-api/ws';
@@ -418,14 +419,14 @@ var createSr25519Keypair = function createSr25519Keypair(path) {
 };
 var createSr25519Signer = function createSr25519Signer(path) {
   var keyPair = createSr25519Keypair(path);
-  return getPolkadotSigner(keyPair.publicKey, 'Sr25519', keyPair.sign);
+  return getTxCreator(keyPair.publicKey, 'Sr25519', keyPair.sign);
 };
 var resolveEcdsaAddress = function resolveEcdsaAddress(privateKey) {
   return keccak_256(secp256k1.getPublicKey(privateKey, false).slice(1)).slice(-20);
 };
 var createEcdsaSigner = function createEcdsaSigner(privateKey) {
   var publicAddress = resolveEcdsaAddress(privateKey);
-  return getPolkadotSigner(publicAddress, 'Ecdsa', function (input) {
+  return getTxCreator(publicAddress, 'Ecdsa', function (input) {
     return signEcdsa(input, privateKey);
   });
 };
@@ -750,22 +751,22 @@ var extractDryRunXcmFailureReason = function extractDryRunXcmFailureReason(resul
   var executionResult = result === null || result === void 0 || (_result$value = result.value) === null || _result$value === void 0 ? void 0 : _result$value.execution_result;
   var error = executionResult === null || executionResult === void 0 || (_executionResult$valu = executionResult.value) === null || _executionResult$valu === void 0 ? void 0 : _executionResult$valu.error;
   var failureType = (_ref2 = (_ref3 = (_ref4 = (_error$error$type = error === null || error === void 0 || (_error$error = error.error) === null || _error$error === void 0 ? void 0 : _error$error.type) !== null && _error$error$type !== void 0 ? _error$error$type : error === null || error === void 0 || (_error$value = error.value) === null || _error$value === void 0 || (_error$value = _error$value.error) === null || _error$value === void 0 ? void 0 : _error$value.type) !== null && _ref4 !== void 0 ? _ref4 : error === null || error === void 0 || (_error$value2 = error.value) === null || _error$value2 === void 0 || (_error$value2 = _error$value2.value) === null || _error$value2 === void 0 ? void 0 : _error$value2.type) !== null && _ref3 !== void 0 ? _ref3 : error === null || error === void 0 || (_error$value3 = error.value) === null || _error$value3 === void 0 ? void 0 : _error$value3.type) !== null && _ref2 !== void 0 ? _ref2 : error === null || error === void 0 ? void 0 : error.type;
-  var failureIndex = typeof (error === null || error === void 0 ? void 0 : error.index) === 'number' ? error.index : undefined;
+  var instructionIndex = typeof (error === null || error === void 0 ? void 0 : error.index) === 'number' ? error.index : undefined;
   if (typeof failureType === 'string') {
     return {
-      failureReason: failureType,
-      failureIndex: failureIndex
+      reason: failureType,
+      instructionIndex: instructionIndex
     };
   }
   if (typeof (executionResult === null || executionResult === void 0 ? void 0 : executionResult.type) === 'string') {
     return {
-      failureReason: executionResult.type,
-      failureIndex: failureIndex
+      reason: executionResult.type,
+      instructionIndex: instructionIndex
     };
   }
   return {
-    failureReason: JSON.stringify((_ref5 = (_result$value2 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value2 !== void 0 ? _result$value2 : result) !== null && _ref5 !== void 0 ? _ref5 : 'Unknown error structure', replaceBigInt),
-    failureIndex: failureIndex
+    reason: JSON.stringify((_ref5 = (_result$value2 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value2 !== void 0 ? _result$value2 : result) !== null && _ref5 !== void 0 ? _ref5 : 'Unknown error structure', replaceBigInt),
+    instructionIndex: instructionIndex
   };
 };
 var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
@@ -774,7 +775,6 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     _classCallCheck(this, PapiApi);
     _this = _callSuper(this, PapiApi, arguments);
     _this.type = 'PAPI';
-    _this._untypedApi = null;
     return _this;
   }
   _inherits(PapiApi, _PolkadotApi);
@@ -786,8 +786,32 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "untypedApi",
     get: function get() {
-      if (!this._untypedApi) this._untypedApi = this.api.getUnsafeApi();
-      return this._untypedApi;
+      var _this$_untypedApi;
+      return (_this$_untypedApi = this._untypedApi) !== null && _this$_untypedApi !== void 0 ? _this$_untypedApi : this._untypedApi = this.api.getUnsafeApi();
+    }
+  }, {
+    key: "ahpApi",
+    get: function get() {
+      var _this$_ahpApi;
+      return (_this$_ahpApi = this._ahpApi) !== null && _this$_ahpApi !== void 0 ? _this$_ahpApi : this._ahpApi = this.api.getUnsafeApi();
+    }
+  }, {
+    key: "bridgeHubApi",
+    get: function get() {
+      var _this$_bridgeHubApi;
+      return (_this$_bridgeHubApi = this._bridgeHubApi) !== null && _this$_bridgeHubApi !== void 0 ? _this$_bridgeHubApi : this._bridgeHubApi = this.api.getUnsafeApi();
+    }
+  }, {
+    key: "hydrationApi",
+    get: function get() {
+      var _this$_hydrationApi;
+      return (_this$_hydrationApi = this._hydrationApi) !== null && _this$_hydrationApi !== void 0 ? _this$_hydrationApi : this._hydrationApi = this.api.getTypedApi(hydration);
+    }
+  }, {
+    key: "moonbeamApi",
+    get: function get() {
+      var _this$_moonbeamApi;
+      return (_this$_moonbeamApi = this._moonbeamApi) !== null && _this$_moonbeamApi !== void 0 ? _this$_moonbeamApi : this._moonbeamApi = this.api.getUnsafeApi();
     }
   }, {
     key: "accountToHex",
@@ -875,7 +899,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     key: "callBatchMethod",
     value: function callBatchMethod(calls, mode) {
       var method = mode === BatchMode.BATCH_ALL ? 'batch_all' : 'batch';
-      return this.untypedApi.tx.Utility[method]({
+      return this.ahpApi.tx.Utility[method]({
         calls: calls.map(function (_ref9) {
           var decodedCall = _ref9.decodedCall;
           return decodedCall;
@@ -886,15 +910,14 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     key: "callDispatchAsMethod",
     value: function callDispatchAsMethod(_ref0, address) {
       var decodedCall = _ref0.decodedCall;
-      var origin = {
-        type: 'system',
-        value: {
-          type: 'Signed',
-          value: address
-        }
-      };
-      return this.untypedApi.tx.Utility.dispatch_as({
-        as_origin: origin,
+      return this.ahpApi.tx.Utility.dispatch_as({
+        as_origin: {
+          type: 'system',
+          value: {
+            type: 'Signed',
+            value: address
+          }
+        },
         call: decodedCall
       });
     }
@@ -907,13 +930,14 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
           while (1) switch (_context3.n) {
             case 0:
               transformedObj = _transform(obj);
-              tx = this.untypedApi.tx.PolkadotXcm.send({
+              tx = this.ahpApi.tx.PolkadotXcm.send({
                 dest: {
                   type: version,
                   value: {
                     parents: Parents.ZERO,
                     interior: {
-                      type: 'Here'
+                      type: 'Here',
+                      value: undefined
                     }
                   }
                 },
@@ -1073,19 +1097,19 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getPaymentInfo",
     value: function () {
-      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(tx, address) {
-        var _yield$tx$getPaymentI, partial_fee, _yield$tx$getPaymentI2, proof_size, ref_time;
+      var _getPaymentInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(tx, address) {
+        var _yield$_getPaymentInf, partial_fee, _yield$_getPaymentInf2, proof_size, ref_time;
         return _regenerator().w(function (_context8) {
           while (1) switch (_context8.n) {
             case 0:
               _context8.n = 1;
-              return tx.getPaymentInfo(address);
+              return getPaymentInfo(tx, address);
             case 1:
-              _yield$tx$getPaymentI = _context8.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;
+              _yield$_getPaymentInf = _context8.v;
+              partial_fee = _yield$_getPaymentInf.partial_fee;
+              _yield$_getPaymentInf2 = _yield$_getPaymentInf.weight;
+              proof_size = _yield$_getPaymentInf2.proof_size;
+              ref_time = _yield$_getPaymentInf2.ref_time;
               return _context8.a(2, {
                 partialFee: partial_fee,
                 weight: {
@@ -1096,15 +1120,15 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
           }
         }, _callee8);
       }));
-      function getPaymentInfo(_x9, _x0) {
-        return _getPaymentInfo.apply(this, arguments);
+      function getPaymentInfo$1(_x9, _x0) {
+        return _getPaymentInfo2.apply(this, arguments);
       }
-      return getPaymentInfo;
+      return getPaymentInfo$1;
     }()
   }, {
     key: "getEvmStorage",
     value: function getEvmStorage(contract, slot) {
-      return this.untypedApi.query.EVM.AccountStorages.getKey(contract, slot);
+      return this.moonbeamApi.query.EVM.AccountStorages.getKey(contract, slot);
     }
   }, {
     key: "getFromRpc",
@@ -1179,7 +1203,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               });
             case 1:
               _context1.n = 2;
-              return this.untypedApi.query.MultiTransactionPayment.AccountCurrencyMap.getValue(address);
+              return this.hydrationApi.query.MultiTransactionPayment.AccountCurrencyMap.getValue(address);
             case 2:
               assetId = _context1.v;
               if (!(assetId === undefined)) {
@@ -1210,7 +1234,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     value: function () {
       var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(options) {
         var _this2 = this;
-        var tx, chain, destination, address, feeAsset, bypassOptions, version, _options$useRootOrigi, useRootOrigin, basePayload, resolvedTx, performDryRunCall, getExecutionSuccessFromResult, findFailureObjectFromResult, extractFailureReasonFromResult, result, message, isSuccess, resolvedFeeAsset, _result2, failureOutputReason, actualWeight, weight, forwardedXcms, destParaId, USE_XCM_PAYMENT_API_CHAINS, overriddenWeight, xcmFee, _yield$this$getPaymen, executionFee, fee, _t3, _t4, _t5;
+        var tx, chain, destination, address, feeAsset, bypassOptions, version, _options$useRootOrigi, useRootOrigin, basePayload, resolvedTx, performDryRunCall, getExecutionSuccessFromResult, findFailureObjectFromResult, extractFailureReasonFromResult, result, message, isSuccess, resolvedFeeAsset, _result2, failure, actualWeight, weight, forwardedXcms, destParaId, USE_XCM_PAYMENT_API_CHAINS, overriddenWeight, xcmFee, _yield$this$getPaymen, executionFee, fee, _t3, _t4, _t5;
         return _regenerator().w(function (_context10) {
           while (1) switch (_context10.p = _context10.n) {
             case 0:
@@ -1286,22 +1310,22 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               extractFailureReasonFromResult = function extractFailureReasonFromResult(result) {
                 var _obj$value, _obj$value2, _ref10, _result$value6;
                 var obj = findFailureObjectFromResult(result);
-                var failureIndex = typeof (obj === null || obj === void 0 || (_obj$value = obj.value) === null || _obj$value === void 0 ? void 0 : _obj$value.index) === 'number' ? obj.value.index : undefined;
+                var instructionIndex = typeof (obj === null || obj === void 0 || (_obj$value = obj.value) === null || _obj$value === void 0 ? void 0 : _obj$value.index) === 'number' ? obj.value.index : undefined;
                 if (obj !== null && obj !== void 0 && obj.type && obj !== null && obj !== void 0 && (_obj$value2 = obj.value) !== null && _obj$value2 !== void 0 && (_obj$value2 = _obj$value2.error) !== null && _obj$value2 !== void 0 && _obj$value2.type) {
                   return {
-                    failureReason: obj.type,
-                    failureSubReason: obj.value.error.type,
-                    failureIndex: failureIndex
+                    reason: obj.type,
+                    subReason: obj.value.error.type,
+                    instructionIndex: instructionIndex
                   };
                 }
                 if (obj !== null && obj !== void 0 && obj.type) {
                   return {
-                    failureReason: obj.type,
-                    failureIndex: failureIndex
+                    reason: obj.type,
+                    instructionIndex: instructionIndex
                   };
                 }
                 return {
-                  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)
+                  reason: 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)
                 };
               };
               _context10.p = 5;
@@ -1337,13 +1361,10 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 _context10.n = 12;
                 break;
               }
-              failureOutputReason = extractFailureReasonFromResult(result);
+              failure = extractFailureReasonFromResult(result);
               return _context10.a(2, Promise.resolve({
                 success: false,
-                failureReason: failureOutputReason.failureReason,
-                failureSubReason: failureOutputReason.failureSubReason,
-                failureIndex: failureOutputReason.failureIndex,
-                failureInstruction: getFailingInstruction((_result2 = result) === null || _result2 === void 0 || (_result2 = _result2.value) === null || _result2 === void 0 ? void 0 : _result2.local_xcm, failureOutputReason.failureIndex),
+                dryRunError: buildDryRunError(failure, (_result2 = result) === null || _result2 === void 0 || (_result2 = _result2.value) === null || _result2 === void 0 ? void 0 : _result2.local_xcm),
                 asset: resolvedFeeAsset.asset
               }));
             case 12:
@@ -1356,7 +1377,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               destParaId = extractDestParaId(forwardedXcms);
               USE_XCM_PAYMENT_API_CHAINS = ['Astar'];
               if (!(this.hasXcmPaymentApiSupport(chain) && result.value.local_xcm && (feeAsset || USE_XCM_PAYMENT_API_CHAINS.includes(chain) || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
-                _context10.n = 18;
+                _context10.n = 17;
                 break;
               }
               if (result.value.local_xcm) {
@@ -1377,10 +1398,6 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               return this.getXcmPaymentApiFee(chain, result.value.local_xcm, forwardedXcms, resolvedFeeAsset.asset, version, false, overriddenWeight);
             case 16:
               xcmFee = _context10.v;
-              if (!(typeof xcmFee === 'bigint')) {
-                _context10.n = 17;
-                break;
-              }
               return _context10.a(2, Promise.resolve({
                 success: true,
                 fee: xcmFee,
@@ -1390,14 +1407,9 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 destParaId: destParaId
               }));
             case 17:
-              resolvedFeeAsset = {
-                isCustomAsset: false,
-                asset: this.resolveDefaultFeeAsset(options)
-              };
-            case 18:
-              _context10.n = 19;
+              _context10.n = 18;
               return this.getPaymentInfo(tx, address);
-            case 19:
+            case 18:
               _yield$this$getPaymen = _context10.v;
               executionFee = _yield$this$getPaymen.partialFee;
               fee = computeOriginFee(result, chain, executionFee, !!feeAsset);
@@ -1421,22 +1433,21 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     key: "getXcmWeight",
     value: function () {
       var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(xcm) {
-        var weightRes, success, value, ref_time, proof_size;
+        var weightRes, _weightRes$value, ref_time, proof_size;
         return _regenerator().w(function (_context11) {
           while (1) switch (_context11.n) {
             case 0:
               _context11.n = 1;
-              return this.untypedApi.apis.XcmPaymentApi.query_xcm_weight(!xcm.type ? _transform(xcm) : xcm);
+              return this.ahpApi.apis.XcmPaymentApi.query_xcm_weight(!xcm.type ? _transform(xcm) : xcm);
             case 1:
               weightRes = _context11.v;
-              success = weightRes.success, value = weightRes.value;
-              if (success) {
+              if (weightRes.success) {
                 _context11.n = 2;
                 break;
               }
-              throw new RuntimeApiError("Failed to get XCM weight for payment fee calculation. Reason: ".concat(JSON.stringify(value)));
+              throw new RuntimeApiError("Failed to get XCM weight for payment fee calculation. Reason: ".concat(JSON.stringify(weightRes.value)));
             case 2:
-              ref_time = value.ref_time, proof_size = value.proof_size;
+              _weightRes$value = weightRes.value, ref_time = _weightRes$value.ref_time, proof_size = _weightRes$value.proof_size;
               return _context11.a(2, {
                 refTime: ref_time,
                 proofSize: proof_size
@@ -1508,11 +1519,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
             case 8:
               _context12.p = 8;
               _context12.n = 9;
-              return this.queryRuntimeApi({
-                module: 'AssetConversionApi',
-                method: 'quote_price_exact_tokens_for_tokens',
-                params: [localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false]
-              });
+              return this.ahpApi.apis.AssetConversionApi.quote_price_exact_tokens_for_tokens(_transform(localizeLocation(chain, nativeAsset.location)), _transform(assetLocalizedLoc), deliveryFeeResolved, false);
             case 9:
               res = _context12.v;
               return _context12.a(2, res !== null && res !== void 0 ? res : 0n);
@@ -1540,8 +1547,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     key: "getXcmPaymentApiFee",
     value: function () {
       var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(chain, localXcm, forwardedXcm, asset, version) {
-        var _this3 = this,
-          _execFeeRes$value;
+        var _this3 = this;
         var transformXcm,
           overridenWeight,
           transformedXcm,
@@ -1553,7 +1559,6 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
           transformedAssetLoc,
           execFeeRes,
           execFee,
-          bridgeHubExecFee,
           deliveryFee,
           _args13 = arguments,
           _t8;
@@ -1570,7 +1575,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                     while (1) switch (_context13.n) {
                       case 0:
                         _context13.n = 1;
-                        return _this3.untypedApi.apis.XcmPaymentApi.query_xcm_weight(transformedXcm);
+                        return _this3.ahpApi.apis.XcmPaymentApi.query_xcm_weight(transformedXcm);
                       case 1:
                         weightRes = _context13.v;
                         if (weightRes.success) {
@@ -1592,8 +1597,8 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 break;
               }
               _t8 = {
-                proof_size: overridenWeight === null || overridenWeight === void 0 ? void 0 : overridenWeight.proofSize,
-                ref_time: overridenWeight === null || overridenWeight === void 0 ? void 0 : overridenWeight.refTime
+                proof_size: overridenWeight.proofSize,
+                ref_time: overridenWeight.refTime
               };
               _context14.n = 3;
               break;
@@ -1609,21 +1614,18 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               versionedAssetId = addXcmVersionHeader(assetId, version);
               transformedAssetLoc = _transform(versionedAssetId);
               _context14.n = 4;
-              return this.untypedApi.apis.XcmPaymentApi.query_weight_to_asset_fee(weight, transformedAssetLoc);
+              return this.ahpApi.apis.XcmPaymentApi.query_weight_to_asset_fee(weight, transformedAssetLoc);
             case 4:
               execFeeRes = _context14.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')) {
+              execFee = execFeeRes.success ? execFeeRes.value : 0n;
+              if (!(chain.startsWith('BridgeHub') && execFeeRes.success === false && execFeeRes.value.type === 'AssetNotFound')) {
                 _context14.n = 6;
                 break;
               }
               _context14.n = 5;
               return this.getBridgeHubFallbackExecFee(chain, weight, asset, version);
             case 5:
-              bridgeHubExecFee = _context14.v;
-              if (typeof bridgeHubExecFee === 'bigint') {
-                execFee = bridgeHubExecFee;
-              }
+              execFee = _context14.v;
             case 6:
               _context14.n = 7;
               return this.getDeliveryFee(chain, forwardedXcm, asset, assetLocalizedLoc, version);
@@ -1647,17 +1649,17 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
           while (1) switch (_context15.n) {
             case 0:
               _context15.n = 1;
-              return this.untypedApi.apis.XcmPaymentApi.query_weight_to_asset_fee(weightValue, {
+              return this.ahpApi.apis.XcmPaymentApi.query_weight_to_asset_fee(weightValue, {
                 type: version,
                 value: _transform(RELAY_LOCATION)
               });
             case 1:
               fallbackExecFeeRes = _context15.v;
-              if (!(typeof (fallbackExecFeeRes === null || fallbackExecFeeRes === void 0 ? void 0 : fallbackExecFeeRes.value) !== 'bigint')) {
+              if (fallbackExecFeeRes.success) {
                 _context15.n = 2;
                 break;
               }
-              return _context15.a(2, undefined);
+              return _context15.a(2, 0n);
             case 2:
               ahApi = this.clone();
               assetHubChain = "AssetHub".concat(this.getRelayChainOf(chain));
@@ -1666,20 +1668,10 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
             case 3:
               ahLocalizedLoc = localizeLocation(assetHubChain, asset.location);
               _context15.n = 4;
-              return ahApi.queryRuntimeApi({
-                module: 'AssetConversionApi',
-                method: 'quote_price_exact_tokens_for_tokens',
-                params: [RELAY_LOCATION, ahLocalizedLoc, fallbackExecFeeRes.value, false]
-              });
+              return ahApi.ahpApi.apis.AssetConversionApi.quote_price_exact_tokens_for_tokens(_transform(RELAY_LOCATION), _transform(ahLocalizedLoc), fallbackExecFeeRes.value, false);
             case 4:
               convertedExecFee = _context15.v;
-              if (!(convertedExecFee !== undefined)) {
-                _context15.n = 5;
-                break;
-              }
-              return _context15.a(2, convertedExecFee);
-            case 5:
-              return _context15.a(2, undefined);
+              return _context15.a(2, convertedExecFee !== null && convertedExecFee !== void 0 ? convertedExecFee : 0n);
           }
         }, _callee15, this);
       }));
@@ -1693,7 +1685,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     value: function () {
       var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(_ref12) {
         var _ref13, _processAssetsDeposit, _ref14, _ref15, _ref16, _ref17, _ref18;
-        var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, version, transformedOriginLocation, result, isSuccess, _extractDryRunXcmFail, failureReason, failureIndex, execResult, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, feeEventValue, fee, processedFee;
+        var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, version, transformedOriginLocation, result, isSuccess, failure, execResult, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, feeEventValue, fee, processedFee;
         return _regenerator().w(function (_context16) {
           while (1) switch (_context16.n) {
             case 0:
@@ -1706,7 +1698,7 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
             case 1:
               transformedOriginLocation = _transform(originLocation);
               _context16.n = 2;
-              return this.untypedApi.apis.DryRunApi.dry_run_xcm(transformedOriginLocation, xcm);
+              return this.ahpApi.apis.DryRunApi.dry_run_xcm(transformedOriginLocation, xcm);
             case 2:
               result = _context16.v;
               isSuccess = result.success && result.value.execution_result.type === 'Complete';
@@ -1714,12 +1706,10 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
                 _context16.n = 3;
                 break;
               }
-              _extractDryRunXcmFail = extractDryRunXcmFailureReason(result), failureReason = _extractDryRunXcmFail.failureReason, failureIndex = _extractDryRunXcmFail.failureIndex;
+              failure = extractDryRunXcmFailureReason(result);
               return _context16.a(2, {
                 success: false,
-                failureReason: failureReason,
-                failureIndex: failureIndex,
-                failureInstruction: getFailingInstruction(xcm, failureIndex),
+                dryRunError: buildDryRunError(failure, xcm),
                 asset: asset
               });
             case 3:
@@ -1738,10 +1728,6 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset, version);
             case 4:
               _fee = _context16.v;
-              if (!(typeof _fee === 'bigint')) {
-                _context16.n = 5;
-                break;
-              }
               return _context16.a(2, {
                 success: true,
                 fee: _fee,
@@ -1790,7 +1776,9 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
               }
               return _context16.a(2, Promise.resolve({
                 success: false,
-                failureReason: 'Cannot determine destination fee. No fee event found',
+                dryRunError: {
+                  reason: 'Cannot determine destination fee. No fee event found'
+                },
                 asset: asset
               }));
             case 6:
@@ -1820,15 +1808,16 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     key: "getBridgeStatus",
     value: function () {
       var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17() {
-        var mode;
+        var _yield$this$bridgeHub, type;
         return _regenerator().w(function (_context17) {
           while (1) switch (_context17.n) {
             case 0:
               _context17.n = 1;
-              return this.untypedApi.query.EthereumOutboundQueue.OperatingMode.getValue();
+              return this.bridgeHubApi.query.EthereumOutboundQueue.OperatingMode.getValue();
             case 1:
-              mode = _context17.v;
-              return _context17.a(2, mode.type);
+              _yield$this$bridgeHub = _context17.v;
+              type = _yield$this$bridgeHub.type;
+              return _context17.a(2, type);
           }
         }, _callee17, this);
       }));
@@ -1920,16 +1909,16 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
     key: "signAndSubmit",
     value: function () {
       var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee20(tx, sender) {
-        var signer, _yield$tx$signAndSubm, txHash;
+        var signer, _yield$tx$createAndSu, txHash;
         return _regenerator().w(function (_context20) {
           while (1) switch (_context20.n) {
             case 0:
               signer = isSenderSigner(sender) ? sender : createDevSigner(sender);
               _context20.n = 1;
-              return tx.signAndSubmit(signer);
+              return tx.createAndSubmit(signer);
             case 1:
-              _yield$tx$signAndSubm = _context20.v;
-              txHash = _yield$tx$signAndSubm.txHash;
+              _yield$tx$createAndSu = _context20.v;
+              txHash = _yield$tx$createAndSu.txHash;
               return _context20.a(2, txHash);
           }
         }, _callee20);
@@ -1949,9 +1938,9 @@ var PapiApi = /*#__PURE__*/function (_PolkadotApi) {
             case 0:
               signer = isSenderSigner(sender) ? sender : createDevSigner(sender);
               return _context21.a(2, new Promise(function (resolve, reject) {
-                tx.signSubmitAndWatch(signer).subscribe({
+                tx.createSubmitAndWatch(signer).subscribe({
                   next: function next(event) {
-                    if (event.type === 'finalized' || event.type === 'txBestBlocksState' && event.found) {
+                    if (event.type === 'finalized' || event.type === 'inBestBlock') {
                       if (!event.ok) {
                         reject(new SubmitTransactionError(JSON.stringify(event.dispatchError.value)));
                       } else {
@@ -2014,6 +2003,9 @@ var findFailingEvent = function findFailingEvent(result) {
     return event.type === 'Utility' && event.value.type === 'DispatchedAs' && event.value.value.result.success === false;
   });
 };
+var getPaymentInfo = function getPaymentInfo(tx, address) {
+  return tx.getPaymentInfo(getFakeTxCreator(address));
+};
 
 /**
  * Retrieves the asset balance for a given account on a specified chain.
@@ -2027,11 +2019,8 @@ var assets = /*#__PURE__*/Object.freeze({
   Foreign: Foreign,
   ForeignAbstract: ForeignAbstract,
   Native: Native,
-  Override: Override,
   findAssetInfo: findAssetInfo,
   getAllAssetsSymbols: getAllAssetsSymbols,
-  getAssetDecimals: getAssetDecimals,
-  getAssetId: getAssetId,
   getAssets: getAssets,
   getAssetsObject: getAssetsObject,
   getBalance: getBalance,
@@ -2042,7 +2031,6 @@ var assets = /*#__PURE__*/Object.freeze({
   getRelayChainSymbol: getRelayChainSymbol,
   getSupportedAssets: getSupportedAssets,
   getTChain: getTChain,
-  hasSupportForAsset: hasSupportForAsset,
   isChainEvm: isChainEvm
 });
 
@@ -2051,133 +2039,6 @@ var convertSs58 = function convertSs58(address, chain) {
   return convertSs58$1(papiApi, address, chain);
 };
 
-/**
- * Builder class for constructing transfers from Ethereum to Polkadot.
- *
- * @deprecated EvmBuilder is deprecated. Please use the Builder class instead.
- */
-var EvmBuilderCore = /*#__PURE__*/function () {
-  function EvmBuilderCore(options) {
-    _classCallCheck(this, EvmBuilderCore);
-    this._options = options;
-  }
-  return _createClass(EvmBuilderCore, [{
-    key: "from",
-    value: function from(chain) {
-      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
-        from: chain
-      }));
-    }
-    /**
-     * Specifies the destination chain on Polkadot.
-     *
-     * @param chain - The Polkadot chain to which the transfer will be made.
-     * @returns An instance of EvmBuilder
-     */
-  }, {
-    key: "to",
-    value: function to(chain) {
-      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
-        to: chain
-      }));
-    }
-    /**
-     * Specifies the currency to transfer.
-     *
-     * @param currency - The currency to be transferred.
-     * @returns An instance of EvmBuilder
-     */
-  }, {
-    key: "currency",
-    value: function currency(_currency) {
-      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
-        currency: _currency
-      }));
-    }
-    /**
-     * Specifies the recipient address on Polkadot.
-     *
-     * @param address - The Polkadot address to receive the transfer.
-     * @returns An instance of EvmBuilder
-     */
-  }, {
-    key: "recipient",
-    value: function recipient(address) {
-      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
-        recipient: address
-      }));
-    }
-    /**
-     * Sets the asset hub address. This is used for transfers that go through the Asset Hub.
-     *
-     * @param address - The address to be used.
-     * @returns An instance of EvmBuilder
-     */
-  }, {
-    key: "ahAddress",
-    value: function ahAddress(address) {
-      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
-        ahAddress: address
-      }));
-    }
-    /**
-     * Specifies the signer for the Ethereum transaction.
-     *
-     * @param signer - The Ethereum signer to authorize the transfer.
-     * @returns An instance of EvmBuilder
-     */
-  }, {
-    key: "signer",
-    value: function signer(_signer) {
-      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
-        signer: _signer
-      }));
-    }
-    /**
-     * Builds and executes the transfer from Ethereum to Polkadot.
-     *
-     * @throws Error if any required parameters are missing.
-     */
-  }, {
-    key: "build",
-    value: (function () {
-      var _build = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        var _this$_options, from, to, recipient, api;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
-            case 0:
-              _this$_options = this._options, from = _this$_options.from, to = _this$_options.to, recipient = _this$_options.recipient, api = _this$_options.api;
-              validateAddress(api, recipient, to);
-              if (!(from === 'Moonbeam' && to === 'Ethereum')) {
-                _context.n = 1;
-                break;
-              }
-              return _context.a(2, transferMoonbeamToEth(from, this._options));
-            case 1:
-              return _context.a(2, transferMoonbeamEvm(this._options));
-          }
-        }, _callee, this);
-      }));
-      function build() {
-        return _build.apply(this, arguments);
-      }
-      return build;
-    }())
-  }]);
-}();
-/**
- * Creates a new EvmBuilder instance for constructing Ethereum to Polkadot transfers.
- *
- * @param provider - The Ethereum provider to use for the transfer.
- * @returns An instance of EvmBuilder class
- * @deprecated EvmBuilder is deprecated. Please use the Builder class instead.
- */
-var EvmBuilder$1 = function EvmBuilder(api) {
-  return new EvmBuilderCore({
-    api: api
-  });
-};
-
 /**
  * Creates a new Builder instance.
  *
@@ -2188,11 +2049,6 @@ var Builder = function Builder(options) {
   var papiApi = new PapiApi(options);
   return Builder$1(papiApi);
 };
-/** @deprecated EvmBuilder is deprecated. Please use the Builder class instead. */
-var EvmBuilder = function EvmBuilder(api) {
-  var papiApi = new PapiApi(api);
-  return EvmBuilder$1(papiApi);
-};
 
 var hydrateCustomChain = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(name, input) {
@@ -2305,4 +2161,4 @@ var transfer = /*#__PURE__*/Object.freeze({
   handleSwapExecuteTransfer: handleSwapExecuteTransfer
 });
 
-export { Builder, EvmBuilder, assets, checkAndConvertToNumberOrBigInt, convertSs58, createChainClient, dryRun, dryRunOrigin, getBalance, getBridgeStatus, getOriginXcmFee, getParaEthTransferFees, getXcmFee, handleSwapExecuteTransfer, hydrateCustomChain, _transform as transform, transfer as xcmPallet };
+export { Builder, assets, checkAndConvertToNumberOrBigInt, convertSs58, createChainClient, dryRun, dryRunOrigin, getBalance, getBridgeStatus, getOriginXcmFee, getParaEthTransferFees, getPaymentInfo, getXcmFee, handleSwapExecuteTransfer, hydrateCustomChain, _transform as transform, transfer as xcmPallet };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk",
-  "version": "13.11.0",
+  "version": "14.1.0-rc",
   "description": "SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -23,14 +23,15 @@
   ],
   "dependencies": {
     "@noble/hashes": "^2.2.0",
-    "@polkadot-api/substrate-bindings": "^0.20.3",
+    "@polkadot-api/substrate-bindings": "0.21.0-rc.1",
     "@polkadot-labs/hdkd": "^0.0.28",
     "@polkadot-labs/hdkd-helpers": "^0.0.30",
     "viem": "^2.53.1",
-    "@paraspell/sdk-core": "13.11.0"
+    "@paraspell/sdk-core": "14.1.0-rc"
   },
   "peerDependencies": {
-    "polkadot-api": "2.1.7"
+    "polkadot-api": "3.0.0-rc.4",
+    "@paraspell/descriptors": "14.1.0-rc"
   },
   "devDependencies": {
     "@acala-network/chopsticks": "^1.5.0",
@@ -46,7 +47,8 @@
     "@vitest/coverage-v8": "^4.1.9",
     "dotenv": "^17.4.2",
     "rollup": "^4.62.2",
-    "rollup-plugin-dts": "^6.4.1"
+    "rollup-plugin-dts": "^6.4.1",
+    "polkadot-api": "3.0.0-rc.4"
   },
   "scripts": {
     "compile": "tsc --noEmit",