Merge branch 'main' of github.com:PureStake/xcm-sdk into update-deps

moonbeam-foundation · Feb 9, 2024 · 5769b25 · 5769b25
2 parents 462f1fd + ec6f53a
commit 5769b25
Show file tree

Hide file tree

Showing 21 changed files with 217 additions and 60 deletions.
diff --git a/.changeset/short-files-compete.md b/.changeset/short-files-compete.md
@@ -0,0 +1,5 @@
+---
+'@moonbeam-network/xcm-config': patch
+---
+
+Change Hydra endpoint
diff --git a/examples/sdk-simple/package.json b/examples/sdk-simple/package.json
@@ -12,8 +12,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@moonbeam-network/xcm-config": "1.3.25",
-    "@moonbeam-network/xcm-sdk": "1.4.21",
+    "@moonbeam-network/xcm-config": "1.3.27",
+    "@moonbeam-network/xcm-sdk": "1.4.23",
     "@moonbeam-network/xcm-utils": "1.0.4"
   },
   "devDependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/builder/CHANGELOG.md b/packages/builder/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @moonbeam-network/xcm-builder
 
+## 1.0.13
+
+### Patch Changes
+
+- Updated dependencies [[`eb20aee`](https://github.com/moonbeam-foundation/xcm-sdk/commit/eb20aee9d9c9052074501421d0d442bd13022424)]:
+  - @moonbeam-network/xcm-types@1.0.4
+
 ## 1.0.12
 
 ### Patch Changes

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-builder",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Moonbeam XCM builder",
   "scripts": {
     "build": "tsup",
@@ -50,7 +50,7 @@
   "types": "./build/index.d.ts",
   "main": "./build/index.cjs",
   "dependencies": {
-    "@moonbeam-network/xcm-types": "1.0.3",
+    "@moonbeam-network/xcm-types": "1.0.4",
     "@moonbeam-network/xcm-utils": "1.0.4",
     "big.js": "^6.2.1",
     "type-fest": "^3.8.0"

diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @moonbeam-network/xcm-config
 
+## 1.3.27
+
+### Patch Changes
+
+- [#179](https://github.com/moonbeam-foundation/xcm-sdk/pull/179) [`eb20aee`](https://github.com/moonbeam-foundation/xcm-sdk/commit/eb20aee9d9c9052074501421d0d442bd13022424) Thanks [@mmaurello](https://github.com/mmaurello)! - USDC wh integration with Moonbeam
+
+- Updated dependencies [[`eb20aee`](https://github.com/moonbeam-foundation/xcm-sdk/commit/eb20aee9d9c9052074501421d0d442bd13022424)]:
+  - @moonbeam-network/xcm-types@1.0.4
+  - @moonbeam-network/xcm-builder@1.0.13
+
+## 1.3.26
+
+### Patch Changes
+
+- [#199](https://github.com/moonbeam-foundation/xcm-sdk/pull/199) [`6849ab3`](https://github.com/moonbeam-foundation/xcm-sdk/commit/6849ab3a5aa200d753849bc710d35fad4e2ac5fd) Thanks [@mmaurello](https://github.com/mmaurello)! - bump xcm delivery fees
+
 ## 1.3.25
 
 ### Patch Changes

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-config",
-  "version": "1.3.25",
+  "version": "1.3.27",
   "description": "All necessary configuration to transfer assets from Moonbeam, Moonriver, Moonbase to other parachains and back",
   "scripts": {
     "build": "tsup",
@@ -50,8 +50,8 @@
   "types": "./build/index.d.ts",
   "main": "./build/index.cjs",
   "dependencies": {
-    "@moonbeam-network/xcm-builder": "1.0.12",
-    "@moonbeam-network/xcm-types": "1.0.3"
+    "@moonbeam-network/xcm-builder": "1.0.13",
+    "@moonbeam-network/xcm-types": "1.0.4"
   },
   "peerDependencies": {
     "@polkadot/types": "^10.10.1",

diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts
@@ -441,7 +441,7 @@ export const hydraDX = new Parachain({
   name: 'HydraDX',
   parachainId: 2034,
   ss58Format: 63,
-  ws: 'wss://rpc.hydradx.cloud',
+  ws: 'wss://hydradx-rpc.dwellir.com',
 });
 
 export const interlay = new Parachain({
@@ -454,13 +454,11 @@ export const interlay = new Parachain({
       asset: intr,
       decimals: 10,
       id: { Token: intr.originSymbol },
-      metadataId: 0,
     },
     {
       asset: ibtc,
       decimals: 8,
       id: { Token: ibtc.originSymbol },
-      metadataId: 0,
     },
   ],
   ecosystem: Ecosystem.Polkadot,
@@ -549,7 +547,6 @@ export const kintsugi = new Parachain({
       asset: kbtc,
       decimals: 8,
       id: { Token: kbtc.originSymbol },
-      metadataId: 0,
     },
   ],
   ecosystem: Ecosystem.Kusama,
@@ -1400,13 +1397,24 @@ export const uniqueAlpha = new Parachain({
 });
 
 export const zeitgeist = new Parachain({
+  assetsData: [
+    {
+      asset: usdcwh,
+      id: { ForeignAsset: 1 },
+    },
+    {
+      asset: glmr,
+      id: { ForeignAsset: 3 },
+    },
+  ],
   ecosystem: Ecosystem.Polkadot,
   genesisHash:
     '0x1bf2a2ecb4a868de66ea8610f2ce7c8c43706561b6476031315f6640fe38e060',
   key: 'zeitgeist',
   name: 'Zeitgeist',
   parachainId: 2092,
   ss58Format: 73,
+  usesChainDecimals: true,
   ws: 'wss://zeitgeist-rpc.dwellir.com',
 });
 

diff --git a/packages/config/src/configs/kusama.ts b/packages/config/src/configs/kusama.ts
@@ -26,7 +26,7 @@ export const kusamaConfig = new ChainConfig({
       fee: {
         asset: ksm,
         balance: BalanceBuilder().substrate().system().account(),
-        xcmDeliveryFeeAmount: 0.0015,
+        xcmDeliveryFeeAmount: 0.002,
       },
     }),
   ],

diff --git a/packages/config/src/configs/kusamaAssetHub.ts b/packages/config/src/configs/kusamaAssetHub.ts
@@ -27,7 +27,7 @@ export const kusamaAssetHubConfig = new ChainConfig({
       fee: {
         asset: ksm,
         balance: BalanceBuilder().substrate().system().account(),
-        xcmDeliveryFeeAmount: 0.00115,
+        xcmDeliveryFeeAmount: 0.0015,
       },
       min: AssetMinBuilder().assets().asset(),
     }),
@@ -47,7 +47,7 @@ export const kusamaAssetHubConfig = new ChainConfig({
       fee: {
         asset: ksm,
         balance: BalanceBuilder().substrate().system().account(),
-        xcmDeliveryFeeAmount: 0.00115,
+        xcmDeliveryFeeAmount: 0.0015,
       },
       min: AssetMinBuilder().assets().asset(),
     }),

diff --git a/packages/config/src/configs/moonbeam.ts b/packages/config/src/configs/moonbeam.ts
@@ -165,7 +165,18 @@ export const moonbeamConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transfer(),
       destination: pendulum,
       destinationFee: {
-        amount: 0.0002, //
+        amount: 0.0002,
+        asset: glmr,
+        balance: BalanceBuilder().substrate().system().account(),
+      },
+    }),
+    new AssetConfig({
+      asset: glmr,
+      balance: BalanceBuilder().substrate().system().account(),
+      contract: ContractBuilder().Xtokens().transfer(),
+      destination: zeitgeist,
+      destinationFee: {
+        amount: 0.3,
         asset: glmr,
         balance: BalanceBuilder().substrate().system().account(),
       },
@@ -515,6 +526,21 @@ export const moonbeamConfig = new ChainConfig({
         balance: BalanceBuilder().substrate().system().account(),
       },
     }),
+    new AssetConfig({
+      asset: usdcwh,
+      balance: BalanceBuilder().evm().erc20(),
+      contract: ContractBuilder().Xtokens().transfer(),
+      destination: zeitgeist,
+      destinationFee: {
+        amount: 0.101,
+        asset: usdcwh,
+        balance: BalanceBuilder().evm().erc20(),
+      },
+      fee: {
+        asset: glmr,
+        balance: BalanceBuilder().substrate().system().account(),
+      },
+    }),
     new AssetConfig({
       asset: usdtwh,
       balance: BalanceBuilder().evm().erc20(),

diff --git a/packages/config/src/configs/zeitgeist.ts b/packages/config/src/configs/zeitgeist.ts
@@ -3,7 +3,7 @@ import {
   ExtrinsicBuilder,
   FeeBuilder,
 } from '@moonbeam-network/xcm-builder';
-import { ztg } from '../assets';
+import { glmr, usdcwh, ztg } from '../assets';
 import { moonbeam, zeitgeist } from '../chains';
 import { AssetConfig } from '../types/AssetConfig';
 import { ChainConfig } from '../types/ChainConfig';
@@ -21,6 +21,32 @@ export const zeitgeistConfig = new ChainConfig({
       },
       extrinsic: ExtrinsicBuilder().xTokens().transfer(),
     }),
+    new AssetConfig({
+      asset: usdcwh,
+      balance: BalanceBuilder().substrate().tokens().accounts(),
+      destination: moonbeam,
+      destinationFee: {
+        amount: 0.04,
+        asset: glmr,
+        balance: BalanceBuilder().substrate().tokens().accounts(),
+      },
+      extrinsic: ExtrinsicBuilder().xTokens().transferMultiCurrencies(),
+      fee: {
+        asset: ztg,
+        balance: BalanceBuilder().substrate().system().account(),
+      },
+    }),
+    new AssetConfig({
+      asset: glmr,
+      balance: BalanceBuilder().substrate().tokens().accounts(),
+      destination: moonbeam,
+      destinationFee: {
+        amount: 0.01,
+        asset: glmr,
+        balance: BalanceBuilder().substrate().tokens().accounts(),
+      },
+      extrinsic: ExtrinsicBuilder().xTokens().transfer(),
+    }),
   ],
   chain: zeitgeist,
 });
diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @moonbeam-network/xcm-sdk
 
+## 1.4.23
+
+### Patch Changes
+
+- [#179](https://github.com/moonbeam-foundation/xcm-sdk/pull/179) [`eb20aee`](https://github.com/moonbeam-foundation/xcm-sdk/commit/eb20aee9d9c9052074501421d0d442bd13022424) Thanks [@mmaurello](https://github.com/mmaurello)! - USDC wh integration with Moonbeam
+
+- Updated dependencies [[`eb20aee`](https://github.com/moonbeam-foundation/xcm-sdk/commit/eb20aee9d9c9052074501421d0d442bd13022424)]:
+  - @moonbeam-network/xcm-config@1.3.27
+  - @moonbeam-network/xcm-types@1.0.4
+  - @moonbeam-network/xcm-builder@1.0.13
+
+## 1.4.22
+
+### Patch Changes
+
+- Updated dependencies [[`6849ab3`](https://github.com/moonbeam-foundation/xcm-sdk/commit/6849ab3a5aa200d753849bc710d35fad4e2ac5fd)]:
+  - @moonbeam-network/xcm-config@1.3.26
+
 ## 1.4.21
 
 ### Patch Changes

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-sdk",
-  "version": "1.4.21",
+  "version": "1.4.23",
   "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",
@@ -51,9 +51,9 @@
   "types": "./build/index.d.ts",
   "main": "./build/index.cjs",
   "dependencies": {
-    "@moonbeam-network/xcm-builder": "1.0.12",
-    "@moonbeam-network/xcm-config": "1.3.25",
-    "@moonbeam-network/xcm-types": "1.0.3",
+    "@moonbeam-network/xcm-builder": "1.0.13",
+    "@moonbeam-network/xcm-config": "1.3.27",
+    "@moonbeam-network/xcm-types": "1.0.4",
     "@moonbeam-network/xcm-utils": "1.0.4",
     "big.js": "^6.2.1"
   },

diff --git a/packages/sdk/src/getTransferData/getDestinationData.ts b/packages/sdk/src/getTransferData/getDestinationData.ts
@@ -29,6 +29,7 @@ export async function getDestinationData({
     amount: 0n,
     decimals: await getDecimals({
       address: destinationAddress,
+      chain,
       config,
       evmSigner,
       polkadot,
@@ -37,7 +38,9 @@ export async function getDestinationData({
 
   const balance = await getBalance({
     address: destinationAddress,
+    chain,
     config,
+    decimals: zeroAmount.decimals,
     evmSigner,
     polkadot,
   });
@@ -53,7 +56,6 @@ export async function getDestinationData({
     polkadot,
   });
   const minAmount = zeroAmount.copyWith({ amount: min });
-
   return {
     balance: balanceAmount,
     chain,