merge main

moonbeam-foundation · Nov 6, 2023 · 83a460d · 83a460d
2 parents 9f39b00 + 55ca5f7
commit 83a460d
Show file tree

Hide file tree

Showing 32 changed files with 1,083 additions and 587 deletions.
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": "1.3.2",
-    "@moonbeam-network/xcm-sdk": "1.3.2",
-    "@moonbeam-network/xcm-utils": "1.0.2"
+    "@moonbeam-network/xcm-config": "1.3.11",
+    "@moonbeam-network/xcm-sdk": "1.4.6",
+    "@moonbeam-network/xcm-utils": "1.0.3"
   },
   "devDependencies": {
     "ts-node": "^10.9.1"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,11 +34,11 @@
     "changeset:publish": "npm run build && changeset publish"
   },
   "dependencies": {
-    "@polkadot/api": "^10.9.1",
-    "@polkadot/api-augment": "^10.9.1",
-    "@polkadot/types": "^10.9.1",
-    "@polkadot/util": "^12.3.2",
-    "@polkadot/util-crypto": "^12.3.2"
+    "@polkadot/api": "^10.10.1",
+    "@polkadot/api-augment": "^10.10.1",
+    "@polkadot/types": "^10.10.1",
+    "@polkadot/util": "^12.5.1",
+    "@polkadot/util-crypto": "^12.5.1"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.8",

diff --git a/packages/builder/CHANGELOG.md b/packages/builder/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @moonbeam-network/xcm-builder
 
+## 1.0.8
+
+### Patch Changes
+
+- [#148](https://github.com/PureStake/xcm-sdk/pull/148) [`3f071c4`](https://github.com/PureStake/xcm-sdk/commit/3f071c42555e9694b090b2281eb9d67b695aa750) Thanks [@mmaurello](https://github.com/mmaurello)! - Picasso integration with Moonbase and dependency updates
+
+- Updated dependencies [[`3f071c4`](https://github.com/PureStake/xcm-sdk/commit/3f071c42555e9694b090b2281eb9d67b695aa750), [`cd5da97`](https://github.com/PureStake/xcm-sdk/commit/cd5da97e606e94f0ec0d2faa17ac44297c5ee98e)]:
+  - @moonbeam-network/xcm-utils@1.0.3
+
+## 1.0.7
+
+### Patch Changes
+
+- [#144](https://github.com/PureStake/xcm-sdk/pull/144) [`8c16492`](https://github.com/PureStake/xcm-sdk/commit/8c16492f2cceef0e1ebc8a9ba70452e644efd135) Thanks [@mmaurello](https://github.com/mmaurello)! - FIL integration and EQ fix
+
 ## 1.0.6
 
 ### 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.6",
+  "version": "1.0.8",
   "description": "Moonbeam XCM builder",
   "scripts": {
     "build": "tsup",
@@ -51,16 +51,16 @@
   "main": "./build/index.cjs",
   "dependencies": {
     "@moonbeam-network/xcm-types": "1.0.1",
-    "@moonbeam-network/xcm-utils": "1.0.2",
+    "@moonbeam-network/xcm-utils": "1.0.3",
     "big.js": "^6.2.1",
     "ethers": "^5.7.2",
     "type-fest": "^3.8.0"
   },
   "peerDependencies": {
-    "@polkadot/api": "^10.9.1",
-    "@polkadot/api-augment": "^10.9.1",
-    "@polkadot/types": "^10.9.1",
-    "@polkadot/util": "^12.3.2",
-    "@polkadot/util-crypto": "^12.3.2"
+    "@polkadot/api": "^10.10.1",
+    "@polkadot/api-augment": "^10.10.1",
+    "@polkadot/types": "^10.10.1",
+    "@polkadot/util": "^12.5.1",
+    "@polkadot/util-crypto": "^12.5.1"
   }
 }
diff --git a/packages/builder/src/extrinsic/pallets/eqBalances/__snapshots__/eqBalances.test.ts.snap b/packages/builder/src/extrinsic/pallets/eqBalances/__snapshots__/eqBalances.test.ts.snap
@@ -28,7 +28,7 @@ exports[`eqBalances transferXcm should get correct arguments 1`] = `
         {
           "AccountKey20": {
             "key": "0xeF46c7649270C912704fB09B75097f6E32208b85",
-            "network": "Any",
+            "network": null,
           },
         },
       ],
@@ -60,7 +60,7 @@ exports[`eqBalances xcmTransfer should get correct arguments 1`] = `
         {
           "AccountKey20": {
             "key": "0xeF46c7649270C912704fB09B75097f6E32208b85",
-            "network": "Any",
+            "network": null,
           },
         },
       ],

diff --git a/packages/builder/src/extrinsic/pallets/eqBalances/eqBalances.ts b/packages/builder/src/extrinsic/pallets/eqBalances/eqBalances.ts
@@ -29,7 +29,7 @@ export function eqBalances() {
                   },
                   {
                     AccountKey20: {
-                      network: 'Any',
+                      network: null,
                       key: address,
                     },
                   },
@@ -60,7 +60,7 @@ export function eqBalances() {
                     },
                     {
                       AccountKey20: {
-                        network: 'Any',
+                        network: null,
                         key: address,
                       },
                     },

diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @moonbeam-network/xcm-config
 
+## 1.3.11
+
+### Patch Changes
+
+- [#152](https://github.com/PureStake/xcm-sdk/pull/152) [`5a50724`](https://github.com/PureStake/xcm-sdk/commit/5a5072453e65d0012ce9826fb1b3b10062141dca) Thanks [@mmaurello](https://github.com/mmaurello)! - Zeitgeist integration with Moonbeam
+
+## 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
+
+- [#153](https://github.com/PureStake/xcm-sdk/pull/153) [`de87e3e`](https://github.com/PureStake/xcm-sdk/commit/de87e3e4b2817080dcb60495cbcc70a8bef47a69) Thanks [@mmaurello](https://github.com/mmaurello)! - Change how we get decimals from assets in destination and change vDOT transfers paying asset
+
+## 1.3.7
+
+### Patch Changes
+
+- [#149](https://github.com/PureStake/xcm-sdk/pull/149) [`6c208b7`](https://github.com/PureStake/xcm-sdk/commit/6c208b71d25b0fc44bca93ab3ef9cc1e253e57df) Thanks [@mmaurello](https://github.com/mmaurello)! - Change OnFinality endpoints
+
+## 1.3.6
+
+### Patch Changes
+
+- [#148](https://github.com/PureStake/xcm-sdk/pull/148) [`3f071c4`](https://github.com/PureStake/xcm-sdk/commit/3f071c42555e9694b090b2281eb9d67b695aa750) Thanks [@mmaurello](https://github.com/mmaurello)! - Picasso integration with Moonbase and dependency updates
+
+- [#147](https://github.com/PureStake/xcm-sdk/pull/147) [`ea6cd77`](https://github.com/PureStake/xcm-sdk/commit/ea6cd777314667029edcedff8fd3b1401a34e84d) Thanks [@mmaurello](https://github.com/mmaurello)! - Support GLMR transfers in interlay
+
+- Updated dependencies [[`3f071c4`](https://github.com/PureStake/xcm-sdk/commit/3f071c42555e9694b090b2281eb9d67b695aa750)]:
+  - @moonbeam-network/xcm-builder@1.0.8
+
+## 1.3.5
+
+### Patch Changes
+
+- [#144](https://github.com/PureStake/xcm-sdk/pull/144) [`8c16492`](https://github.com/PureStake/xcm-sdk/commit/8c16492f2cceef0e1ebc8a9ba70452e644efd135) Thanks [@mmaurello](https://github.com/mmaurello)! - FIL integration and EQ fix
+
+- Updated dependencies [[`8c16492`](https://github.com/PureStake/xcm-sdk/commit/8c16492f2cceef0e1ebc8a9ba70452e644efd135)]:
+  - @moonbeam-network/xcm-builder@1.0.7
+
+## 1.3.4
+
+### Patch Changes
+
+- [#141](https://github.com/PureStake/xcm-sdk/pull/141) [`de2a0bb`](https://github.com/PureStake/xcm-sdk/commit/de2a0bba3a3af7fb1c67d23d4ead3915b9513f2f) Thanks [@mmaurello](https://github.com/mmaurello)! - change robonomics wss endpoint
+
+## 1.3.3
+
+### Patch Changes
+
+- [#139](https://github.com/PureStake/xcm-sdk/pull/139) [`cbd30b1`](https://github.com/PureStake/xcm-sdk/commit/cbd30b1d4e37ff877e4e27121491ab086a985df0) Thanks [@mmaurello](https://github.com/mmaurello)! - OriginTrail integration with Moonbeam - remove Nodle Eden integration with Moonbase
+
 ## 1.3.2
 
 ### 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.2",
+  "version": "1.3.11",
   "description": "All necessary configuration to transfer assets from Moonbeam, Moonriver, Moonbase to other parachains and back",
   "scripts": {
     "build": "tsup",
@@ -50,12 +50,12 @@
   "types": "./build/index.d.ts",
   "main": "./build/index.cjs",
   "dependencies": {
-    "@moonbeam-network/xcm-builder": "1.0.6",
+    "@moonbeam-network/xcm-builder": "1.0.8",
     "@moonbeam-network/xcm-types": "1.0.1"
   },
   "peerDependencies": {
-    "@polkadot/types": "^10.9.1",
-    "@polkadot/util": "^12.3.2",
-    "@polkadot/util-crypto": "^12.3.2"
+    "@polkadot/types": "^10.10.1",
+    "@polkadot/util": "^12.5.1",
+    "@polkadot/util-crypto": "^12.5.1"
   }
 }
diff --git a/packages/config/src/assets.ts b/packages/config/src/assets.ts
@@ -15,6 +15,11 @@ export const astr = new Asset({
   originSymbol: 'ASTR',
 });
 
+export const atom = new Asset({
+  key: 'atom',
+  originSymbol: 'ATOM',
+});
+
 export const auq = new Asset({
   key: 'auq',
   originSymbol: 'AUQ',
@@ -75,6 +80,11 @@ export const dai = new Asset({
   originSymbol: 'DAI',
 });
 
+export const fil = new Asset({
+  key: 'fil',
+  originSymbol: 'FIL',
+});
+
 export const glmr = new Asset({
   key: 'glmr',
   originSymbol: 'GLMR',
@@ -165,6 +175,11 @@ export const pha = new Asset({
   originSymbol: 'PHA',
 });
 
+export const pica = new Asset({
+  key: 'pica',
+  originSymbol: 'PICA',
+});
+
 export const ring = new Asset({
   key: 'ring',
   originSymbol: 'RING',
@@ -221,6 +236,11 @@ export const usdt = new Asset({
   originSymbol: 'USDT',
 });
 
+export const usdtwh = new Asset({
+  key: 'usdtwh',
+  originSymbol: 'USDT.Wh',
+});
+
 export const wbtc = new Asset({
   key: 'wbtc',
   originSymbol: 'WBTC',
@@ -271,10 +291,16 @@ export const xrt = new Asset({
   originSymbol: 'XRT',
 });
 
+export const ztg = new Asset({
+  key: 'ztg',
+  originSymbol: 'ZTG',
+});
+
 export const assetsList: Asset[] = [
   aca,
   alan,
   astr,
+  atom,
   auq,
   aseed,
   bnc,
@@ -286,6 +312,7 @@ export const assetsList: Asset[] = [
   dot,
   eq,
   eqd,
+  fil,
   glmr,
   hdx,
   hko,
@@ -304,6 +331,7 @@ export const assetsList: Asset[] = [
   para,
   paring,
   pha,
+  pica,
   ring,
   rmrk,
   sdn,
@@ -315,6 +343,7 @@ export const assetsList: Asset[] = [
   usdcAH,
   usdcwh,
   usdt,
+  usdtwh,
   vbnc,
   vdot,
   vfil,
@@ -325,6 +354,7 @@ export const assetsList: Asset[] = [
   wbtc,
   weth,
   wftm,
+  ztg,
 ];
 
 export const assetsMap = new Map<string, Asset>(