Merge branch 'main' into riha/get-balance-by-chain-and-token

moonbeam-foundation · Mar 20, 2024 · 72e4b37 · 72e4b37
2 parents b547687 + 3ade51f
commit 72e4b37
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 11 deletions.
diff --git a/.changeset/new-tools-move.md b/.changeset/new-tools-move.md
@@ -0,0 +1,5 @@
+---
+'@moonbeam-network/xcm-utils': patch
+---
+
+Add MRL types to polkadot API
diff --git a/examples/sdk-simple/package.json b/examples/sdk-simple/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "dependencies": {
     "@moonbeam-network/xcm-config": "2.0.4",
-    "@moonbeam-network/xcm-sdk": "2.0.5",
+    "@moonbeam-network/xcm-sdk": "2.0.6",
     "@moonbeam-network/xcm-utils": "2.0.1"
   },
   "devDependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts
@@ -790,7 +790,7 @@ export const moonbaseBeta = new EvmParachain({
   parachainId: 888,
   rpc: 'https://frag-moonbase-beta-rpc.g.moonbase.moonbeam.network',
   ss58Format: 1287,
-  ws: 'wss://frag-moonbase-beta-rpc-ws.g.moonbase.moonbeam.network',
+  ws: 'wss://deo-moon-rpc-1-moonbase-beta-rpc-1.moonbase.ol-infra.network',
 });
 
 export const moonbeam = new EvmParachain({

diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @moonbeam-network/xcm-sdk
 
+## 2.0.6
+
+### Patch Changes
+
+- [#220](https://github.com/moonbeam-foundation/xcm-sdk/pull/220) [`bf0e917e64372b7a9bb7782ff8bc8ea69149bd36`](https://github.com/moonbeam-foundation/xcm-sdk/commit/bf0e917e64372b7a9bb7782ff8bc8ea69149bd36) Thanks [@mmaurello](https://github.com/mmaurello)! - Fix decimal fetching for HydraDX
+
 ## 2.0.5
 
 ### Patch Changes

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-sdk",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "The Moonbeam XCM SDK enables developers to easily deposit and withdraw assets to Moonbeam/Moonriver from the relay chain and other parachains in the Polkadot/Kusama ecosystem",
   "scripts": {
     "build": "tsup",

diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
@@ -1,3 +1,4 @@
 export * from './getTransferData/getSourceData';
+export * from './getTransferData/getTransferData.utils';
 export * from './sdk';
 export * from './sdk.interfaces';
diff --git a/packages/sdk/src/polkadot/PolkadotService.interfaces.ts b/packages/sdk/src/polkadot/PolkadotService.interfaces.ts
@@ -1,7 +1,7 @@
-import { Bytes, Struct, u8 } from '@polkadot/types';
+import { Bytes, Option, Struct, u8 } from '@polkadot/types';
 
 export interface AssetMetadata extends Struct {
   readonly name: Bytes;
   readonly symbol: Bytes;
-  readonly decimals: u8;
+  readonly decimals: u8 | Option<u8>;
 }
diff --git a/packages/sdk/src/polkadot/PolkadotService.ts b/packages/sdk/src/polkadot/PolkadotService.ts
@@ -114,9 +114,13 @@ export class PolkadotService {
 
     const data = (await fn(asset)) as AssetMetadata | Option<AssetMetadata>;
     const unwrapped = 'unwrapOrDefault' in data ? data.unwrapOrDefault() : data;
+    const decimals =
+      'unwrapOrDefault' in unwrapped.decimals
+        ? unwrapped.decimals.unwrapOrDefault()
+        : unwrapped.decimals;
 
     return {
-      decimals: unwrapped.decimals.toNumber(),
+      decimals: decimals.toNumber(),
       symbol: unwrapped.symbol.toString(),
     };
   }
@@ -138,12 +142,17 @@ export class PolkadotService {
   async getAssetDecimals(asset: Asset): Promise<number> {
     const metaId = this.chain.getMetadataAssetId(asset);
 
-    return (
+    const decimals =
       this.chain.getAssetDecimals(asset) ||
       (await this.getAssetDecimalsFromQuery(metaId)) ||
       (await this.getAssetMeta(metaId))?.decimals ||
-      this.decimals
-    );
+      this.decimals; // TODO remove this and handle it separately only for native assets
+
+    if (!decimals) {
+      throw new Error(`No decimals found for asset ${asset.originSymbol}`);
+    }
+
+    return decimals;
   }
 
   async query(config: SubstrateQueryConfig): Promise<bigint> {

diff --git a/packages/utils/src/polkadot/polkadot.api.ts b/packages/utils/src/polkadot/polkadot.api.ts
@@ -2,6 +2,12 @@ import { ApiPromise, WsProvider } from '@polkadot/api';
 import { typesBundle } from '@polkadot/apps-config';
 import LRU from 'lru-cache';
 
+export enum MRLTypes {
+  XcmVersionedMultiLocation = 'XcmVersionedMultiLocation',
+  XcmRoutingUserAction = 'XcmRoutingUserAction',
+  VersionedUserAction = 'VersionedUserAction',
+}
+
 const cache = new LRU<string, Promise<ApiPromise>>({
   max: 20,
   // eslint-disable-next-line sort-keys
@@ -20,6 +26,14 @@ export async function getPolkadotApi(ws: string): Promise<ApiPromise> {
     ApiPromise.create({
       noInitWarn: true,
       provider: new WsProvider(ws),
+      types: {
+        [MRLTypes.XcmRoutingUserAction]: {
+          destination: MRLTypes.XcmVersionedMultiLocation,
+        },
+        [MRLTypes.VersionedUserAction]: {
+          _enum: { V1: MRLTypes.XcmRoutingUserAction },
+        },
+      },
       typesBundle,
     });