@paraspell/sdk-pjs 12.5.1 → 12.6.1

package/README.md

@@ -65,14 +65,13 @@ import { Native, Foreign, ForeignAbstract } from '@paraspell/sdk-pjs'; //Only ne
 ## Implementation
 
 > [!NOTE]
-> - Local transfers are now available for every currency and every chain. To try them, simply use the same origin and destination parameters.
-> - Transfer info queries are now all in the Builder pattern and don't require any imports other than the builder.
-> - You can now query Ethereum asset balances on Ethereum via balance query
-> - The Builder() now accepts an optional configuration object (To enhance localhost experience and testing). This object can contain apiOverrides and a development flag. More information in the "Localhost test setup" section.
 > - Brand new asset decimal abstraction introduced. It can be turned on in Builder config. Will be turned on by default in next major release.
+> - V11 > V12 Migration guide https://paraspell.github.io/docs/migration/v11-to-v12.html
 > 
 > **Latest news:**
-> - V11 > V12 Migration guide https://paraspell.github.io/docs/migration/v11-to-v12.html
+> - You can now pass signer directly into senderAddress parameter
+> - The local transfers now have additional builder parameter called keepAlive
+> - Transact is here! Find out more: https://paraspell.github.io/docs/sdk/xcmPallet.html#transact
 
 
 ### Sending XCM
@@ -86,13 +85,15 @@ const builder = Builder(/*chain api/builder_config/ws_url_string/ws_url_array -
       .to(TChain /*,customParaId - optional*/ | Location object /*Only works for PolkadotXCM pallet*/) 
       .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection /*for example symbol: symbol or id: id, or location: location*/, amount: amount /*Use "ALL" to transfer everything*/}, {currencySelection}, ..])
       .address(address | Location object /*If you are sending through xTokens, you need to pass the destination and address Location in one object (x2)*/)
-      .senderAddress(address) // - OPTIONAL but strongly recommended as it is automatically ignored when not needed - Used when origin is AssetHub with feeAsset or when sending to AssetHub to prevent asset traps by auto-swapping to DOT to have DOT ED.
+      .senderAddress(address | {address, PJS_Signer}) // - OPTIONAL but strongly recommended as it is automatically ignored when not needed - Used when origin is AssetHub with feeAsset or when sending to AssetHub to prevent asset traps by auto-swapping to DOT to have DOT ED.
       /*.ahAddress(ahAddress) - OPTIONAL - used when origin is EVM chain and XCM goes through AssetHub (Multihop transfer where we are unable to convert Key20 to ID32 address eg. origin: Moonbeam & destination: Ethereum (Multihop goes from Moonbeam > AssetHub > BridgeHub > Ethereum)
         .feeAsset({symbol: 'symbol'} || {id: 'id'} || {location: 'location'}) // Optional parameter used when multiasset is provided or when origin is AssetHub - so user can pay in fees different than DOT
         .xcmVersion(Version.V3/V4/V5)  //Optional parameter for manual override of XCM Version used in call
         .customPallet('Pallet','pallet_function') //Optional parameter for manual override of XCM Pallet and function used in call (If they are named differently on some chain but syntax stays the same). Both pallet name and function required. Pallet name must be CamelCase, function name snake_case.*/
 
 const tx = await builder.build()
+// Or if you use signers in senderAddress:
+// await builder.signAndSubmit() - Signs and submits the transaction; returns TX hash for tracking
 
 //Make sure to disconnect the API after it is no longer used (eg, after a transaction)
 await builder.disconnect()
@@ -123,6 +124,8 @@ const builder = Builder(/*chain api/builder_config/ws_url_string/ws_url_array -
       .to(TChain) //Has to be the same as the origin (from)
       .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection /*for example symbol: symbol or id: id, or location: location*/, amount: amount /*Use "ALL" to transfer everything*/}, {currencySelection}, ..])
       .address(address)
+   /* .keepAlive(bool) - Optional: Allows draining the account below the existential deposit. */
+
 
 const tx = await builder.build()
 
@@ -147,6 +150,56 @@ await builder.disconnect()
 */
 ```
 
+#### Transact
+
+```ts
+const builder = Builder(/*client | builder_config | ws_url | [ws_url, ws_url,..] - Optional*/)
+      .from(TSubstrateChain) // 'AssetHubPolkadot' | 'Hydration' | 'Moonbeam' | 'Polkadot' |  ... https://paraspell.github.io/docs/sdk/AssetPallet.html#import-chains-as-types
+      .to(TChain) // Has to be same as origin (from)
+      .currency(CURRENCY_SPEC) // Refer to currency spec options below
+      .senderAddress(senderAddress | PAPI SIGNER)
+      .address(address)
+      .transact(hex, /* originType, TWeight - Optional */)
+
+const tx = await builder.build()
+// Or if you use signers in senderAddress:
+// await builder.signAndSubmit() - Signs and submits the transaction; returns TX hash for tracking
+
+//Disconnect API after TX
+await builder.disconnect()
+```
+
+#### Dry run your XCM Calls:
+```ts
+//Builder pattern
+const result = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+        .from(TSubstrateChain)
+        .to(TChain)
+        .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | {[{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}]})
+        /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in same fee asset as selected currency.*/
+        .address(ADDRESS)
+        .senderAddress(address | {address, PJS_Signer})
+        .dryRun()
+
+//Check Parachain for DryRun support - returns true/false
+import { hasDryRunSupport } from "@paraspell/sdk";
+
+const result = hasDryRunSupport(chain)
+```
+
+#### Dry run preview:
+```ts
+//Builder pattern
+const result = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+        .from(TSubstrateChain)
+        .to(TChain)
+        .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | {[{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}]})
+        /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in same fee asset as selected currency.*/
+        .address(ADDRESS)
+        .senderAddress(address | {address, PJS_Signer})
+        .dryRunPreview(/*{ mintFeeAssets: true } - false by default - Mints fee assets also, if user does not have enough to cover fees on origin.*/)
+```
+
 #### Batch calls
 
 ```ts
@@ -189,38 +242,6 @@ const tx = await builder.build()
 await builder.disconnect()
 ```
 
-#### Dry run your XCM Calls:
-```ts
-//Builder pattern
-const result = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-        .from(TSubstrateChain)
-        .to(TChain)
-        .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | {[{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}]})
-        /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in same fee asset as selected currency.*/
-        .address(ADDRESS)
-        .senderAddress(SENDER_ADDRESS)
-        .dryRun()
-
-//Check Parachain for DryRun support - returns true/false
-import { hasDryRunSupport } from "@paraspell/sdk";
-
-const result = hasDryRunSupport(chain)
-```
-
-#### Dry run preview:
-
-```ts
-//Builder pattern
-const result = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
-        .from(TSubstrateChain)
-        .to(TChain)
-        .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | {[{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}]})
-        /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in same fee asset as selected currency.*/
-        .address(ADDRESS)
-        .senderAddress(SENDER_ADDRESS)
-        .dryRunPreview(/*{ mintFeeAssets: true } - false by default - Mints fee assets also, if user does not have enough to cover fees on origin.*/)
-```
-
 ### Localhost test setup
 
 ```ts
