difftreelog
build merge from develop
in: master
7 files changed
.docker/Dockerfile-xcm.j2diffbeforeafterboth--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -58,7 +58,7 @@
COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
COPY --from=uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
COPY --from=uniquenetwork/builder-cumulus:{{ CUMULUS_BUILD_BRANCH }} /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
-COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/Acala/target/production/acala /acala/target/release/
+COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/acala/target/production/acala /acala/target/release/
COPY --from=uniquenetwork/builder-astar:{{ ASTAR_BUILD_BRANCH }} /unique_parachain/astar/target/release/astar /astar/target/release/
COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/
.envdiffbeforeafterboth--- a/.env
+++ b/.env
@@ -5,25 +5,25 @@
POLKADOT_MAINNET_BRANCH=release-v0.9.37
STATEMINT_BUILD_BRANCH=release-parachains-v9370
-ACALA_BUILD_BRANCH=2.12.0
-MOONBEAM_BUILD_BRANCH=runtime-2201
-ASTAR_BUILD_BRANCH=v5.3.0
-UNIQUE_MAINNET_BRANCH=release-v937053
+ACALA_BUILD_BRANCH=2.17.0
+MOONBEAM_BUILD_BRANCH=runtime-2302
+ASTAR_BUILD_BRANCH=v5.4.0
+UNIQUE_MAINNET_BRANCH=release-v941055
UNIQUE_REPLICA_FROM=wss://ws.unique.network:443
KUSAMA_MAINNET_BRANCH=release-v0.9.38
STATEMINE_BUILD_BRANCH=release-parachains-v9382
-KARURA_BUILD_BRANCH=release-karura-2.15.0
-MOONRIVER_BUILD_BRANCH=runtime-2201
-SHIDEN_BUILD_BRANCH=v4.49.0
-QUARTZ_MAINNET_BRANCH=release-v937053
+KARURA_BUILD_BRANCH=release-karura-2.17.0
+MOONRIVER_BUILD_BRANCH=runtime-2302
+SHIDEN_BUILD_BRANCH=v5.4.0
+QUARTZ_MAINNET_BRANCH=release-v941055
QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:443
-UNIQUEWEST_MAINNET_BRANCH=release-v0.9.40
-WESTMINT_BUILD_BRANCH=parachains-v9400
-OPAL_MAINNET_BRANCH=release-v937053
+UNIQUEWEST_MAINNET_BRANCH=release-v0.9.42
+WESTMINT_BUILD_BRANCH=parachains-v9420
+OPAL_MAINNET_BRANCH=release-v941055
OPAL_REPLICA_FROM=wss://ws-opal.unique.network:443
-UNIQUEEAST_MAINNET_BRANCH=release-v0.9.32
-SAPPHIRE_MAINNET_BRANCH=release-v937053
+UNIQUEEAST_MAINNET_BRANCH=release-v0.9.42
+SAPPHIRE_MAINNET_BRANCH=release-v941055
SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:443
README.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@
```
git clone https://github.com/paritytech/polkadot.git
cd polkadot
-git checkout release-v0.9.39
+git checkout release-v0.9.42
cargo build --release
```
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -118,7 +118,8 @@
"polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json",
"polkadot-types-from-defs": "ts-node --esm ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",
"polkadot-types-from-chain": "ts-node --esm ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",
- "polkadot-types": "echo \"export default {}\" > src/interfaces/lookup.ts && yarn polkadot-types-fetch-metadata && yarn polkadot-types-from-defs && yarn polkadot-types-from-defs && yarn polkadot-types-from-chain"
+ "polkadot-types": "echo \"export default {}\" > src/interfaces/lookup.ts && yarn polkadot-types-fetch-metadata && yarn polkadot-types-from-defs && yarn polkadot-types-from-defs && yarn polkadot-types-from-chain",
+ "generateEnv": "ts-node --esm ./src/generateEnv.ts"
},
"author": "",
"license": "SEE LICENSE IN ../LICENSE",
tests/src/generateEnv.tsdiffbeforeafterboth--- a/tests/src/generateEnv.ts
+++ b/tests/src/generateEnv.ts
@@ -62,12 +62,14 @@
ff('wss://rpc.astar.network/', /^(.+)$/, (_, r) => {
switch (r) {
case '55': return 'v5.3.0';
+ case '57': return 'v5.4.0';
default: throw new Error('unknown astar branch for runtime ' + r);
}
}).then(v => env = setVar(env, 'ASTAR_BUILD_BRANCH', v)),
ff('wss://shiden.api.onfinality.io/public-ws', /^(.+)$/, (_, r) => {
switch (r) {
case '90': return 'v4.49.0';
+ case '96': return 'v5.4.0';
default: throw new Error('unknown shiden branch for runtime ' + r);
}
}).then(v => env = setVar(env, 'SHIDEN_BUILD_BRANCH', v)),
tests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmQuartz.test.ts
+++ b/tests/src/xcm/xcmQuartz.test.ts
@@ -797,6 +797,7 @@
let quartzParachainMultilocation: any;
let quartzAccountMultilocation: any;
let quartzCombinedMultilocation: any;
+ let quartzCombinedMultilocationKarura: any; // TODO remove it when Karura goes V2
let messageSent: any;
@@ -815,7 +816,7 @@
};
quartzParachainMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: quartzParachainJunction,
@@ -824,7 +825,7 @@
};
quartzAccountMultilocation = {
- V1: {
+ V2: {
parents: 0,
interior: {
X1: quartzAccountJunction,
@@ -833,6 +834,15 @@
};
quartzCombinedMultilocation = {
+ V2: {
+ parents: 1,
+ interior: {
+ X2: [quartzParachainJunction, quartzAccountJunction],
+ },
+ },
+ };
+
+ quartzCombinedMultilocationKarura = {
V1: {
parents: 1,
interior: {
@@ -861,7 +871,7 @@
const id = {
Token: 'KAR',
};
- const destination = quartzCombinedMultilocation;
+ const destination = quartzCombinedMultilocationKarura;
await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');
messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
@@ -887,7 +897,7 @@
const destinationParachain = quartzParachainMultilocation;
const beneficiary = quartzAccountMultilocation;
const assets = {
- V1: [{
+ V2: [{
id: {
Concrete: {
parents: 0,
@@ -1061,7 +1071,7 @@
itSub('Should connect to Moonriver and send QTZ back', async ({helper}) => {
await usingMoonriverPlaygrounds(moonriverUrl, async (helper) => {
const asset = {
- V1: {
+ V2: {
id: {
Concrete: {
parents: 1,
@@ -1076,7 +1086,7 @@
},
};
const destination = {
- V1: {
+ V2: {
parents: 1,
interior: {
X2: [
@@ -1131,7 +1141,7 @@
const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
const quartzMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {Parachain: QUARTZ_CHAIN},
@@ -1202,7 +1212,7 @@
const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
const quartzMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
@@ -1327,7 +1337,7 @@
console.log('2. Register asset location on Shiden');
const assetLocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
@@ -1419,7 +1429,7 @@
itSub('Should connect to Shiden and send QTZ back', async ({helper}) => {
await usingShidenPlaygrounds(shidenUrl, async (helper) => {
const destination = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
@@ -1430,7 +1440,7 @@
};
const beneficiary = {
- V1: {
+ V2: {
parents: 0,
interior: {
X1: {
@@ -1444,7 +1454,7 @@
};
const assets = {
- V1: [
+ V2: [
{
id: {
Concrete: {
@@ -1501,7 +1511,7 @@
const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
const quartzMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {Parachain: QUARTZ_CHAIN},
@@ -1564,7 +1574,7 @@
const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
const quartzMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
tests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth799 let uniqueParachainMultilocation: any;799 let uniqueParachainMultilocation: any;800 let uniqueAccountMultilocation: any;800 let uniqueAccountMultilocation: any;801 let uniqueCombinedMultilocation: any;801 let uniqueCombinedMultilocation: any;802 let uniqueCombinedMultilocationAcala: any; // TODO remove when Acala goes V2802803803 let messageSent: any;804 let messageSent: any;804805817 };818 };818819819 uniqueParachainMultilocation = {820 uniqueParachainMultilocation = {820 V1: {821 V2: {821 parents: 1,822 parents: 1,822 interior: {823 interior: {823 X1: uniqueParachainJunction,824 X1: uniqueParachainJunction,826 };827 };827828828 uniqueAccountMultilocation = {829 uniqueAccountMultilocation = {829 V1: {830 V2: {830 parents: 0,831 parents: 0,831 interior: {832 interior: {832 X1: uniqueAccountJunction,833 X1: uniqueAccountJunction,833 },834 },834 },835 },835 };836 };837838 uniqueCombinedMultilocation = {839 V2: {840 parents: 1,841 interior: {842 X2: [uniqueParachainJunction, uniqueAccountJunction],843 },844 },845 };836846837 uniqueCombinedMultilocation = {847 uniqueCombinedMultilocationAcala = {838 V1: {848 V1: {839 parents: 1,849 parents: 1,840 interior: {850 interior: {863 const id = {873 const id = {864 Token: 'ACA',874 Token: 'ACA',865 };875 };866 const destination = uniqueCombinedMultilocation;876 const destination = uniqueCombinedMultilocationAcala;867 await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');877 await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');868878869 messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);879 messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);889 const destinationParachain = uniqueParachainMultilocation;899 const destinationParachain = uniqueParachainMultilocation;890 const beneficiary = uniqueAccountMultilocation;900 const beneficiary = uniqueAccountMultilocation;891 const assets = {901 const assets = {892 V1: [{902 V2: [{893 id: {903 id: {894 Concrete: {904 Concrete: {895 parents: 0,905 parents: 0,1064 itSub('Should connect to Moonbeam and send UNQ back', async ({helper}) => {1074 itSub('Should connect to Moonbeam and send UNQ back', async ({helper}) => {1065 await usingMoonbeamPlaygrounds(moonbeamUrl, async (helper) => {1075 await usingMoonbeamPlaygrounds(moonbeamUrl, async (helper) => {1066 const asset = {1076 const asset = {1067 V1: {1077 V2: {1068 id: {1078 id: {1069 Concrete: {1079 Concrete: {1070 parents: 1,1080 parents: 1,1079 },1089 },1080 };1090 };1081 const destination = {1091 const destination = {1082 V1: {1092 V2: {1083 parents: 1,1093 parents: 1,1084 interior: {1094 interior: {1085 X2: [1095 X2: [1134 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1144 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);113511451136 const uniqueMultilocation = {1146 const uniqueMultilocation = {1137 V1: {1147 V2: {1138 parents: 1,1148 parents: 1,1139 interior: {1149 interior: {1140 X1: {Parachain: UNIQUE_CHAIN},1150 X1: {Parachain: UNIQUE_CHAIN},1205 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1215 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);120612161207 const uniqueMultilocation = {1217 const uniqueMultilocation = {1208 V1: {1218 V2: {1209 parents: 1,1219 parents: 1,1210 interior: {1220 interior: {1211 X1: {1221 X1: {133013401331 console.log('2. Register asset location on Astar');1341 console.log('2. Register asset location on Astar');1332 const assetLocation = {1342 const assetLocation = {1333 V1: {1343 V2: {1334 parents: 1,1344 parents: 1,1335 interior: {1345 interior: {1336 X1: {1346 X1: {1422 itSub('Should connect to Astar and send UNQ back', async ({helper}) => {1432 itSub('Should connect to Astar and send UNQ back', async ({helper}) => {1423 await usingAstarPlaygrounds(astarUrl, async (helper) => {1433 await usingAstarPlaygrounds(astarUrl, async (helper) => {1424 const destination = {1434 const destination = {1425 V1: {1435 V2: {1426 parents: 1,1436 parents: 1,1427 interior: {1437 interior: {1428 X1: {1438 X1: {1433 };1443 };143414441435 const beneficiary = {1445 const beneficiary = {1436 V1: {1446 V2: {1437 parents: 0,1447 parents: 0,1438 interior: {1448 interior: {1439 X1: {1449 X1: {1447 };1457 };144814581449 const assets = {1459 const assets = {1450 V1: [1460 V2: [1451 {1461 {1452 id: {1462 id: {1453 Concrete: {1463 Concrete: {1503 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1513 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);150415141505 const uniqueMultilocation = {1515 const uniqueMultilocation = {1506 V1: {1516 V2: {1507 parents: 1,1517 parents: 1,1508 interior: {1518 interior: {1509 X1: {Parachain: UNIQUE_CHAIN},1519 X1: {Parachain: UNIQUE_CHAIN},1566 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1576 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);156715771568 const uniqueMultilocation = {1578 const uniqueMultilocation = {1569 V1: {1579 V2: {1570 parents: 1,1580 parents: 1,1571 interior: {1581 interior: {1572 X1: {1582 X1: {