diff --git a/networks/all.ts b/networks/all.ts index 76c9b8d..1008393 100644 --- a/networks/all.ts +++ b/networks/all.ts @@ -2,6 +2,7 @@ import { Config } from './types' import acalaConfig from './acala' import acalaNextConfig from './acala-next' +import assethubConfig from './assethub' import astarConfig from './astar' import bifrostConfig from './bifrost' import centrifugeConfig from './centrifuge' @@ -13,12 +14,11 @@ import moonbeamConfig from './moonbeam' // import parallelConfig from './parallel' import phalaConfig from './phala' import polkadotConfig from './polkadot' -import statemintConfig from './statemint' import uniqueConfig from './unique' const all = { polkadot: polkadotConfig, - statemint: statemintConfig, + assethub: assethubConfig, acala: acalaConfig, astar: astarConfig, acalaNext: acalaNextConfig, diff --git a/networks/statemint.ts b/networks/assethub.ts similarity index 79% rename from networks/statemint.ts rename to networks/assethub.ts index 7e3fd10..f99e93a 100644 --- a/networks/statemint.ts +++ b/networks/assethub.ts @@ -2,11 +2,11 @@ import { Config } from './types' export default { polkadot: { - name: 'statemint' as const, + name: 'assetHubPolkadot' as const, endpoint: 'wss://rpc-asset-hub-polkadot.luckyfriday.io', }, kusama: { - name: 'statemine' as const, + name: 'assetHubKusama' as const, endpoint: 'wss://rpc-asset-hub-kusama.luckyfriday.io', }, config: ({ alice }) => ({ @@ -16,21 +16,21 @@ export default { }, Assets: { account: [ - [[statemine.usdtIndex, alice.address], { balance: 1000e6 }], // USDT + [[assetHubKusama.usdtIndex, alice.address], { balance: 1000e6 }], // USDT ], }, }, }), } satisfies Config -export const statemint = { +export const assetHubPolkadot = { paraId: 1000, dot: { Concrete: { parents: 1, interior: 'Here' } }, wbtc: { Concrete: { parents: 0, interior: { X2: [{ PalletInstance: 50 }, { GeneralIndex: 21 }] } } }, wbtcIndex: 21, } as const -export const statemine = { +export const assetHubKusama = { paraId: 1000, ksm: { Concrete: { parents: 1, interior: 'Here' } }, usdt: { Concrete: { parents: 0, interior: { X2: [{ PalletInstance: 50 }, { GeneralIndex: 1984 }] } } }, diff --git a/package.json b/package.json index 2ec900e..22ebdae 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@acala-network/sdk": "^4.1.9-13", "@acala-network/sdk-core": "^4.1.9-13", "@polkadot/api": "^10.12.6", - "@polkawallet/bridge": "^0.1.5-31", + "@polkawallet/bridge": "^0.1.6-2", "@swc/core": "^1.4.12", "axios": "^1.6.8", "dotenv": "^16.4.5", diff --git a/tests/bridge-sdk/__snapshots__/kusama.test.ts.snap b/tests/bridge-sdk/__snapshots__/kusama.test.ts.snap index 470fe6d..771f2db 100644 --- a/tests/bridge-sdk/__snapshots__/kusama.test.ts.snap +++ b/tests/bridge-sdk/__snapshots__/kusama.test.ts.snap @@ -20,6 +20,26 @@ exports[`'altair' to 'karura' using bridgeSDK cross-chain 'AIR' > parachain brid } `; +exports[`'assetHubKusama' to 'kusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` +{ + "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", + "decimals": 12, + "fromChain": "(rounded 8)", + "toChain": "(rounded 12)", +} +`; + +exports[`'assetHubKusama' to 'kusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.00008)"`; + +exports[`'assetHubKusama' to 'kusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` +{ + "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", + "decimals": 12, + "fromChain": 10, + "toChain": 10, +} +`; + exports[`'basilisk' to 'karura' using bridgeSDK cross-chain 'BSX' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", @@ -300,45 +320,45 @@ exports[`'kintsugi' to 'karura' using bridgeSDK cross-chain 'LKSM' > parachain b } `; -exports[`'kusama' to 'basilisk' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` +exports[`'kusama' to 'assetHubKusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 12, "fromChain": "(rounded 8)", - "toChain": "(rounded 1000)", + "toChain": "(rounded 12)", } `; -exports[`'kusama' to 'basilisk' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` +exports[`'kusama' to 'assetHubKusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.0001)"`; + +exports[`'kusama' to 'assetHubKusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 12, "fromChain": 10, - "toChain": 1000, + "toChain": 10, } `; -exports[`'kusama' to 'karura' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` +exports[`'kusama' to 'basilisk' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 12, "fromChain": "(rounded 8)", - "toChain": "(rounded 12)", + "toChain": "(rounded 1000)", } `; -exports[`'kusama' to 'karura' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.00004)"`; - -exports[`'kusama' to 'karura' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` +exports[`'kusama' to 'basilisk' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 12, "fromChain": 10, - "toChain": 10, + "toChain": 1000, } `; -exports[`'kusama' to 'statemine' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` +exports[`'kusama' to 'karura' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 12, @@ -347,9 +367,9 @@ exports[`'kusama' to 'statemine' using bridgeSDK cross-chain 'KSM' > parachain b } `; -exports[`'kusama' to 'statemine' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.0001)"`; +exports[`'kusama' to 'karura' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.00004)"`; -exports[`'kusama' to 'statemine' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` +exports[`'kusama' to 'karura' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 12, @@ -377,23 +397,3 @@ exports[`'shiden' to 'karura' using bridgeSDK cross-chain 'KUSD' > parachain bri "toChain": 10, } `; - -exports[`'statemine' to 'kusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` -{ - "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", - "decimals": 12, - "fromChain": "(rounded 8)", - "toChain": "(rounded 12)", -} -`; - -exports[`'statemine' to 'kusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.00008)"`; - -exports[`'statemine' to 'kusama' using bridgeSDK cross-chain 'KSM' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` -{ - "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", - "decimals": 12, - "fromChain": 10, - "toChain": 10, -} -`; diff --git a/tests/bridge-sdk/__snapshots__/polkadot.test.ts.snap b/tests/bridge-sdk/__snapshots__/polkadot.test.ts.snap index 7e2b038..4d5a91d 100644 --- a/tests/bridge-sdk/__snapshots__/polkadot.test.ts.snap +++ b/tests/bridge-sdk/__snapshots__/polkadot.test.ts.snap @@ -80,6 +80,26 @@ exports[`'acala' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain bri } `; +exports[`'assetHubPolkadot' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` +{ + "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", + "decimals": 10, + "fromChain": "(rounded 998)", + "toChain": "(rounded 1000)", +} +`; + +exports[`'assetHubPolkadot' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.002)"`; + +exports[`'assetHubPolkadot' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` +{ + "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", + "decimals": 10, + "fromChain": 1000, + "toChain": 1000, +} +`; + exports[`'astar' to 'acala' using bridgeSDK cross-chain 'AUSD' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", @@ -129,7 +149,7 @@ exports[`'polkadot' to 'acala' using bridgeSDK cross-chain 'DOT' > parachain bri } `; -exports[`'polkadot' to 'acala' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.0002)"`; +exports[`'polkadot' to 'acala' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.0001)"`; exports[`'polkadot' to 'acala' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` { @@ -140,27 +160,7 @@ exports[`'polkadot' to 'acala' using bridgeSDK cross-chain 'DOT' > parachain bri } `; -exports[`'polkadot' to 'statemint' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` -{ - "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", - "decimals": 10, - "fromChain": "(rounded 998)", - "toChain": "(rounded 1000)", -} -`; - -exports[`'polkadot' to 'statemint' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.004)"`; - -exports[`'polkadot' to 'statemint' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` -{ - "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", - "decimals": 10, - "fromChain": 1000, - "toChain": 1000, -} -`; - -exports[`'statemint' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` +exports[`'polkadot' to 'assetHubPolkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > after 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 10, @@ -169,9 +169,9 @@ exports[`'statemint' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain } `; -exports[`'statemint' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.002)"`; +exports[`'polkadot' to 'assetHubPolkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > fee 1`] = `"(rounded 0.004)"`; -exports[`'statemint' to 'polkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` +exports[`'polkadot' to 'assetHubPolkadot' using bridgeSDK cross-chain 'DOT' > parachain bridge to releaychain > Cross-chain using BridgeSDK works > initial 1`] = ` { "address": "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", "decimals": 10, diff --git a/tests/bridge-sdk/kusama.test.ts b/tests/bridge-sdk/kusama.test.ts index 3e313dc..d5a1ac7 100644 --- a/tests/bridge-sdk/kusama.test.ts +++ b/tests/bridge-sdk/kusama.test.ts @@ -23,13 +23,13 @@ const tests = [ token: 'KSM', }, { - from: 'statemine', + from: 'assetHubKusama', to: 'kusama', token: 'KSM', }, { from: 'kusama', - to: 'statemine', + to: 'assetHubKusama', token: 'KSM', }, { diff --git a/tests/bridge-sdk/polkadot.test.ts b/tests/bridge-sdk/polkadot.test.ts index 7619252..ed68535 100644 --- a/tests/bridge-sdk/polkadot.test.ts +++ b/tests/bridge-sdk/polkadot.test.ts @@ -13,11 +13,11 @@ const tests = [ }, { from: 'polkadot', - to: 'statemint', + to: 'assetHubPolkadot', token: 'DOT', }, { - from: 'statemint', + from: 'assetHubPolkadot', to: 'polkadot', token: 'DOT', }, diff --git a/tests/bridge-sdk/shared.ts b/tests/bridge-sdk/shared.ts index d8476e6..a315976 100644 --- a/tests/bridge-sdk/shared.ts +++ b/tests/bridge-sdk/shared.ts @@ -5,6 +5,7 @@ import { sendTransaction, testingPairs } from '@acala-network/chopsticks-testing import { AcalaAdapter } from '@polkawallet/bridge/adapters/acala/acala' import { AltairAdapter } from '@polkawallet/bridge/adapters/centrifuge' +import { AssetHubKusamaAdapter, AssetHubPolkadotAdapter } from '@polkawallet/bridge/adapters/assethub' import { AstarAdapter, ShidenAdapter } from '@polkawallet/bridge/adapters/astar' import { BasiliskAdapter } from '@polkawallet/bridge/adapters/hydradx' import { BifrostAdapter } from '@polkawallet/bridge/adapters/bifrost' @@ -18,7 +19,6 @@ import { KusamaAdapter, PolkadotAdapter } from '@polkawallet/bridge/adapters/pol import { MoonbeamAdapter, MoonriverAdapter } from '@polkawallet/bridge/adapters/moonbeam' import { QuartzAdapter, UniqueAdapter } from '@polkawallet/bridge/adapters/unique' import { ShadowAdapter } from '@polkawallet/bridge/adapters/crust' -import { StatemineAdapter, StatemintAdapter } from '@polkawallet/bridge/adapters/statemint' import { Network, NetworkNames, createNetworks } from '../../networks' import { check } from '../../helpers' @@ -96,10 +96,10 @@ export const buildTests = (tests: ReadonlyArray) => { karura: KaruraAdapter, kusama: KusamaAdapter, moonriver: MoonriverAdapter, - statemine: StatemineAdapter, + assetHubKusama: AssetHubKusamaAdapter, basilisk: BasiliskAdapter, polkadot: PolkadotAdapter, - statemint: StatemintAdapter, + assetHubPolkadot: AssetHubPolkadotAdapter, moonbeam: MoonbeamAdapter, acala: AcalaAdapter, bifrost: BifrostAdapter, diff --git a/tests/xcm-transfer/__snapshots__/kusama-para.test.ts.snap b/tests/xcm-transfer/__snapshots__/kusama-para.test.ts.snap index ab46bfe..0b90397 100644 --- a/tests/xcm-transfer/__snapshots__/kusama-para.test.ts.snap +++ b/tests/xcm-transfer/__snapshots__/kusama-para.test.ts.snap @@ -1,37 +1,49 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > balance on from chain 1`] = `99000000000000000000`; +exports[`'assetHubKusama' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > balance on from chain 1`] = ` +{ + "balance": 999000000, + "extra": null, + "reason": { + "consumer": null, + }, + "status": "Liquid", +} +`; -exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > balance on to chain 1`] = ` +exports[`'assetHubKusama' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > balance on to chain 1`] = ` { - "free": "(rounded 101000000000000000000)", + "free": "(rounded 999000)", "frozen": 0, "reserved": 0, } `; -exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > from chain hrmp messages 1`] = ` +exports[`'assetHubKusama' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > from chain hrmp messages 1`] = ` [ { "data": [ "ConcatenatedVersionedXcm", { - "v2": [ + "v3": [ { "reserveAssetDeposited": [ { "fun": { - "fungible": "0x00000000000000000de0b6b3a7640000", + "fungible": 1000000, }, "id": { "concrete": { "interior": { - "x2": [ + "x3": [ { - "parachain": 2000, + "parachain": 1000, }, { - "generalKey": "0x024bb6afb5fa2b07a5d1c499e1c3ddb5a15e709a71", + "palletInstance": 50, + }, + { + "generalIndex": 1984, }, ], }, @@ -48,17 +60,20 @@ exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > from cha "buyExecution": { "fees": { "fun": { - "fungible": "0x00000000000000000de0b6b3a7640000", + "fungible": 1000000, }, "id": { "concrete": { "interior": { - "x2": [ + "x3": [ { - "parachain": 2000, + "parachain": 1000, }, { - "generalKey": "0x024bb6afb5fa2b07a5d1c499e1c3ddb5a15e709a71", + "palletInstance": 50, + }, + { + "generalIndex": 1984, }, ], }, @@ -75,7 +90,7 @@ exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > from cha "depositAsset": { "assets": { "wild": { - "all": null, + "allCounted": 1, }, }, "beneficiary": { @@ -83,119 +98,63 @@ exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > from cha "x1": { "accountId32": { "id": "0x88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee", - "network": { - "any": null, - }, + "network": null, }, }, }, "parents": 0, }, - "maxAssets": 1, }, }, + { + "setTopic": "(redacted)", + }, ], }, ], - "recipient": 2090, + "recipient": 2000, }, ] `; -exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > to chain xcm events 1`] = ` +exports[`'assetHubKusama' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > to chain xcm events 1`] = ` [ { "data": { - "messageHash": "(hash)", - "messageId": "(hash)", - "weight": { + "id": "(hash)", + "origin": { + "Sibling": 1000, + }, + "success": true, + "weightUsed": { "proofSize": 0, - "refTime": 400000000, + "refTime": 1000000000, }, }, - "method": "Success", - "section": "xcmpQueue", + "method": "Processed", + "section": "messageQueue", }, ] `; -exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > tx events 1`] = ` +exports[`'assetHubKusama' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > tx events 1`] = ` [ { "data": { - "assets": [ - { - "fun": { - "Fungible": 1000000000000000000, - }, - "id": { - "Concrete": { - "interior": { - "X2": [ - { - "Parachain": 2000, - }, - { - "GeneralKey": { - "data": "(hash)", - "length": 21, - }, - }, - ], - }, - "parents": 1, - }, - }, - }, - ], - "dest": { - "interior": { - "X2": [ - { - "Parachain": "(rounded 2100)", - }, - { - "AccountId32": { - "id": "(hash)", - "network": null, - }, - }, - ], - }, - "parents": 1, - }, - "fee": { - "fun": { - "Fungible": 1000000000000000000, - }, - "id": { - "Concrete": { - "interior": { - "X2": [ - { - "Parachain": 2000, - }, - { - "GeneralKey": { - "data": "(hash)", - "length": 21, - }, - }, - ], - }, - "parents": 1, - }, + "outcome": { + "Complete": { + "proofSize": "(rounded 8800)", + "refTime": "(rounded 841000000)", }, }, - "sender": "rPizfonc8MPuEsMxufAytHjpRW7a2YrXWHKibaJXe9ZtjKx", }, - "method": "TransferredMultiAssets", - "section": "xTokens", + "method": "Attempted", + "section": "polkadotXcm", }, ] `; -exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > balance on from chain 1`] = ` +exports[`'karura' -> 'assetHubKusama' xcm transfer 'USDT' > xtokens transfer > balance on from chain 1`] = ` { "free": 9000000, "frozen": 0, @@ -203,7 +162,7 @@ exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > balanc } `; -exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > balance on to chain 1`] = ` +exports[`'karura' -> 'assetHubKusama' xcm transfer 'USDT' > xtokens transfer > balance on to chain 1`] = ` { "balance": "(rounded 1000000000)", "extra": null, @@ -214,7 +173,7 @@ exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > balanc } `; -exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > from chain hrmp messages 1`] = ` +exports[`'karura' -> 'assetHubKusama' xcm transfer 'USDT' > xtokens transfer > from chain hrmp messages 1`] = ` [ { "data": [ @@ -306,7 +265,7 @@ exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > from c ] `; -exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > to chain xcm events 1`] = ` +exports[`'karura' -> 'assetHubKusama' xcm transfer 'USDT' > xtokens transfer > to chain xcm events 1`] = ` [ { "data": { @@ -323,7 +282,7 @@ exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > to cha ] `; -exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > tx events 1`] = ` +exports[`'karura' -> 'assetHubKusama' xcm transfer 'USDT' > xtokens transfer > tx events 1`] = ` [ { "data": { @@ -399,50 +358,38 @@ exports[`'karura' -> 'statemine' xcm transfer 'USDT' > xtokens transfer > tx eve ] `; -exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > balance on from chain 1`] = ` -{ - "balance": 999000000, - "extra": null, - "reason": { - "consumer": null, - }, - "status": "Liquid", -} -`; +exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > balance on from chain 1`] = `99000000000000000000`; -exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > balance on to chain 1`] = ` +exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > balance on to chain 1`] = ` { - "free": "(rounded 999000)", + "free": "(rounded 101000000000000000000)", "frozen": 0, "reserved": 0, } `; -exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > from chain hrmp messages 1`] = ` +exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > from chain hrmp messages 1`] = ` [ { "data": [ "ConcatenatedVersionedXcm", { - "v3": [ + "v2": [ { "reserveAssetDeposited": [ { "fun": { - "fungible": 1000000, + "fungible": "0x00000000000000000de0b6b3a7640000", }, "id": { "concrete": { "interior": { - "x3": [ - { - "parachain": 1000, - }, + "x2": [ { - "palletInstance": 50, + "parachain": 2000, }, { - "generalIndex": 1984, + "generalKey": "0x024bb6afb5fa2b07a5d1c499e1c3ddb5a15e709a71", }, ], }, @@ -459,20 +406,17 @@ exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > from "buyExecution": { "fees": { "fun": { - "fungible": 1000000, + "fungible": "0x00000000000000000de0b6b3a7640000", }, "id": { "concrete": { "interior": { - "x3": [ - { - "parachain": 1000, - }, + "x2": [ { - "palletInstance": 50, + "parachain": 2000, }, { - "generalIndex": 1984, + "generalKey": "0x024bb6afb5fa2b07a5d1c499e1c3ddb5a15e709a71", }, ], }, @@ -489,7 +433,7 @@ exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > from "depositAsset": { "assets": { "wild": { - "allCounted": 1, + "all": null, }, }, "beneficiary": { @@ -497,58 +441,114 @@ exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > from "x1": { "accountId32": { "id": "0x88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee", - "network": null, + "network": { + "any": null, + }, }, }, }, "parents": 0, }, + "maxAssets": 1, }, }, - { - "setTopic": "(redacted)", - }, ], }, ], - "recipient": 2000, + "recipient": 2090, }, ] `; -exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > to chain xcm events 1`] = ` +exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > to chain xcm events 1`] = ` [ { "data": { - "id": "(hash)", - "origin": { - "Sibling": 1000, - }, - "success": true, - "weightUsed": { + "messageHash": "(hash)", + "messageId": "(hash)", + "weight": { "proofSize": 0, - "refTime": 1000000000, + "refTime": 400000000, }, }, - "method": "Processed", - "section": "messageQueue", + "method": "Success", + "section": "xcmpQueue", }, ] `; -exports[`'statemine' -> 'karura' xcm transfer 'USDT' > xcmPallet transfer > tx events 1`] = ` +exports[`'karura' -> 'basilisk' xcm transfer 'DAI' > xtokens transfer > tx events 1`] = ` [ { "data": { - "outcome": { - "Complete": { - "proofSize": "(rounded 8800)", - "refTime": "(rounded 841000000)", + "assets": [ + { + "fun": { + "Fungible": 1000000000000000000, + }, + "id": { + "Concrete": { + "interior": { + "X2": [ + { + "Parachain": 2000, + }, + { + "GeneralKey": { + "data": "(hash)", + "length": 21, + }, + }, + ], + }, + "parents": 1, + }, + }, + }, + ], + "dest": { + "interior": { + "X2": [ + { + "Parachain": "(rounded 2100)", + }, + { + "AccountId32": { + "id": "(hash)", + "network": null, + }, + }, + ], + }, + "parents": 1, + }, + "fee": { + "fun": { + "Fungible": 1000000000000000000, + }, + "id": { + "Concrete": { + "interior": { + "X2": [ + { + "Parachain": 2000, + }, + { + "GeneralKey": { + "data": "(hash)", + "length": 21, + }, + }, + ], + }, + "parents": 1, + }, }, }, + "sender": "rPizfonc8MPuEsMxufAytHjpRW7a2YrXWHKibaJXe9ZtjKx", }, - "method": "Attempted", - "section": "polkadotXcm", + "method": "TransferredMultiAssets", + "section": "xTokens", }, ] `; diff --git a/tests/xcm-transfer/__snapshots__/polkadot-para.test.ts.snap b/tests/xcm-transfer/__snapshots__/polkadot-para.test.ts.snap index 6ca955e..690c1fa 100644 --- a/tests/xcm-transfer/__snapshots__/polkadot-para.test.ts.snap +++ b/tests/xcm-transfer/__snapshots__/polkadot-para.test.ts.snap @@ -1,208 +1,6 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > balance on from chain 1`] = ` -{ - "free": 9000000000000, - "frozen": 0, - "reserved": 0, -} -`; - -exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > balance on to chain 1`] = ` -{ - "balance": "(rounded 1000000000000)", - "extra": null, - "reason": { - "sufficient": null, - }, - "status": "Liquid", -} -`; - -exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > from chain ump messages 1`] = ` -[ - { - "v2": [ - { - "withdrawAsset": [ - { - "fun": { - "fungible": 1000000000000, - }, - "id": { - "concrete": { - "interior": { - "here": null, - }, - "parents": 0, - }, - }, - }, - ], - }, - { - "clearOrigin": null, - }, - { - "buyExecution": { - "fees": { - "fun": { - "fungible": 500000000000, - }, - "id": { - "concrete": { - "interior": { - "here": null, - }, - "parents": 0, - }, - }, - }, - "weightLimit": { - "unlimited": null, - }, - }, - }, - { - "depositReserveAsset": { - "assets": { - "wild": { - "all": null, - }, - }, - "dest": { - "interior": { - "x1": { - "parachain": 2004, - }, - }, - "parents": 0, - }, - "maxAssets": 1, - "xcm": [ - { - "buyExecution": { - "fees": { - "fun": { - "fungible": 500000000000, - }, - "id": { - "concrete": { - "interior": { - "here": null, - }, - "parents": 1, - }, - }, - }, - "weightLimit": { - "unlimited": null, - }, - }, - }, - { - "depositAsset": { - "assets": { - "wild": { - "all": null, - }, - }, - "beneficiary": { - "interior": { - "x1": { - "accountKey20": { - "key": "0xf24ff3a9cf04c71dbc94d0b566f7a27b94566cac", - "network": { - "any": null, - }, - }, - }, - }, - "parents": 0, - }, - "maxAssets": 1, - }, - }, - ], - }, - }, - ], - }, -] -`; - -exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > to chain xcm events 1`] = ` -[ - { - "data": { - "messageHash": "(hash)", - "messageId": "(hash)", - "outcome": { - "Complete": { - "proofSize": "(rounded 26000)", - "refTime": "(rounded 690000000)", - }, - }, - }, - "method": "ExecutedDownward", - "section": "dmpQueue", - }, -] -`; - -exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > tx events 1`] = ` -[ - { - "data": { - "assets": [ - { - "fun": { - "Fungible": 1000000000000, - }, - "id": { - "Concrete": { - "interior": "Here", - "parents": 1, - }, - }, - }, - ], - "dest": { - "interior": { - "X2": [ - { - "Parachain": "(rounded 2000)", - }, - { - "AccountKey20": { - "key": "0xf24ff3a9cf04c71dbc94d0b566f7a27b94566cac", - "network": null, - }, - }, - ], - }, - "parents": 1, - }, - "fee": { - "fun": { - "Fungible": 1000000000000, - }, - "id": { - "Concrete": { - "interior": "Here", - "parents": 1, - }, - }, - }, - "sender": "23y3WetbNi6rDMgHmyRDjgpb7PnhgPotuPPawxruTMLYTLzG", - }, - "method": "TransferredMultiAssets", - "section": "xTokens", - }, -] -`; - -exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > balance on from chain 1`] = ` +exports[`'acala' -> 'assetHubPolkadot' xcm transfer 'WBTC' > xtokens transfer > balance on from chain 1`] = ` { "free": 90000000, "frozen": 0, @@ -210,7 +8,7 @@ exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > balance } `; -exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > balance on to chain 1`] = ` +exports[`'acala' -> 'assetHubPolkadot' xcm transfer 'WBTC' > xtokens transfer > balance on to chain 1`] = ` { "balance": 1000000000, "extra": null, @@ -221,7 +19,7 @@ exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > balance } `; -exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > from chain hrmp messages 1`] = ` +exports[`'acala' -> 'assetHubPolkadot' xcm transfer 'WBTC' > xtokens transfer > from chain hrmp messages 1`] = ` [ { "data": [ @@ -319,7 +117,7 @@ exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > from ch ] `; -exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > to chain xcm events 1`] = ` +exports[`'acala' -> 'assetHubPolkadot' xcm transfer 'WBTC' > xtokens transfer > to chain xcm events 1`] = ` [ { "data": { @@ -337,7 +135,7 @@ exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > to chai ] `; -exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > tx events 1`] = ` +exports[`'acala' -> 'assetHubPolkadot' xcm transfer 'WBTC' > xtokens transfer > tx events 1`] = ` [ { "data": { @@ -412,29 +210,29 @@ exports[`'acala' -> 'statemint' xcm transfer 'WBTC' > xtokens transfer > tx even ] `; -exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > balance on from chain 1`] = ` +exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > balance on from chain 1`] = ` { - "balance": 9000000000000, - "extra": null, - "reason": { - "consumer": null, - }, - "status": "Liquid", + "free": 9000000000000, + "frozen": 0, + "reserved": 0, } `; -exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > balance on to chain 1`] = ` +exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > balance on to chain 1`] = ` { - "free": "(rounded 11000000000000)", - "frozen": 0, - "reserved": 0, + "balance": "(rounded 1000000000000)", + "extra": null, + "reason": { + "sufficient": null, + }, + "status": "Liquid", } `; -exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > from chain ump messages 1`] = ` +exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > from chain ump messages 1`] = ` [ { - "v3": [ + "v2": [ { "withdrawAsset": [ { @@ -479,17 +277,18 @@ exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > from chai "depositReserveAsset": { "assets": { "wild": { - "allCounted": 1, + "all": null, }, }, "dest": { "interior": { "x1": { - "parachain": 2000, + "parachain": 2004, }, }, "parents": 0, }, + "maxAssets": 1, "xcm": [ { "buyExecution": { @@ -515,20 +314,23 @@ exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > from chai "depositAsset": { "assets": { "wild": { - "allCounted": 1, + "all": null, }, }, "beneficiary": { "interior": { "x1": { - "accountId32": { - "id": "0x88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee", - "network": null, + "accountKey20": { + "key": "0xf24ff3a9cf04c71dbc94d0b566f7a27b94566cac", + "network": { + "any": null, + }, }, }, }, "parents": 0, }, + "maxAssets": 1, }, }, ], @@ -539,25 +341,26 @@ exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > from chai ] `; -exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > to chain xcm events 1`] = ` +exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > to chain xcm events 1`] = ` [ { "data": { - "id": "(hash)", - "origin": "Parent", - "success": true, - "weightUsed": { - "proofSize": 0, - "refTime": 1000000000, + "messageHash": "(hash)", + "messageId": "(hash)", + "outcome": { + "Complete": { + "proofSize": "(rounded 26000)", + "refTime": "(rounded 690000000)", + }, }, }, - "method": "Processed", - "section": "messageQueue", + "method": "ExecutedDownward", + "section": "dmpQueue", }, ] `; -exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > tx events 1`] = ` +exports[`'acala' -> 'moonbeam' xcm transfer 'DOT' > xtokens transfer > tx events 1`] = ` [ { "data": { @@ -578,11 +381,11 @@ exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > tx events "interior": { "X2": [ { - "Parachain": 2000, + "Parachain": "(rounded 2000)", }, { - "AccountId32": { - "id": "(hash)", + "AccountKey20": { + "key": "0xf24ff3a9cf04c71dbc94d0b566f7a27b94566cac", "network": null, }, }, @@ -601,7 +404,7 @@ exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > tx events }, }, }, - "sender": "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac", + "sender": "23y3WetbNi6rDMgHmyRDjgpb7PnhgPotuPPawxruTMLYTLzG", }, "method": "TransferredMultiAssets", "section": "xTokens", @@ -609,7 +412,7 @@ exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > tx events ] `; -exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > balance on from chain 1`] = ` +exports[`'assetHubPolkadot' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > balance on from chain 1`] = ` { "balance": 90000000, "extra": null, @@ -620,7 +423,7 @@ exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > balan } `; -exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > balance on to chain 1`] = ` +exports[`'assetHubPolkadot' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > balance on to chain 1`] = ` { "free": "(rounded 10000000)", "frozen": 0, @@ -628,7 +431,7 @@ exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > balan } `; -exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > from chain hrmp messages 1`] = ` +exports[`'assetHubPolkadot' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > from chain hrmp messages 1`] = ` [ { "data": [ @@ -726,7 +529,7 @@ exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > from ] `; -exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > to chain xcm events 1`] = ` +exports[`'assetHubPolkadot' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > to chain xcm events 1`] = ` [ { "data": { @@ -746,7 +549,7 @@ exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > to ch ] `; -exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > tx events 1`] = ` +exports[`'assetHubPolkadot' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > tx events 1`] = ` [ { "data": { @@ -762,3 +565,200 @@ exports[`'statemint' -> 'acala' xcm transfer 'WBTC' > xcmPallet transfer > tx ev }, ] `; + +exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > balance on from chain 1`] = ` +{ + "balance": 9000000000000, + "extra": null, + "reason": { + "consumer": null, + }, + "status": "Liquid", +} +`; + +exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > balance on to chain 1`] = ` +{ + "free": "(rounded 11000000000000)", + "frozen": 0, + "reserved": 0, +} +`; + +exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > from chain ump messages 1`] = ` +[ + { + "v3": [ + { + "withdrawAsset": [ + { + "fun": { + "fungible": 1000000000000, + }, + "id": { + "concrete": { + "interior": { + "here": null, + }, + "parents": 0, + }, + }, + }, + ], + }, + { + "clearOrigin": null, + }, + { + "buyExecution": { + "fees": { + "fun": { + "fungible": 500000000000, + }, + "id": { + "concrete": { + "interior": { + "here": null, + }, + "parents": 0, + }, + }, + }, + "weightLimit": { + "unlimited": null, + }, + }, + }, + { + "depositReserveAsset": { + "assets": { + "wild": { + "allCounted": 1, + }, + }, + "dest": { + "interior": { + "x1": { + "parachain": 2000, + }, + }, + "parents": 0, + }, + "xcm": [ + { + "buyExecution": { + "fees": { + "fun": { + "fungible": 500000000000, + }, + "id": { + "concrete": { + "interior": { + "here": null, + }, + "parents": 1, + }, + }, + }, + "weightLimit": { + "unlimited": null, + }, + }, + }, + { + "depositAsset": { + "assets": { + "wild": { + "allCounted": 1, + }, + }, + "beneficiary": { + "interior": { + "x1": { + "accountId32": { + "id": "0x88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee", + "network": null, + }, + }, + }, + "parents": 0, + }, + }, + }, + ], + }, + }, + ], + }, +] +`; + +exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > to chain xcm events 1`] = ` +[ + { + "data": { + "id": "(hash)", + "origin": "Parent", + "success": true, + "weightUsed": { + "proofSize": 0, + "refTime": 1000000000, + }, + }, + "method": "Processed", + "section": "messageQueue", + }, +] +`; + +exports[`'moonbeam' -> 'acala' xcm transfer 'DOT' > xtokens transfer > tx events 1`] = ` +[ + { + "data": { + "assets": [ + { + "fun": { + "Fungible": 1000000000000, + }, + "id": { + "Concrete": { + "interior": "Here", + "parents": 1, + }, + }, + }, + ], + "dest": { + "interior": { + "X2": [ + { + "Parachain": 2000, + }, + { + "AccountId32": { + "id": "(hash)", + "network": null, + }, + }, + ], + }, + "parents": 1, + }, + "fee": { + "fun": { + "Fungible": 1000000000000, + }, + "id": { + "Concrete": { + "interior": "Here", + "parents": 1, + }, + }, + }, + "sender": "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac", + }, + "method": "TransferredMultiAssets", + "section": "xTokens", + }, +] +`; diff --git a/tests/xcm-transfer/kusama-para.test.ts b/tests/xcm-transfer/kusama-para.test.ts index 2802e4c..a26fff5 100644 --- a/tests/xcm-transfer/kusama-para.test.ts +++ b/tests/xcm-transfer/kusama-para.test.ts @@ -1,33 +1,33 @@ import { Context } from '../../networks/types' import { query, tx } from '../../helpers/api' +import { assetHubKusama } from '../../networks/assethub' import { basilisk } from '../../networks/hydraDX' import { karura } from '../../networks/acala' -import { statemine } from '../../networks/statemint' import buildTest from './shared' const tests = [ - // statemine <-> karura + // assetHubKusama <-> karura { - from: 'statemine', + from: 'assetHubKusama', to: 'karura', name: 'USDT', test: { xcmPalletHorizontal: { tx: tx.xcmPallet.limitedReserveTransferAssetsV3( - statemine.usdt, + assetHubKusama.usdt, 1e6, tx.xcmPallet.parachainV3(1, karura.paraId), ), - fromBalance: query.assets(statemine.usdtIndex), + fromBalance: query.assets(assetHubKusama.usdtIndex), toBalance: query.tokens(karura.usdt), }, }, }, { from: 'karura', - to: 'statemine', + to: 'assetHubKusama', name: 'USDT', fromStorage: ({ alice }: Context) => ({ Tokens: { @@ -36,9 +36,9 @@ const tests = [ }), test: { xtokenstHorizontal: { - tx: tx.xtokens.transfer(karura.usdt, 1e6, tx.xtokens.parachainV3(statemine.paraId)), + tx: tx.xtokens.transfer(karura.usdt, 1e6, tx.xtokens.parachainV3(assetHubKusama.paraId)), fromBalance: query.tokens(karura.usdt), - toBalance: query.assets(statemine.usdtIndex), + toBalance: query.assets(assetHubKusama.usdtIndex), }, }, }, diff --git a/tests/xcm-transfer/polkadot-para.test.ts b/tests/xcm-transfer/polkadot-para.test.ts index e6caa66..0f39254 100644 --- a/tests/xcm-transfer/polkadot-para.test.ts +++ b/tests/xcm-transfer/polkadot-para.test.ts @@ -2,15 +2,15 @@ import { Context } from '../../networks/types' import { query, tx } from '../../helpers/api' import { acala } from '../../networks/acala' +import { assetHubPolkadot } from '../../networks/assethub' import { moonbeam } from '../../networks/moonbeam' -import { statemint } from '../../networks/statemint' import buildTest from './shared' const tests = [ - // statemint <-> acala + // assetHubPolkadot <-> acala { - from: 'statemint', + from: 'assetHubPolkadot', to: 'acala', name: 'WBTC', fromStorage: ({ alice }: Context) => ({ @@ -18,22 +18,26 @@ const tests = [ account: [[[acala.paraAccount], { providers: 1, data: { free: 10e10 } }]], }, Assets: { - account: [[[statemint.wbtcIndex, alice.address], { balance: 1e8 }]], - asset: [[[statemint.wbtcIndex], { supply: 1e8 }]], + account: [[[assetHubPolkadot.wbtcIndex, alice.address], { balance: 1e8 }]], + asset: [[[assetHubPolkadot.wbtcIndex], { supply: 1e8 }]], }, }), test: { xcmPalletHorizontal: { - tx: tx.xcmPallet.limitedReserveTransferAssetsV3(statemint.wbtc, 1e7, tx.xcmPallet.parachainV3(1, acala.paraId)), - fromBalance: query.assets(statemint.wbtcIndex), + tx: tx.xcmPallet.limitedReserveTransferAssetsV3( + assetHubPolkadot.wbtc, + 1e7, + tx.xcmPallet.parachainV3(1, acala.paraId), + ), + fromBalance: query.assets(assetHubPolkadot.wbtcIndex), toBalance: query.tokens(acala.wbtc), }, }, }, { - // TODO: this failed with FailedToTransactAsset on statemint somehow + // TODO: this failed with FailedToTransactAsset on assetHubPolkadot somehow from: 'acala', - to: 'statemint', + to: 'assetHubPolkadot', route: 'polkadot', // for sending DOT for fee name: 'WBTC', fromStorage: ({ alice }: Context) => ({ @@ -47,10 +51,10 @@ const tests = [ }, Assets: { account: [ - [[statemint.wbtcIndex, acala.paraAccount], { balance: 10e8 }], - [[statemint.wbtcIndex, alice.address], { balance: 10e8 }], + [[assetHubPolkadot.wbtcIndex, acala.paraAccount], { balance: 10e8 }], + [[assetHubPolkadot.wbtcIndex, alice.address], { balance: 10e8 }], ], - asset: [[[statemint.wbtcIndex], { supply: 10e8 }]], + asset: [[[assetHubPolkadot.wbtcIndex], { supply: 10e8 }]], }, }), test: { @@ -60,10 +64,10 @@ const tests = [ 1e7, acala.dot, // fee 1e10, - tx.xtokens.parachainV3(statemint.paraId), + tx.xtokens.parachainV3(assetHubPolkadot.paraId), ), fromBalance: query.tokens(acala.wbtc), - toBalance: query.assets(statemint.wbtcIndex), + toBalance: query.assets(assetHubPolkadot.wbtcIndex), }, }, }, diff --git a/yarn.lock b/yarn.lock index 421f9b6..a3f182c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2683,9 +2683,9 @@ __metadata: languageName: node linkType: hard -"@polkawallet/bridge@npm:^0.1.5-31": - version: 0.1.5-31 - resolution: "@polkawallet/bridge@npm:0.1.5-31" +"@polkawallet/bridge@npm:^0.1.6-2": + version: 0.1.6-2 + resolution: "@polkawallet/bridge@npm:0.1.6-2" dependencies: "@acala-network/api": "npm:^5" "@acala-network/sdk": "npm:^4.1.9-7" @@ -2700,7 +2700,7 @@ __metadata: "@acala-network/api": ^5 "@polkadot/api": ^10 ethers: ^5 - checksum: 10c0/5e2632f9d99b53cfa039ed73050515c01875307954f5179b8ec83e33e788b66ae103af68e804d1a7f35b0c45c17470624778b4c45619348025976e85944b889a + checksum: 10c0/dd43eca276885411aada67fbfdb641b394c3283874fc6d71d2c5b92c466bd6cf91f657a0d97e0c7fe3a22edf97665c584a4a9b96e7fe77a5b70fd7993cf1f5c3 languageName: node linkType: hard @@ -4562,7 +4562,7 @@ __metadata: "@acala-network/sdk": "npm:^4.1.9-13" "@acala-network/sdk-core": "npm:^4.1.9-13" "@polkadot/api": "npm:^10.12.6" - "@polkawallet/bridge": "npm:^0.1.5-31" + "@polkawallet/bridge": "npm:^0.1.6-2" "@swc/core": "npm:^1.4.12" "@types/lodash": "npm:^4.17.0" "@types/node": "npm:^20.12.5"