@paraspell/sdk-dedot 13.0.1 → 13.2.0

package/README.md

@@ -13,9 +13,6 @@
     <a href="https://github.com/paraspell/xcm-sdk/actions">
       <img alt="build" src="https://github.com/paraspell/xcm-tools/actions/workflows/ci.yml/badge.svg" />
     </a>
-    <a href="https://snyk.io/test/github/paraspell/sdk">
-      <img alt="snyk" src="https://snyk.io/test/github/paraspell/sdk/badge.svg" />
-    </a>
   </p>
   <p>Supporting every XCM Active Parachain <a href = "https://paraspell.github.io/docs/supported.html"\>[list]</p>
   <p>SDK documentation <a href = "https://paraspell.github.io/docs/" \>[here]</p>
@@ -597,6 +594,8 @@ console.log(CHAINS)
 
 - Run unit tests using `pnpm test`
 
+- Run end-to-end tests (SDK+SWAP) using `pnpm test:e2e`
+
 - Run all core tests and checks using `pnpm runAll`
 
 > [!NOTE]

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { getEvmPrivateKeyHex, getNativeAssetSymbol, getOtherAssets, NumberFormatError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, isSenderSigner, PolkadotApi, resolveChainApi, DEFAULT_TTL_MS, isExternalChain, UnsupportedOperationError, findAssetInfoOrThrow, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, localizeLocation, isAssetXcEqual, addXcmVersionHeader, RELAY_LOCATION, getRelayChainOf, replaceBigInt, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
+import { getEvmPrivateKeyHex, getNativeAssetSymbol, getOtherAssets, NumberFormatError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, isSenderSigner, PolkadotApi, resolveChainApi, DEFAULT_TTL_MS, isExternalChain, UnsupportedOperationError, findAssetInfoOrThrow, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, localizeLocation, createAssetId, addXcmVersionHeader, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, replaceBigInt, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { stringPascalCase, isEvmAddress, decodeAddress, isHex, u8aToHex, hexToU8a, stringToU8a, blake2AsHex } from 'dedot/utils';
 import { Keyring } from '@polkadot/keyring';
@@ -797,8 +797,8 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
               this._ttlMs = clientTtlMs;
               this._chain = chain;
               _context3.n = 2;
-              return resolveChainApi(this._config, chain, function (wsUrl, c) {
-                return _this2.createApiInstance(wsUrl, c);
+              return resolveChainApi(this._config, chain, function (wsUrl) {
+                return leaseClient(wsUrl, _this2._ttlMs);
               });
             case 2:
               this._api = _context3.v;
@@ -814,8 +814,8 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
     }()
   }, {
     key: "createApiInstance",
-    value: function createApiInstance(wsUrl, _chain) {
-      return leaseClient(wsUrl, this._ttlMs, false);
+    value: function createApiInstance(wsUrl) {
+      return leaseClient(wsUrl, this._ttlMs);
     }
   }, {
     key: "accountToHex",
@@ -1293,7 +1293,7 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
               forwardedXcms = result.value.forwardedXcms.length > 0 ? result.value.forwardedXcms[0] : [];
               actualWeight = (_execRes$actualWeight = execRes === null || execRes === void 0 ? void 0 : execRes.actualWeight) !== null && _execRes$actualWeight !== void 0 ? _execRes$actualWeight : execRes === null || execRes === void 0 ? void 0 : execRes.actual_weight;
               weight = actualWeight ? actualWeight : undefined;
-              destParaId = forwardedXcms.length === 0 ? undefined : forwardedXcms[0].value.interior.type === "Here" ? 0 : forwardedXcms[0].value.interior.value[0].value;
+              destParaId = this.extractDestParaId(forwardedXcms);
               localXcm = resValue === null || resValue === void 0 ? void 0 : resValue.localXcm;
               USE_XCM_PAYMENT_API_CHAINS = ["Astar"];
               if (!(hasXcmPaymentApiSupport(chain) && localXcm && (feeAsset || USE_XCM_PAYMENT_API_CHAINS.includes(chain) || chain.startsWith("AssetHub") && destination === "Ethereum") || resolvedFeeAsset.isCustomAsset)) {
@@ -1370,7 +1370,8 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
           queryWeight,
           weight,
           assetLocalizedLoc,
-          transformedAssetLoc,
+          assetId,
+          transformedAssetId,
           execFeeRes,
           execFee,
           bridgeHubExecFee,
@@ -1416,12 +1417,10 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
             case 3:
               weight = _t5;
               assetLocalizedLoc = localizeLocation(chain, asset.location);
-              transformedAssetLoc = _transform(assetLocalizedLoc);
+              assetId = createAssetId(version, assetLocalizedLoc);
+              transformedAssetId = _transform(addXcmVersionHeader(assetId, version));
               _context1.n = 4;
-              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, {
-                type: version,
-                value: transformedAssetLoc
-              });
+              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, transformedAssetId);
             case 4:
               execFeeRes = _context1.v;
               execFee = typeof (execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.value) === "bigint" ? execFeeRes.value : 0n;
@@ -1455,7 +1454,7 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
     value: function () {
       var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
         var _deliveryFeeRes, _assets$0$fun$value, _assets$;
-        var usedThirdParam, deliveryFeeRes, baseArgs, _this$api$call$xcmPay, message, _this$api$call$xcmPay2, versionedAssetLoc, assets, deliveryFeeResolved, nativeAsset, res, _t6;
+        var usedThirdParam, deliveryFeeRes, baseArgs, _this$api$call$xcmPay, message, _this$api$call$xcmPay2, assetId, versionedAssetLoc, assets, deliveryFeeResolved, nativeAsset, res, _t6;
         return _regenerator().w(function (_context10) {
           while (1) switch (_context10.p = _context10.n) {
             case 0:
@@ -1481,7 +1480,8 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
                 break;
               }
               usedThirdParam = true;
-              versionedAssetLoc = addXcmVersionHeader(assetLocalizedLoc, version);
+              assetId = createAssetId(version, assetLocalizedLoc);
+              versionedAssetLoc = _transform(addXcmVersionHeader(assetId, version));
               _context10.n = 4;
               return (_this$api$call$xcmPay2 = this.api.call.xcmPaymentApi).queryDeliveryFees.apply(_this$api$call$xcmPay2, baseArgs.concat([versionedAssetLoc]));
             case 4:
@@ -1589,6 +1589,14 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
       }
       return getXcmWeight;
     }()
+  }, {
+    key: "extractDestParaId",
+    value: function extractDestParaId(forwardedXcms) {
+      var _first$value, _interior$value$0$val, _interior$value, _interior$value2;
+      var first = forwardedXcms[0];
+      var interior = first === null || first === void 0 || (_first$value = first.value) === null || _first$value === void 0 ? void 0 : _first$value.interior;
+      return forwardedXcms.length === 0 ? undefined : (interior === null || interior === void 0 ? void 0 : interior.type) === "Here" ? 0 : (_interior$value$0$val = interior === null || interior === void 0 || (_interior$value = interior.value) === null || _interior$value === void 0 || (_interior$value = _interior$value[0]) === null || _interior$value === void 0 ? void 0 : _interior$value.value) !== null && _interior$value$0$val !== void 0 ? _interior$value$0$val : interior === null || interior === void 0 || (_interior$value2 = interior.value) === null || _interior$value2 === void 0 ? void 0 : _interior$value2.value;
+    }
   }, {
     key: "getDryRunXcm",
     value: function () {
@@ -1626,7 +1634,7 @@ var DedotApi = /*#__PURE__*/function (_PolkadotApi) {
               actualWeight = executionResult.value.used;
               weight = actualWeight ? actualWeight : undefined;
               forwardedXcms = result.value.forwardedXcms.length > 0 ? result.value.forwardedXcms[0] : [];
-              destParaId = forwardedXcms.length === 0 ? undefined : forwardedXcms[0].value.interior.type === "Here" ? 0 : forwardedXcms[0].value.interior.value[0].value;
+              destParaId = this.extractDestParaId(forwardedXcms);
               if (!hasXcmPaymentApiSupport(chain)) {
                 _context13.n = 6;
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-dedot",
-  "version": "13.0.1",
+  "version": "13.2.0",
   "description": "Dedot-based SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "dist"
   ],
   "dependencies": {
-    "@paraspell/sdk-core": "13.0.1"
+    "@paraspell/sdk-core": "13.2.0"
   },
   "peerDependencies": {
     "dedot": ">= 1.2.0",
@@ -52,6 +52,7 @@
     "test": "vitest run",
     "test:cov": "vitest run --coverage",
     "test:watch": "vitest",
-    "runAll": "pnpm compile && pnpm format:write && pnpm lint && pnpm test"
+    "runAll": "pnpm compile && pnpm format:write && pnpm lint && pnpm test",
+    "test:e2e": "vitest run --config ./vitest.config.e2e.ts --sequence.concurrent"
   }
 }