update with main

moonbeam-foundation · Mar 27, 2024 · e3a8005 · e3a8005
2 parents 82ce0a9 + 12512b8
commit e3a8005
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 44 deletions.
diff --git a/.changeset/new-tools-move.md b/.changeset/new-tools-move.md
diff --git a/examples/sdk-simple/package.json b/examples/sdk-simple/package.json
@@ -12,9 +12,9 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@moonbeam-network/xcm-config": "2.0.4",
-    "@moonbeam-network/xcm-sdk": "2.0.6",
-    "@moonbeam-network/xcm-utils": "2.0.1"
+    "@moonbeam-network/xcm-config": "2.0.5",
+    "@moonbeam-network/xcm-sdk": "2.0.7",
+    "@moonbeam-network/xcm-utils": "2.0.2"
   },
   "devDependencies": {
     "bun": "^1.0.21"

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,13 @@
 # @moonbeam-network/xcm-builder
 
+## 2.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`3ade51ff0ef5acc4a6f84391159d3652cd6ee792`](https://github.com/moonbeam-foundation/xcm-sdk/commit/3ade51ff0ef5acc4a6f84391159d3652cd6ee792)]:
+  - @moonbeam-network/xcm-utils@2.0.2
+  - @moonbeam-network/xcm-types@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-builder",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Moonbeam XCM builder",
   "scripts": {
     "build": "tsup",
@@ -50,8 +50,8 @@
   "types": "./build/index.d.ts",
   "main": "./build/index.cjs",
   "dependencies": {
-    "@moonbeam-network/xcm-types": "2.0.1",
-    "@moonbeam-network/xcm-utils": "2.0.1",
+    "@moonbeam-network/xcm-types": "2.0.2",
+    "@moonbeam-network/xcm-utils": "2.0.2",
     "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,13 @@
 # @moonbeam-network/xcm-config
 
+## 2.0.5
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @moonbeam-network/xcm-builder@2.0.2
+  - @moonbeam-network/xcm-types@2.0.2
+
 ## 2.0.4
 
 ### Patch Changes

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-config",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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": "2.0.1",
-    "@moonbeam-network/xcm-types": "2.0.1"
+    "@moonbeam-network/xcm-builder": "2.0.2",
+    "@moonbeam-network/xcm-types": "2.0.2"
   },
   "peerDependencies": {
     "@polkadot/types": "^10.10.1",

diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @moonbeam-network/xcm-sdk
 
+## 2.0.7
+
+### Patch Changes
+
+- [#223](https://github.com/moonbeam-foundation/xcm-sdk/pull/223) [`8a488f2823cd19dce651251e774998f4e97cc4bf`](https://github.com/moonbeam-foundation/xcm-sdk/commit/8a488f2823cd19dce651251e774998f4e97cc4bf) Thanks [@mmaurello](https://github.com/mmaurello)! - Inform required amount in error message for multi assets
+
+- Updated dependencies [[`3ade51ff0ef5acc4a6f84391159d3652cd6ee792`](https://github.com/moonbeam-foundation/xcm-sdk/commit/3ade51ff0ef5acc4a6f84391159d3652cd6ee792)]:
+  - @moonbeam-network/xcm-utils@2.0.2
+  - @moonbeam-network/xcm-builder@2.0.2
+  - @moonbeam-network/xcm-types@2.0.2
+  - @moonbeam-network/xcm-config@2.0.5
+
 ## 2.0.6
 
 ### 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.6",
+  "version": "2.0.7",
   "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,10 +51,10 @@
   "types": "./build/index.d.ts",
   "main": "./build/index.cjs",
   "dependencies": {
-    "@moonbeam-network/xcm-builder": "2.0.1",
-    "@moonbeam-network/xcm-config": "2.0.4",
-    "@moonbeam-network/xcm-types": "2.0.1",
-    "@moonbeam-network/xcm-utils": "2.0.1",
+    "@moonbeam-network/xcm-builder": "2.0.2",
+    "@moonbeam-network/xcm-config": "2.0.5",
+    "@moonbeam-network/xcm-types": "2.0.2",
+    "@moonbeam-network/xcm-utils": "2.0.2",
     "big.js": "^6.2.1"
   },
   "peerDependencies": {

diff --git a/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts b/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts
@@ -70,7 +70,6 @@ export class Xtokens implements TransferContractInterface {
     if (amount === 0n) {
       return 0n;
     }
-
     /**
      * Contract can throw an error if user balance is smaller than fee.
      * Or if you try to send 0 as amount.

diff --git a/packages/sdk/src/getTransferData/getSourceData.ts b/packages/sdk/src/getTransferData/getSourceData.ts
@@ -6,11 +6,16 @@ import {
 } from '@moonbeam-network/xcm-builder';
 import {
   AssetConfig,
+  DestinationFeeConfig,
   FeeAssetConfig,
   TransferConfig,
 } from '@moonbeam-network/xcm-config';
 import { AnyChain, AssetAmount } from '@moonbeam-network/xcm-types';
-import { convertDecimals, toBigInt } from '@moonbeam-network/xcm-utils';
+import {
+  convertDecimals,
+  toBigInt,
+  toDecimal,
+} from '@moonbeam-network/xcm-utils';
 import Big from 'big.js';
 import { TransferContractInterface, createContract } from '../contract';
 import { PolkadotService } from '../polkadot';
@@ -133,11 +138,17 @@ export async function getSourceData({
     fee: destinationFee.amount,
     feeAsset: chain.getAssetId(destinationFee),
   });
+  const destinationFeeBalanceAmount = zeroDestinationFeeAmount.copyWith({
+    amount: destinationFeeBalance,
+  });
+
   const fee = await getFee({
     balance,
     chain,
     contract,
     decimals: zeroFeeAmount.decimals,
+    destinationFeeBalanceAmount,
+    destinationFeeConfig: config.destinationFee,
     evmSigner,
     extrinsic,
     feeConfig: config.fee,
@@ -149,9 +160,7 @@ export async function getSourceData({
   const { existentialDeposit } = polkadot;
   const feeAmount = zeroFeeAmount.copyWith({ amount: fee });
   const feeBalanceAmount = zeroFeeAmount.copyWith({ amount: feeBalance });
-  const destinationFeeBalanceAmount = zeroDestinationFeeAmount.copyWith({
-    amount: destinationFeeBalance,
-  });
+
   const minAmount = zeroAmount.copyWith({ amount: min });
 
   const maxAmount = getMax({
@@ -211,6 +220,8 @@ export interface GetFeeParams {
   evmSigner?: EvmSigner;
   extrinsic?: ExtrinsicConfig;
   feeConfig?: FeeAssetConfig;
+  destinationFeeConfig?: DestinationFeeConfig;
+  destinationFeeBalanceAmount?: AssetAmount;
   polkadot: PolkadotService;
   sourceAddress: string;
 }
@@ -220,6 +231,8 @@ export async function getFee({
   chain,
   contract,
   decimals,
+  destinationFeeConfig,
+  destinationFeeBalanceAmount,
   evmSigner,
   extrinsic,
   feeConfig,
@@ -231,6 +244,27 @@ export async function getFee({
       throw new Error('EVM Signer must be provided');
     }
 
+    if (
+      destinationFeeConfig &&
+      destinationFeeBalanceAmount &&
+      typeof destinationFeeConfig.amount === 'number'
+    ) {
+      const destinationFeeBalance = Number(
+        toDecimal(
+          destinationFeeBalanceAmount.amount,
+          destinationFeeBalanceAmount.decimals,
+        ),
+      );
+      if (
+        destinationFeeBalance &&
+        destinationFeeConfig.amount > destinationFeeBalance
+      ) {
+        throw new Error(
+          `Can't get a fee, make sure you have ${destinationFeeConfig?.amount} ${destinationFeeConfig?.asset.originSymbol} needed for fees in destination`,
+        );
+      }
+    }
+
     return getContractFee(balance, contract, decimals, evmSigner);
   }
 

diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @moonbeam-network/xcm-types
 
+## 2.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`3ade51ff0ef5acc4a6f84391159d3652cd6ee792`](https://github.com/moonbeam-foundation/xcm-sdk/commit/3ade51ff0ef5acc4a6f84391159d3652cd6ee792)]:
+  - @moonbeam-network/xcm-utils@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-types",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Moonbeam XCM Types",
   "scripts": {
     "build": "tsup",
@@ -49,7 +49,7 @@
   "types": "./build/index.d.ts",
   "main": "./build/index.cjs",
   "dependencies": {
-    "@moonbeam-network/xcm-utils": "2.0.1",
+    "@moonbeam-network/xcm-utils": "2.0.2",
     "big.js": "^6.2.1",
     "type-fest": "^3.8.0",
     "viem": "^2.8.6"

diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @moonbeam-network/xcm-utils
 
+## 2.0.2
+
+### Patch Changes
+
+- [#211](https://github.com/moonbeam-foundation/xcm-sdk/pull/211) [`3ade51ff0ef5acc4a6f84391159d3652cd6ee792`](https://github.com/moonbeam-foundation/xcm-sdk/commit/3ade51ff0ef5acc4a6f84391159d3652cd6ee792) Thanks [@mmaurello](https://github.com/mmaurello)! - Add MRL types to polkadot API
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/xcm-utils",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Moonbeam XCM utilities",
   "scripts": {
     "build": "tsup",