@@ -237,7 +258,7 @@ const builder = await Builder({
   .to(TChain)
   .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}])
   .address(address) //You can also use prederived accounts - //Alice, //Bob... //Alith, //Balthathar...
-  .senderAddress(address) //You can also use prederived accounts //Alice, //Bob... //Alith, //Balthathar...
+  .senderAddress(address | {address, PJS_Signer}) //You can also use prederived accounts //Alice, //Bob... //Alith, //Balthathar...
 
 const tx = await builder.build()
 //Or if you use prederived account as senderAddress:
@@ -251,90 +272,90 @@ await builder.disconnect()
 
 For full documentation with output examples of XCM Fee queries, head to [official documentation](https://paraspell.github.io/docs/sdk/xcmUtils.html).
 
-#### XCM Transfer info
+#### XCM Fee (Origin and Dest.)
+
 ```ts
-const info = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+const fee = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
           .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
           .address(RECIPIENT_ADDRESS)
-          .senderAddress(SENDER_ADDRESS)
-          .getTransferInfo()
+          .senderAddress(address | {address, PJS_Signer})
+          .getXcmFee(/*{disableFallback: true / false}*/)  //Fallback is optional. When fallback is disabled, you only get notified of a DryRun error, but no Payment info query fallback is performed. Payment info is still performed if Origin or Destination chain do not support DryRun out of the box.
 ```
 
-#### Transferable amount
+#### XCM Fee (Origin only)
+
 ```ts
-const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+const fee = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
           .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
           .address(RECIPIENT_ADDRESS)
-          .senderAddress(SENDER_ADDRESS)
-          .getTransferableAmount()
+          .senderAddress(address | {address, PJS_Signer})
+          .getOriginXcmFee(/*{disableFallback: true / false}*/)  //Fallback is optional. When fallback is disabled, you only get notified of a DryRun error, but no Payment info query fallback is performed. Payment info is still performed if Origin do not support DryRun out of the box.
 ```
 
-#### Minimal transferable amount
+#### XCM Transfer info
 ```ts
-const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+const info = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
           .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
           .address(RECIPIENT_ADDRESS)
-          .senderAddress(SENDER_ADDRESS)
-          .getMinTransferableAmount()
+          .senderAddress(address | {address, PJS_Signer})
+          .getTransferInfo()
 ```
 
-#### Receivable amount
+#### Transferable amount
 ```ts
-const receivable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
           .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
           .address(RECIPIENT_ADDRESS)
-          .senderAddress(SENDER_ADDRESS)
-          .getReceivableAmount()
+          .senderAddress(address | {address, PJS_Signer})
+          .getTransferableAmount()
 ```
 
-#### Verify ED on destination
+#### Minimal transferable amount
 ```ts
-const ed = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+const transferable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
           .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
           .address(RECIPIENT_ADDRESS)
-          .senderAddress(SENDER_ADDRESS)
-          .verifyEdOnDestination()
+          .senderAddress(address | {address, PJS_Signer})
+          .getMinTransferableAmount()
 ```
 
-#### XCM Fee (Origin and Dest.)
-
+#### Receivable amount
 ```ts
-const fee = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+const receivable = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
           .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
           .address(RECIPIENT_ADDRESS)
-          .senderAddress(SENDER_ADDRESS)
-          .getXcmFee(/*{disableFallback: true / false}*/)  //Fallback is optional. When fallback is disabled, you only get notified of a DryRun error, but no Payment info query fallback is performed. Payment info is still performed if Origin or Destination chain do not support DryRun out of the box.
+          .senderAddress(address | {address, PJS_Signer})
+          .getReceivableAmount()
 ```
 
-#### XCM Fee (Origin only)
-
+#### Verify ED on destination
 ```ts
-const fee = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
+const ed = await Builder(/*chain api/builder_config/ws_url_string/ws_url_array - optional*/)
           .from(TSubstrateChain)
           .to(TChain)
           .currency(CURRENCY_SPEC)
           /*.feeAsset(CURRENCY) - Optional parameter when origin === AssetHubPolkadot and TX is supposed to be paid in the same fee asset as selected currency.*/
           .address(RECIPIENT_ADDRESS)
-          .senderAddress(SENDER_ADDRESS)
-          .getOriginXcmFee(/*{disableFallback: true / false}*/)  //Fallback is optional. When fallback is disabled, you only get notified of a DryRun error, but no Payment info query fallback is performed. Payment info is still performed if Origin do not support DryRun out of the box.
+          .senderAddress(address | {address, PJS_Signer})
+          .verifyEdOnDestination()
 ```
 
 #### Asset balance

package/dist/index.d.ts

@@ -3,15 +3,19 @@ import { TApiOrUrl, WithApi, TEvmChainFrom, TChain, TCurrencyInputWithAmount, Fo
 export * from '@paraspell/sdk-core';
 import * as _polkadot_api from '@polkadot/api';
 import { ApiPromise } from '@polkadot/api';
-import { SubmittableExtrinsic } from '@polkadot/api/types';
+import { SubmittableExtrinsic, Signer } from '@polkadot/api/types';
 import * as ethers from 'ethers';
-import { Signer, AbstractProvider } from 'ethers';
+import { Signer as Signer$1, AbstractProvider } from 'ethers';
 import { WalletClient } from 'viem';
 import * as _snowbridge_api_dist_toPolkadot_v2 from '@snowbridge/api/dist/toPolkadot_v2';
 
 type TPjsApi = ApiPromise;
 type TPjsApiOrUrl = TApiOrUrl<TPjsApi>;
 type Extrinsic = SubmittableExtrinsic<'promise'>;
+type TPjsSigner = {
+    signer: Signer;
+    address: string;
+};
 type TEvmBuilderOptionsBase = {
     /**
      * The source chain. Can be either 'Ethereum', 'Moonbeam', 'Moonriver', or 'Darwinia'.
@@ -36,9 +40,9 @@ type TEvmBuilderOptionsBase = {
     /**
      * The Ethereum signer.
      */
-    signer: Signer | WalletClient;
+    signer: Signer$1 | WalletClient;
 };
-type TPjsEvmBuilderOptions<TApi, TRes> = WithApi<TEvmBuilderOptionsBase, TApi, TRes> & {
+type TPjsEvmBuilderOptions<TApi, TRes, TSigner> = WithApi<TEvmBuilderOptionsBase, TApi, TRes, TSigner> & {
     provider?: AbstractProvider;
 };
 
@@ -113,10 +117,10 @@ declare const convertSs58: (address: string, chain: TSubstrateChain) => string;
 /**
  * Builder class for constructing transfers from Ethereum to Polkadot.
  */
-declare class EvmBuilderCore<TApi, TRes, T extends Partial<TPjsEvmBuilderOptions<TApi, TRes>> = object> {
+declare class EvmBuilderCore<TApi, TRes, TSigner, T extends Partial<TPjsEvmBuilderOptions<TApi, TRes, TSigner>> = object> {
     protected readonly _options: T;
     constructor(options: T);
-    from(chain: TEvmChainFrom): EvmBuilderCore<TApi, TRes, T & {
+    from(chain: TEvmChainFrom): EvmBuilderCore<TApi, TRes, TSigner, T & {
         from: TEvmChainFrom;
     }>;
     /**
@@ -125,7 +129,7 @@ declare class EvmBuilderCore<TApi, TRes, T extends Partial<TPjsEvmBuilderOptions
      * @param chain - The Polkadot chain to which the transfer will be made.
      * @returns An instance of EvmBuilder
      */
-    to(chain: TChain): EvmBuilderCore<TApi, TRes, T & {
+    to(chain: TChain): EvmBuilderCore<TApi, TRes, TSigner, T & {
         to: TChain;
     }>;
     /**
@@ -134,7 +138,7 @@ declare class EvmBuilderCore<TApi, TRes, T extends Partial<TPjsEvmBuilderOptions
      * @param currency - The currency to be transferred.
      * @returns An instance of EvmBuilder
      */
-    currency(currency: TCurrencyInputWithAmount): EvmBuilderCore<TApi, TRes, T & {
+    currency(currency: TCurrencyInputWithAmount): EvmBuilderCore<TApi, TRes, TSigner, T & {
         currency: TCurrencyInputWithAmount;
     }>;
     /**
@@ -143,7 +147,7 @@ declare class EvmBuilderCore<TApi, TRes, T extends Partial<TPjsEvmBuilderOptions
      * @param address - The Polkadot address to receive the transfer.
      * @returns An instance of EvmBuilder
      */
-    address(address: string): EvmBuilderCore<TApi, TRes, T & {
+    address(address: string): EvmBuilderCore<TApi, TRes, TSigner, T & {
         address: string;
     }>;
     /**
@@ -152,7 +156,7 @@ declare class EvmBuilderCore<TApi, TRes, T extends Partial<TPjsEvmBuilderOptions
      * @param address - The address to be used.
      * @returns An instance of EvmBuilder
      */
-    ahAddress(address: string | undefined): EvmBuilderCore<unknown, unknown, T & {
+    ahAddress(address: string | undefined): EvmBuilderCore<unknown, unknown, unknown, T & {
         ahAddress: string | undefined;
     }>;
     /**
@@ -161,15 +165,15 @@ declare class EvmBuilderCore<TApi, TRes, T extends Partial<TPjsEvmBuilderOptions
      * @param signer - The Ethereum signer to authorize the transfer.
      * @returns An instance of EvmBuilder
      */
-    signer(signer: Signer | WalletClient): EvmBuilderCore<TApi, TRes, T & {
-        signer: Signer | WalletClient;
+    signer(signer: Signer$1 | WalletClient): EvmBuilderCore<TApi, TRes, TSigner, T & {
+        signer: Signer$1 | WalletClient;
     }>;
     /**
      * Builds and executes the transfer from Ethereum to Polkadot.
      *
      * @throws Error if any required parameters are missing.
      */
-    build(this: EvmBuilderCore<TApi, TRes, TPjsEvmBuilderOptions<TApi, TRes>>): Promise<string>;
+    build(this: EvmBuilderCore<TApi, TRes, TSigner, TPjsEvmBuilderOptions<TApi, TRes, TSigner>>): Promise<string>;
 }
 
 /**
@@ -178,31 +182,31 @@ declare class EvmBuilderCore<TApi, TRes, T extends Partial<TPjsEvmBuilderOptions
  * @param api - The API instance to use for building transactions. If not provided, a new instance will be created.
  * @returns A new Builder instance.
  */
-declare const Builder: (api?: TBuilderOptions<TPjsApiOrUrl>) => GeneralBuilder$1<_polkadot_api.ApiPromise, Extrinsic, object>;
-type GeneralBuilder<T extends Partial<TSendBaseOptions> = object> = GeneralBuilder$1<TPjsApi, Extrinsic, T>;
-declare const EvmBuilder: (provider?: AbstractProvider, api?: TBuilderOptions<TPjsApiOrUrl>) => EvmBuilderCore<unknown, unknown, {
-    api: _paraspell_sdk_core.IPolkadotApi<_polkadot_api.ApiPromise, Extrinsic>;
+declare const Builder: (api?: TBuilderOptions<TPjsApiOrUrl>) => GeneralBuilder$1<_polkadot_api.ApiPromise, Extrinsic, TPjsSigner, object>;
+type GeneralBuilder<T extends Partial<TSendBaseOptions<Extrinsic>> = object> = GeneralBuilder$1<TPjsApi, Extrinsic, TPjsSigner, T>;
+declare const EvmBuilder: (provider?: AbstractProvider, api?: TBuilderOptions<TPjsApiOrUrl>) => EvmBuilderCore<unknown, unknown, unknown, {
+    api: _paraspell_sdk_core.IPolkadotApi<_polkadot_api.ApiPromise, Extrinsic, TPjsSigner>;
     provider: AbstractProvider | undefined;
 }>;
 
-declare const approveToken: (signer: Signer, amount: bigint, symbol: string) => Promise<{
+declare const approveToken: (signer: Signer$1, amount: bigint, symbol: string) => Promise<{
     result: ethers.ContractTransactionResponse;
     receipt: ethers.ContractTransactionReceipt | null;
 }>;
 
-declare const depositToken: (signer: Signer, amount: bigint, symbol: string) => Promise<{
+declare const depositToken: (signer: Signer$1, amount: bigint, symbol: string) => Promise<{
     result: ethers.ContractTransactionResponse;
     receipt: ethers.ContractTransactionReceipt | null;
 }>;
 
-declare const getTokenBalance: (signer: Signer, symbol: string) => Promise<bigint>;
+declare const getTokenBalance: (signer: Signer$1, symbol: string) => Promise<bigint>;
 
 /**
  * Transfers assets from parachain to another parachain or from/to relay chain.
  * @param options - The transfer options.
  * @returns An extrinsic to be signed and sent.
  */
-declare const send: (options: _paraspell_sdk_core.TSendBaseOptions & {
+declare const send: (options: _paraspell_sdk_core.TSendBaseOptions<Extrinsic> & {
     isAmountAll: boolean;
 } & {
     api?: TPjsApiOrUrl;
@@ -213,7 +217,7 @@ declare const dryRun: (options: _paraspell_sdk_core.TDryRunBaseOptions<Extrinsic
 declare const dryRunOrigin: (options: _paraspell_sdk_core.TDryRunCallBaseOptions<Extrinsic> & {
     api?: TPjsApiOrUrl;
 }) => Promise<_paraspell_sdk_core.TDryRunChainResult>;
-declare const transferEthToPolkadot: (options: Omit<TPjsEvmBuilderOptions<TPjsApi, Extrinsic>, "api">) => Promise<{
+declare const transferEthToPolkadot: (options: Omit<TPjsEvmBuilderOptions<TPjsApi, Extrinsic, TPjsSigner>, "api">) => Promise<{
     response: ethers.TransactionResponse;
     messageReceipt: _snowbridge_api_dist_toPolkadot_v2.MessageReceipt;
 }>;
@@ -249,4 +253,4 @@ declare namespace transfer {
 declare const createChainClient: (chain: TSubstrateChain, builderOptions?: TBuilderOptions<TPjsApiOrUrl>) => Promise<_polkadot_api.ApiPromise>;
 
 export { Builder, EvmBuilder, approveToken, assets, claimAssets, convertSs58, createChainClient, depositToken, dryRun, dryRunOrigin, getBalance, getBridgeStatus, getParaEthTransferFees, getTokenBalance, send, transferEthToPolkadot, transfer as xcmPallet };
-export type { Extrinsic, GeneralBuilder, TPjsApi, TPjsApiOrUrl, TPjsEvmBuilderOptions };
+export type { Extrinsic, GeneralBuilder, TPjsApi, TPjsApiOrUrl, TPjsEvmBuilderOptions, TPjsSigner };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { getEvmPrivateKeyHex, createClientCache, createClientPoolHelpers, isConfig, getChainProviders, BatchMode, findNativeAssetInfoOrThrow, MissingChainApiError, isExternalChain, UnsupportedOperationError, findAssetInfoOrThrow, computeFeeFromDryRunPjs, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, assertHasLocation, localizeLocation, addXcmVersionHeader, Version, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, assertHasId, getParaId, RoutingResolutionError, abstractDecimals, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
+import { getEvmPrivateKeyHex, createClientCache, createClientPoolHelpers, isConfig, getChainProviders, BatchMode, findNativeAssetInfoOrThrow, isSenderSigner, MissingChainApiError, isExternalChain, UnsupportedOperationError, findAssetInfoOrThrow, computeFeeFromDryRunPjs, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, localizeLocation, addXcmVersionHeader, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, assertHasId, getParaId, RoutingResolutionError, abstractDecimals, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { Keyring, WsProvider, ApiPromise } from '@polkadot/api';
 import { isHex, u8aToHex, hexToU8a, stringToU8a } from '@polkadot/util';
@@ -410,6 +410,11 @@ var PolkadotJsApi = /*#__PURE__*/function () {
         method = _this$convertToPjsCal.method;
       return (_this$api$tx$module = this.api.tx[module])[method].apply(_this$api$tx$module, values);
     }
+  }, {
+    key: "txFromHex",
+    value: function txFromHex(hex) {
+      return Promise.resolve(this.api.tx(hex));
+    }
   }, {
     key: "queryState",
     value: function () {
@@ -476,10 +481,10 @@ var PolkadotJsApi = /*#__PURE__*/function () {
       return stringToU8a(str);
     }
   }, {
-    key: "calculateTransactionFee",
+    key: "getPaymentInfo",
     value: function () {
-      var _calculateTransactionFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(tx, address) {
-        var _yield$tx$paymentInfo, partialFee;
+      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(tx, address) {
+        var _yield$tx$paymentInfo, _yield$tx$paymentInfo2, proofSize, refTime, partialFee;
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
             case 0:
@@ -487,15 +492,24 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               return tx.paymentInfo(address);
             case 1:
               _yield$tx$paymentInfo = _context5.v;
+              _yield$tx$paymentInfo2 = _yield$tx$paymentInfo.weight;
+              proofSize = _yield$tx$paymentInfo2.proofSize;
+              refTime = _yield$tx$paymentInfo2.refTime;
               partialFee = _yield$tx$paymentInfo.partialFee;
-              return _context5.a(2, partialFee.toBigInt());
+              return _context5.a(2, {
+                weight: {
+                  proofSize: proofSize.toBigInt(),
+                  refTime: refTime.toBigInt()
+                },
+                partialFee: partialFee.toBigInt()
+              });
           }
         }, _callee5);
       }));
-      function calculateTransactionFee(_x5, _x6) {
-        return _calculateTransactionFee.apply(this, arguments);
+      function getPaymentInfo(_x5, _x6) {
+        return _getPaymentInfo.apply(this, arguments);
       }
-      return calculateTransactionFee;
+      return getPaymentInfo;
     }()
   }, {
     key: "quoteAhPrice",
@@ -661,21 +675,20 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(options) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(options) {
         var _this = this;
-        var tx, address, feeAsset, chain, destination, _options$useRootOrigi, useRootOrigin, bypassOptions, supportsDryRunApi, DEFAULT_XCM_VERSION, basePayload, resolvedTx, resolvedFeeAsset, performDryRunCall, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureErr, shouldRetryWithVersion, msg, _msg, forwardedXcms, actualWeight, weight, nativeAsset, hasLocation, destParaId, getPaymentInfoWeight, overriddenWeight, xcmFee, executionFee, fee, _t, _t2, _t3, _t4;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.p = _context10.n) {
+        var tx, address, feeAsset, chain, destination, version, _options$useRootOrigi, useRootOrigin, bypassOptions, supportsDryRunApi, basePayload, resolvedTx, resolvedFeeAsset, performDryRunCall, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureErr, shouldRetryWithVersion, msg, _msg, forwardedXcms, actualWeight, weight, destParaId, overriddenWeight, xcmFee, _yield$this$getPaymen, executionFee, fee, _t, _t2, _t3, _t4;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.p = _context1.n) {
             case 0:
-              tx = options.tx, address = options.address, feeAsset = options.feeAsset, chain = options.chain, destination = options.destination, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi, bypassOptions = options.bypassOptions;
+              tx = options.tx, address = options.address, feeAsset = options.feeAsset, chain = options.chain, destination = options.destination, version = options.version, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi, bypassOptions = options.bypassOptions;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context10.n = 1;
+                _context1.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
             case 1:
-              DEFAULT_XCM_VERSION = 3;
               basePayload = useRootOrigin ? {
                 system: {
                   Root: null
@@ -686,32 +699,34 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 }
               };
               if (!useRootOrigin) {
-                _context10.n = 3;
+                _context1.n = 3;
                 break;
               }
-              _context10.n = 2;
+              _context1.n = 2;
               return wrapTxBypass(_objectSpread2(_objectSpread2({}, options), {}, {
                 api: this
               }), bypassOptions);
             case 2:
-              _t = _context10.v;
-              _context10.n = 4;
+              _t = _context1.v;
+              _context1.n = 4;
               break;
             case 3:
               _t = tx;
             case 4:
               resolvedTx = _t;
-              _context10.n = 5;
+              _context1.n = 5;
               return this.resolveFeeAsset(options);
             case 5:
-              resolvedFeeAsset = _context10.v;
+              resolvedFeeAsset = _context1.v;
               performDryRunCall = /*#__PURE__*/function () {
                 var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(includeVersion) {
                   var _this$api$call$dryRun;
+                  var versionNum;
                   return _regenerator().w(function (_context0) {
                     while (1) switch (_context0.n) {
                       case 0:
-                        return _context0.a(2, (_this$api$call$dryRun = _this.api.call.dryRunApi).dryRunCall.apply(_this$api$call$dryRun, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [DEFAULT_XCM_VERSION] : []))));
+                        versionNum = Number(version.charAt(1));
+                        return _context0.a(2, (_this$api$call$dryRun = _this.api.call.dryRunApi).dryRunCall.apply(_this$api$call$dryRun, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [versionNum] : []))));
                     }
                   }, _callee0);
                 }));
@@ -759,11 +774,11 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 failureReason: ''
               };
               shouldRetryWithVersion = false;
-              _context10.p = 6;
-              _context10.n = 7;
+              _context1.p = 6;
+              _context1.n = 7;
               return performDryRunCall(false);
             case 7:
-              response = _context10.v;
+              response = _context1.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = getExecutionSuccessFromResult(resultHuman);
@@ -773,49 +788,49 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                   shouldRetryWithVersion = true;
                 }
               }
-              _context10.n = 10;
+              _context1.n = 10;
               break;
             case 8:
-              _context10.p = 8;
-              _t2 = _context10.v;
+              _context1.p = 8;
+              _t2 = _context1.v;
               msg = _t2 instanceof Error ? _t2.message : String(_t2);
               if (!msg.includes('Expected 3 arguments')) {
-                _context10.n = 9;
+                _context1.n = 9;
                 break;
               }
               shouldRetryWithVersion = true;
-              _context10.n = 10;
+              _context1.n = 10;
               break;
             case 9:
-              return _context10.a(2, {
+              return _context1.a(2, {
                 success: false,
                 failureReason: msg,
                 asset: resolvedFeeAsset.asset
               });
             case 10:
               if (!shouldRetryWithVersion) {
-                _context10.n = 14;
+                _context1.n = 14;
                 break;
               }
-              _context10.p = 11;
-              _context10.n = 12;
+              _context1.p = 11;
+              _context1.n = 12;
               return performDryRunCall(true);
             case 12:
-              response = _context10.v;
+              response = _context1.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = getExecutionSuccessFromResult(resultHuman);
               if (!isSuccess) {
                 failureErr = extractFailureReasonFromResult(resultHuman, resultJson);
               }
-              _context10.n = 14;
+              _context1.n = 14;
               break;
             case 13:
-              _context10.p = 13;
-              _t3 = _context10.v;
+              _context1.p = 13;
+              _t3 = _context1.v;
               _msg = _t3 instanceof Error ? _t3.message : String(_t3);
               failureErr = failureErr || _msg;
-              return _context10.a(2, {
+              return _context1.a(2, {
                 success: false,
                 failureReason: failureErr.failureReason,
                 failureSubReason: failureErr.failureSubReason,
@@ -823,10 +838,10 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               });
             case 14:
               if (isSuccess) {
-                _context10.n = 15;
+                _context1.n = 15;
                 break;
               }
-              return _context10.a(2, {
+              return _context1.a(2, {
                 success: false,
                 failureReason: failureErr.failureReason || 'Unknown error',
                 failureSubReason: failureErr.failureSubReason,
@@ -839,57 +854,36 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 refTime: BigInt(actualWeight.refTime),
                 proofSize: BigInt(actualWeight.proofSize)
               } : undefined;
-              nativeAsset = findNativeAssetInfoOrThrow(chain);
-              hasLocation = feeAsset ? Boolean(feeAsset.location) : Boolean(nativeAsset === null || nativeAsset === void 0 ? void 0 : nativeAsset.location);
               destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref7) {
                 return i.here === null ? 0 : (_ref7 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref7 === void 0 ? void 0 : _ref7.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
-              if (!(hasXcmPaymentApiSupport(chain) && resultJson.ok.local_xcm && hasLocation && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
-                _context10.n = 21;
+              if (!(hasXcmPaymentApiSupport(chain) && resultJson.ok.local_xcm && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
+                _context1.n = 21;
                 break;
               }
-              getPaymentInfoWeight = /*#__PURE__*/function () {
-                var _ref8 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
-                  var _yield$tx$paymentInfo2, weight;
-                  return _regenerator().w(function (_context1) {
-                    while (1) switch (_context1.n) {
-                      case 0:
-                        _context1.n = 1;
-                        return tx.paymentInfo(address);
-                      case 1:
-                        _yield$tx$paymentInfo2 = _context1.v;
-                        weight = _yield$tx$paymentInfo2.weight;
-                        return _context1.a(2, weight);
-                    }
-                  }, _callee1);
-                }));
-                return function getPaymentInfoWeight() {
-                  return _ref8.apply(this, arguments);
-                };
-              }();
               if (resultJson.ok.local_xcm) {
-                _context10.n = 17;
+                _context1.n = 17;
                 break;
               }
-              _context10.n = 16;
-              return getPaymentInfoWeight();
+              _context1.n = 16;
+              return this.getPaymentInfo(tx, address);
             case 16:
-              _t4 = _context10.v;
-              _context10.n = 18;
+              _t4 = _context1.v.weight;
+              _context1.n = 18;
               break;
             case 17:
               _t4 = undefined;
             case 18:
               overriddenWeight = _t4;
-              _context10.n = 19;
-              return this.getXcmPaymentApiFee(chain, resultJson.ok.local_xcm, forwardedXcms, resolvedFeeAsset.asset, false, overriddenWeight);
+              _context1.n = 19;
+              return this.getXcmPaymentApiFee(chain, resultJson.ok.local_xcm, forwardedXcms, resolvedFeeAsset.asset, version, false, overriddenWeight);
             case 19:
-              xcmFee = _context10.v;
+              xcmFee = _context1.v;
               if (!(typeof xcmFee === 'bigint')) {
-                _context10.n = 20;
+                _context1.n = 20;
                 break;
               }
-              return _context10.a(2, Promise.resolve({
+              return _context1.a(2, Promise.resolve({
                 success: true,
                 fee: xcmFee,
                 asset: resolvedFeeAsset.asset,
@@ -903,12 +897,13 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 asset: this.resolveDefaultFeeAsset(options)
               };
             case 21:
-              _context10.n = 22;
-              return this.calculateTransactionFee(tx, address);
+              _context1.n = 22;
+              return this.getPaymentInfo(tx, address);
             case 22:
-              executionFee = _context10.v;
+              _yield$this$getPaymen = _context1.v;
+              executionFee = _yield$this$getPaymen.partialFee;
               fee = computeFeeFromDryRunPjs(resultHuman, chain, executionFee);
-              return _context10.a(2, {
+              return _context1.a(2, {
                 success: true,
                 fee: fee,
                 asset: resolvedFeeAsset.asset,
@@ -917,7 +912,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 destParaId: destParaId
               });
           }
-        }, _callee10, this, [[11, 13], [6, 8]]);
+        }, _callee1, this, [[11, 13], [6, 8]]);
       }));
       function getDryRunCall(_x13) {
         return _getDryRunCall.apply(this, arguments);
@@ -927,7 +922,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, localXcm, forwardedXcm, asset) {
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(chain, localXcm, forwardedXcm, asset, version) {
         var overridenWeight,
           weight,
           assetLocalizedLoc,
@@ -938,57 +933,56 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           isAssetNotFound,
           bridgeHubExecFee,
           deliveryFee,
-          _args1 = arguments,
+          _args0 = arguments,
           _t5;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.n) {
             case 0:
-              overridenWeight = _args1.length > 5 ? _args1[5] : undefined;
+              overridenWeight = _args0.length > 6 ? _args0[6] : undefined;
               if (!(overridenWeight !== null && overridenWeight !== void 0)) {
-                _context11.n = 1;
+                _context10.n = 1;
                 break;
               }
               _t5 = overridenWeight;
-              _context11.n = 3;
+              _context10.n = 3;
               break;
             case 1:
-              _context11.n = 2;
+              _context10.n = 2;
               return this.getXcmWeight(localXcm);
             case 2:
-              _t5 = _context11.v;
+              _t5 = _context10.v;
             case 3:
               weight = _t5;
-              assertHasLocation(asset);
               assetLocalizedLoc = localizeLocation(chain, asset.location);
-              _context11.n = 4;
-              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, addXcmVersionHeader(assetLocalizedLoc, Version.V4));
+              _context10.n = 4;
+              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, addXcmVersionHeader(assetLocalizedLoc, version));
             case 4:
-              feeResult = _context11.v;
+              feeResult = _context10.v;
               execFeeRes = feeResult.toJSON();
               execFeeOk = execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.ok;
               execFee = typeof execFeeOk === 'string' || typeof execFeeOk === 'number' ? BigInt(execFeeOk) : 0n;
               isAssetNotFound = (execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.err) === 'AssetNotFound';
               if (!(chain.startsWith('BridgeHub') && isAssetNotFound)) {
-                _context11.n = 6;
+                _context10.n = 6;
                 break;
               }
-              _context11.n = 5;
-              return this.getBridgeHubFallbackExecFee(chain, weight, asset);
+              _context10.n = 5;
+              return this.getBridgeHubFallbackExecFee(chain, weight, asset, version);
             case 5:
-              bridgeHubExecFee = _context11.v;
+              bridgeHubExecFee = _context10.v;
               if (typeof bridgeHubExecFee === 'bigint') {
                 execFee = bridgeHubExecFee;
               }
             case 6:
-              _context11.n = 7;
-              return this.getDeliveryFee(chain, forwardedXcm, asset, assetLocalizedLoc);
+              _context10.n = 7;
+              return this.getDeliveryFee(chain, forwardedXcm, asset, assetLocalizedLoc, version);
             case 7:
-              deliveryFee = _context11.v;
-              return _context11.a(2, execFee + deliveryFee);
+              deliveryFee = _context10.v;
+              return _context10.a(2, execFee + deliveryFee);
           }
-        }, _callee11, this);
+        }, _callee10, this);
       }));
-      function getXcmPaymentApiFee(_x15, _x16, _x17, _x18) {
+      function getXcmPaymentApiFee(_x15, _x16, _x17, _x18, _x19) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -996,68 +990,67 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDeliveryFee",
     value: function () {
-      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(chain, forwardedXcm, asset, assetLocalizedLoc) {
-        var _deliveryFeeRes, _ref9, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref0, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
+      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
+        var _deliveryFeeRes, _ref8, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref9, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
         var usedThirdParam, deliveryFeeRes, baseArgs, _this$api$call$xcmPay, message, _this$api$call$xcmPay2, versionedAssetLoc, deliveryFeeResJson, deliveryFeeResolved, nativeAsset, res, _t6;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.p = _context12.n) {
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.p = _context11.n) {
             case 0:
               usedThirdParam = false;
               if (!(forwardedXcm.length > 0)) {
-                _context12.n = 6;
+                _context11.n = 6;
                 break;
               }
               baseArgs = [forwardedXcm[0], forwardedXcm[1][0]];
-              _context12.p = 1;
-              _context12.n = 2;
+              _context11.p = 1;
+              _context11.n = 2;
               return (_this$api$call$xcmPay = this.api.call.xcmPaymentApi).queryDeliveryFees.apply(_this$api$call$xcmPay, baseArgs);
             case 2:
-              deliveryFeeRes = _context12.v;
-              _context12.n = 6;
+              deliveryFeeRes = _context11.v;
+              _context11.n = 6;
               break;
             case 3:
-              _context12.p = 3;
-              _t6 = _context12.v;
+              _context11.p = 3;
+              _t6 = _context11.v;
               message = _t6 instanceof Error ? _t6.message : String(_t6);
               if (!message.includes('Expected 3 arguments')) {
-                _context12.n = 5;
+                _context11.n = 5;
                 break;
               }
               usedThirdParam = true;
-              versionedAssetLoc = addXcmVersionHeader(assetLocalizedLoc, Version.V4);
-              _context12.n = 4;
+              versionedAssetLoc = addXcmVersionHeader(assetLocalizedLoc, version);
+              _context11.n = 4;
               return (_this$api$call$xcmPay2 = this.api.call.xcmPaymentApi).queryDeliveryFees.apply(_this$api$call$xcmPay2, baseArgs.concat([versionedAssetLoc]));
             case 4:
-              deliveryFeeRes = _context12.v;
-              _context12.n = 6;
+              deliveryFeeRes = _context11.v;
+              _context11.n = 6;
               break;
             case 5:
               throw _t6;
             case 6:
               deliveryFeeResJson = (_deliveryFeeRes = deliveryFeeRes) === null || _deliveryFeeRes === void 0 ? void 0 : _deliveryFeeRes.toJSON();
-              deliveryFeeResolved = deliveryFeeRes && ((_ref9 = (_deliveryFeeResJson$o = (_deliveryFeeResJson$o2 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o2 === void 0 ? void 0 : _deliveryFeeResJson$o2.v4) !== null && _deliveryFeeResJson$o !== void 0 ? _deliveryFeeResJson$o : (_deliveryFeeResJson$o3 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o3 === void 0 ? void 0 : _deliveryFeeResJson$o3.v3) === null || _ref9 === void 0 ? void 0 : _ref9.length) > 0 ? BigInt((_ref0 = (_deliveryFeeResJson$o4 = deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o5 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o5 === void 0 ? void 0 : _deliveryFeeResJson$o5.v4) !== null && _deliveryFeeResJson$o4 !== void 0 ? _deliveryFeeResJson$o4 : deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o6 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o6 === void 0 ? void 0 : _deliveryFeeResJson$o6.v3) === null || _ref0 === void 0 || (_ref0 = _ref0[0]) === null || _ref0 === void 0 || (_ref0 = _ref0.fun) === null || _ref0 === void 0 ? void 0 : _ref0.fungible) : 0n;
+              deliveryFeeResolved = deliveryFeeRes && ((_ref8 = (_deliveryFeeResJson$o = (_deliveryFeeResJson$o2 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o2 === void 0 ? void 0 : _deliveryFeeResJson$o2.v4) !== null && _deliveryFeeResJson$o !== void 0 ? _deliveryFeeResJson$o : (_deliveryFeeResJson$o3 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o3 === void 0 ? void 0 : _deliveryFeeResJson$o3.v3) === null || _ref8 === void 0 ? void 0 : _ref8.length) > 0 ? BigInt((_ref9 = (_deliveryFeeResJson$o4 = deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o5 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o5 === void 0 ? void 0 : _deliveryFeeResJson$o5.v4) !== null && _deliveryFeeResJson$o4 !== void 0 ? _deliveryFeeResJson$o4 : deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o6 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o6 === void 0 ? void 0 : _deliveryFeeResJson$o6.v3) === null || _ref9 === void 0 || (_ref9 = _ref9[0]) === null || _ref9 === void 0 || (_ref9 = _ref9.fun) === null || _ref9 === void 0 ? void 0 : _ref9.fungible) : 0n;
               nativeAsset = findNativeAssetInfoOrThrow(chain);
               if (!(isAssetXcEqual(asset, nativeAsset) || usedThirdParam)) {
-                _context12.n = 7;
+                _context11.n = 7;
                 break;
               }
-              return _context12.a(2, deliveryFeeResolved);
+              return _context11.a(2, deliveryFeeResolved);
             case 7:
-              _context12.p = 7;
-              assertHasLocation(nativeAsset);
-              _context12.n = 8;
+              _context11.p = 7;
+              _context11.n = 8;
               return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
             case 8:
-              res = _context12.v;
-              return _context12.a(2, res !== null && res !== void 0 ? res : 0n);
+              res = _context11.v;
+              return _context11.a(2, res !== null && res !== void 0 ? res : 0n);
             case 9:
-              _context12.p = 9;
-              _context12.v;
-              return _context12.a(2, 0n);
+              _context11.p = 9;
+              _context11.v;
+              return _context11.a(2, 0n);
           }
-        }, _callee12, this, [[7, 9], [1, 3]]);
+        }, _callee11, this, [[7, 9], [1, 3]]);
       }));
-      function getDeliveryFee(_x19, _x20, _x21, _x22) {
+      function getDeliveryFee(_x20, _x21, _x22, _x23, _x24) {
         return _getDeliveryFee.apply(this, arguments);
       }
       return getDeliveryFee;
@@ -1065,46 +1058,45 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBridgeHubFallbackExecFee",
     value: function () {
-      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(chain, weightValue, asset) {
+      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(chain, weightValue, asset, version) {
         var fallbackExecFeeRes, fallbackJson, fallbackOk, fallbackExecFee, ahApi, assetHubChain, ahLocalizedLoc, convertedExecFee;
-        return _regenerator().w(function (_context13) {
-          while (1) switch (_context13.n) {
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _context13.n = 1;
-              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weightValue, addXcmVersionHeader(RELAY_LOCATION, Version.V4));
+              _context12.n = 1;
+              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weightValue, addXcmVersionHeader(RELAY_LOCATION, version));
             case 1:
-              fallbackExecFeeRes = _context13.v;
+              fallbackExecFeeRes = _context12.v;
               fallbackJson = fallbackExecFeeRes.toJSON();
               fallbackOk = fallbackJson === null || fallbackJson === void 0 ? void 0 : fallbackJson.ok;
               fallbackExecFee = typeof fallbackOk === 'string' || typeof fallbackOk === 'number' ? BigInt(fallbackOk) : undefined;
               if (!(fallbackExecFee === undefined)) {
-                _context13.n = 2;
+                _context12.n = 2;
                 break;
               }
-              return _context13.a(2, undefined);
+              return _context12.a(2, undefined);
             case 2:
               ahApi = this.clone();
               assetHubChain = "AssetHub".concat(getRelayChainOf(chain));
-              _context13.n = 3;
+              _context12.n = 3;
               return ahApi.init(assetHubChain);
             case 3:
-              assertHasLocation(asset);
               ahLocalizedLoc = localizeLocation(assetHubChain, asset.location);
-              _context13.n = 4;
+              _context12.n = 4;
               return ahApi.quoteAhPrice(RELAY_LOCATION, ahLocalizedLoc, fallbackExecFee, false);
             case 4:
-              convertedExecFee = _context13.v;
+              convertedExecFee = _context12.v;
               if (!(typeof convertedExecFee === 'bigint')) {
-                _context13.n = 5;
+                _context12.n = 5;
                 break;
               }
-              return _context13.a(2, convertedExecFee);
+              return _context12.a(2, convertedExecFee);
             case 5:
-              return _context13.a(2, undefined);
+              return _context12.a(2, undefined);
           }
-        }, _callee13, this);
+        }, _callee12, this);
       }));
-      function getBridgeHubFallbackExecFee(_x23, _x24, _x25) {
+      function getBridgeHubFallbackExecFee(_x25, _x26, _x27, _x28) {
         return _getBridgeHubFallbackExecFee.apply(this, arguments);
       }
       return getBridgeHubFallbackExecFee;
@@ -1112,21 +1104,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmWeight",
     value: function () {
-      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(xcm) {
+      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(xcm) {
         var result, resultJson;
-        return _regenerator().w(function (_context14) {
-          while (1) switch (_context14.n) {
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
-              _context14.n = 1;
+              _context13.n = 1;
               return this.api.call.xcmPaymentApi.queryXcmWeight(xcm);
             case 1:
-              result = _context14.v;
+              result = _context13.v;
               resultJson = result.toJSON();
-              return _context14.a(2, resultJson.ok);
+              return _context13.a(2, resultJson.ok);
           }
-        }, _callee14, this);
+        }, _callee13, this);
       }));
-      function getXcmWeight(_x26) {
+      function getXcmWeight(_x29) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -1134,34 +1126,34 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(_ref1) {
-        var _ref11, _ref12, _ref13;
-        var originLocation, xcm, asset, chain, origin, supportsDryRunApi, response, result, resultJson, isSuccess, error, failureReason, forwardedXcms, actualWeight, weight, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee;
-        return _regenerator().w(function (_context15) {
-          while (1) switch (_context15.n) {
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(_ref0) {
+        var _ref10, _ref11, _ref12;
+        var originLocation, xcm, asset, chain, version, origin, supportsDryRunApi, response, result, resultJson, isSuccess, error, failureReason, forwardedXcms, actualWeight, weight, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee;
+        return _regenerator().w(function (_context14) {
+          while (1) switch (_context14.n) {
             case 0:
-              originLocation = _ref1.originLocation, xcm = _ref1.xcm, asset = _ref1.asset, chain = _ref1.chain, origin = _ref1.origin;
+              originLocation = _ref0.originLocation, xcm = _ref0.xcm, asset = _ref0.asset, chain = _ref0.chain, version = _ref0.version, origin = _ref0.origin;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context15.n = 1;
+                _context14.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
             case 1:
-              _context15.n = 2;
+              _context14.n = 2;
               return this.api.call.dryRunApi.dryRunXcm(originLocation, xcm);
             case 2:
-              response = _context15.v;
+              response = _context14.v;
               result = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = result.Ok && result.Ok.executionResult.Complete;
               if (isSuccess) {
-                _context15.n = 3;
+                _context14.n = 3;
                 break;
               }
               error = result.Ok.executionResult.Incomplete.error;
               failureReason = typeof error === 'string' ? error : error.error;
-              return _context15.a(2, {
+              return _context14.a(2, {
                 success: false,
                 failureReason: failureReason,
                 asset: asset
@@ -1173,22 +1165,22 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 refTime: BigInt(actualWeight.refTime),
                 proofSize: BigInt(actualWeight.proofSize)
               } : undefined;
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref10) {
-                return i.Here ? 0 : (_ref10 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref10 === void 0 ? void 0 : _ref10.parachain;
+              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref1) {
+                return i.Here ? 0 : (_ref1 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref1 === void 0 ? void 0 : _ref1.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
               if (!(hasXcmPaymentApiSupport(chain) && asset)) {
-                _context15.n = 5;
+                _context14.n = 5;
                 break;
               }
-              _context15.n = 4;
-              return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset);
+              _context14.n = 4;
+              return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset, version);
             case 4:
-              _fee = _context15.v;
+              _fee = _context14.v;
               if (!(typeof _fee === 'bigint')) {
-                _context15.n = 5;
+                _context14.n = 5;
                 break;
               }
-              return _context15.a(2, {
+              return _context14.a(2, {
                 success: true,
                 fee: _fee,
                 asset: asset,
@@ -1200,24 +1192,24 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               emitted = result.Ok.emittedEvents; // We want to look for the last event
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['balances', 'foreignAssets', 'assets'];
-              feeEvent = (_ref11 = (_ref12 = (_ref13 = origin === 'Mythos' ? reversedEvents.find(function (event) {
+              feeEvent = (_ref10 = (_ref11 = (_ref12 = origin === 'Mythos' ? reversedEvents.find(function (event) {
                 return event.section === 'assetConversion' && event.method === 'SwapCreditExecuted';
-              }) : undefined) !== null && _ref13 !== void 0 ? _ref13 :
+              }) : undefined) !== null && _ref12 !== void 0 ? _ref12 :
               // Prefer an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.section) && event.method === 'Issued';
-              })) !== null && _ref12 !== void 0 ? _ref12 :
+              })) !== null && _ref11 !== void 0 ? _ref11 :
               // Fallback to Minted event
               reversedEvents.find(function (event) {
                 return ['balances', 'foreignAssets'].includes(event.section) && event.method === 'Minted';
-              })) !== null && _ref11 !== void 0 ? _ref11 : reversedEvents.find(function (event) {
+              })) !== null && _ref10 !== void 0 ? _ref10 : reversedEvents.find(function (event) {
                 return ['currencies', 'tokens'].includes(event.section) && event.method === 'Deposited';
               });
               if (feeEvent) {
-                _context15.n = 6;
+                _context14.n = 6;
                 break;
               }
-              return _context15.a(2, Promise.resolve({
+              return _context14.a(2, Promise.resolve({
                 success: false,
                 failureReason: 'Cannot determine destination fee. No Issued event found',
                 asset: asset
@@ -1225,7 +1217,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
             case 6:
               feeAmount = feeEvent.section === 'assetConversion' ? feeEvent.data.amountIn : feeEvent.data.amount;
               fee = BigInt(feeAmount.replace(/,/g, ''));
-              return _context15.a(2, {
+              return _context14.a(2, {
                 success: true,
                 fee: fee,
                 asset: asset,
@@ -1234,9 +1226,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 destParaId: destParaId
               });
           }
-        }, _callee15, this);
+        }, _callee14, this);
       }));
-      function getDryRunXcm(_x27) {
+      function getDryRunXcm(_x30) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1244,18 +1236,18 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBridgeStatus",
     value: function () {
-      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
+      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
         var outboundOperatingMode;
-        return _regenerator().w(function (_context16) {
-          while (1) switch (_context16.n) {
+        return _regenerator().w(function (_context15) {
+          while (1) switch (_context15.n) {
             case 0:
-              _context16.n = 1;
+              _context15.n = 1;
               return this.api.query.ethereumOutboundQueue.operatingMode();
             case 1:
-              outboundOperatingMode = _context16.v;
-              return _context16.a(2, outboundOperatingMode.toPrimitive());
+              outboundOperatingMode = _context15.v;
+              return _context15.a(2, outboundOperatingMode.toPrimitive());
           }
-        }, _callee16, this);
+        }, _callee15, this);
       }));
       function getBridgeStatus() {
         return _getBridgeStatus.apply(this, arguments);
@@ -1307,29 +1299,44 @@ var PolkadotJsApi = /*#__PURE__*/function () {
     }
   }, {
     key: "deriveAddress",
-    value: function deriveAddress(path) {
-      var _createKeyringPair = createKeyringPair(path),
+    value: function deriveAddress(sender) {
+      if (isSenderSigner(sender)) return sender.address;
+      var _createKeyringPair = createKeyringPair(sender),
         address = _createKeyringPair.address;
       return address;
     }
   }, {
     key: "signAndSubmit",
     value: function () {
-      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(tx, path) {
-        var pair, hash;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(tx, sender) {
+        var hash, _t8;
+        return _regenerator().w(function (_context16) {
+          while (1) switch (_context16.n) {
             case 0:
-              pair = createKeyringPair(path);
-              _context17.n = 1;
-              return tx.signAndSend(pair);
+              if (!isSenderSigner(sender)) {
+                _context16.n = 2;
+                break;
+              }
+              _context16.n = 1;
+              return tx.signAndSend(sender.address, {
+                signer: sender.signer
+              });
             case 1:
-              hash = _context17.v;
-              return _context17.a(2, hash.toHex());
+              _t8 = _context16.v;
+              _context16.n = 4;
+              break;
+            case 2:
+              _context16.n = 3;
+              return tx.signAndSend(createKeyringPair(sender));
+            case 3:
+              _t8 = _context16.v;
+            case 4:
+              hash = _t8;
+              return _context16.a(2, hash.toHex());
           }
-        }, _callee17);
+        }, _callee16);
       }));
-      function signAndSubmit(_x28, _x29) {
+      function signAndSubmit(_x31, _x32) {
         return _signAndSubmit.apply(this, arguments);
       }
       return signAndSubmit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-pjs",
-  "version": "12.5.1",
+  "version": "12.6.1",
   "description": "Polkadot.js based SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "@snowbridge/registry": "^0.3.2",
     "ethers": "6.15.0",
     "viem": "2.45.0",
-    "@paraspell/sdk-core": "12.5.1"
+    "@paraspell/sdk-core": "12.6.1"
   },
   "peerDependencies": {
     "@polkadot/api": ">= 16.0 < 17",