git.delta.rocks / unique-network / refs/commits / 52f3d47930d0

difftreelog

build merge from develop

Yaroslav Bolyukin2023-06-01parents: #ca8bb41 #ac58597.patch.diff
in: master

7 files changed

modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
58COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/58COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
59COPY --from=uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/59COPY --from=uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
60COPY --from=uniquenetwork/builder-cumulus:{{ CUMULUS_BUILD_BRANCH }} /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus60COPY --from=uniquenetwork/builder-cumulus:{{ CUMULUS_BUILD_BRANCH }} /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
61COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/Acala/target/production/acala /acala/target/release/61COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/acala/target/production/acala /acala/target/release/
62COPY --from=uniquenetwork/builder-astar:{{ ASTAR_BUILD_BRANCH }} /unique_parachain/astar/target/release/astar /astar/target/release/62COPY --from=uniquenetwork/builder-astar:{{ ASTAR_BUILD_BRANCH }} /unique_parachain/astar/target/release/astar /astar/target/release/
63COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/63COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/
6464
modified.envdiffbeforeafterboth
55
6POLKADOT_MAINNET_BRANCH=release-v0.9.376POLKADOT_MAINNET_BRANCH=release-v0.9.37
7STATEMINT_BUILD_BRANCH=release-parachains-v93707STATEMINT_BUILD_BRANCH=release-parachains-v9370
8ACALA_BUILD_BRANCH=2.12.08ACALA_BUILD_BRANCH=2.17.0
9MOONBEAM_BUILD_BRANCH=runtime-22019MOONBEAM_BUILD_BRANCH=runtime-2302
10ASTAR_BUILD_BRANCH=v5.3.010ASTAR_BUILD_BRANCH=v5.4.0
11UNIQUE_MAINNET_BRANCH=release-v93705311UNIQUE_MAINNET_BRANCH=release-v941055
12UNIQUE_REPLICA_FROM=wss://ws.unique.network:44312UNIQUE_REPLICA_FROM=wss://ws.unique.network:443
1313
14KUSAMA_MAINNET_BRANCH=release-v0.9.3814KUSAMA_MAINNET_BRANCH=release-v0.9.38
15STATEMINE_BUILD_BRANCH=release-parachains-v938215STATEMINE_BUILD_BRANCH=release-parachains-v9382
16KARURA_BUILD_BRANCH=release-karura-2.15.016KARURA_BUILD_BRANCH=release-karura-2.17.0
17MOONRIVER_BUILD_BRANCH=runtime-220117MOONRIVER_BUILD_BRANCH=runtime-2302
18SHIDEN_BUILD_BRANCH=v4.49.018SHIDEN_BUILD_BRANCH=v5.4.0
19QUARTZ_MAINNET_BRANCH=release-v93705319QUARTZ_MAINNET_BRANCH=release-v941055
20QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:44320QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:443
2121
22UNIQUEWEST_MAINNET_BRANCH=release-v0.9.4022UNIQUEWEST_MAINNET_BRANCH=release-v0.9.42
23WESTMINT_BUILD_BRANCH=parachains-v940023WESTMINT_BUILD_BRANCH=parachains-v9420
24OPAL_MAINNET_BRANCH=release-v93705324OPAL_MAINNET_BRANCH=release-v941055
25OPAL_REPLICA_FROM=wss://ws-opal.unique.network:44325OPAL_REPLICA_FROM=wss://ws-opal.unique.network:443
2626
27UNIQUEEAST_MAINNET_BRANCH=release-v0.9.3227UNIQUEEAST_MAINNET_BRANCH=release-v0.9.42
28SAPPHIRE_MAINNET_BRANCH=release-v93705328SAPPHIRE_MAINNET_BRANCH=release-v941055
29SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:44329SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:443
3030
modifiedREADME.mddiffbeforeafterboth
90```90```
91git clone https://github.com/paritytech/polkadot.git91git clone https://github.com/paritytech/polkadot.git
92cd polkadot92cd polkadot
93git checkout release-v0.9.3993git checkout release-v0.9.42
94cargo build --release94cargo build --release
95```95```
9696
modifiedtests/package.jsondiffbeforeafterboth
118 "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",118 "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",
119 "polkadot-types-from-defs": "ts-node --esm ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",119 "polkadot-types-from-defs": "ts-node --esm ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",
120 "polkadot-types-from-chain": "ts-node --esm ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",120 "polkadot-types-from-chain": "ts-node --esm ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",
121 "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"121 "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",
122 "generateEnv": "ts-node --esm ./src/generateEnv.ts"
122 },123 },
123 "author": "",124 "author": "",
124 "license": "SEE LICENSE IN ../LICENSE",125 "license": "SEE LICENSE IN ../LICENSE",
modifiedtests/src/generateEnv.tsdiffbeforeafterboth
62 ff('wss://rpc.astar.network/', /^(.+)$/, (_, r) => {62 ff('wss://rpc.astar.network/', /^(.+)$/, (_, r) => {
63 switch (r) {63 switch (r) {
64 case '55': return 'v5.3.0';64 case '55': return 'v5.3.0';
65 case '57': return 'v5.4.0';
65 default: throw new Error('unknown astar branch for runtime ' + r);66 default: throw new Error('unknown astar branch for runtime ' + r);
66 }67 }
67 }).then(v => env = setVar(env, 'ASTAR_BUILD_BRANCH', v)),68 }).then(v => env = setVar(env, 'ASTAR_BUILD_BRANCH', v)),
68 ff('wss://shiden.api.onfinality.io/public-ws', /^(.+)$/, (_, r) => {69 ff('wss://shiden.api.onfinality.io/public-ws', /^(.+)$/, (_, r) => {
69 switch (r) {70 switch (r) {
70 case '90': return 'v4.49.0';71 case '90': return 'v4.49.0';
72 case '96': return 'v5.4.0';
71 default: throw new Error('unknown shiden branch for runtime ' + r);73 default: throw new Error('unknown shiden branch for runtime ' + r);
72 }74 }
73 }).then(v => env = setVar(env, 'SHIDEN_BUILD_BRANCH', v)),75 }).then(v => env = setVar(env, 'SHIDEN_BUILD_BRANCH', v)),
modifiedtests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth
797 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 V2
800801
801 let messageSent: any;802 let messageSent: any;
802803
815 };816 };
816817
817 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 };
825826
826 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 };
835
836 quartzCombinedMultilocation = {
837 V2: {
838 parents: 1,
839 interior: {
840 X2: [quartzParachainJunction, quartzAccountJunction],
841 },
842 },
843 };
834844
835 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');
866876
867 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);
11321142
1133 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);
12031213
1204 const quartzMultilocation = {1214 const quartzMultilocation = {
1205 V1: {1215 V2: {
1206 parents: 1,1216 parents: 1,
1207 interior: {1217 interior: {
1208 X1: {1218 X1: {
13271337
1328 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 };
14311441
1432 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 };
14451455
1446 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);
15021512
1503 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);
15651575
1566 const quartzMultilocation = {1576 const quartzMultilocation = {
1567 V1: {1577 V2: {
1568 parents: 1,1578 parents: 1,
1569 interior: {1579 interior: {
1570 X1: {1580 X1: {
modifiedtests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth
799 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 V2
802803
803 let messageSent: any;804 let messageSent: any;
804805
817 };818 };
818819
819 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 };
827828
828 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 };
837
838 uniqueCombinedMultilocation = {
839 V2: {
840 parents: 1,
841 interior: {
842 X2: [uniqueParachainJunction, uniqueAccountJunction],
843 },
844 },
845 };
836846
837 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');
868878
869 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);
11351145
1136 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);
12061216
1207 const uniqueMultilocation = {1217 const uniqueMultilocation = {
1208 V1: {1218 V2: {
1209 parents: 1,1219 parents: 1,
1210 interior: {1220 interior: {
1211 X1: {1221 X1: {
13301340
1331 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 };
14341444
1435 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 };
14481458
1449 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);
15041514
1505 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);
15671577
1568 const uniqueMultilocation = {1578 const uniqueMultilocation = {
1569 V1: {1579 V2: {
1570 parents: 1,1580 parents: 1,
1571 interior: {1581 interior: {
1572 X1: {1582 X1: {