@paraspell/sdk 8.6.0 → 8.6.1

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
 var sdkCore = require('@paraspell/sdk-core');
-var polkadotSdkCompat = require('polkadot-api/polkadot-sdk-compat');
-var polkadotApi = require('polkadot-api');
 var blake2b = require('@noble/hashes/blake2b');
 var utils = require('@noble/hashes/utils');
+var polkadotApi = require('polkadot-api');
+var polkadotSdkCompat = require('polkadot-api/polkadot-sdk-compat');
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -1235,20 +1235,20 @@ var PapiApi = /*#__PURE__*/function () {
 }();
 
 var createApiInstanceForNode = function createApiInstanceForNode(node) {
-  var pjsApi = new PapiApi();
-  return sdkCore.createApiInstanceForNode(pjsApi, node);
+  var papiApi = new PapiApi();
+  return sdkCore.createApiInstanceForNode(papiApi, node);
 };
 var createPapiApiCall = function createPapiApiCall(apiCall) {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-      var pjsApi, optionsWithApi;
+      var papiApi, optionsWithApi;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            pjsApi = new PapiApi();
-            pjsApi.setApi(options.api);
+            papiApi = new PapiApi();
+            papiApi.setApi(options.api);
             optionsWithApi = _objectSpread2(_objectSpread2({}, options), {}, {
-              api: pjsApi
+              api: papiApi
             });
             return _context.abrupt("return", apiCall(optionsWithApi));
           case 4:
@@ -1263,43 +1263,6 @@ var createPapiApiCall = function createPapiApiCall(apiCall) {
   }();
 };
 
