Merge branch 'main' into mjm/zeitgeist-moonbeam

moonbeam-foundation · Nov 6, 2023 · 8779701 · 8779701
2 parents 8c3b434 + 345680e
commit 8779701
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 30 deletions.
diff --git a/.changeset/slimy-lies-exercise.md b/.changeset/slimy-lies-exercise.md
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.8",
-    "@moonbeam-network/xcm-sdk": "1.4.3",
+    "@moonbeam-network/xcm-config": "1.3.10",
+    "@moonbeam-network/xcm-sdk": "1.4.5",
     "@moonbeam-network/xcm-utils": "1.0.3"
   },
   "devDependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @moonbeam-network/xcm-config
 
+## 1.3.10
+
+### Patch Changes
+
+- [#157](https://github.com/PureStake/xcm-sdk/pull/157) [`7103bb0`](https://github.com/PureStake/xcm-sdk/commit/7103bb0cacf9e448968cd9aafd0e512b82fa348b) Thanks [@mmaurello](https://github.com/mmaurello)! - Revert decimals change in destination fee
+
+## 1.3.9
+
+### Patch Changes
+
+- [#155](https://github.com/PureStake/xcm-sdk/pull/155) [`a6f48df`](https://github.com/PureStake/xcm-sdk/commit/a6f48df94bd662c120676c8d72a697ef59181220) Thanks [@mmaurello](https://github.com/mmaurello)! - USDT Wormhole integration
+
 ## 1.3.8
 
 ### 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.8",
+  "version": "1.3.10",
   "description": "All necessary configuration to transfer assets from Moonbeam, Moonriver, Moonbase to other parachains and back",
   "scripts": {
     "build": "tsup",

diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts
@@ -183,7 +183,7 @@ export const bifrostKusama = new Parachain({
   name: 'Bifrost',
   parachainId: 2001,
   ss58Format: 6,
-  ws: 'wss://bifrost-rpc.liebi.com/ws',
+  ws: 'wss://us.bifrost-rpc.liebi.com/ws',
 });
 
 export const bifrostPolkadot = new Parachain({

diff --git a/packages/config/src/configs/bifrostPolkadot.ts b/packages/config/src/configs/bifrostPolkadot.ts
@@ -59,11 +59,11 @@ export const bifrostPolkadotConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().tokens().accounts(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.01,
-        asset: vdot,
-        balance: BalanceBuilder().substrate().tokens().accounts(),
+        amount: 0.2,
+        asset: bnc,
+        balance: BalanceBuilder().substrate().system().account(),
       },
-      extrinsic: ExtrinsicBuilder().xTokens().transfer(),
+      extrinsic: ExtrinsicBuilder().xTokens().transferMultiCurrencies(),
       fee: {
         asset: bnc,
         balance: BalanceBuilder().substrate().system().account(),

diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @moonbeam-network/xcm-sdk
 
+## 1.4.5
+
+### Patch Changes
+
+- [#157](https://github.com/PureStake/xcm-sdk/pull/157) [`7103bb0`](https://github.com/PureStake/xcm-sdk/commit/7103bb0cacf9e448968cd9aafd0e512b82fa348b) Thanks [@mmaurello](https://github.com/mmaurello)! - Revert decimals change in destination fee
+
+- Updated dependencies [[`7103bb0`](https://github.com/PureStake/xcm-sdk/commit/7103bb0cacf9e448968cd9aafd0e512b82fa348b)]:
+  - @moonbeam-network/xcm-config@1.3.10
+
+## 1.4.4
+
+### Patch Changes
+
+- [#155](https://github.com/PureStake/xcm-sdk/pull/155) [`a6f48df`](https://github.com/PureStake/xcm-sdk/commit/a6f48df94bd662c120676c8d72a697ef59181220) Thanks [@mmaurello](https://github.com/mmaurello)! - USDT Wormhole integration
+
+- Updated dependencies [[`a6f48df`](https://github.com/PureStake/xcm-sdk/commit/a6f48df94bd662c120676c8d72a697ef59181220)]:
+  - @moonbeam-network/xcm-config@1.3.9
+
 ## 1.4.3
 
 ### 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.3",
+  "version": "1.4.5",
   "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",
@@ -48,7 +48,7 @@
   "main": "./build/index.cjs",
   "dependencies": {
     "@moonbeam-network/xcm-builder": "1.0.8",
-    "@moonbeam-network/xcm-config": "1.3.8",
+    "@moonbeam-network/xcm-config": "1.3.10",
     "@moonbeam-network/xcm-types": "1.0.1",
     "@moonbeam-network/xcm-utils": "1.0.3",
     "big.js": "^6.2.1"

diff --git a/packages/sdk/src/getTransferData/getDestinationData.ts b/packages/sdk/src/getTransferData/getDestinationData.ts
@@ -71,19 +71,12 @@ export interface GetFeeParams {
 }
 
 export async function getFee({
-  address,
   config,
-  evmSigner,
   polkadot,
 }: GetFeeParams): Promise<AssetAmount> {
   const { amount, asset } = config.source.config.destinationFee;
-  const decimals = await getDecimals({
-    address,
-    asset,
-    config: config.destination.config,
-    evmSigner,
-    polkadot,
-  });
+  // TODO we have to consider correctly here when an asset is ERC20 to get it from contract
+  const decimals = await polkadot.getAssetDecimals(asset);
   const zeroAmount = AssetAmount.fromAsset(asset, {
     amount: 0n,
     decimals,