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.tsdiffbeforeafterboth797 let quartzParachainMultilocation: any;797 let quartzParachainMultilocation: any;798 let quartzAccountMultilocation: any;798 let quartzAccountMultilocation: any;799 let quartzCombinedMultilocation: any;799 let quartzCombinedMultilocation: any;800 let quartzCombinedMultilocationKarura: any; // TODO remove it when Karura goes V2800801801 let messageSent: any;802 let messageSent: any;802803815 };816 };816817817 quartzParachainMultilocation = {818 quartzParachainMultilocation = {818 V1: {819 V2: {819 parents: 1,820 parents: 1,820 interior: {821 interior: {821 X1: quartzParachainJunction,822 X1: quartzParachainJunction,824 };825 };825826826 quartzAccountMultilocation = {827 quartzAccountMultilocation = {827 V1: {828 V2: {828 parents: 0,829 parents: 0,829 interior: {830 interior: {830 X1: quartzAccountJunction,831 X1: quartzAccountJunction,831 },832 },832 },833 },833 };834 };835836 quartzCombinedMultilocation = {837 V2: {838 parents: 1,839 interior: {840 X2: [quartzParachainJunction, quartzAccountJunction],841 },842 },843 };834844835 quartzCombinedMultilocation = {845 quartzCombinedMultilocationKarura = {836 V1: {846 V1: {837 parents: 1,847 parents: 1,838 interior: {848 interior: {861 const id = {871 const id = {862 Token: 'KAR',872 Token: 'KAR',863 };873 };864 const destination = quartzCombinedMultilocation;874 const destination = quartzCombinedMultilocationKarura;865 await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');875 await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');866876867 messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);877 messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);887 const destinationParachain = quartzParachainMultilocation;897 const destinationParachain = quartzParachainMultilocation;888 const beneficiary = quartzAccountMultilocation;898 const beneficiary = quartzAccountMultilocation;889 const assets = {899 const assets = {890 V1: [{900 V2: [{891 id: {901 id: {892 Concrete: {902 Concrete: {893 parents: 0,903 parents: 0,1061 itSub('Should connect to Moonriver and send QTZ back', async ({helper}) => {1071 itSub('Should connect to Moonriver and send QTZ back', async ({helper}) => {1062 await usingMoonriverPlaygrounds(moonriverUrl, async (helper) => {1072 await usingMoonriverPlaygrounds(moonriverUrl, async (helper) => {1063 const asset = {1073 const asset = {1064 V1: {1074 V2: {1065 id: {1075 id: {1066 Concrete: {1076 Concrete: {1067 parents: 1,1077 parents: 1,1076 },1086 },1077 };1087 };1078 const destination = {1088 const destination = {1079 V1: {1089 V2: {1080 parents: 1,1090 parents: 1,1081 interior: {1091 interior: {1082 X2: [1092 X2: [1131 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1141 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);113211421133 const quartzMultilocation = {1143 const quartzMultilocation = {1134 V1: {1144 V2: {1135 parents: 1,1145 parents: 1,1136 interior: {1146 interior: {1137 X1: {Parachain: QUARTZ_CHAIN},1147 X1: {Parachain: QUARTZ_CHAIN},1202 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1212 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);120312131204 const quartzMultilocation = {1214 const quartzMultilocation = {1205 V1: {1215 V2: {1206 parents: 1,1216 parents: 1,1207 interior: {1217 interior: {1208 X1: {1218 X1: {132713371328 console.log('2. Register asset location on Shiden');1338 console.log('2. Register asset location on Shiden');1329 const assetLocation = {1339 const assetLocation = {1330 V1: {1340 V2: {1331 parents: 1,1341 parents: 1,1332 interior: {1342 interior: {1333 X1: {1343 X1: {1419 itSub('Should connect to Shiden and send QTZ back', async ({helper}) => {1429 itSub('Should connect to Shiden and send QTZ back', async ({helper}) => {1420 await usingShidenPlaygrounds(shidenUrl, async (helper) => {1430 await usingShidenPlaygrounds(shidenUrl, async (helper) => {1421 const destination = {1431 const destination = {1422 V1: {1432 V2: {1423 parents: 1,1433 parents: 1,1424 interior: {1434 interior: {1425 X1: {1435 X1: {1430 };1440 };143114411432 const beneficiary = {1442 const beneficiary = {1433 V1: {1443 V2: {1434 parents: 0,1444 parents: 0,1435 interior: {1445 interior: {1436 X1: {1446 X1: {1444 };1454 };144514551446 const assets = {1456 const assets = {1447 V1: [1457 V2: [1448 {1458 {1449 id: {1459 id: {1450 Concrete: {1460 Concrete: {1501 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1511 const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);150215121503 const quartzMultilocation = {1513 const quartzMultilocation = {1504 V1: {1514 V2: {1505 parents: 1,1515 parents: 1,1506 interior: {1516 interior: {1507 X1: {Parachain: QUARTZ_CHAIN},1517 X1: {Parachain: QUARTZ_CHAIN},1564 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1574 const [targetAccount] = await helper.arrange.createAccounts([0n], alice);156515751566 const quartzMultilocation = {1576 const quartzMultilocation = {1567 V1: {1577 V2: {1568 parents: 1,1578 parents: 1,1569 interior: {1579 interior: {1570 X1: {1580 X1: {tests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmUnique.test.ts
+++ b/tests/src/xcm/xcmUnique.test.ts
@@ -799,6 +799,7 @@
let uniqueParachainMultilocation: any;
let uniqueAccountMultilocation: any;
let uniqueCombinedMultilocation: any;
+ let uniqueCombinedMultilocationAcala: any; // TODO remove when Acala goes V2
let messageSent: any;
@@ -817,7 +818,7 @@
};
uniqueParachainMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: uniqueParachainJunction,
@@ -826,7 +827,7 @@
};
uniqueAccountMultilocation = {
- V1: {
+ V2: {
parents: 0,
interior: {
X1: uniqueAccountJunction,
@@ -835,6 +836,15 @@
};
uniqueCombinedMultilocation = {
+ V2: {
+ parents: 1,
+ interior: {
+ X2: [uniqueParachainJunction, uniqueAccountJunction],
+ },
+ },
+ };
+
+ uniqueCombinedMultilocationAcala = {
V1: {
parents: 1,
interior: {
@@ -863,7 +873,7 @@
const id = {
Token: 'ACA',
};
- const destination = uniqueCombinedMultilocation;
+ const destination = uniqueCombinedMultilocationAcala;
await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');
messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
@@ -889,7 +899,7 @@
const destinationParachain = uniqueParachainMultilocation;
const beneficiary = uniqueAccountMultilocation;
const assets = {
- V1: [{
+ V2: [{
id: {
Concrete: {
parents: 0,
@@ -1064,7 +1074,7 @@
itSub('Should connect to Moonbeam and send UNQ back', async ({helper}) => {
await usingMoonbeamPlaygrounds(moonbeamUrl, async (helper) => {
const asset = {
- V1: {
+ V2: {
id: {
Concrete: {
parents: 1,
@@ -1079,7 +1089,7 @@
},
};
const destination = {
- V1: {
+ V2: {
parents: 1,
interior: {
X2: [
@@ -1134,7 +1144,7 @@
const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
const uniqueMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {Parachain: UNIQUE_CHAIN},
@@ -1205,7 +1215,7 @@
const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
const uniqueMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
@@ -1330,7 +1340,7 @@
console.log('2. Register asset location on Astar');
const assetLocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
@@ -1422,7 +1432,7 @@
itSub('Should connect to Astar and send UNQ back', async ({helper}) => {
await usingAstarPlaygrounds(astarUrl, async (helper) => {
const destination = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
@@ -1433,7 +1443,7 @@
};
const beneficiary = {
- V1: {
+ V2: {
parents: 0,
interior: {
X1: {
@@ -1447,7 +1457,7 @@
};
const assets = {
- V1: [
+ V2: [
{
id: {
Concrete: {
@@ -1503,7 +1513,7 @@
const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
const uniqueMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {Parachain: UNIQUE_CHAIN},
@@ -1566,7 +1576,7 @@
const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
const uniqueMultilocation = {
- V1: {
+ V2: {
parents: 1,
interior: {
X1: {
@@ -1632,5 +1642,4 @@
accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
});
-
});