@paraspell/sdk 12.1.2 → 12.2.1

package/README.md

@@ -309,9 +309,12 @@ const builder = await Builder({
   .from(TSubstrateChain)
   .to(TChain)
   .currency({id: currencyID, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: currencySymbol, amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Native('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: Foreign('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {symbol: ForeignAbstract('currencySymbol'), amount: amount /*Use "ALL" to transfer everything*/} | {location: AssetLocationString, amount: amount /*Use "ALL" to transfer everything*/ | AssetLocationJson, amount: amount /*Use "ALL" to transfer everything*/} | {location: Override('Custom Location'), amount: amount /*Use "ALL" to transfer everything*/} | [{currencySelection, isFeeAsset?: true /* for example symbol: symbol or id: id, or Location: Location*/, amount: amount /*Use "ALL" to transfer everything*/}])
-  .address(address)
+  .address(address) //You can also use prederived accounts - //Alice, //Bob... //Alith, //Balthathar...
+  .senderAddress(address) //You can also use prederived accounts //Alice, //Bob... //Alith, //Balthathar...
 
 const tx = await builder.build()
+//Or if you use prederived account as senderAddress:
+//await builder.signAndSubmit()
 
 //Disconnect API after TX
 await builder.disconnect()

package/dist/index.mjs

@@ -1,21 +1,23 @@
-import { NumberFormatError, isConfig, InvalidAddressError, BatchMode, findNativeAssetInfoOrThrow, getChainProviders, MissingChainApiError, Parents, Version, findAssetInfoOrThrow, computeFeeFromDryRun, hasXcmPaymentApiSupport, replaceBigInt, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, padValueBy, isRelayChain, isAssetEqual, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1, getParaEthTransferFees as getParaEthTransferFees$1, getBridgeStatus as getBridgeStatus$1, getXcmFee as getXcmFee$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1 } from '@paraspell/sdk-core';
+import { getEvmPrivateKeyHex, NumberFormatError, createClientCache, createClientPoolHelpers, isConfig, getChainProviders, InvalidAddressError, BatchMode, findNativeAssetInfoOrThrow, MissingChainApiError, Parents, Version, findAssetInfoOrThrow, computeFeeFromDryRun, hasXcmPaymentApiSupport, replaceBigInt, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, padValueBy, isRelayChain, isAssetEqual, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1, getParaEthTransferFees as getParaEthTransferFees$1, getBridgeStatus as getBridgeStatus$1, getXcmFee as getXcmFee$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
+import { secp256k1 } from '@noble/curves/secp256k1.js';
+import { keccak_256 } from '@noble/hashes/sha3.js';
+import { bytesToHex, hexToBytes } from '@noble/hashes/utils.js';
+import { sr25519CreateDerive } from '@polkadot-labs/hdkd';
+import { entropyToMiniSecret, mnemonicToEntropy, DEV_PHRASE } from '@polkadot-labs/hdkd-helpers';
+import { AccountId, Binary, FixedSizeBinary, getSs58AddressInfo, createClient } from 'polkadot-api';
+import { getPolkadotSigner } from 'polkadot-api/signer';
 import { blake2b } from '@noble/hashes/blake2.js';
-import { bytesToHex } from '@noble/hashes/utils.js';
 import { withLegacy } from '@polkadot-api/legacy-provider';
-import { Binary, FixedSizeBinary, getSs58AddressInfo, AccountId, createClient } from 'polkadot-api';
 import { withPolkadotSdkCompat } from 'polkadot-api/polkadot-sdk-compat';
 import { getWsProvider } from 'polkadot-api/ws-provider';
-import { isAddress } from 'viem';
+import { isAddress, isHex } from 'viem';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
   for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
   return n;
 }
-function _arrayWithHoles(r) {
-  if (Array.isArray(r)) return r;
-}
 function _arrayWithoutHoles(r) {
   if (Array.isArray(r)) return _arrayLikeToArray(r);
 }
@@ -117,33 +119,6 @@ function _defineProperty(e, r, t) {
 function _iterableToArray(r) {
   if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
 }
-function _iterableToArrayLimit(r, l) {
-  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (null != t) {
-    var e,
-      n,
-      i,
-      u,
-      a = [],
-      f = true,
-      o = false;
-    try {
-      if (i = (t = t.call(r)).next, 0 === l) ; else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-    } catch (r) {
-      o = true, n = r;
-    } finally {
-      try {
-        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
-      } finally {
-        if (o) throw n;
-      }
-    }
-    return a;
-  }
-}
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _nonIterableSpread() {
   throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
@@ -276,9 +251,6 @@ function _regeneratorDefine(e, r, n, t) {
     }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
   }, _regeneratorDefine(e, r, n, t);
 }
-function _slicedToArray(r, e) {
-  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
-}
 function _toConsumableArray(r) {
   return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
 }
@@ -313,6 +285,51 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
+var signEcdsa = function signEcdsa(input, privateKey) {
+  var signature = secp256k1.sign(keccak_256(input), privateKey, {
+    prehash: false,
+    format: 'recovered'
+  });
+  return Uint8Array.from([].concat(_toConsumableArray(signature.slice(1)), [signature[0]]));
+};
+var createSr25519Keypair = function createSr25519Keypair(path) {
+  var miniSecret = entropyToMiniSecret(mnemonicToEntropy(DEV_PHRASE));
+  var derive = sr25519CreateDerive(miniSecret);
+  return derive(path);
+};
+var createSr25519Signer = function createSr25519Signer(path) {
+  var keyPair = createSr25519Keypair(path);
+  return getPolkadotSigner(keyPair.publicKey, 'Sr25519', keyPair.sign);
+};
+var resolveEcdsaAddress = function resolveEcdsaAddress(privateKey) {
+  return keccak_256(secp256k1.getPublicKey(privateKey, false).slice(1)).slice(-20);
+};
+var createEcdsaSigner = function createEcdsaSigner(privateKey) {
+  var publicAddress = resolveEcdsaAddress(privateKey);
+  return getPolkadotSigner(publicAddress, 'Ecdsa', function (input) {
+    return signEcdsa(input, privateKey);
+  });
+};
+var getEvmPrivateKey = function getEvmPrivateKey(path) {
+  var pkHex = getEvmPrivateKeyHex(path);
+  if (pkHex) return hexToBytes(pkHex.slice(2));
+  return undefined;
+};
+var createDevSigner = function createDevSigner(path) {
+  var evmPrivateKey = getEvmPrivateKey(path);
+  if (evmPrivateKey) return createEcdsaSigner(evmPrivateKey);
+  return createSr25519Signer(path);
+};
+var deriveAddress = function deriveAddress(path) {
+  var evmPrivateKey = getEvmPrivateKey(path);
+  if (evmPrivateKey) {
+    var address = resolveEcdsaAddress(evmPrivateKey);
+    return "0x".concat(bytesToHex(address));
+  }
+  var keyPair = createSr25519Keypair(path);
+  return AccountId().dec(keyPair.publicKey);
+};
+
 var LEGACY_CHAINS = ['Interlay', 'CrustShadow', 'Kintsugi', 'RobonomicsPolkadot', 'Pendulum'];
 // Cache settings
 var DEFAULT_TTL_MS = 60000; // 1 minute
@@ -551,180 +568,24 @@ var _transform = function transform(obj) {
   }
 };
 
-function createClientCache(maxSize, onEviction) {
-  var extensionMs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 5 * 60000;
-  var data = new Map();
-  var timers = new Map();
-  var now = function now() {
-    return Date.now();
-  };
-  var timeLeft = function timeLeft(w) {
-    return Math.max(w.expireAt - now(), 0);
-  };
-  var schedule = function schedule(k, delay) {
-    if (timers.has(k)) clearTimeout(timers.get(k));
-    timers.set(k, setTimeout(function () {
-      return handleTimeout(k);
-    }, delay));
-  };
-  var handleTimeout = function handleTimeout(k) {
-    var w = data.get(k);
-    if (!w) return;
-    if (!w.extended && w.value.refs > 0) {
-      // first expiry while still in use - Extend grace period
-      // Call rpc.properties to keep the connection alive
-      void _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.p = _context.n) {
-            case 0:
-              _context.p = 0;
-              _context.n = 1;
-              return w.value.client.getChainSpecData();
-            case 1:
-              _context.n = 3;
-              break;
-            case 2:
-              _context.p = 2;
-              _context.v;
-            case 3:
-              return _context.a(2);
-          }
-        }, _callee, null, [[0, 2]]);
-      }))();
-      w.value.destroyWanted = true;
-      w.extended = true;
-      w.expireAt = now() + extensionMs;
-      schedule(k, extensionMs);
-      return;
-    }
-    evict(k); // second expiry or unused - real eviction
-  };
-  var evict = function evict(k) {
-    var w = data.get(k);
-    if (!w) return;
-    clearTimeout(timers.get(k));
-    timers["delete"](k);
-    data["delete"](k);
-    onEviction === null || onEviction === void 0 || onEviction(k, w.value);
-  };
-  var evictIfNeeded = function evictIfNeeded() {
-    if (data.size <= maxSize) return;
-    var victimKey;
-    var victim;
-    var _iterator = _createForOfIteratorHelper(data),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _step$value = _slicedToArray(_step.value, 2),
-          k = _step$value[0],
-          w = _step$value[1];
-        if (!victim) {
-          victimKey = k;
-          victim = w;
-          continue;
-        }
-        var better = w.extended && !victim.extended ||
-        // Prefer extended over normal
-        w.extended === victim.extended && w.value.destroyWanted && !victim.value.destroyWanted || w.extended === victim.extended && w.value.destroyWanted === victim.value.destroyWanted && timeLeft(w) < timeLeft(victim) || w.extended === victim.extended && w.value.destroyWanted === victim.value.destroyWanted && timeLeft(w) === timeLeft(victim) && w.value.refs < victim.value.refs; // Prefer with less refs
-        if (better) {
-          victimKey = k;
-          victim = w;
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    if (victimKey !== undefined) evict(victimKey);
-  };
-  var set = function set(k, v, ttl) {
-    var existing = data.get(k);
-    if (existing) {
-      existing.value = v;
-      existing.ttl = ttl;
-      existing.extended = false;
-      existing.expireAt = now() + ttl;
-      schedule(k, ttl);
-    } else {
-      data.set(k, {
-        value: v,
-        ttl: ttl,
-        extended: false,
-        expireAt: now() + ttl
-      });
-      schedule(k, ttl);
-    }
-    evictIfNeeded();
-  };
-  var get = function get(k) {
-    var w = data.get(k);
-    if (!w) return undefined;
-    if (!w.extended && timeLeft(w) < w.ttl) {
-      w.expireAt = now() + w.ttl; // refresh normal life
-      schedule(k, w.ttl);
-    }
-    return w.value;
-  };
-  var revive = function revive(k, ttl) {
-    var w = data.get(k);
-    if (!w) return;
-    var remaining = timeLeft(w);
-    w.extended = false;
-    if (ttl < remaining) {
-      w.ttl = ttl;
-      w.expireAt = now() + ttl;
-      schedule(k, ttl);
-    }
-    // if ttl ≥ remaining - keep current timer
-  };
-  var del = function del(k) {
-    if (!data.has(k)) return false;
-    evict(k);
-    return true;
-  };
-  var clear = function clear() {
-    var _iterator2 = _createForOfIteratorHelper(timers.values()),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var t = _step2.value;
-        clearTimeout(t);
+var clientPool = createClientCache(MAX_CLIENTS, /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(client) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          _context.n = 1;
+          return client.getChainSpecData();
+        case 1:
+          return _context.a(2);
       }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    timers.clear();
-    data.clear();
-  };
-  return {
-    set: set,
-    get: get,
-    "delete": del,
-    has: function has(k) {
-      return data.has(k);
-    },
-    clear: clear,
-    peek: function peek(k) {
-      var _data$get;
-      return (_data$get = data.get(k)) === null || _data$get === void 0 ? void 0 : _data$get.value;
-    },
-    remainingTtl: function remainingTtl(k) {
-      var w = data.get(k);
-      return w ? timeLeft(w) : undefined;
-    },
-    revive: revive
+    }, _callee);
+  }));
+  return function (_x) {
+    return _ref.apply(this, arguments);
   };
