From d91de57c34e66356e3b08c13c7f316464b5be670 Mon Sep 17 00:00:00 2001 From: elmar Date: Fri, 14 Jun 2024 11:35:50 +0300 Subject: [PATCH 1/5] Multiple WS urls for PolkadotJS API (#273) --- .changeset/quick-parrots-kick.md | 6 ++++++ packages/types/src/chain/parachain/EvmParachain.ts | 2 +- packages/types/src/chain/parachain/Parachain.ts | 4 ++-- packages/utils/src/polkadot/polkadot.api.ts | 9 ++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 .changeset/quick-parrots-kick.md diff --git a/.changeset/quick-parrots-kick.md b/.changeset/quick-parrots-kick.md new file mode 100644 index 00000000..0d142179 --- /dev/null +++ b/.changeset/quick-parrots-kick.md @@ -0,0 +1,6 @@ +--- +'@moonbeam-network/xcm-types': patch +'@moonbeam-network/xcm-utils': patch +--- + +Multiple WS urls for PolkadotJS API diff --git a/packages/types/src/chain/parachain/EvmParachain.ts b/packages/types/src/chain/parachain/EvmParachain.ts index f221b2b7..2ce1b8e5 100644 --- a/packages/types/src/chain/parachain/EvmParachain.ts +++ b/packages/types/src/chain/parachain/EvmParachain.ts @@ -58,7 +58,7 @@ export class EvmParachain extends Parachain { rpcUrls: { default: { http: [this.rpc], - webSocket: [this.ws], + webSocket: Array.isArray(this.ws) ? this.ws : [this.ws], }, }, }); diff --git a/packages/types/src/chain/parachain/Parachain.ts b/packages/types/src/chain/parachain/Parachain.ts index 7e575a5f..ddfb5b4e 100644 --- a/packages/types/src/chain/parachain/Parachain.ts +++ b/packages/types/src/chain/parachain/Parachain.ts @@ -12,7 +12,7 @@ export interface ParachainConstructorParams ss58Format: number; usesChainDecimals?: boolean; weight?: number; - ws: string; + ws: string | string[]; } export class Parachain extends Chain { @@ -28,7 +28,7 @@ export class Parachain extends Chain { readonly weight: number | undefined; - readonly ws: string; + readonly ws: string | string[]; constructor({ assetsData, diff --git a/packages/utils/src/polkadot/polkadot.api.ts b/packages/utils/src/polkadot/polkadot.api.ts index 3700d0be..a21b13ee 100644 --- a/packages/utils/src/polkadot/polkadot.api.ts +++ b/packages/utils/src/polkadot/polkadot.api.ts @@ -22,9 +22,12 @@ const cache = new LRUCache>({ }, }); -export async function getPolkadotApi(ws: string): Promise { +export async function getPolkadotApi( + ws: string | string[], +): Promise { + const key = Array.isArray(ws) ? ws.join(';') : ws; const promise = - cache.get(ws) || + cache.get(key) || ApiPromise.create({ noInitWarn: true, provider: new WsProvider(ws), @@ -39,7 +42,7 @@ export async function getPolkadotApi(ws: string): Promise { typesBundle, }); - cache.set(ws, promise); + cache.set(key, promise); const api = await promise; From 8b075d53997d7879c545d1dc46a5b073784e7688 Mon Sep 17 00:00:00 2001 From: elmar Date: Fri, 14 Jun 2024 12:31:39 +0300 Subject: [PATCH 2/5] Fixing balances e2e tests (#275) --- .../acceptance/__snapshots__/sdk.test.ts.snap | 374 +++++++++--------- packages/sdk/tests/acceptance/sdk.test.ts | 120 ++---- 2 files changed, 220 insertions(+), 274 deletions(-) diff --git a/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap b/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap index 6da3641d..d6157dc8 100644 --- a/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap +++ b/packages/sdk/tests/acceptance/__snapshots__/sdk.test.ts.snap @@ -1,8 +1,8 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`sdk > getParachainBalances > should get expected balances for Centrifuge for substrate address 1`] = ` +exports[`sdk > getParachainBalances > on 'Centrifuge' for address: '4fAKSBMGVT9jt1jkuJvXgvMbmqV2BuspFWWEm…' > should get expected balances 1`] = ` [ - s { + a { "amount": 570000000000000000n, "decimals": 18, "key": "cfg", @@ -12,9 +12,9 @@ exports[`sdk > getParachainBalances > should get expected balances for Centrifug ] `; -exports[`sdk > getParachainBalances > should get expected balances for Centrifuge 1`] = ` +exports[`sdk > getParachainBalances > on 'Centrifuge' for address: '5FtGz8bgoCQ6pNAYLWCfxKx9ekLnX1ewP9q2T…' > should get expected balances 1`] = ` [ - s { + a { "amount": 570000000000000000n, "decimals": 18, "key": "cfg", @@ -24,52 +24,31 @@ exports[`sdk > getParachainBalances > should get expected balances for Centrifug ] `; -exports[`sdk > getParachainBalances > should get expected balances for HydraDX 1`] = ` +exports[`sdk > getParachainBalances > on 'HydraDX Alphanet' for address: '5FtGz8bgoCQ6pNAYLWCfxKx9ekLnX1ewP9q2T…' > should get expected balances 1`] = ` [ - s { - "amount": 37000000000000n, + a { + "amount": 178046239082538836n, "decimals": 18, - "key": "weth", - "originSymbol": "WETH", - "symbol": "WETH", - }, - s { - "amount": 120n, - "decimals": 8, - "key": "wbtc", - "originSymbol": "WBTC", - "symbol": "WBTC", - }, - s { - "amount": 0n, - "decimals": 6, - "key": "usdtwh", - "originSymbol": "USDT.Wh", - "symbol": "USDT.Wh", + "key": "ftmwh", + "originSymbol": "FTM.wh", + "symbol": "FTM.wh", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { - "amount": 0n, - "decimals": 18, - "key": "dai", - "originSymbol": "DAI", - "symbol": "DAI", - }, - s { + a { "amount": 0n, "decimals": 18, - "key": "glmr", - "originSymbol": "GLMR", - "symbol": "GLMR", + "key": "dev", + "originSymbol": "DEV", + "symbol": "DEV", }, - s { - "amount": 1000000000000n, + a { + "amount": 3000000000000n, "decimals": 12, "key": "hdx", "originSymbol": "HDX", @@ -78,30 +57,30 @@ exports[`sdk > getParachainBalances > should get expected balances for HydraDX 1 ] `; -exports[`sdk > getParachainBalances > should get expected balances for HydraDX Alphanet 1`] = ` +exports[`sdk > getParachainBalances > on 'HydraDX Alphanet' for address: '7MR8Qxy9sJmN6bfHMggAtFY5DwLxfrssLuTnP…' > should get expected balances 1`] = ` [ - s { + a { "amount": 178046239082538836n, "decimals": 18, "key": "ftmwh", "originSymbol": "FTM.wh", "symbol": "FTM.wh", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 0n, "decimals": 18, "key": "dev", "originSymbol": "DEV", "symbol": "DEV", }, - s { + a { "amount": 3000000000000n, "decimals": 12, "key": "hdx", @@ -111,31 +90,52 @@ exports[`sdk > getParachainBalances > should get expected balances for HydraDX A ] `; -exports[`sdk > getParachainBalances > should get expected balances for HydraDX Alphanet for substrate address 1`] = ` +exports[`sdk > getParachainBalances > on 'HydraDX' for address: '5FtGz8bgoCQ6pNAYLWCfxKx9ekLnX1ewP9q2T…' > should get expected balances 1`] = ` [ - s { - "amount": 178046239082538836n, + a { + "amount": 37000000000000n, "decimals": 18, - "key": "ftmwh", - "originSymbol": "FTM.wh", - "symbol": "FTM.wh", + "key": "weth", + "originSymbol": "WETH", + "symbol": "WETH", + }, + a { + "amount": 120n, + "decimals": 8, + "key": "wbtc", + "originSymbol": "WBTC", + "symbol": "WBTC", }, - s { + a { + "amount": 0n, + "decimals": 6, + "key": "usdtwh", + "originSymbol": "USDT.Wh", + "symbol": "USDT.Wh", + }, + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 0n, "decimals": 18, - "key": "dev", - "originSymbol": "DEV", - "symbol": "DEV", + "key": "dai", + "originSymbol": "DAI", + "symbol": "DAI", }, - s { - "amount": 3000000000000n, + a { + "amount": 0n, + "decimals": 18, + "key": "glmr", + "originSymbol": "GLMR", + "symbol": "GLMR", + }, + a { + "amount": 1000000000000n, "decimals": 12, "key": "hdx", "originSymbol": "HDX", @@ -144,51 +144,51 @@ exports[`sdk > getParachainBalances > should get expected balances for HydraDX A ] `; -exports[`sdk > getParachainBalances > should get expected balances for HydraDX for substrate address 1`] = ` +exports[`sdk > getParachainBalances > on 'HydraDX' for address: '7MR8Qxy9sJmN6bfHMggAtFY5DwLxfrssLuTnP…' > should get expected balances 1`] = ` [ - s { + a { "amount": 37000000000000n, "decimals": 18, "key": "weth", "originSymbol": "WETH", "symbol": "WETH", }, - s { + a { "amount": 120n, "decimals": 8, "key": "wbtc", "originSymbol": "WBTC", "symbol": "WBTC", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdtwh", "originSymbol": "USDT.Wh", "symbol": "USDT.Wh", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 0n, "decimals": 18, "key": "dai", "originSymbol": "DAI", "symbol": "DAI", }, - s { + a { "amount": 0n, "decimals": 18, "key": "glmr", "originSymbol": "GLMR", "symbol": "GLMR", }, - s { + a { "amount": 1000000000000n, "decimals": 12, "key": "hdx", @@ -198,93 +198,93 @@ exports[`sdk > getParachainBalances > should get expected balances for HydraDX f ] `; -exports[`sdk > getParachainBalances > should get expected balances for Moonbase Alpha 1`] = ` +exports[`sdk > getParachainBalances > on 'Moonbase Alpha' for address: '0x4E82143Af671Cc8201Bc7efCBbCED3A69e8…' > should get expected balances 1`] = ` [ - s { + a { "amount": 0n, "decimals": 18, "key": "agng", "originSymbol": "AGNG", "symbol": "AGNG", }, - s { + a { "amount": 0n, "decimals": 12, "key": "hdx", "originSymbol": "HDX", "symbol": "HDX", }, - s { + a { "amount": 1234567890000000000n, "decimals": 18, "key": "ftmwh", "originSymbol": "FTM.wh", "symbol": "FTM.wh", }, - s { + a { "amount": 10000n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 0n, "decimals": 12, "key": "unit", "originSymbol": "Unit", "symbol": "Unit", }, - s { + a { "amount": 0n, "decimals": 10, "key": "tur", "originSymbol": "TUR", "symbol": "TUR", }, - s { + a { "amount": 0n, "decimals": 18, "key": "tt1", "originSymbol": "TT1", "symbol": "TT1", }, - s { + a { "amount": 0n, "decimals": 12, "key": "pica", "originSymbol": "PICA", "symbol": "PICA", }, - s { + a { "amount": 0n, "decimals": 6, "key": "atom", "originSymbol": "ATOM", "symbol": "ATOM", }, - s { + a { "amount": 0n, "decimals": 12, "key": "otp", "originSymbol": "OTP", "symbol": "OTP", }, - s { + a { "amount": 0n, "decimals": 12, "key": "ampe", "originSymbol": "AMPE", "symbol": "AMPE", }, - s { + a { "amount": 10000000000000000n, "decimals": 18, "key": "alan", "originSymbol": "ALAN", "symbol": "ALAN", }, - s { + a { "amount": 6543210000000000000n, "decimals": 18, "key": "dev", @@ -294,30 +294,30 @@ exports[`sdk > getParachainBalances > should get expected balances for Moonbase ] `; -exports[`sdk > getParachainBalances > should get expected balances for Moonbase Beta 1`] = ` +exports[`sdk > getParachainBalances > on 'Moonbase Beta' for address: '0x4E82143Af671Cc8201Bc7efCBbCED3A69e8…' > should get expected balances 1`] = ` [ - s { + a { "amount": 100000000000000000n, "decimals": 18, "key": "ftmwh", "originSymbol": "FTM.wh", "symbol": "FTM.wh", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 1100000000000000000n, "decimals": 18, "key": "alan", "originSymbol": "ALAN", "symbol": "ALAN", }, - s { + a { "amount": 1100000000000000000n, "decimals": 18, "key": "dev", @@ -327,275 +327,275 @@ exports[`sdk > getParachainBalances > should get expected balances for Moonbase ] `; -exports[`sdk > getParachainBalances > should get expected balances for Moonbeam 1`] = ` +exports[`sdk > getParachainBalances > on 'Moonbeam' for address: '0x4E82143Af671Cc8201Bc7efCBbCED3A69e8…' > should get expected balances 1`] = ` [ - s { + a { "amount": 0n, "decimals": 18, "key": "peaq", "originSymbol": "PEAQ", "symbol": "PEAQ", }, - s { + a { "amount": 0n, "decimals": 12, "key": "bncs", "originSymbol": "BNCS", "symbol": "BNCS", }, - s { + a { "amount": 0n, "decimals": 10, "key": "sub", "originSymbol": "SUB", "symbol": "SUB", }, - s { + a { "amount": 0n, "decimals": 10, "key": "ztg", "originSymbol": "ZTG", "symbol": "ZTG", }, - s { + a { "amount": 0n, "decimals": 18, "key": "fil", "originSymbol": "FIL", "symbol": "FIL", }, - s { + a { "amount": 0n, "decimals": 18, "key": "weth", "originSymbol": "WETH", "symbol": "WETH", }, - s { + a { "amount": 0n, "decimals": 8, "key": "wbtc", "originSymbol": "WBTC", "symbol": "WBTC", }, - s { + a { "amount": 0n, "decimals": 18, "key": "vmanta", "originSymbol": "vMANTA", "symbol": "vMANTA", }, - s { + a { "amount": 0n, "decimals": 18, "key": "vglmr", "originSymbol": "vGLMR", "symbol": "vGLMR", }, - s { + a { "amount": 0n, "decimals": 18, "key": "vfil", "originSymbol": "vFIL", "symbol": "vFIL", }, - s { + a { "amount": 0n, "decimals": 10, "key": "vdot", "originSymbol": "vDOT", "symbol": "vDOT", }, - s { + a { "amount": 0n, "decimals": 18, "key": "vastr", "originSymbol": "vASTR", "symbol": "vASTR", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdtwh", "originSymbol": "USDT.Wh", "symbol": "USDT.Wh", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 0n, "decimals": 18, "key": "dai", "originSymbol": "DAI", "symbol": "DAI", }, - s { + a { "amount": 0n, "decimals": 12, "key": "hdx", "originSymbol": "HDX", "symbol": "HDX", }, - s { + a { "amount": 0n, "decimals": 10, "key": "ded", "originSymbol": "DED", "symbol": "DED", }, - s { + a { "amount": 0n, "decimals": 10, "key": "pink", "originSymbol": "PINK", "symbol": "PINK", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdc", "originSymbol": "USDC", "symbol": "USDC", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdt", "originSymbol": "USDT", "symbol": "USDT", }, - s { + a { "amount": 0n, "decimals": 18, "key": "ring", "originSymbol": "RING", "symbol": "RING", }, - s { + a { "amount": 0n, "decimals": 12, "key": "pha", "originSymbol": "PHA", "symbol": "PHA", }, - s { + a { "amount": 0n, "decimals": 12, "key": "pen", "originSymbol": "PEN", "symbol": "PEN", }, - s { + a { "amount": 0n, "decimals": 12, "key": "para", "originSymbol": "PARA", "symbol": "PARA", }, - s { + a { "amount": 0n, "decimals": 12, "key": "neuro", "originSymbol": "NEURO", "symbol": "NEURO", }, - s { + a { "amount": 0n, "decimals": 11, "key": "nodl", "originSymbol": "NODL", "symbol": "NODL", }, - s { + a { "amount": 0n, "decimals": 18, "key": "manta", "originSymbol": "MANTA", "symbol": "MANTA", }, - s { + a { "amount": 0n, "decimals": 10, "key": "ldot", "originSymbol": "LDOT", "symbol": "LDOT", }, - s { + a { "amount": 0n, "decimals": 10, "key": "intr", "originSymbol": "INTR", "symbol": "INTR", }, - s { + a { "amount": 0n, "decimals": 8, "key": "ibtc", "originSymbol": "IBTC", "symbol": "IBTC", }, - s { + a { "amount": 0n, "decimals": 9, "key": "eqd", "originSymbol": "EQD", "symbol": "EQD", }, - s { + a { "amount": 0n, "decimals": 9, "key": "eq", "originSymbol": "EQ", "symbol": "EQ", }, - s { + a { "amount": 330000000n, "decimals": 10, "key": "dot", "originSymbol": "DOT", "symbol": "DOT", }, - s { + a { "amount": 0n, "decimals": 18, "key": "cfg", "originSymbol": "CFG", "symbol": "CFG", }, - s { + a { "amount": 0n, "decimals": 12, "key": "bnc", "originSymbol": "BNC", "symbol": "BNC", }, - s { + a { "amount": 0n, "decimals": 12, "key": "aseed", "originSymbol": "aSEED", "symbol": "aSEED", }, - s { + a { "amount": 0n, "decimals": 18, "key": "astr", "originSymbol": "ASTR", "symbol": "ASTR", }, - s { + a { "amount": 0n, "decimals": 12, "key": "aca", "originSymbol": "ACA", "symbol": "ACA", }, - s { + a { "amount": 1330000000000000000n, "decimals": 18, "key": "glmr", @@ -605,148 +605,148 @@ exports[`sdk > getParachainBalances > should get expected balances for Moonbeam ] `; -exports[`sdk > getParachainBalances > should get expected balances for peaq 1`] = ` +exports[`sdk > getParachainBalances > on 'peaq Alphanet' for address: '5FtGz8bgoCQ6pNAYLWCfxKx9ekLnX1ewP9q2T…' > should get expected balances 1`] = ` +[ + a { + "amount": 0n, + "decimals": 18, + "key": "ftmwh", + "originSymbol": "FTM.wh", + "symbol": "FTM.wh", + }, + a { + "amount": 0n, + "decimals": 18, + "key": "dev", + "originSymbol": "DEV", + "symbol": "DEV", + }, + a { + "amount": 1223300000000000000n, + "decimals": 18, + "key": "agng", + "originSymbol": "AGNG", + "symbol": "AGNG", + }, +] +`; + +exports[`sdk > getParachainBalances > on 'peaq EVM Alphanet' for address: '0x4E82143Af671Cc8201Bc7efCBbCED3A69e8…' > should get expected balances 1`] = ` +[ + a { + "amount": 330000000000000000n, + "decimals": 18, + "key": "dev", + "originSymbol": "DEV", + "symbol": "DEV", + }, + a { + "amount": 123000000000000000n, + "decimals": 18, + "key": "ftmwh", + "originSymbol": "FTM.wh", + "symbol": "FTM.wh", + }, +] +`; + +exports[`sdk > getParachainBalances > on 'peaq EVM' for address: '0x4E82143Af671Cc8201Bc7efCBbCED3A69e8…' > should get expected balances 1`] = ` [ - s { + a { "amount": 0n, "decimals": 6, "key": "usdtwh", "originSymbol": "USDT.Wh", "symbol": "USDT.Wh", }, - s { + a { "amount": 0n, "decimals": 18, "key": "weth", "originSymbol": "WETH", "symbol": "WETH", }, - s { + a { "amount": 0n, "decimals": 8, "key": "wbtc", "originSymbol": "WBTC", "symbol": "WBTC", }, - s { + a { "amount": 0n, "decimals": 18, "key": "dai", "originSymbol": "DAI", "symbol": "DAI", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 0n, "decimals": 18, "key": "glmr", "originSymbol": "GLMR", "symbol": "GLMR", }, - s { - "amount": 1313000000000000000n, - "decimals": 18, - "key": "peaq", - "originSymbol": "PEAQ", - "symbol": "PEAQ", - }, -] -`; - -exports[`sdk > getParachainBalances > should get expected balances for peaq Alphanet 1`] = ` -[ - s { - "amount": 0n, - "decimals": 18, - "key": "ftmwh", - "originSymbol": "FTM.wh", - "symbol": "FTM.wh", - }, - s { - "amount": 0n, - "decimals": 18, - "key": "dev", - "originSymbol": "DEV", - "symbol": "DEV", - }, - s { - "amount": 1223300000000000000n, - "decimals": 18, - "key": "agng", - "originSymbol": "AGNG", - "symbol": "AGNG", - }, ] `; -exports[`sdk > getParachainBalances > should get expected balances for peaq EVM 1`] = ` +exports[`sdk > getParachainBalances > on 'peaq' for address: '5FtGz8bgoCQ6pNAYLWCfxKx9ekLnX1ewP9q2T…' > should get expected balances 1`] = ` [ - s { + a { "amount": 0n, "decimals": 6, "key": "usdtwh", "originSymbol": "USDT.Wh", "symbol": "USDT.Wh", }, - s { + a { "amount": 0n, "decimals": 18, "key": "weth", "originSymbol": "WETH", "symbol": "WETH", }, - s { + a { "amount": 0n, "decimals": 8, "key": "wbtc", "originSymbol": "WBTC", "symbol": "WBTC", }, - s { + a { "amount": 0n, "decimals": 18, "key": "dai", "originSymbol": "DAI", "symbol": "DAI", }, - s { + a { "amount": 0n, "decimals": 6, "key": "usdcwh", "originSymbol": "USDC.Wh", "symbol": "USDC.Wh", }, - s { + a { "amount": 0n, "decimals": 18, "key": "glmr", "originSymbol": "GLMR", "symbol": "GLMR", }, -] -`; - -exports[`sdk > getParachainBalances > should get expected balances for peaq EVM Alphanet 1`] = ` -[ - s { - "amount": 330000000000000000n, - "decimals": 18, - "key": "dev", - "originSymbol": "DEV", - "symbol": "DEV", - }, - s { - "amount": 123000000000000000n, + a { + "amount": 1313000000000000000n, "decimals": 18, - "key": "ftmwh", - "originSymbol": "FTM.wh", - "symbol": "FTM.wh", + "key": "peaq", + "originSymbol": "PEAQ", + "symbol": "PEAQ", }, ] `; diff --git a/packages/sdk/tests/acceptance/sdk.test.ts b/packages/sdk/tests/acceptance/sdk.test.ts index a5783592..2af3410c 100644 --- a/packages/sdk/tests/acceptance/sdk.test.ts +++ b/packages/sdk/tests/acceptance/sdk.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable sort-keys */ // eslint-disable-next-line import/no-extraneous-dependencies import { describe, expect, it } from 'vitest'; import { @@ -12,102 +13,47 @@ import { peaqEvm, peaqEvmAlphanet, } from '@moonbeam-network/xcm-config'; +import { AnyChain } from '@moonbeam-network/xcm-types'; import { getParachainBalances } from '../../src/sdk'; // E2E balance test wallet const hydraDXAddress = '7MR8Qxy9sJmN6bfHMggAtFY5DwLxfrssLuTnP5rmkpD92oPH'; -const centrifugeAddress = '4fAKSBMGVT9jt1jkuJvXgvMbmqV2BuspFWWEmdVeFj9yRudb'; const moonEvmAddress = '0x4E82143Af671Cc8201Bc7efCBbCED3A69e84405e'; const substrateAddress = '5FtGz8bgoCQ6pNAYLWCfxKx9ekLnX1ewP9q2TjMT2riu7sf9'; -const moonbaseBetaAddress = '0x4E82143Af671Cc8201Bc7efCBbCED3A69e84405e'; -const peaqSubstrateAccount = '5FtGz8bgoCQ6pNAYLWCfxKx9ekLnX1ewP9q2TjMT2riu7sf9'; + +const config: { chain: AnyChain; address: string }[] = [ + { chain: moonbeam, address: moonEvmAddress }, + { chain: hydraDX, address: hydraDXAddress }, + { chain: hydraDX, address: substrateAddress }, + { + chain: centrifuge, + address: '4fAKSBMGVT9jt1jkuJvXgvMbmqV2BuspFWWEmdVeFj9yRudb', + }, + { chain: centrifuge, address: substrateAddress }, + { chain: hydraDxAlphanet, address: hydraDXAddress }, + { chain: hydraDxAlphanet, address: substrateAddress }, + { + chain: moonbaseBeta, + address: '0x4E82143Af671Cc8201Bc7efCBbCED3A69e84405e', + }, + { chain: moonbaseAlpha, address: moonEvmAddress }, + { chain: peaqEvmAlphanet, address: moonEvmAddress }, + { chain: peaqAlphanet, address: substrateAddress }, + { chain: peaqChain, address: substrateAddress }, + { chain: peaqEvm, address: moonEvmAddress }, +]; describe('sdk', () => { describe(`${getParachainBalances.name}`, () => { - it(`should get expected balances for ${moonbeam.name}`, async () => { - const result = await getParachainBalances(moonbeam, moonEvmAddress); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${hydraDX.name}`, async () => { - const result = await getParachainBalances(hydraDX, hydraDXAddress); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${hydraDX.name} for substrate address`, async () => { - const result = await getParachainBalances(hydraDX, substrateAddress); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${centrifuge.name}`, async () => { - const result = await getParachainBalances(centrifuge, centrifugeAddress); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${centrifuge.name} for substrate address`, async () => { - const result = await getParachainBalances(centrifuge, substrateAddress); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${hydraDxAlphanet.name}`, async () => { - const result = await getParachainBalances( - hydraDxAlphanet, - hydraDXAddress, - ); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${hydraDxAlphanet.name} for substrate address`, async () => { - const result = await getParachainBalances( - hydraDxAlphanet, - substrateAddress, - ); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${moonbaseBeta.name}`, async () => { - const result = await getParachainBalances( - moonbaseBeta, - moonbaseBetaAddress, - ); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${moonbaseAlpha.name}`, async () => { - const result = await getParachainBalances(moonbaseAlpha, moonEvmAddress); - - expect(result).toMatchSnapshot(); - }); - - it(`should get expected balances for ${peaqEvmAlphanet.name}`, async () => { - const result = await getParachainBalances( - peaqEvmAlphanet, - moonEvmAddress, - ); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${peaqAlphanet.name}`, async () => { - const result = await getParachainBalances( - peaqAlphanet, - peaqSubstrateAccount, - ); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${peaqChain.name}`, async () => { - const result = await getParachainBalances( - peaqChain, - peaqSubstrateAccount, - ); - - expect(result).toMatchSnapshot(); - }); - it(`should get expected balances for ${peaqEvm.name}`, async () => { - const result = await getParachainBalances(peaqEvm, moonEvmAddress); - - expect(result).toMatchSnapshot(); - }); + describe.each(config)( + 'on $chain.name for address: $address', + ({ chain, address }) => { + it(`should get expected balances`, async () => { + const result = await getParachainBalances(chain, address); + expect(result).toMatchSnapshot(); + }); + }, + ); }); }); From 49b762dbe5882233d0e20ef51d82f92b94888bbe Mon Sep 17 00:00:00 2001 From: Richard Kenigs <18597956+Rihyx@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:59:22 +0200 Subject: [PATCH 3/5] add token addresses to chain configs for EvmParachains (#277) * add token addresses to chain configs for EvmParachains * add changeset --- .changeset/mighty-jars-destroy.md | 6 ++ packages/config/src/chains.ts | 87 +++++++++++++++++++ .../chain/parachain/Parachain.interfaces.ts | 1 + 3 files changed, 94 insertions(+) create mode 100644 .changeset/mighty-jars-destroy.md diff --git a/.changeset/mighty-jars-destroy.md b/.changeset/mighty-jars-destroy.md new file mode 100644 index 00000000..5867aeeb --- /dev/null +++ b/.changeset/mighty-jars-destroy.md @@ -0,0 +1,6 @@ +--- +'@moonbeam-network/xcm-config': patch +'@moonbeam-network/xcm-types': patch +--- + +Add ERC20 token addresses diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts index 8888fbdb..ba04bea5 100644 --- a/packages/config/src/chains.ts +++ b/packages/config/src/chains.ts @@ -704,15 +704,18 @@ export const mantaParachain = new Parachain({ export const moonbaseAlpha = new EvmParachain({ assetsData: [ { + address: '0x9133c5a22024118804089f1fB752b7B2ce2a6351', asset: alan, id: '0x9133c5a22024118804089f1fB752b7B2ce2a6351', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0xfFfFfffF7fee8415e1c2AC3A15C48D3546B95e16', asset: ampe, id: '170050401128744171791743427490841452054', }, { + address: '0xffffffffb7cdb201c395c238350568f17cfbd3b5', // Picasso Cosmos Hub asset: atom, id: '244316754493307480955066032215622931381', }, @@ -721,54 +724,66 @@ export const moonbaseAlpha = new EvmParachain({ // id: '69536036667157951501899290870203586130', // }, { + address: '0x0000000000000000000000000000000000000802', asset: dev, id: '0x0000000000000000000000000000000000000802', metadataId: 0, min: 0.01, }, { + address: '0xfffFFfFF31103d490325BB0a8E40eF62e2F614C0', asset: lit, id: '65216491554813189869575508812319036608', }, { + address: '0xFfffffFfB3229c8E7657eABEA704d5e75246e544', asset: otp, id: '238111524681612888331172110363070489924', }, { + address: '0xFFFffFfF8283448b3cB519Ca4732F2ddDC6A6165', asset: paring, id: '173481220575862801646329923366065693029', }, { + address: '0xFFFfFFFF10DD5Fd142163a40Ce0dae8c56e2801f', asset: pica, id: '22417088946346045371238623691600461855', }, { + address: '0xfFffFfFf75976211C786fe4d73d2477e222786Ac', asset: tt1, id: '156305701417244550631956600137082963628', }, { + address: '0xfFffffFf6448d0746f2a66342B67ef9CAf89478E', asset: tur, id: '133300872918374599700079037156071917454', }, { + address: '0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080', asset: unit, id: '42259045809535163221576417993425387648', }, { + address: '0x566c1cebc6A4AFa1C122E039C4BEBe77043148Ee', asset: ftmwh, id: '0x566c1cebc6A4AFa1C122E039C4BEBe77043148Ee', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0xFFFfFfff345Dc44DDAE98Df024Eb494321E73FcC', asset: hdx, id: '69606720909260275826784788104880799692', }, { + address: '0xE5dE10C4b744bac6b783fAF8d9B9fDFF14Acc3c9', asset: usdcwh, id: '0xE5dE10C4b744bac6b783fAF8d9B9fDFF14Acc3c9', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0xFFfFFFFF38794F8c53fC7325ea07463dc6965e20', asset: agng, id: '75066649112131892397889252914026143264', }, @@ -840,171 +855,210 @@ export const moonbaseBeta = new EvmParachain({ export const moonbeam = new EvmParachain({ assetsData: [ { + address: '0xffffFFffa922Fef94566104a6e5A35a4fCDDAA9f', asset: aca, id: '224821240862170613278369189818311486111', }, { + address: '0xFfFFFfffA893AD19e540E172C10d78D4d479B5Cf', asset: astr, id: '224077081838586484055667086558292981199', }, { + address: '0xfFfFFFFF52C56A9257bB97f4B2b6F7B2D624ecda', asset: aseed, id: '110021739665376159354538090254163045594', }, { + address: '0xFFffffFf7cC06abdF7201b350A1265c62C8601d2', asset: bnc, id: '165823357460190568952172802245839421906', }, { + address: '0xfFfffffF6aF229AE7f0F4e0188157e189a487D59', asset: bncs, id: '142155548796783636521833385094843759961', }, { + address: '0xFFfFfFff44bD9D2FFEE20B25D1Cf9E78Edb6Eae3', asset: cfg, id: '91372035960551235635465443179559840483', }, { + address: '0x06e605775296e851FF43b4dAa541Bb0984E9D6fD', asset: dai, id: '0x06e605775296e851FF43b4dAa541Bb0984E9D6fD', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0xfFffFFFf5da2d7214D268375cf8fb1715705FdC6', asset: ded, id: '124463719055550872076363892993240202694', }, { + address: '0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080', asset: dot, id: '42259045809535163221576417993425387648', }, { + address: '0xFffFFfFf8f6267e040D8a0638C576dfBa4F0F6D6', asset: eq, id: '190590555344745888270686124937537713878', }, { + address: '0xFFffFfFF8cdA1707bAF23834d211B08726B1E499', asset: eqd, id: '187224307232923873519830480073807488153', }, { + address: '0xfFFfFFFF6C57e17D210DF507c82807149fFd70B2', asset: fil, id: '0xfFFfFFFF6C57e17D210DF507c82807149fFd70B2', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0x0000000000000000000000000000000000000802', asset: glmr, id: '0x0000000000000000000000000000000000000802', min: 0.1, }, { + address: '0xFFFfFfff345Dc44DDAE98Df024Eb494321E73FcC', asset: hdx, id: '69606720909260275826784788104880799692', }, { + address: '0xFFFFFfFf5AC1f9A51A93F5C527385edF7Fe98A52', asset: ibtc, id: '120637696315203257380661607956669368914', }, { + address: '0xFffFFFFF4C1cbCd97597339702436d4F18a375Ab', asset: intr, id: '101170542313601871197860408087030232491', }, { + address: '0xFFfFfFffA9cfFfa9834235Fe53f4733F1b8B28d4', asset: ldot, id: '225719522181998468294117309041779353812', }, { + address: '0xfFFffFFf7D3875460d4509eb8d0362c611B4E841', asset: manta, id: '166446646689194205559791995948102903873', }, { + address: '0xfffffffFe896ba7Cb118b9Fa571c6dC0a99dEfF1', asset: nodl, id: '309163521958167876851250718453738106865', }, { + address: '0xFfffffFfB3229c8E7657eABEA704d5e75246e544', asset: neuro, id: '238111524681612888331172110363070489924', }, { + address: '0xFfFffFFF18898CB5Fe1E88E668152B4f4052A947', asset: para, id: '32615670524745285411807346420584982855', }, { + address: '0xFffFFFFFEC4908b74688a01374f789B48E9a3eab', asset: peaq, id: '314077021455772878282433861213184736939', }, { + address: '0xFFFfFfFf63d24eCc8eB8a7b5D0803e900F7b6cED', asset: pha, id: '132685552157663328694213725410064821485', }, { + address: '0xffFFfFFf2257622F345E1ACDe0D4f46D7d1D77D0', asset: pen, id: '45647473099451451833602657905356404688', }, { + address: '0xFfffFfff5e90e365eDcA87fB4c8306Df1E91464f', asset: ring, id: '125699734534028342599692732320197985871', }, { + address: '0xfFfFffFf43B4560Bc0C451a3386E082bff50aC90', asset: sub, id: '89994634370519791027168048838578580624', }, { + address: '0xFFfffffF7D2B0B761Af01Ca8e25242976ac0aD7D', asset: usdc, id: '0xFFfffffF7D2B0B761Af01Ca8e25242976ac0aD7D', metadataId: '166377000701797186346254371275954761085', // registered XC20 id for ERC20 tokens }, { + address: '0x931715FEE2d06333043d11F658C8CE934aC61D0c', asset: usdcwh, id: '0x931715FEE2d06333043d11F658C8CE934aC61D0c', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0xc30E9cA94CF52f3Bf5692aaCF81353a27052c46f', asset: usdtwh, id: '0xc30E9cA94CF52f3Bf5692aaCF81353a27052c46f', metadataId: 0, }, { + address: '0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d', asset: usdt, id: '311091173110107856861649819128533077277', }, { + address: '0xFffFffff55C732C47639231a4C4373245763d26E', asset: vastr, id: '0xFffFffff55C732C47639231a4C4373245763d26E', metadataId: '114018676402354620972806895487280206446', // registered XC20 id for ERC20 tokens }, { + address: '0xFFFfffFf15e1b7E3dF971DD813Bc394deB899aBf', asset: vdot, id: '0xFFFfffFf15e1b7E3dF971DD813Bc394deB899aBf', metadataId: '29085784439601774464560083082574142143', // registered XC20 id for ERC20 tokens }, { + address: '0xFffffFffCd0aD0EA6576B7b285295c85E94cf4c1', asset: vfil, id: '0xFffffFffCd0aD0EA6576B7b285295c85E94cf4c1', metadataId: '272547899416482196831721420898811311297', // registered XC20 id for ERC20 tokens }, { + address: '0xFfFfFFff99dABE1a8De0EA22bAa6FD48fdE96F6c', asset: vglmr, id: '0xFfFfFFff99dABE1a8De0EA22bAa6FD48fdE96F6c', metadataId: '204507659831918931608354793288110796652', // registered XC20 id for ERC20 tokens }, { + address: '0xFFfFFfFfdA2a05FB50e7ae99275F4341AEd43379', asset: vmanta, id: '0xFFfFFfFfdA2a05FB50e7ae99275F4341AEd43379', metadataId: '289989900872525819559124583375550296953', // registered XC20 id for ERC20 tokens }, { + address: '0xE57eBd2d67B462E9926e04a8e33f01cD0D64346D', asset: wbtc, id: '0xE57eBd2d67B462E9926e04a8e33f01cD0D64346D', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0xab3f0245B83feB11d15AAffeFD7AD465a59817eD', asset: weth, id: '0xab3f0245B83feB11d15AAffeFD7AD465a59817eD', metadataId: 0, // no metadata for ERC20 tokens }, { + address: '0xFFFFfffF71815ab6142E0E20c7259126C6B40612', asset: ztg, id: '150874409661081770150564009349448205842', }, { + address: '0xfFfFFfFf30478fAFBE935e466da114E14fB3563d', asset: pink, id: '64174511183114006009298114091987195453', }, @@ -1030,105 +1084,130 @@ export const moonbeam = new EvmParachain({ export const moonriver = new EvmParachain({ assetsData: [ { + address: '0xFfFffFFfa1B026a00FbAA67c86D5d1d5BF8D8228', asset: aseed, id: '214920334981412447805621250067209749032', }, { + address: '0xFFfFFfFFF075423be54811EcB478e911F22dDe7D', asset: bnc, id: '319623561105283008236062145480775032445', }, { + address: '0xFFFffFfF8283448b3cB519Ca4732F2ddDC6A6165', asset: crab, id: '173481220575862801646329923366065693029', }, { + address: '0xffFfFFFf519811215E05eFA24830Eebe9c43aCD7', asset: csm, id: '108457044225666871745333730479173774551', }, { + address: '0xffffffFF394054BCDa1902B6A6436840435655a3', asset: hko, id: '76100021443485661246318545281171740067', }, { + address: '0xFfFFFFfF08220AD2E6e157f26eD8bD22A336A0A5', asset: kar, id: '10810581592933651521121702237638664357', }, { + address: '0xFFFfFfFfF6E528AD57184579beeE00c5d5e646F0', asset: kbtc, id: '328179947973504579459046439826496046832', }, { + address: '0xfffFFFFF83F4f317d3cbF6EC6250AeC3697b3fF2', asset: kint, id: '175400718394635817552109270754364440562', }, { + address: '0xFFffFffFA083189f870640b141ae1E882c2b5bad', asset: kma, id: '213357169630950964874127107356898319277', }, { + address: '0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080', asset: ksm, id: '42259045809535163221576417993425387648', }, { + address: '0xfffFFfFF31103d490325BB0a8E40eF62e2F614C0', asset: lit, id: '65216491554813189869575508812319036608', }, { + address: '0xffFfFffF58d867EEa1Ce5126A4769542116324e9', asset: mgx, id: '118095707745084482624853002839493125353', }, { + address: '0x0000000000000000000000000000000000000802', asset: movr, id: '0x0000000000000000000000000000000000000802', min: 0.01, }, { + address: '0xffFfFFff8E6b63d9e447B6d4C45BDA8AF9dc9603', asset: pha, id: '189307976387032586987344677431204943363', }, { + address: '0xFffFfFFf7dD9B9C60ac83e49D7E3E1f7A1370aD2', asset: pica, id: '167283995827706324502761431814209211090', }, { + address: '0xffffffFF893264794d9d57E1E0E21E0042aF5A0A', asset: rmrk, id: '182365888117048807484804376330534607370', }, { + address: '0xFFFfffFF0Ca324C842330521525E7De111F38972', asset: sdn, id: '16797826370226091782818345603793389938', }, { + address: '0xFfFfffFf4F0CD46769550E5938F6beE2F5d4ef1e', asset: teer, id: '105075627293246237499203909093923548958', }, { + address: '0xfFFfFffF683474B842852111cc31d470bD8f5081', asset: tnkr, id: '138512078356357941985706694377215053953', }, { + address: '0xfFffffFf6448d0746f2a66342B67ef9CAf89478E', asset: tur, id: '133300872918374599700079037156071917454', }, { + address: '0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d', asset: usdt, id: '311091173110107856861649819128533077277', }, { + address: '0xFffFFffF51470Dca3dbe535bD2880a9CcDBc6Bd9', asset: xrt, id: '108036400430056508975016746969135344601', }, { + address: '0xFFffffff3646A00f78caDf8883c5A2791BfCDdc4', asset: vbnc, id: '0xFFffffff3646A00f78caDf8883c5A2791BfCDdc4', metadataId: '72145018963825376852137222787619937732', }, { + address: '0xFFffffFFC6DEec7Fc8B11A2C8ddE9a59F8c62EFe', asset: vksm, id: '0xFFffffFFC6DEec7Fc8B11A2C8ddE9a59F8c62EFe', metadataId: '264344629840762281112027368930249420542', }, { + address: '0xfFfffFfF98e37bF6a393504b5aDC5B53B4D0ba11', asset: vmovr, id: '0xfFfffFfF98e37bF6a393504b5aDC5B53B4D0ba11', metadataId: '203223821023327994093278529517083736593', @@ -1340,6 +1419,7 @@ export const peaqEvmAlphanet = new EvmParachain({ decimals: 18, }, { + address: '0xFfFfFffF000000000000000000000000000003e8', asset: dev, decimals: 18, id: '0xFfFfFffF000000000000000000000000000003e8', @@ -1347,6 +1427,7 @@ export const peaqEvmAlphanet = new EvmParachain({ minId: 1000, }, { + address: '0xFffFffFF000000000000000000000000000003E9', asset: ftmwh, decimals: 18, id: '0xFffFffFF000000000000000000000000000003E9', @@ -1383,6 +1464,7 @@ export const peaqEvm = new EvmParachain({ decimals: 18, }, { + address: '0xFfFfFffF000000000000000000000000000003e8', asset: glmr, decimals: 18, id: '0xFfFfFffF000000000000000000000000000003e8', @@ -1390,30 +1472,35 @@ export const peaqEvm = new EvmParachain({ minId: 1000, }, { + address: '0xFffFffFF000000000000000000000000000003E9', asset: usdcwh, id: '0xFffFffFF000000000000000000000000000003E9', metadataId: 1001, minId: 1001, }, { + address: '0xFFFfFfFf000000000000000000000000000003ea', asset: weth, id: '0xFFFfFfFf000000000000000000000000000003ea', metadataId: 1002, minId: 1002, }, { + address: '0xfffFFFFF000000000000000000000000000003eb', asset: wbtc, id: '0xfffFFFFF000000000000000000000000000003eb', metadataId: 1003, minId: 1003, }, { + address: '0xfFffFFFF000000000000000000000000000003Ec', asset: dai, id: '0xfFffFFFF000000000000000000000000000003Ec', metadataId: 1004, minId: 1004, }, { + address: '0xfFffffFF000000000000000000000000000003Ed', asset: usdtwh, id: '0xfFffffFF000000000000000000000000000003Ed', metadataId: 1005, diff --git a/packages/types/src/chain/parachain/Parachain.interfaces.ts b/packages/types/src/chain/parachain/Parachain.interfaces.ts index 14d39749..836e24ac 100644 --- a/packages/types/src/chain/parachain/Parachain.interfaces.ts +++ b/packages/types/src/chain/parachain/Parachain.interfaces.ts @@ -8,6 +8,7 @@ export type ChainAssetId = export interface ChainAssetsData { asset: Asset; + address?: string; balanceId?: ChainAssetId; decimals?: number; id?: ChainAssetId; From b032066a07428607b75e6cb6f2a5e9f1e5d78b4f Mon Sep 17 00:00:00 2001 From: Richard Kenigs <18597956+Rihyx@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:13:24 +0200 Subject: [PATCH 4/5] fix vulnerability (#278) --- .changeset/smart-comics-jog.md | 9 +++++ package-lock.json | 67 ++++++++-------------------------- package.json | 2 +- 3 files changed, 25 insertions(+), 53 deletions(-) create mode 100644 .changeset/smart-comics-jog.md diff --git a/.changeset/smart-comics-jog.md b/.changeset/smart-comics-jog.md new file mode 100644 index 00000000..244a5dcb --- /dev/null +++ b/.changeset/smart-comics-jog.md @@ -0,0 +1,9 @@ +--- +'@moonbeam-network/xcm-builder': patch +'@moonbeam-network/xcm-config': patch +'@moonbeam-network/xcm-sdk': patch +'@moonbeam-network/xcm-types': patch +'@moonbeam-network/xcm-utils': patch +--- + +Update Vime and fix vulnerability diff --git a/package-lock.json b/package-lock.json index 9aa6ecb3..858020ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "tsup": "^8.1.0", "turbo": "^2.0.3", "typescript": "^5.4.5", - "viem": "^2.13.8", + "viem": "^2.15.1", "vitest": "^1.6.0" } }, @@ -9374,9 +9374,9 @@ } }, "node_modules/ethers": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.0.tgz", - "integrity": "sha512-+yyQQQWEntY5UVbCv++guA14RRVFm1rSnO1GoLFdrK7/XRWMoktNgyG9UjwxrQqGBfGyFKknNZ81YpUS2emCgg==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.1.tgz", + "integrity": "sha512-hdJ2HOxg/xx97Lm9HdCWk949BfYqYWpyw4//78SiwOLgASyfrNszfMUNB2joKjvGUdwhHfaiMMFFwacVVoLR9A==", "funding": [ { "type": "individual", @@ -9387,6 +9387,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", @@ -9394,7 +9395,7 @@ "@types/node": "18.15.13", "aes-js": "4.0.0-beta.5", "tslib": "2.4.0", - "ws": "8.5.0" + "ws": "8.17.1" }, "engines": { "node": ">=14.0.0" @@ -9432,26 +9433,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" }, - "node_modules/ethers/node_modules/ws": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -17991,15 +17972,16 @@ } }, "node_modules/viem": { - "version": "2.13.8", - "resolved": "https://registry.npmjs.org/viem/-/viem-2.13.8.tgz", - "integrity": "sha512-JX8dOrCJKazNVs7YAahXnX+NANp0nlK16GyYjtQXILnar1daCPsLy4uzKgZDBVBD6DdRP2lsbPfo4X7QX3q5EQ==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/viem/-/viem-2.15.1.tgz", + "integrity": "sha512-Vrveen3vDOJyPf8Q8TDyWePG2pTdK6IpSi4P6qlvAP+rXkAeqRvwYBy9AmGm+BeYpCETAyTT0SrCP6458XSt+w==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/wevm" } ], + "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.0", "@noble/curves": "1.2.0", @@ -18008,7 +17990,7 @@ "@scure/bip39": "1.2.1", "abitype": "1.0.0", "isows": "1.0.4", - "ws": "8.13.0" + "ws": "8.17.1" }, "peerDependencies": { "typescript": ">=5.0.4" @@ -18046,26 +18028,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/viem/node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/vite": { "version": "5.2.13", "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.13.tgz", @@ -19067,9 +19029,10 @@ "peer": true }, "node_modules/ws": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", - "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "license": "MIT", "engines": { "node": ">=10.0.0" }, diff --git a/package.json b/package.json index 559b505c..8de783d7 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "tsup": "^8.1.0", "turbo": "^2.0.3", "typescript": "^5.4.5", - "viem": "^2.13.8", + "viem": "^2.15.1", "vitest": "^1.6.0" }, "lint-staged": { From 5b8dfcac0948554f05e4b9c15d36750483f49620 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:15:03 +0200 Subject: [PATCH 5/5] Version Packages (#274) Co-authored-by: github-actions[bot] --- .changeset/mighty-jars-destroy.md | 6 ------ .changeset/quick-parrots-kick.md | 6 ------ .changeset/smart-comics-jog.md | 9 -------- examples/sdk-simple/package.json | 6 +++--- package-lock.json | 34 +++++++++++++++---------------- packages/builder/CHANGELOG.md | 10 +++++++++ packages/builder/package.json | 6 +++--- packages/config/CHANGELOG.md | 12 +++++++++++ packages/config/package.json | 6 +++--- packages/sdk/CHANGELOG.md | 12 +++++++++++ packages/sdk/package.json | 10 ++++----- packages/types/CHANGELOG.md | 13 ++++++++++++ packages/types/package.json | 4 ++-- packages/utils/CHANGELOG.md | 8 ++++++++ packages/utils/package.json | 2 +- 15 files changed, 89 insertions(+), 55 deletions(-) delete mode 100644 .changeset/mighty-jars-destroy.md delete mode 100644 .changeset/quick-parrots-kick.md delete mode 100644 .changeset/smart-comics-jog.md diff --git a/.changeset/mighty-jars-destroy.md b/.changeset/mighty-jars-destroy.md deleted file mode 100644 index 5867aeeb..00000000 --- a/.changeset/mighty-jars-destroy.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@moonbeam-network/xcm-config': patch -'@moonbeam-network/xcm-types': patch ---- - -Add ERC20 token addresses diff --git a/.changeset/quick-parrots-kick.md b/.changeset/quick-parrots-kick.md deleted file mode 100644 index 0d142179..00000000 --- a/.changeset/quick-parrots-kick.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@moonbeam-network/xcm-types': patch -'@moonbeam-network/xcm-utils': patch ---- - -Multiple WS urls for PolkadotJS API diff --git a/.changeset/smart-comics-jog.md b/.changeset/smart-comics-jog.md deleted file mode 100644 index 244a5dcb..00000000 --- a/.changeset/smart-comics-jog.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -'@moonbeam-network/xcm-builder': patch -'@moonbeam-network/xcm-config': patch -'@moonbeam-network/xcm-sdk': patch -'@moonbeam-network/xcm-types': patch -'@moonbeam-network/xcm-utils': patch ---- - -Update Vime and fix vulnerability diff --git a/examples/sdk-simple/package.json b/examples/sdk-simple/package.json index 53fe2bd9..e4818753 100644 --- 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.3.0", - "@moonbeam-network/xcm-sdk": "2.3.0", - "@moonbeam-network/xcm-utils": "2.1.0" + "@moonbeam-network/xcm-config": "2.3.1", + "@moonbeam-network/xcm-sdk": "2.3.1", + "@moonbeam-network/xcm-utils": "2.1.1" }, "devDependencies": { "bun": "^1.0.21" diff --git a/package-lock.json b/package-lock.json index 858020ec..8f106ac5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,9 +50,9 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@moonbeam-network/xcm-config": "2.3.0", - "@moonbeam-network/xcm-sdk": "2.3.0", - "@moonbeam-network/xcm-utils": "2.1.0" + "@moonbeam-network/xcm-config": "2.3.1", + "@moonbeam-network/xcm-sdk": "2.3.1", + "@moonbeam-network/xcm-utils": "2.1.1" }, "devDependencies": { "bun": "^1.0.21" @@ -19188,11 +19188,11 @@ }, "packages/builder": { "name": "@moonbeam-network/xcm-builder", - "version": "2.3.0", + "version": "2.3.1", "license": "MIT", "dependencies": { - "@moonbeam-network/xcm-types": "2.2.2", - "@moonbeam-network/xcm-utils": "2.1.0", + "@moonbeam-network/xcm-types": "2.2.3", + "@moonbeam-network/xcm-utils": "2.1.1", "big.js": "^6.2.1" }, "peerDependencies": { @@ -19205,11 +19205,11 @@ }, "packages/config": { "name": "@moonbeam-network/xcm-config", - "version": "2.3.0", + "version": "2.3.1", "license": "MIT", "dependencies": { - "@moonbeam-network/xcm-builder": "2.3.0", - "@moonbeam-network/xcm-types": "2.2.2" + "@moonbeam-network/xcm-builder": "2.3.1", + "@moonbeam-network/xcm-types": "2.2.3" }, "peerDependencies": { "@polkadot/types": "^11.2.1", @@ -19219,13 +19219,13 @@ }, "packages/sdk": { "name": "@moonbeam-network/xcm-sdk", - "version": "2.3.0", + "version": "2.3.1", "license": "MIT", "dependencies": { - "@moonbeam-network/xcm-builder": "2.3.0", - "@moonbeam-network/xcm-config": "2.3.0", - "@moonbeam-network/xcm-types": "2.2.2", - "@moonbeam-network/xcm-utils": "2.1.0", + "@moonbeam-network/xcm-builder": "2.3.1", + "@moonbeam-network/xcm-config": "2.3.1", + "@moonbeam-network/xcm-types": "2.2.3", + "@moonbeam-network/xcm-utils": "2.1.1", "big.js": "^6.2.1" }, "peerDependencies": { @@ -19239,10 +19239,10 @@ }, "packages/types": { "name": "@moonbeam-network/xcm-types", - "version": "2.2.2", + "version": "2.2.3", "license": "MIT", "dependencies": { - "@moonbeam-network/xcm-utils": "2.1.0", + "@moonbeam-network/xcm-utils": "2.1.1", "big.js": "^6.2.1" }, "peerDependencies": { @@ -19251,7 +19251,7 @@ }, "packages/utils": { "name": "@moonbeam-network/xcm-utils", - "version": "2.1.0", + "version": "2.1.1", "license": "MIT", "dependencies": { "big.js": "^6.2.1", diff --git a/packages/builder/CHANGELOG.md b/packages/builder/CHANGELOG.md index b8ec3891..9589824a 100644 --- a/packages/builder/CHANGELOG.md +++ b/packages/builder/CHANGELOG.md @@ -1,5 +1,15 @@ # @moonbeam-network/xcm-builder +## 2.3.1 + +### Patch Changes + +- [#278](https://github.com/moonbeam-foundation/xcm-sdk/pull/278) [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f) Thanks [@Rihyx](https://github.com/Rihyx)! - Update Vime and fix vulnerability + +- Updated dependencies [[`49b762d`](https://github.com/moonbeam-foundation/xcm-sdk/commit/49b762dbe5882233d0e20ef51d82f92b94888bbe), [`d91de57`](https://github.com/moonbeam-foundation/xcm-sdk/commit/d91de57c34e66356e3b08c13c7f316464b5be670), [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f)]: + - @moonbeam-network/xcm-types@2.2.3 + - @moonbeam-network/xcm-utils@2.1.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/builder/package.json b/packages/builder/package.json index 0beb07ec..900bcabc 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@moonbeam-network/xcm-builder", - "version": "2.3.0", + "version": "2.3.1", "description": "Moonbeam XCM builder", "scripts": { "build": "tsup", @@ -49,8 +49,8 @@ "types": "./build/index.d.ts", "main": "./build/index.cjs", "dependencies": { - "@moonbeam-network/xcm-types": "2.2.2", - "@moonbeam-network/xcm-utils": "2.1.0", + "@moonbeam-network/xcm-types": "2.2.3", + "@moonbeam-network/xcm-utils": "2.1.1", "big.js": "^6.2.1" }, "peerDependencies": { diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md index 07739a1f..41a36467 100644 --- a/packages/config/CHANGELOG.md +++ b/packages/config/CHANGELOG.md @@ -1,5 +1,17 @@ # @moonbeam-network/xcm-config +## 2.3.1 + +### Patch Changes + +- [#277](https://github.com/moonbeam-foundation/xcm-sdk/pull/277) [`49b762d`](https://github.com/moonbeam-foundation/xcm-sdk/commit/49b762dbe5882233d0e20ef51d82f92b94888bbe) Thanks [@Rihyx](https://github.com/Rihyx)! - Add ERC20 token addresses + +- [#278](https://github.com/moonbeam-foundation/xcm-sdk/pull/278) [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f) Thanks [@Rihyx](https://github.com/Rihyx)! - Update Vime and fix vulnerability + +- Updated dependencies [[`49b762d`](https://github.com/moonbeam-foundation/xcm-sdk/commit/49b762dbe5882233d0e20ef51d82f92b94888bbe), [`d91de57`](https://github.com/moonbeam-foundation/xcm-sdk/commit/d91de57c34e66356e3b08c13c7f316464b5be670), [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f)]: + - @moonbeam-network/xcm-types@2.2.3 + - @moonbeam-network/xcm-builder@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/config/package.json b/packages/config/package.json index 74fb3b07..b41a6069 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@moonbeam-network/xcm-config", - "version": "2.3.0", + "version": "2.3.1", "description": "All necessary configuration to transfer assets from Moonbeam, Moonriver, Moonbase to other parachains and back", "scripts": { "build": "tsup", @@ -49,8 +49,8 @@ "types": "./build/index.d.ts", "main": "./build/index.cjs", "dependencies": { - "@moonbeam-network/xcm-builder": "2.3.0", - "@moonbeam-network/xcm-types": "2.2.2" + "@moonbeam-network/xcm-builder": "2.3.1", + "@moonbeam-network/xcm-types": "2.2.3" }, "peerDependencies": { "@polkadot/types": "^11.2.1", diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md index e2dad1bf..5c0ed2d6 100644 --- a/packages/sdk/CHANGELOG.md +++ b/packages/sdk/CHANGELOG.md @@ -1,5 +1,17 @@ # @moonbeam-network/xcm-sdk +## 2.3.1 + +### Patch Changes + +- [#278](https://github.com/moonbeam-foundation/xcm-sdk/pull/278) [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f) Thanks [@Rihyx](https://github.com/Rihyx)! - Update Vime and fix vulnerability + +- Updated dependencies [[`49b762d`](https://github.com/moonbeam-foundation/xcm-sdk/commit/49b762dbe5882233d0e20ef51d82f92b94888bbe), [`d91de57`](https://github.com/moonbeam-foundation/xcm-sdk/commit/d91de57c34e66356e3b08c13c7f316464b5be670), [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f)]: + - @moonbeam-network/xcm-config@2.3.1 + - @moonbeam-network/xcm-types@2.2.3 + - @moonbeam-network/xcm-utils@2.1.1 + - @moonbeam-network/xcm-builder@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 237e7d50..28a2975c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@moonbeam-network/xcm-sdk", - "version": "2.3.0", + "version": "2.3.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", @@ -51,10 +51,10 @@ "types": "./build/index.d.ts", "main": "./build/index.cjs", "dependencies": { - "@moonbeam-network/xcm-builder": "2.3.0", - "@moonbeam-network/xcm-config": "2.3.0", - "@moonbeam-network/xcm-types": "2.2.2", - "@moonbeam-network/xcm-utils": "2.1.0", + "@moonbeam-network/xcm-builder": "2.3.1", + "@moonbeam-network/xcm-config": "2.3.1", + "@moonbeam-network/xcm-types": "2.2.3", + "@moonbeam-network/xcm-utils": "2.1.1", "big.js": "^6.2.1" }, "peerDependencies": { diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 24fcf4ed..b38b16f7 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -1,5 +1,18 @@ # @moonbeam-network/xcm-types +## 2.2.3 + +### Patch Changes + +- [#277](https://github.com/moonbeam-foundation/xcm-sdk/pull/277) [`49b762d`](https://github.com/moonbeam-foundation/xcm-sdk/commit/49b762dbe5882233d0e20ef51d82f92b94888bbe) Thanks [@Rihyx](https://github.com/Rihyx)! - Add ERC20 token addresses + +- [#273](https://github.com/moonbeam-foundation/xcm-sdk/pull/273) [`d91de57`](https://github.com/moonbeam-foundation/xcm-sdk/commit/d91de57c34e66356e3b08c13c7f316464b5be670) Thanks [@ekenigs](https://github.com/ekenigs)! - Multiple WS urls for PolkadotJS API + +- [#278](https://github.com/moonbeam-foundation/xcm-sdk/pull/278) [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f) Thanks [@Rihyx](https://github.com/Rihyx)! - Update Vime and fix vulnerability + +- Updated dependencies [[`d91de57`](https://github.com/moonbeam-foundation/xcm-sdk/commit/d91de57c34e66356e3b08c13c7f316464b5be670), [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f)]: + - @moonbeam-network/xcm-utils@2.1.1 + ## 2.2.2 ### Patch Changes diff --git a/packages/types/package.json b/packages/types/package.json index 20e2311e..87152d97 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@moonbeam-network/xcm-types", - "version": "2.2.2", + "version": "2.2.3", "description": "Moonbeam XCM Types", "scripts": { "build": "tsup", @@ -48,7 +48,7 @@ "types": "./build/index.d.ts", "main": "./build/index.cjs", "dependencies": { - "@moonbeam-network/xcm-utils": "2.1.0", + "@moonbeam-network/xcm-utils": "2.1.1", "big.js": "^6.2.1" }, "peerDependencies": { diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index b2017c80..2c651231 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,5 +1,13 @@ # @moonbeam-network/xcm-utils +## 2.1.1 + +### Patch Changes + +- [#273](https://github.com/moonbeam-foundation/xcm-sdk/pull/273) [`d91de57`](https://github.com/moonbeam-foundation/xcm-sdk/commit/d91de57c34e66356e3b08c13c7f316464b5be670) Thanks [@ekenigs](https://github.com/ekenigs)! - Multiple WS urls for PolkadotJS API + +- [#278](https://github.com/moonbeam-foundation/xcm-sdk/pull/278) [`b032066`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b032066a07428607b75e6cb6f2a5e9f1e5d78b4f) Thanks [@Rihyx](https://github.com/Rihyx)! - Update Vime and fix vulnerability + ## 2.1.0 ### Minor Changes diff --git a/packages/utils/package.json b/packages/utils/package.json index 554f7c56..3645f579 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@moonbeam-network/xcm-utils", - "version": "2.1.0", + "version": "2.1.1", "description": "Moonbeam XCM utilities", "scripts": { "build": "tsup",