From 6a119d9e166ca3805696718cb9ff42455c65b65e Mon Sep 17 00:00:00 2001 From: mmaurello <93129175+mmaurello@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:46:05 +0200 Subject: [PATCH 1/2] remove parallel (#369) * remove parallel * add changeset * add new moonbase beta endpoint * update snapshot --- .changeset/seven-ladybugs-perform.md | 5 ++ packages/config/src/chains.ts | 37 ++------------ packages/config/src/configs/index.ts | 2 - packages/config/src/configs/moonbeam.ts | 28 ----------- packages/config/src/configs/parallel.ts | 48 ------------------- .../acceptance/__snapshots__/sdk.test.ts.snap | 7 --- 6 files changed, 9 insertions(+), 118 deletions(-) create mode 100644 .changeset/seven-ladybugs-perform.md delete mode 100644 packages/config/src/configs/parallel.ts diff --git a/.changeset/seven-ladybugs-perform.md b/.changeset/seven-ladybugs-perform.md new file mode 100644 index 00000000..bffc9644 --- /dev/null +++ b/.changeset/seven-ladybugs-perform.md @@ -0,0 +1,5 @@ +--- +'@moonbeam-network/xcm-config': patch +--- + +Remove Parallel diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts index 6b11b8f4..6635d3d0 100644 --- a/packages/config/src/chains.ts +++ b/packages/config/src/chains.ts @@ -46,7 +46,6 @@ import { neuro, nodl, otp, - para, paring, peaq, pen, @@ -878,7 +877,10 @@ export const moonbaseBeta = new EvmParachain({ parachainId: 888, rpc: 'https://frag-moonbase-beta-rpc.g.moonbase.moonbeam.network', ss58Format: 1287, - ws: ['wss://deo-moon-rpc-1-moonbase-beta-rpc-1.moonbase.ol-infra.network'], + ws: [ + 'wss://moonbase-beta.api.moonbase.moonbeam.network', + 'wss://deo-moon-rpc-1-moonbase-beta-rpc-1.moonbase.ol-infra.network', + ], }); export const moonbeam = new EvmParachain({ @@ -992,11 +994,6 @@ export const moonbeam = new EvmParachain({ asset: neuro, id: '238111524681612888331172110363070489924', }, - { - address: '0xFfFffFFF18898CB5Fe1E88E668152B4f4052A947', - asset: para, - id: '32615670524745285411807346420584982855', - }, { address: '0xFffFFFFFEC4908b74688a01374f789B48E9a3eab', asset: peaq, @@ -1333,31 +1330,6 @@ export const originTrailAlphanet = new Parachain({ ws: ['wss://otp-lunaris-alpha-node-02.origin-trail.network'], }); -export const parallel = new Parachain({ - assetsData: [ - { - asset: glmr, - id: 114, - }, - // NOTE: no meta for native token - { - asset: para, - metadataId: 0, - }, - ], - ecosystem: Ecosystem.Polkadot, - genesisHash: - '0xe61a41c53f5dcd0beb09df93b34402aada44cb05117b71059cce40a2723a4e97', - key: 'parallel', - name: 'Parallel', - parachainId: 2012, - ss58Format: 172, - ws: [ - 'wss://parallel-rpc.dwellir.com', - 'wss://polkadot-parallel-rpc.parallel.fi', - ], -}); - export const peaqAlphanet = new Parachain({ assetsData: [ { @@ -1955,7 +1927,6 @@ export const chainsList: AnyChain[] = [ neuroweb, nodle, originTrailAlphanet, - parallel, peaqChain, peaqEvm, peaqAlphanet, diff --git a/packages/config/src/configs/index.ts b/packages/config/src/configs/index.ts index 72474bdf..05d7d59b 100644 --- a/packages/config/src/configs/index.ts +++ b/packages/config/src/configs/index.ts @@ -29,7 +29,6 @@ import { moonriverConfig } from './moonriver'; import { neurowebConfig } from './neuroweb'; import { nodleConfig } from './nodle'; import { originTrailAlphanetConfig } from './originTrailAlphanet'; -import { parallelConfig } from './parallel'; import { peaqConfig } from './peaq'; import { peaqAlphanetConfig } from './peaqAlphanet'; import { peaqEvmConfig } from './peaqEvm'; @@ -77,7 +76,6 @@ export const chainsConfigList: ChainConfig[] = [ neurowebConfig, nodleConfig, originTrailAlphanetConfig, - parallelConfig, peaqConfig, peaqEvmConfig, peaqAlphanetConfig, diff --git a/packages/config/src/configs/moonbeam.ts b/packages/config/src/configs/moonbeam.ts index 9b50f8cb..f049fba3 100644 --- a/packages/config/src/configs/moonbeam.ts +++ b/packages/config/src/configs/moonbeam.ts @@ -20,7 +20,6 @@ import { manta, neuro, nodl, - para, peaq, pen, pha, @@ -54,7 +53,6 @@ import { moonbeam, neuroweb, nodle, - parallel, peaqChain, peaqEvm, pendulum, @@ -135,17 +133,6 @@ export const moonbeamConfig = new ChainConfig({ balance: BalanceBuilder().substrate().system().account(), }, }), - new AssetConfig({ - asset: glmr, - balance: BalanceBuilder().substrate().system().account(), - contract: ContractBuilder().Xtokens().transfer(), - destination: parallel, - destinationFee: { - amount: 0.000000032, - asset: glmr, - balance: BalanceBuilder().substrate().system().account(), - }, - }), new AssetConfig({ asset: glmr, balance: BalanceBuilder().substrate().system().account(), @@ -359,21 +346,6 @@ export const moonbeamConfig = new ChainConfig({ balance: BalanceBuilder().substrate().system().account(), }, }), - new AssetConfig({ - asset: para, - balance: BalanceBuilder().substrate().assets().account(), - contract: ContractBuilder().Xtokens().transfer(), - destination: parallel, - destinationFee: { - amount: 0.064, - asset: para, - balance: BalanceBuilder().substrate().assets().account(), - }, - fee: { - asset: glmr, - balance: BalanceBuilder().substrate().system().account(), - }, - }), new AssetConfig({ asset: pen, balance: BalanceBuilder().substrate().assets().account(), diff --git a/packages/config/src/configs/parallel.ts b/packages/config/src/configs/parallel.ts deleted file mode 100644 index e0182854..00000000 --- a/packages/config/src/configs/parallel.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { - BalanceBuilder, - ExtrinsicBuilder, - FeeBuilder, -} from '@moonbeam-network/xcm-builder'; -import { glmr, para } from '../assets'; -import { moonbeam, parallel } from '../chains'; -import { AssetConfig } from '../types/AssetConfig'; -import { ChainConfig } from '../types/ChainConfig'; - -export const parallelConfig = new ChainConfig({ - assets: [ - new AssetConfig({ - asset: para, - balance: BalanceBuilder().substrate().system().account(), - destination: moonbeam, - destinationFee: { - amount: FeeBuilder() - .xcmPaymentApi() - .xcmPaymentFee({ isAssetReserveChain: false }), - asset: para, - balance: BalanceBuilder().substrate().system().account(), - }, - extrinsic: ExtrinsicBuilder() - .xTokens() - .transferMultiAsset(parallel.parachainId) - .X2(), - }), - new AssetConfig({ - asset: glmr, - balance: BalanceBuilder().substrate().assets().account(), - destination: moonbeam, - destinationFee: { - amount: FeeBuilder() - .xcmPaymentApi() - .xcmPaymentFee({ isAssetReserveChain: true }), - asset: glmr, - balance: BalanceBuilder().substrate().assets().account(), - }, - extrinsic: ExtrinsicBuilder().xTokens().transfer(), - fee: { - asset: para, - balance: BalanceBuilder().substrate().system().account(), - }, - }), - ], - chain: parallel, -}); diff --git a/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap b/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap index 211a0b9b..95b3a0e8 100644 --- a/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap +++ b/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap @@ -504,13 +504,6 @@ exports[`sdk > getParachainBalances > on 'Moonbeam' for address: '0x4E82143Af671 "originSymbol": "PEN", "symbol": "PEN", }, - r { - "amount": 0n, - "decimals": 12, - "key": "para", - "originSymbol": "PARA", - "symbol": "PARA", - }, r { "amount": 0n, "decimals": 12, From 641334d0a495a078ca4ef62b2d2bd98f1d8b8a48 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:12:13 +0200 Subject: [PATCH 2/2] Version Packages (#370) Co-authored-by: github-actions[bot] --- .changeset/seven-ladybugs-perform.md | 5 ----- examples/sdk-simple/package.json | 4 ++-- package-lock.json | 10 +++++----- packages/config/CHANGELOG.md | 6 ++++++ packages/config/package.json | 2 +- packages/sdk/CHANGELOG.md | 7 +++++++ packages/sdk/package.json | 4 ++-- 7 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 .changeset/seven-ladybugs-perform.md diff --git a/.changeset/seven-ladybugs-perform.md b/.changeset/seven-ladybugs-perform.md deleted file mode 100644 index bffc9644..00000000 --- a/.changeset/seven-ladybugs-perform.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@moonbeam-network/xcm-config': patch ---- - -Remove Parallel diff --git a/examples/sdk-simple/package.json b/examples/sdk-simple/package.json index 2399a842..d989937a 100644 --- a/examples/sdk-simple/package.json +++ b/examples/sdk-simple/package.json @@ -12,8 +12,8 @@ "author": "", "license": "MIT", "dependencies": { - "@moonbeam-network/xcm-config": "2.7.0", - "@moonbeam-network/xcm-sdk": "2.7.0", + "@moonbeam-network/xcm-config": "2.7.1", + "@moonbeam-network/xcm-sdk": "2.7.1", "@moonbeam-network/xcm-utils": "2.2.0" }, "devDependencies": { diff --git a/package-lock.json b/package-lock.json index 4fb2511b..c9fa8611 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,8 +50,8 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@moonbeam-network/xcm-config": "2.7.0", - "@moonbeam-network/xcm-sdk": "2.7.0", + "@moonbeam-network/xcm-config": "2.7.1", + "@moonbeam-network/xcm-sdk": "2.7.1", "@moonbeam-network/xcm-utils": "2.2.0" }, "devDependencies": { @@ -19611,7 +19611,7 @@ }, "packages/config": { "name": "@moonbeam-network/xcm-config", - "version": "2.7.0", + "version": "2.7.1", "license": "MIT", "dependencies": { "@moonbeam-network/xcm-builder": "2.5.2", @@ -19625,11 +19625,11 @@ }, "packages/sdk": { "name": "@moonbeam-network/xcm-sdk", - "version": "2.7.0", + "version": "2.7.1", "license": "MIT", "dependencies": { "@moonbeam-network/xcm-builder": "2.5.2", - "@moonbeam-network/xcm-config": "2.7.0", + "@moonbeam-network/xcm-config": "2.7.1", "@moonbeam-network/xcm-types": "2.5.0", "@moonbeam-network/xcm-utils": "2.2.0", "big.js": "^6.2.1" diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md index 4151ea66..c27d14c8 100644 --- a/packages/config/CHANGELOG.md +++ b/packages/config/CHANGELOG.md @@ -1,5 +1,11 @@ # @moonbeam-network/xcm-config +## 2.7.1 + +### Patch Changes + +- [#369](https://github.com/moonbeam-foundation/xcm-sdk/pull/369) [`6a119d9`](https://github.com/moonbeam-foundation/xcm-sdk/commit/6a119d9e166ca3805696718cb9ff42455c65b65e) Thanks [@mmaurello](https://github.com/mmaurello)! - Remove Parallel + ## 2.7.0 ### Minor Changes diff --git a/packages/config/package.json b/packages/config/package.json index 0a8490a5..17b8da3d 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@moonbeam-network/xcm-config", - "version": "2.7.0", + "version": "2.7.1", "description": "All necessary configuration to transfer assets from Moonbeam, Moonriver, Moonbase to other parachains and back", "scripts": { "build": "tsup", diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md index 8d0e3078..69b16abd 100644 --- a/packages/sdk/CHANGELOG.md +++ b/packages/sdk/CHANGELOG.md @@ -1,5 +1,12 @@ # @moonbeam-network/xcm-sdk +## 2.7.1 + +### Patch Changes + +- Updated dependencies [[`6a119d9`](https://github.com/moonbeam-foundation/xcm-sdk/commit/6a119d9e166ca3805696718cb9ff42455c65b65e)]: + - @moonbeam-network/xcm-config@2.7.1 + ## 2.7.0 ### Minor Changes diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b9bca37d..de07b4fc 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@moonbeam-network/xcm-sdk", - "version": "2.7.0", + "version": "2.7.1", "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", @@ -52,7 +52,7 @@ "main": "./build/index.cjs", "dependencies": { "@moonbeam-network/xcm-builder": "2.5.2", - "@moonbeam-network/xcm-config": "2.7.0", + "@moonbeam-network/xcm-config": "2.7.1", "@moonbeam-network/xcm-types": "2.5.0", "@moonbeam-network/xcm-utils": "2.2.0", "big.js": "^6.2.1"