-}
-
-var clientPool = createClientCache(MAX_CLIENTS, function (_key, entry) {
+}(), function (_key, entry) {
   entry.client.destroy();
 }, EXTENSION_MS);
-var keyFromWs = function keyFromWs(ws) {
-  return Array.isArray(ws) ? JSON.stringify(ws) : ws;
-};
 var createPolkadotClient = function createPolkadotClient(ws, useLegacy) {
   var options = useLegacy ? {
     innerEnhancer: withLegacy()
@@ -732,48 +593,21 @@ var createPolkadotClient = function createPolkadotClient(ws, useLegacy) {
   var provider = getWsProvider(ws, options);
   return createClient(useLegacy ? provider : withPolkadotSdkCompat(provider));
 };
-var leasePolkadotClient = function leasePolkadotClient(ws, ttlMs, useLegacy) {
-  var key = keyFromWs(ws);
-  var entry = clientPool.peek(key);
-  if (!entry) {
-    entry = {
-      client: createPolkadotClient(ws, useLegacy),
-      refs: 0,
-      destroyWanted: false
-    };
-    clientPool.set(key, entry, ttlMs);
-  }
-  entry.refs += 1;
-  clientPool.revive(key, ttlMs);
-  entry.destroyWanted = false;
-  return entry.client;
-};
-var releasePolkadotClient = function releasePolkadotClient(ws) {
-  var key = keyFromWs(ws);
-  var entry = clientPool.peek(key);
-  if (!entry) {
-    return;
-  }
-  entry.refs -= 1;
-  if (entry.refs === 0 && entry.destroyWanted) {
-    clientPool["delete"](key);
-  }
-};
-var isHex = function isHex(str) {
-  return typeof str === 'string' && /^0x[0-9a-fA-F]+$/.test(str);
-};
+var _createClientPoolHelp = createClientPoolHelpers(clientPool, createPolkadotClient),
+  leaseClient = _createClientPoolHelp.leaseClient,
+  releaseClient = _createClientPoolHelp.releaseClient;
 var extractDryRunXcmFailureReason = function extractDryRunXcmFailureReason(result) {
-  var _result$value, _executionResult$valu, _ref, _ref2, _ref3, _error$error$type, _error$error, _error$value, _error$value2, _error$value3, _ref4, _result$value2;
+  var _result$value, _executionResult$valu, _ref2, _ref3, _ref4, _error$error$type, _error$error, _error$value, _error$value2, _error$value3, _ref5, _result$value2;
   var executionResult = result === null || result === void 0 || (_result$value = result.value) === null || _result$value === void 0 ? void 0 : _result$value.execution_result;
   var error = executionResult === null || executionResult === void 0 || (_executionResult$valu = executionResult.value) === null || _executionResult$valu === void 0 ? void 0 : _executionResult$valu.error;
-  var failureType = (_ref = (_ref2 = (_ref3 = (_error$error$type = error === null || error === void 0 || (_error$error = error.error) === null || _error$error === void 0 ? void 0 : _error$error.type) !== null && _error$error$type !== void 0 ? _error$error$type : error === null || error === void 0 || (_error$value = error.value) === null || _error$value === void 0 || (_error$value = _error$value.error) === null || _error$value === void 0 ? void 0 : _error$value.type) !== null && _ref3 !== void 0 ? _ref3 : error === null || error === void 0 || (_error$value2 = error.value) === null || _error$value2 === void 0 || (_error$value2 = _error$value2.value) === null || _error$value2 === void 0 ? void 0 : _error$value2.type) !== null && _ref2 !== void 0 ? _ref2 : error === null || error === void 0 || (_error$value3 = error.value) === null || _error$value3 === void 0 ? void 0 : _error$value3.type) !== null && _ref !== void 0 ? _ref : error === null || error === void 0 ? void 0 : error.type;
+  var failureType = (_ref2 = (_ref3 = (_ref4 = (_error$error$type = error === null || error === void 0 || (_error$error = error.error) === null || _error$error === void 0 ? void 0 : _error$error.type) !== null && _error$error$type !== void 0 ? _error$error$type : error === null || error === void 0 || (_error$value = error.value) === null || _error$value === void 0 || (_error$value = _error$value.error) === null || _error$value === void 0 ? void 0 : _error$value.type) !== null && _ref4 !== void 0 ? _ref4 : error === null || error === void 0 || (_error$value2 = error.value) === null || _error$value2 === void 0 || (_error$value2 = _error$value2.value) === null || _error$value2 === void 0 ? void 0 : _error$value2.type) !== null && _ref3 !== void 0 ? _ref3 : error === null || error === void 0 || (_error$value3 = error.value) === null || _error$value3 === void 0 ? void 0 : _error$value3.type) !== null && _ref2 !== void 0 ? _ref2 : error === null || error === void 0 ? void 0 : error.type;
   if (typeof failureType === 'string') {
     return failureType;
   }
   if (typeof (executionResult === null || executionResult === void 0 ? void 0 : executionResult.type) === 'string') {
     return executionResult.type;
   }
-  return JSON.stringify((_ref4 = (_result$value2 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value2 !== void 0 ? _result$value2 : result) !== null && _ref4 !== void 0 ? _ref4 : 'Unknown error structure', replaceBigInt);
+  return JSON.stringify((_ref5 = (_result$value2 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value2 !== void 0 ? _result$value2 : result) !== null && _ref5 !== void 0 ? _ref5 : 'Unknown error structure', replaceBigInt);
 };
 var PapiApi = /*#__PURE__*/function () {
   function PapiApi(config) {
@@ -796,40 +630,40 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain) {
+      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(chain) {
         var clientTtlMs,
           apiConfig,
           _args = arguments;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
             case 0:
               clientTtlMs = _args.length > 1 && _args[1] !== undefined ? _args[1] : DEFAULT_TTL_MS;
               if (!(this.initialized || chain === 'Ethereum')) {
-                _context.n = 1;
+                _context2.n = 1;
                 break;
               }
-              return _context.a(2);
+              return _context2.a(2);
             case 1:
               this._ttlMs = clientTtlMs;
               this._chain = chain;
               apiConfig = this.getApiConfigForChain(chain); // For development mode, api for each used chain must be provided
               if (!(isConfig(this._config) && this._config.development && !apiConfig)) {
-                _context.n = 2;
+                _context2.n = 2;
                 break;
               }
               throw new MissingChainApiError(chain);
             case 2:
-              _context.n = 3;
+              _context2.n = 3;
               return this.resolveApi(apiConfig, chain);
             case 3:
-              this.api = _context.v;
+              this.api = _context2.v;
               this.initialized = true;
             case 4:
-              return _context.a(2);
+              return _context2.a(2);
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function init(_x) {
+      function init(_x2) {
         return _init.apply(this, arguments);
       }
       return init;
@@ -845,39 +679,21 @@ var PapiApi = /*#__PURE__*/function () {
     }
   }, {
     key: "resolveApi",
-    value: function () {
-      var _resolveApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(apiConfig, chain) {
-        var wsUrl;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
-            case 0:
-              if (apiConfig) {
-                _context2.n = 1;
-                break;
-              }
-              wsUrl = getChainProviders(chain);
-              return _context2.a(2, this.createApiInstance(wsUrl, chain));
-            case 1:
-              if (!(typeof apiConfig === 'string' || apiConfig instanceof Array)) {
-                _context2.n = 2;
-                break;
-              }
-              return _context2.a(2, this.createApiInstance(apiConfig, chain));
-            case 2:
-              return _context2.a(2, apiConfig);
-          }
-        }, _callee2, this);
-      }));
-      function resolveApi(_x2, _x3) {
-        return _resolveApi.apply(this, arguments);
+    value: function resolveApi(apiConfig, chain) {
+      if (!apiConfig) {
+        var wsUrl = getChainProviders(chain);
+        return this.createApiInstance(wsUrl, chain);
       }
-      return resolveApi;
-    }()
+      if (typeof apiConfig === 'string' || apiConfig instanceof Array) {
+        return this.createApiInstance(apiConfig, chain);
+      }
+      return Promise.resolve(apiConfig);
+    }
   }, {
     key: "createApiInstance",
     value: function createApiInstance(wsUrl, chain) {
       var useLegacy = LEGACY_CHAINS.includes(chain);
-      return Promise.resolve(leasePolkadotClient(wsUrl, this._ttlMs, useLegacy));
+      return Promise.resolve(leaseClient(wsUrl, this._ttlMs, useLegacy));
     }
   }, {
     key: "accountToHex",
@@ -904,29 +720,29 @@ var PapiApi = /*#__PURE__*/function () {
     }
   }, {
     key: "deserializeExtrinsics",
-    value: function deserializeExtrinsics(_ref5) {
-      var module = _ref5.module,
-        method = _ref5.method,
-        params = _ref5.params;
+    value: function deserializeExtrinsics(_ref6) {
+      var module = _ref6.module,
+        method = _ref6.method,
+        params = _ref6.params;
       var transformedParams = _transform(params);
       return this.api.getUnsafeApi().tx[module][method](transformedParams);
     }
   }, {
     key: "queryState",
-    value: function queryState(_ref6) {
+    value: function queryState(_ref7) {
       var _this$api$getUnsafeAp;
-      var module = _ref6.module,
-        method = _ref6.method,
-        params = _ref6.params;
+      var module = _ref7.module,
+        method = _ref7.method,
+        params = _ref7.params;
       return (_this$api$getUnsafeAp = this.api.getUnsafeApi().query[module][method]).getValue.apply(_this$api$getUnsafeAp, _toConsumableArray(params.map(_transform)));
     }
   }, {
     key: "queryRuntimeApi",
-    value: function queryRuntimeApi(_ref7) {
+    value: function queryRuntimeApi(_ref8) {
       var _this$api$getUnsafeAp2;
-      var module = _ref7.module,
-        method = _ref7.method,
-        params = _ref7.params;
+      var module = _ref8.module,
+        method = _ref8.method,
+        params = _ref8.params;
       return (_this$api$getUnsafeAp2 = this.api.getUnsafeApi().apis[module])[method].apply(_this$api$getUnsafeAp2, _toConsumableArray(params.map(_transform)));
     }
   }, {
@@ -986,7 +802,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function objectToHex(_x4) {
+      function objectToHex(_x3) {
         return _objectToHex.apply(this, arguments);
       }
       return objectToHex;
@@ -1034,7 +850,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee4, this, [[0, 2]]);
       }));
-      function hasMethod(_x5, _x6) {
+      function hasMethod(_x4, _x5) {
         return _hasMethod.apply(this, arguments);
       }
       return hasMethod;
@@ -1061,7 +877,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee5);
       }));
-      function calculateTransactionFee(_x7, _x8) {
+      function calculateTransactionFee(_x6, _x7) {
         return _calculateTransactionFee.apply(this, arguments);
       }
       return calculateTransactionFee;
@@ -1074,11 +890,11 @@ var PapiApi = /*#__PURE__*/function () {
           transformedFromMl,
           transformedToMl,
           response,
-          _args6 = arguments;
+          _args5 = arguments;
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.n) {
             case 0:
-              includeFee = _args6.length > 3 && _args6[3] !== undefined ? _args6[3] : true;
+              includeFee = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : true;
               transformedFromMl = _transform(fromMl);
               transformedToMl = _transform(toMl);
               _context6.n = 1;
@@ -1089,7 +905,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function quoteAhPrice(_x9, _x0, _x1) {
+      function quoteAhPrice(_x8, _x9, _x0) {
         return _quoteAhPrice.apply(this, arguments);
       }
       return quoteAhPrice;
@@ -1103,20 +919,19 @@ var PapiApi = /*#__PURE__*/function () {
     key: "getFromRpc",
     value: function () {
       var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(module, method, key) {
-        var toSS58, value;
+        var value;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
             case 0:
-              toSS58 = AccountId().dec;
               _context7.n = 1;
-              return this.api._request("".concat(module, "_").concat(method), [module === 'system' && isHex(key) && !isAddress(key) ? toSS58(key) : key]);
+              return this.api._request("".concat(module, "_").concat(method), [module === 'system' && isHex(key) && !isAddress(key) ? AccountId().dec(key) : key]);
             case 1:
               value = _context7.v;
               return _context7.a(2, isHex(value) ? value : '0x' + value.toString(16).padStart(8, '0'));
           }
         }, _callee7, this);
       }));
-      function getFromRpc(_x10, _x11, _x12) {
+      function getFromRpc(_x1, _x10, _x11) {
         return _getFromRpc.apply(this, arguments);
       }
       return getFromRpc;
@@ -1142,16 +957,16 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee8);
       }));