-/**
- * 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.
- */
-var send = createPapiApiCall(sdkCore.send);
-var getDryRun = createPapiApiCall(sdkCore.getDryRun);
-var getParaEthTransferFees = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ahApi) {
-    var papiApi;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          papiApi = new PapiApi();
-          papiApi.setApi(ahApi);
-          _context.next = 4;
-          return papiApi.init('AssetHubPolkadot');
-        case 4:
-          return _context.abrupt("return", sdkCore.getParaEthTransferFees(papiApi));
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getParaEthTransferFees(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var transfer = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  getDryRun: getDryRun,
-  getParaEthTransferFees: getParaEthTransferFees,
-  send: send
-});
-
 /**
  * Retrieves the native balance for a given account on a specified node.
  *
@@ -1372,17 +1335,17 @@ var assets = /*#__PURE__*/Object.freeze({
 /**
  * Builder class for constructing transfers from Ethereum to Polkadot.
  */
-var EvmBuilderClass = /*#__PURE__*/function () {
-  function EvmBuilderClass(api) {
-    _classCallCheck(this, EvmBuilderClass);
-    this._options = {};
-    this._options.api = api;
+var EvmBuilderCore = /*#__PURE__*/function () {
+  function EvmBuilderCore(options) {
+    _classCallCheck(this, EvmBuilderCore);
+    this._options = options;
   }
-  return _createClass(EvmBuilderClass, [{
+  return _createClass(EvmBuilderCore, [{
     key: "from",
     value: function from(node) {
-      this._options.from = node;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        from: node
+      }));
     }
     /**
      * Specifies the destination node on Polkadot.
@@ -1393,8 +1356,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "to",
     value: function to(node) {
-      this._options.to = node;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        to: node
+      }));
     }
     /**
      * Specifies the currency to transfer.
@@ -1405,8 +1369,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "currency",
     value: function currency(_currency) {
-      this._options.currency = _currency;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        currency: _currency
+      }));
     }
     /**
      * Specifies the recipient address on Polkadot.
@@ -1417,9 +1382,10 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "address",
     value: function address(_address, ahAddress) {
-      this._options.address = _address;
-      this._options.ahAddress = ahAddress;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        address: _address,
+        ahAddress: ahAddress
+      }));
     }
     /**
      * Specifies the signer for the Ethereum transaction.
@@ -1430,8 +1396,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "signer",
     value: function signer(_signer) {
-      this._options.signer = _signer;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        signer: _signer
+      }));
     }
     /**
      * Builds and executes the transfer from Ethereum to Polkadot.
@@ -1442,40 +1409,20 @@ var EvmBuilderClass = /*#__PURE__*/function () {
     key: "build",
     value: (function () {
       var _build = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var requiredParams, _i, _requiredParams, param;
+        var _this$_options, from, to, address;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              requiredParams = ['from', 'to', 'currency', 'address', 'signer'];
-              _i = 0, _requiredParams = requiredParams;
-            case 2:
-              if (!(_i < _requiredParams.length)) {
-                _context.next = 9;
-                break;
-              }
-              param = _requiredParams[_i];
-              if (!(this._options[param] === undefined)) {
-                _context.next = 6;
-                break;
-              }
-              throw new Error("Builder object is missing parameter: ".concat(param));
-            case 6:
-              _i++;
-              _context.next = 2;
-              break;
-            case 9:
-              sdkCore.validateAddress(this._options.address, this._options.to);
-              if (!(this._options.from === 'Moonbeam' && this._options.to === 'Ethereum')) {
-                _context.next = 12;
+              _this$_options = this._options, from = _this$_options.from, to = _this$_options.to, address = _this$_options.address;
+              sdkCore.validateAddress(address, to);
+              if (!(from === 'Moonbeam' && to === 'Ethereum')) {
+                _context.next = 4;
                 break;
               }
               return _context.abrupt("return", sdkCore.transferMoonbeamToEth(this._options));
-            case 12:
-              _context.next = 14;
-              return sdkCore.transferMoonbeamEvm(this._options);
-            case 14:
-              return _context.abrupt("return", _context.sent);
-            case 15:
+            case 4:
+              return _context.abrupt("return", sdkCore.transferMoonbeamEvm(this._options));
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -1495,7 +1442,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
  * @returns An instance of EvmBuilder class
  */
 var EvmBuilder$1 = function EvmBuilder(api) {
-  return new EvmBuilderClass(api);
+  return new EvmBuilderCore({
+    api: api
+  });
 };
 
 /**
@@ -1509,15 +1458,50 @@ var Builder = function Builder(api) {
   papiApi.setApi(api);
   return sdkCore.Builder(papiApi);
 };
-var GeneralBuilder = sdkCore.GeneralBuilder;
 var EvmBuilder = function EvmBuilder() {
   var papiApi = new PapiApi();
   return EvmBuilder$1(papiApi);
 };
 
+/**
+ * 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.
+ */
+var send = createPapiApiCall(sdkCore.send);
+var getDryRun = createPapiApiCall(sdkCore.getDryRun);
+var getParaEthTransferFees = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ahApi) {
+    var papiApi;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          papiApi = new PapiApi();
+          papiApi.setApi(ahApi);
+          _context.next = 4;
+          return papiApi.init('AssetHubPolkadot');
+        case 4:
+          return _context.abrupt("return", sdkCore.getParaEthTransferFees(papiApi));
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getParaEthTransferFees(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var transfer = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  getDryRun: getDryRun,
+  getParaEthTransferFees: getParaEthTransferFees,
+  send: send
+});
+
 exports.Builder = Builder;
 exports.EvmBuilder = EvmBuilder;
-exports.GeneralBuilder = GeneralBuilder;
 exports.assets = assets;
 exports.claimAssets = claimAssets;
 exports.createApiInstanceForNode = createApiInstanceForNode;

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import * as _paraspell_sdk_core from '@paraspell/sdk-core';
-import { TApiOrUrl, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, TOptionalEvmBuilderOptions, IPolkadotApi, TNodeWithRelayChains, TCurrencyInputWithAmount, GeneralBuilder as GeneralBuilder$1, IFinalBuilderWithOptions as IFinalBuilderWithOptions$1, TNodeDotKsmWithRelayChains } from '@paraspell/sdk-core';
+import { TApiOrUrl, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, TEvmBuilderOptions, TNodeWithRelayChains, TCurrencyInputWithAmount, GeneralBuilder as GeneralBuilder$1, TSendBaseOptions, TNodeDotKsmWithRelayChains } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
+import { TEvmNodeFrom } from '@paraspell/sdk-core/src';
 import * as polkadot_api from 'polkadot-api';
 import { PolkadotClient, UnsafeTransaction } from 'polkadot-api';
 import { Signer } from 'ethers';
@@ -9,29 +10,7 @@ import { WalletClient } from 'viem';
 type TPapiApi = PolkadotClient;
 type TPapiApiOrUrl = TApiOrUrl<PolkadotClient>;
 type TPapiTransaction = UnsafeTransaction<any, string, string, any>;
-
-/**
- * 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 & {
-    origin: _paraspell_sdk_core.TNodeDotKsmWithRelayChains;
-    currency: _paraspell_sdk_core.TCurrencyInputWithAmount;
-} & {
-    api?: TPapiApiOrUrl;
-}) => Promise<TPapiTransaction>;
-declare const getDryRun: (options: _paraspell_sdk_core.TDryRunBaseOptions<TPapiTransaction> & {
-    api?: TPapiApiOrUrl;
-}) => Promise<_paraspell_sdk_core.TDryRunResult>;
-declare const getParaEthTransferFees: (ahApi?: TPapiApiOrUrl) => Promise<[bigint, bigint]>;
-
-declare const transfer_getDryRun: typeof getDryRun;
-declare const transfer_getParaEthTransferFees: typeof getParaEthTransferFees;
-declare const transfer_send: typeof send;
-declare namespace transfer {
-  export { transfer_getDryRun as getDryRun, transfer_getParaEthTransferFees as getParaEthTransferFees, transfer_send as send };
-}
+type TEvmNodeFromPapi = Extract<TEvmNodeFrom, 'Moonbeam' | 'Moonriver' | 'Darwinia'>;
 
 /**
  * Retrieves the native balance for a given account on a specified node.
@@ -70,12 +49,7 @@ declare const getAssetBalance: (options: _paraspell_sdk_core.TGetAssetBalanceOpt
  *
  * @returns An extrinsic representing the claim transaction.
  */
-declare const claimAssets: (options: {
-    node: _paraspell_sdk_core.TNodeWithRelayChains;
-    multiAssets: _paraspell_sdk_core.TMultiAsset[];
-    address: _paraspell_sdk_core.TAddress;
-    version?: _paraspell_sdk_core.TVersionClaimAssets;
-} & {
+declare const claimAssets: (options: _paraspell_sdk_core.TAssetClaimOptionsBase & {
     api?: TPapiApiOrUrl;
 }) => Promise<TPapiTransaction>;
 declare const getOriginFeeDetails: (options: _paraspell_sdk_core.TGetOriginFeeDetailsOptionsBase & {
@@ -130,44 +104,54 @@ declare namespace assets {
 /**
  * Builder class for constructing transfers from Ethereum to Polkadot.
  */
-declare class EvmBuilderClass<TApi, TRes> {
-    _options: TOptionalEvmBuilderOptions<TApi, TRes>;
-    constructor(api: IPolkadotApi<TApi, TRes>);
-    from(node: 'Moonbeam' | 'Moonriver' | 'Darwinia'): this;
+declare class EvmBuilderCore<TApi, TRes, T extends Partial<TEvmBuilderOptions<TApi, TRes>> = object> {
+    protected readonly _options: T;
+    constructor(options: T);
+    from(node: TEvmNodeFromPapi): EvmBuilderCore<TApi, TRes, T & {
+        from: TEvmNodeFromPapi;
+    }>;
     /**
      * Specifies the destination node on Polkadot.
      *
      * @param node - The Polkadot node to which the transfer will be made.
      * @returns An instance of EvmBuilder
      */
-    to(node: TNodeWithRelayChains): this;
+    to(node: TNodeWithRelayChains): EvmBuilderCore<TApi, TRes, T & {
+        to: TNodeWithRelayChains;
+    }>;
     /**
      * Specifies the currency to transfer.
      *
      * @param currency - The currency to be transferred.
      * @returns An instance of EvmBuilder
      */
-    currency(currency: TCurrencyInputWithAmount): this;
+    currency(currency: TCurrencyInputWithAmount): EvmBuilderCore<TApi, TRes, T & {
+        currency: TCurrencyInputWithAmount;
+    }>;
     /**
      * Specifies the recipient address on Polkadot.
      *
      * @param address - The Polkadot address to receive the transfer.
      * @returns An instance of EvmBuilder
      */
-    address(address: string, ahAddress?: string): this;
+    address(address: string, ahAddress?: string): EvmBuilderCore<TApi, TRes, T & {
+        address: string;
+    }>;
     /**
      * Specifies the signer for the Ethereum transaction.
      *
      * @param signer - The Ethereum signer to authorize the transfer.
      * @returns An instance of EvmBuilder
      */
-    signer(signer: Signer | WalletClient): this;
+    signer(signer: Signer | WalletClient): EvmBuilderCore<TApi, TRes, T & {
+        signer: Signer | WalletClient;
+    }>;
     /**
      * Builds and executes the transfer from Ethereum to Polkadot.
      *
      * @throws Error if any required parameters are missing.
      */
-    build(): Promise<string>;
+    build(this: EvmBuilderCore<TApi, TRes, TEvmBuilderOptions<TApi, TRes>>): Promise<string>;
 }
 
 /**
@@ -176,19 +160,32 @@ declare class EvmBuilderClass<TApi, TRes> {
  * @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?: TPapiApiOrUrl) => _paraspell_sdk_core.IFromBuilder<polkadot_api.PolkadotClient, TPapiTransaction>;
-declare const GeneralBuilder: {
-    new (batchManager: {
-        transactionOptions: _paraspell_sdk_core.TSendOptions<polkadot_api.PolkadotClient, TPapiTransaction>[];
-        addTransaction(options: _paraspell_sdk_core.TSendOptions<polkadot_api.PolkadotClient, TPapiTransaction>): void;
-        isEmpty(): boolean;
-        buildBatch(api: _paraspell_sdk_core.IPolkadotApi<polkadot_api.PolkadotClient, TPapiTransaction>, from: _paraspell_sdk_core.TNodeDotKsmWithRelayChains, options?: _paraspell_sdk_core.TBatchOptions): Promise<TPapiTransaction>;
-    }, api: _paraspell_sdk_core.IPolkadotApi<polkadot_api.PolkadotClient, TPapiTransaction>, from?: _paraspell_sdk_core.TNodeDotKsmWithRelayChains): GeneralBuilder$1<polkadot_api.PolkadotClient, TPapiTransaction>;
-};
-declare const EvmBuilder: () => EvmBuilderClass<polkadot_api.PolkadotClient, TPapiTransaction>;
+declare const Builder: (api?: TPapiApiOrUrl) => GeneralBuilder$1<PolkadotClient, TPapiTransaction, object>;
+type GeneralBuilder<T extends Partial<TSendBaseOptions> = object> = GeneralBuilder$1<PolkadotClient, TPapiTransaction, T>;
+declare const EvmBuilder: () => EvmBuilderCore<unknown, unknown, {
+    api: _paraspell_sdk_core.IPolkadotApi<PolkadotClient, TPapiTransaction>;
+}>;
 
-type IFinalBuilderWithOptions = IFinalBuilderWithOptions$1<TPapiApi, TPapiTransaction>;
+/**
+ * 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 & {
+    api?: TPapiApiOrUrl;
+}) => Promise<TPapiTransaction>;
+declare const getDryRun: (options: _paraspell_sdk_core.TDryRunBaseOptions<TPapiTransaction> & {
+    api?: TPapiApiOrUrl;
+}) => Promise<_paraspell_sdk_core.TDryRunResult>;
+declare const getParaEthTransferFees: (ahApi?: TPapiApiOrUrl) => Promise<[bigint, bigint]>;
+
+declare const transfer_getDryRun: typeof getDryRun;
+declare const transfer_getParaEthTransferFees: typeof getParaEthTransferFees;
+declare const transfer_send: typeof send;
+declare namespace transfer {
+  export { transfer_getDryRun as getDryRun, transfer_getParaEthTransferFees as getParaEthTransferFees, transfer_send as send };
+}
 
 declare const createApiInstanceForNode: (node: TNodeDotKsmWithRelayChains) => Promise<polkadot_api.PolkadotClient>;
 
-export { Builder, EvmBuilder, GeneralBuilder, type IFinalBuilderWithOptions, type TPapiApi, type TPapiApiOrUrl, type TPapiTransaction, assets, claimAssets, createApiInstanceForNode, getAssetBalance, getBalanceForeign, getBalanceNative, getDryRun, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getOriginFeeDetails, getParaEthTransferFees, getTransferInfo, getTransferableAmount, send, verifyEdOnDestination, transfer as xcmPallet };
+export { Builder, EvmBuilder, type GeneralBuilder, type TEvmNodeFromPapi, type TPapiApi, type TPapiApiOrUrl, type TPapiTransaction, assets, claimAssets, createApiInstanceForNode, getAssetBalance, getBalanceForeign, getBalanceNative, getDryRun, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getOriginFeeDetails, getParaEthTransferFees, getTransferInfo, getTransferableAmount, send, verifyEdOnDestination, transfer as xcmPallet };

package/dist/index.mjs

@@ -1,9 +1,9 @@
-import { BatchMode, createApiInstanceForNode as createApiInstanceForNode$1, NodeNotSupportedError, Parents, Version, getNode, isForeignAsset, computeFeeFromDryRun, getAssetsObject, getParaEthTransferFees as getParaEthTransferFees$1, send as send$1, getDryRun as getDryRun$1, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getTransferInfo as getTransferInfo$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, getMaxNativeTransferableAmount as getMaxNativeTransferableAmount$1, getMaxForeignTransferableAmount as getMaxForeignTransferableAmount$1, getTransferableAmount as getTransferableAmount$1, verifyEdOnDestination as verifyEdOnDestination$1, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, GeneralBuilder as GeneralBuilder$1, Builder as Builder$1 } from '@paraspell/sdk-core';
+import { BatchMode, createApiInstanceForNode as createApiInstanceForNode$1, NodeNotSupportedError, Parents, Version, getNode, isForeignAsset, computeFeeFromDryRun, getAssetsObject, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getTransferInfo as getTransferInfo$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, getMaxNativeTransferableAmount as getMaxNativeTransferableAmount$1, getMaxForeignTransferableAmount as getMaxForeignTransferableAmount$1, getTransferableAmount as getTransferableAmount$1, verifyEdOnDestination as verifyEdOnDestination$1, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, getParaEthTransferFees as getParaEthTransferFees$1, send as send$1, getDryRun as getDryRun$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
-import { withPolkadotSdkCompat } from 'polkadot-api/polkadot-sdk-compat';
-import { FixedSizeBinary, Binary, createClient, AccountId } from 'polkadot-api';
 import { blake2b } from '@noble/hashes/blake2b';
 import { bytesToHex } from '@noble/hashes/utils';
+import { FixedSizeBinary, Binary, createClient, AccountId } from 'polkadot-api';
+import { withPolkadotSdkCompat } from 'polkadot-api/polkadot-sdk-compat';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -1234,20 +1234,20 @@ var PapiApi = /*#__PURE__*/function () {
 }();
 
 var createApiInstanceForNode = function createApiInstanceForNode(node) {
-  var pjsApi = new PapiApi();
-  return createApiInstanceForNode$1(pjsApi, node);
+  var papiApi = new PapiApi();
+  return createApiInstanceForNode$1(papiApi, node);
 };
 var createPapiApiCall = function createPapiApiCall(apiCall) {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-      var pjsApi, optionsWithApi;
+      var papiApi, optionsWithApi;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            pjsApi = new PapiApi();
-            pjsApi.setApi(options.api);
+            papiApi = new PapiApi();
+            papiApi.setApi(options.api);
             optionsWithApi = _objectSpread2(_objectSpread2({}, options), {}, {
-              api: pjsApi
+              api: papiApi
             });
             return _context.abrupt("return", apiCall(optionsWithApi));
           case 4:
@@ -1262,43 +1262,6 @@ var createPapiApiCall = function createPapiApiCall(apiCall) {
   }();
 };
 
-/**
- * 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.
- */
-var send = createPapiApiCall(send$1);
-var getDryRun = createPapiApiCall(getDryRun$1);
-var getParaEthTransferFees = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ahApi) {
-    var papiApi;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          papiApi = new PapiApi();
-          papiApi.setApi(ahApi);
-          _context.next = 4;
-          return papiApi.init('AssetHubPolkadot');
-        case 4:
-          return _context.abrupt("return", getParaEthTransferFees$1(papiApi));
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getParaEthTransferFees(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var transfer = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  getDryRun: getDryRun,
-  getParaEthTransferFees: getParaEthTransferFees,
-  send: send
-});
-
 /**
  * Retrieves the native balance for a given account on a specified node.
  *
@@ -1371,17 +1334,17 @@ var assets = /*#__PURE__*/Object.freeze({
 /**
  * Builder class for constructing transfers from Ethereum to Polkadot.
  */
-var EvmBuilderClass = /*#__PURE__*/function () {
-  function EvmBuilderClass(api) {
-    _classCallCheck(this, EvmBuilderClass);
-    this._options = {};
-    this._options.api = api;
+var EvmBuilderCore = /*#__PURE__*/function () {
+  function EvmBuilderCore(options) {
+    _classCallCheck(this, EvmBuilderCore);
+    this._options = options;
   }
-  return _createClass(EvmBuilderClass, [{
+  return _createClass(EvmBuilderCore, [{
     key: "from",
     value: function from(node) {
-      this._options.from = node;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        from: node
+      }));
     }
     /**
      * Specifies the destination node on Polkadot.
@@ -1392,8 +1355,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "to",
     value: function to(node) {
-      this._options.to = node;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        to: node
+      }));
     }
     /**
      * Specifies the currency to transfer.
@@ -1404,8 +1368,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "currency",
     value: function currency(_currency) {
-      this._options.currency = _currency;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        currency: _currency
+      }));
     }
     /**
      * Specifies the recipient address on Polkadot.
@@ -1416,9 +1381,10 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "address",
     value: function address(_address, ahAddress) {
-      this._options.address = _address;
-      this._options.ahAddress = ahAddress;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        address: _address,
+        ahAddress: ahAddress
+      }));
     }
     /**
      * Specifies the signer for the Ethereum transaction.
@@ -1429,8 +1395,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
   }, {
     key: "signer",
     value: function signer(_signer) {
-      this._options.signer = _signer;
-      return this;
+      return new EvmBuilderCore(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        signer: _signer
+      }));
     }
     /**
      * Builds and executes the transfer from Ethereum to Polkadot.
@@ -1441,40 +1408,20 @@ var EvmBuilderClass = /*#__PURE__*/function () {
     key: "build",
     value: (function () {
       var _build = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var requiredParams, _i, _requiredParams, param;
+        var _this$_options, from, to, address;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              requiredParams = ['from', 'to', 'currency', 'address', 'signer'];
-              _i = 0, _requiredParams = requiredParams;
-            case 2:
-              if (!(_i < _requiredParams.length)) {
-                _context.next = 9;
-                break;
-              }
-              param = _requiredParams[_i];
-              if (!(this._options[param] === undefined)) {
-                _context.next = 6;
-                break;
-              }
-              throw new Error("Builder object is missing parameter: ".concat(param));
-            case 6:
-              _i++;
-              _context.next = 2;
-              break;
-            case 9:
-              validateAddress(this._options.address, this._options.to);
-              if (!(this._options.from === 'Moonbeam' && this._options.to === 'Ethereum')) {
-                _context.next = 12;
+              _this$_options = this._options, from = _this$_options.from, to = _this$_options.to, address = _this$_options.address;
+              validateAddress(address, to);
+              if (!(from === 'Moonbeam' && to === 'Ethereum')) {
+                _context.next = 4;
                 break;
               }
               return _context.abrupt("return", transferMoonbeamToEth(this._options));
-            case 12:
-              _context.next = 14;
-              return transferMoonbeamEvm(this._options);
-            case 14:
-              return _context.abrupt("return", _context.sent);
-            case 15:
+            case 4:
+              return _context.abrupt("return", transferMoonbeamEvm(this._options));
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -1494,7 +1441,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
  * @returns An instance of EvmBuilder class
  */
 var EvmBuilder$1 = function EvmBuilder(api) {
-  return new EvmBuilderClass(api);
+  return new EvmBuilderCore({
+    api: api
+  });
 };
 
 /**
@@ -1508,10 +1457,46 @@ var Builder = function Builder(api) {
   papiApi.setApi(api);
   return Builder$1(papiApi);
 };
-var GeneralBuilder = GeneralBuilder$1;
 var EvmBuilder = function EvmBuilder() {
   var papiApi = new PapiApi();
   return EvmBuilder$1(papiApi);
 };
 
-export { Builder, EvmBuilder, GeneralBuilder, assets, claimAssets, createApiInstanceForNode, getAssetBalance, getBalanceForeign, getBalanceNative, getDryRun, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getOriginFeeDetails, getParaEthTransferFees, getTransferInfo, getTransferableAmount, send, verifyEdOnDestination, transfer as xcmPallet };
+/**
+ * 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.
+ */
+var send = createPapiApiCall(send$1);
+var getDryRun = createPapiApiCall(getDryRun$1);
+var getParaEthTransferFees = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ahApi) {
+    var papiApi;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          papiApi = new PapiApi();
+          papiApi.setApi(ahApi);
+          _context.next = 4;
+          return papiApi.init('AssetHubPolkadot');
+        case 4:
+          return _context.abrupt("return", getParaEthTransferFees$1(papiApi));
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getParaEthTransferFees(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var transfer = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  getDryRun: getDryRun,
+  getParaEthTransferFees: getParaEthTransferFees,
+  send: send
+});
+
+export { Builder, EvmBuilder, assets, claimAssets, createApiInstanceForNode, getAssetBalance, getBalanceForeign, getBalanceNative, getDryRun, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getOriginFeeDetails, getParaEthTransferFees, getTransferInfo, getTransferableAmount, send, verifyEdOnDestination, transfer as xcmPallet };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "description": "SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "ethers": "^6.13.5",
     "viem": "^2.23.5",
     "@noble/hashes": "^1.7.1",
-    "@paraspell/sdk-core": "8.6.0"
+    "@paraspell/sdk-core": "8.6.1"
   },
   "peerDependencies": {
     "polkadot-api": ">= 1.9.3 < 2"