-      function createApiForChain(_x13) {
+      function createApiForChain(_x12) {
         return _createApiForChain.apply(this, arguments);
       }
       return createApiForChain;
     }()
   }, {
     key: "resolveDefaultFeeAsset",
-    value: function resolveDefaultFeeAsset(_ref8) {
-      var chain = _ref8.chain,
-        feeAsset = _ref8.feeAsset;
+    value: function resolveDefaultFeeAsset(_ref9) {
+      var chain = _ref9.chain,
+        feeAsset = _ref9.feeAsset;
       return feeAsset !== null && feeAsset !== void 0 ? feeAsset : findNativeAssetInfoOrThrow(chain);
     }
   }, {
@@ -1194,7 +1009,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function resolveFeeAsset(_x14) {
+      function resolveFeeAsset(_x13) {
         return _resolveFeeAsset.apply(this, arguments);
       }
       return resolveFeeAsset;
@@ -1243,7 +1058,7 @@ var PapiApi = /*#__PURE__*/function () {
             case 4:
               resolvedTx = _t2;
               performDryRunCall = /*#__PURE__*/function () {
-                var _ref9 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(includeVersion) {
+                var _ref0 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(includeVersion) {
                   var _this$api$getUnsafeAp3;
                   var callArgs;
                   return _regenerator().w(function (_context0) {
@@ -1257,8 +1072,8 @@ var PapiApi = /*#__PURE__*/function () {
                     }
                   }, _callee0);
                 }));
-                return function performDryRunCall(_x16) {
-                  return _ref9.apply(this, arguments);
+                return function performDryRunCall(_x15) {
+                  return _ref0.apply(this, arguments);
                 };
               }();
               getExecutionSuccessFromResult = function getExecutionSuccessFromResult(result) {
@@ -1287,7 +1102,7 @@ var PapiApi = /*#__PURE__*/function () {
                 return result;
               };
               extractFailureReasonFromResult = function extractFailureReasonFromResult(result) {
-                var _obj$value, _ref0, _result$value6;
+                var _obj$value, _ref1, _result$value6;
                 var obj = findFailureObjectFromResult(result);
                 if (obj !== null && obj !== void 0 && obj.type && obj !== null && obj !== void 0 && (_obj$value = obj.value) !== null && _obj$value !== void 0 && (_obj$value = _obj$value.error) !== null && _obj$value !== void 0 && _obj$value.type) {
                   return {
@@ -1301,7 +1116,7 @@ var PapiApi = /*#__PURE__*/function () {
                   };
                 }
                 return {
-                  failureReason: JSON.stringify((_ref0 = (_result$value6 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value6 !== void 0 ? _result$value6 : result) !== null && _ref0 !== void 0 ? _ref0 : 'Unknown error structure', replaceBigInt)
+                  failureReason: JSON.stringify((_ref1 = (_result$value6 = result === null || result === void 0 ? void 0 : result.value) !== null && _result$value6 !== void 0 ? _result$value6 : result) !== null && _ref1 !== void 0 ? _ref1 : 'Unknown error structure', replaceBigInt)
                 };
               };
               failureOutputReason = {
@@ -1364,7 +1179,7 @@ var PapiApi = /*#__PURE__*/function () {
                 break;
               }
               getPaymentInfoWeight = /*#__PURE__*/function () {
-                var _ref1 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+                var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
                   var _yield$tx$getPaymentI, weight;
                   return _regenerator().w(function (_context1) {
                     while (1) switch (_context1.n) {
@@ -1379,7 +1194,7 @@ var PapiApi = /*#__PURE__*/function () {
                   }, _callee1);
                 }));
                 return function getPaymentInfoWeight() {
-                  return _ref1.apply(this, arguments);
+                  return _ref10.apply(this, arguments);
                 };
               }();
               if (result.value.local_xcm) {
@@ -1434,7 +1249,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function getDryRunCall(_x15) {
+      function getDryRunCall(_x14) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -1459,7 +1274,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function getXcmWeight(_x17) {
+      function getXcmWeight(_x16) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -1487,18 +1302,18 @@ var PapiApi = /*#__PURE__*/function () {
           nativeAsset,
           deliveryFee,
           res,
-          _args13 = arguments,
+          _args12 = arguments,
           _t4,
           _t5,
           _t6;
         return _regenerator().w(function (_context13) {
           while (1) switch (_context13.p = _context13.n) {
             case 0:
-              transformXcm = _args13.length > 4 && _args13[4] !== undefined ? _args13[4] : false;
-              overridenWeight = _args13.length > 5 ? _args13[5] : undefined;
+              transformXcm = _args12.length > 4 && _args12[4] !== undefined ? _args12[4] : false;
+              overridenWeight = _args12.length > 5 ? _args12[5] : undefined;
               transformedXcm = transformXcm ? _transform(localXcm) : localXcm;
               queryWeight = /*#__PURE__*/function () {
-                var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
+                var _ref11 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
                   var weightRes;
                   return _regenerator().w(function (_context12) {
                     while (1) switch (_context12.n) {
@@ -1512,7 +1327,7 @@ var PapiApi = /*#__PURE__*/function () {
                   }, _callee12);
                 }));
                 return function queryWeight() {
-                  return _ref10.apply(this, arguments);
+                  return _ref11.apply(this, arguments);
                 };
               }();
               if (!(overridenWeight !== null && overridenWeight !== void 0)) {
@@ -1598,7 +1413,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee13, this, [[10, 12]]);
       }));
-      function getXcmPaymentApiFee(_x18, _x19, _x20, _x21) {
+      function getXcmPaymentApiFee(_x17, _x18, _x19, _x20) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1645,7 +1460,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function getBridgeHubFallbackExecFee(_x22, _x23, _x24) {
+      function getBridgeHubFallbackExecFee(_x21, _x22, _x23) {
         return _getBridgeHubFallbackExecFee.apply(this, arguments);
       }
       return getBridgeHubFallbackExecFee;
@@ -1653,13 +1468,13 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(_ref11) {
-        var _ref12, _processAssetsDeposit, _ref13, _ref14, _ref15, _ref16, _ref17;
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(_ref12) {
+        var _ref13, _processAssetsDeposit, _ref14, _ref15, _ref16, _ref17, _ref18;
         var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, supportsDryRunApi, transformedOriginLocation, result, isSuccess, failureReason, actualWeight, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, fee, processedFee;
         return _regenerator().w(function (_context15) {
           while (1) switch (_context15.n) {
             case 0:
-              originLocation = _ref11.originLocation, xcm = _ref11.xcm, chain = _ref11.chain, origin = _ref11.origin, asset = _ref11.asset, feeAsset = _ref11.feeAsset, originFee = _ref11.originFee, amount = _ref11.amount;
+              originLocation = _ref12.originLocation, xcm = _ref12.xcm, chain = _ref12.chain, origin = _ref12.origin, asset = _ref12.asset, feeAsset = _ref12.feeAsset, originFee = _ref12.originFee, amount = _ref12.amount;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context15.n = 1;
@@ -1716,15 +1531,15 @@ var PapiApi = /*#__PURE__*/function () {
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['Balances', 'ForeignAssets', 'Assets'];
               isFeeAsset = origin === 'AssetHubPolkadot' && feeAsset && asset && isAssetEqual(feeAsset, asset);
-              feeAssetFeeEvent = (_ref12 = isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
+              feeAssetFeeEvent = (_ref13 = isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
                 return (event.type === 'ForeignAssets' || event.type === 'Assets') && event.value.type === 'Issued';
-              }) : undefined) !== null && _ref12 !== void 0 ? _ref12 : isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
+              }) : undefined) !== null && _ref13 !== void 0 ? _ref13 : isFeeAsset ? _toConsumableArray(emitted).find(function (event) {
                 return event.type === 'Tokens' && event.value.type === 'Deposited';
               }) : undefined;
               processedAssetsAmount = chain === 'AssetHubPolkadot' && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== 'DOT' ? processAssetsDepositedEvents(emitted, amount, 'Assets', 'Deposited', true) : (_processAssetsDeposit = processAssetsDepositedEvents(emitted, amount, 'Balances', 'Minted', false)) !== null && _processAssetsDeposit !== void 0 ? _processAssetsDeposit : processAssetsDepositedEvents(emitted, amount, 'Balances', 'Issued', false);
-              feeEvent = (_ref13 = (_ref14 = (_ref15 = (_ref16 = (_ref17 = feeAssetFeeEvent !== null && feeAssetFeeEvent !== void 0 ? feeAssetFeeEvent :
-              //
-              processedAssetsAmount !== undefined ? {
+              feeEvent = (_ref14 = (_ref15 = (_ref16 = (_ref17 = (_ref18 = feeAssetFeeEvent !== null && feeAssetFeeEvent !== void 0 ? feeAssetFeeEvent : chain === 'Mythos' ? reversedEvents.find(function (event) {
+                return event.type === 'Balances' && event.value.type === 'Issued';
+              }) : undefined) !== null && _ref18 !== void 0 ? _ref18 : processedAssetsAmount !== undefined ? {
                 type: 'Assets',
                 value: {
                   type: 'Deposited',
@@ -1732,23 +1547,17 @@ var PapiApi = /*#__PURE__*/function () {
                     amount: processedAssetsAmount
                   }
                 }
-              } : undefined) !== null && _ref17 !== void 0 ? _ref17 :
-              //
-              chain === 'Mythos' ? reversedEvents.find(function (event) {
-                return event.type === 'Balances' && event.value.type === 'Issued';
-              }) : undefined) !== null && _ref16 !== void 0 ? _ref16 :
-              //
-              origin === 'Mythos' || chain === 'AssetHubPolkadot' && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== 'DOT' ? reversedEvents.find(function (event) {
+              } : undefined) !== null && _ref17 !== void 0 ? _ref17 : origin === 'Mythos' || chain === 'AssetHubPolkadot' && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== 'DOT' ? reversedEvents.find(function (event) {
                 return event.type === 'AssetConversion' && event.value.type === 'SwapCreditExecuted';
-              }) : undefined) !== null && _ref15 !== void 0 ? _ref15 :
+              }) : undefined) !== null && _ref16 !== void 0 ? _ref16 :
               // Prefer to Minted event
               reversedEvents.find(function (event) {
                 return ['Balances', 'ForeignAssets'].includes(event.type) && event.value.type === 'Minted';
-              })) !== null && _ref14 !== void 0 ? _ref14 :
+              })) !== null && _ref15 !== void 0 ? _ref15 :
               // Fallback an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.type) && event.value.type === 'Issued';
-              })) !== null && _ref13 !== void 0 ? _ref13 : reversedEvents.find(function (event) {
+              })) !== null && _ref14 !== void 0 ? _ref14 : reversedEvents.find(function (event) {
                 return ['Currencies', 'Tokens'].includes(event.type) && event.value.type === 'Deposited';
               });
               if (feeEvent) {
@@ -1777,7 +1586,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee15, this);
       }));
-      function getDryRunXcm(_x25) {
+      function getDryRunXcm(_x24) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1831,11 +1640,39 @@ var PapiApi = /*#__PURE__*/function () {
           this.api.destroy();
         } else {
           var key = api === undefined ? getChainProviders(this._chain) : api;
-          releasePolkadotClient(key);
+          releaseClient(key);
         }
       }
       return Promise.resolve();
     }
+  }, {
+    key: "deriveAddress",
+    value: function deriveAddress$1(path) {
+      return deriveAddress(path);
+    }
+  }, {
+    key: "signAndSubmit",
+    value: function () {
+      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(tx, path) {
+        var signer, _yield$tx$signAndSubm, txHash;
+        return _regenerator().w(function (_context17) {
+          while (1) switch (_context17.n) {
+            case 0:
+              signer = createDevSigner(path);
+              _context17.n = 1;
+              return tx.signAndSubmit(signer);
+            case 1:
+              _yield$tx$signAndSubm = _context17.v;
+              txHash = _yield$tx$signAndSubm.txHash;
+              return _context17.a(2, txHash);
+          }
+        }, _callee17);
+      }));
+      function signAndSubmit(_x25, _x26) {
+        return _signAndSubmit.apply(this, arguments);
+      }
+      return signAndSubmit;
+    }()
   }]);
 }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk",
-  "version": "12.1.2",
+  "version": "12.2.1",
   "description": "SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -25,8 +25,10 @@
   "dependencies": {
     "@noble/hashes": "^2.0.1",
     "@polkadot-api/legacy-provider": "^0.3.6",
+    "@polkadot-labs/hdkd": "^0.0.26",
+    "@polkadot-labs/hdkd-helpers": "^0.0.27",
     "viem": "2.40.3",
-    "@paraspell/sdk-core": "12.1.2"
+    "@paraspell/sdk-core": "12.2.1"
   },
   "peerDependencies": {
     "polkadot-api": ">= 1.23.1 < 2"
@@ -36,8 +38,6 @@
     "@babel/preset-env": "^7.28.5",
     "@codecov/rollup-plugin": "^1.9.1",
     "@noble/curves": "^2.0.1",
-    "@polkadot-labs/hdkd": "^0.0.26",
-    "@polkadot-labs/hdkd-helpers": "^0.0.27",
     "@rollup/plugin-babel": "^6.1.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-typescript": "^12.3.0",