git.delta.rocks / unique-network / refs/commits / ac58597758fc

difftreelog

Merge pull request #936 from UniqueNetwork/build/941056

Yaroslav Bolyukin2023-05-24parents: #7bf7837 #748c609.patch.diff
in: master

9 files changed

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.41
94cargo build --release94cargo build --release
95```95```
9696
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
51	spec_name: create_runtime_str!(RUNTIME_NAME),51	spec_name: create_runtime_str!(RUNTIME_NAME),
52	impl_name: create_runtime_str!(RUNTIME_NAME),52	impl_name: create_runtime_str!(RUNTIME_NAME),
53	authoring_version: 1,53	authoring_version: 1,
54	spec_version: 941055,54	spec_version: 941056,
55	impl_version: 0,55	impl_version: 0,
56	apis: RUNTIME_API_VERSIONS,56	apis: RUNTIME_API_VERSIONS,
57	transaction_version: 3,57	transaction_version: 3,
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
54	spec_name: create_runtime_str!(RUNTIME_NAME),54	spec_name: create_runtime_str!(RUNTIME_NAME),
55	impl_name: create_runtime_str!(RUNTIME_NAME),55	impl_name: create_runtime_str!(RUNTIME_NAME),
56	authoring_version: 1,56	authoring_version: 1,
57	spec_version: 941055,57	spec_version: 941056,
58	impl_version: 0,58	impl_version: 0,
59	apis: RUNTIME_API_VERSIONS,59	apis: RUNTIME_API_VERSIONS,
60	transaction_version: 3,60	transaction_version: 3,
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
51	spec_name: create_runtime_str!(RUNTIME_NAME),51	spec_name: create_runtime_str!(RUNTIME_NAME),
52	impl_name: create_runtime_str!(RUNTIME_NAME),52	impl_name: create_runtime_str!(RUNTIME_NAME),
53	authoring_version: 1,53	authoring_version: 1,
54	spec_version: 941055,54	spec_version: 941056,
55	impl_version: 0,55	impl_version: 0,
56	apis: RUNTIME_API_VERSIONS,56	apis: RUNTIME_API_VERSIONS,
57	transaction_version: 3,57	transaction_version: 3,
modifiedtests/package.jsondiffbeforeafterboth
116    "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",116    "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",
117    "polkadot-types-from-defs": "ts-node --esm ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",117    "polkadot-types-from-defs": "ts-node --esm ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",
118    "polkadot-types-from-chain": "ts-node --esm ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",118    "polkadot-types-from-chain": "ts-node --esm ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",
119    "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"119    "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",
120    "generateEnv": "ts-node --esm ./src/generateEnv.ts"
120  },121  },
121  "author": "",122  "author": "",
122  "license": "SEE LICENSE IN ../LICENSE",123  "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
803  let quartzParachainMultilocation: any;803  let quartzParachainMultilocation: any;
804  let quartzAccountMultilocation: any;804  let quartzAccountMultilocation: any;
805  let quartzCombinedMultilocation: any;805  let quartzCombinedMultilocation: any;
806  let quartzCombinedMultilocationKarura: any; // TODO remove it when Karura goes V2
806807
807  let messageSent: any;808  let messageSent: any;
808809
821      };822      };
822823
823      quartzParachainMultilocation = {824      quartzParachainMultilocation = {
824        V1: {825        V2: {
825          parents: 1,826          parents: 1,
826          interior: {827          interior: {
827            X1: quartzParachainJunction,828            X1: quartzParachainJunction,
830      };831      };
831832
832      quartzAccountMultilocation = {833      quartzAccountMultilocation = {
833        V1: {834        V2: {
834          parents: 0,835          parents: 0,
835          interior: {836          interior: {
836            X1: quartzAccountJunction,837            X1: quartzAccountJunction,
837          },838          },
838        },839        },
839      };840      };
841
842      quartzCombinedMultilocation = {
843        V2: {
844          parents: 1,
845          interior: {
846            X2: [quartzParachainJunction, quartzAccountJunction],
847          },
848        },
849      };
840850
841      quartzCombinedMultilocation = {851      quartzCombinedMultilocationKarura = {
842        V1: {852        V1: {
843          parents: 1,853          parents: 1,
844          interior: {854          interior: {
869      const id = {879      const id = {
870        Token: 'KAR',880        Token: 'KAR',
871      };881      };
872      const destination = quartzCombinedMultilocation;882      const destination = quartzCombinedMultilocationKarura;
873      await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');883      await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');
874884
875      messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);885      messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
895      const destinationParachain = quartzParachainMultilocation;905      const destinationParachain = quartzParachainMultilocation;
896      const beneficiary = quartzAccountMultilocation;906      const beneficiary = quartzAccountMultilocation;
897      const assets = {907      const assets = {
898        V1: [{908        V2: [{
899          id: {909          id: {
900            Concrete: {910            Concrete: {
901              parents: 0,911              parents: 0,
1069  itSub('Should connect to Moonriver and send QTZ back', async ({helper}) => {1079  itSub('Should connect to Moonriver and send QTZ back', async ({helper}) => {
1070    await usingMoonriverPlaygrounds(moonriverUrl, async (helper) => {1080    await usingMoonriverPlaygrounds(moonriverUrl, async (helper) => {
1071      const asset = {1081      const asset = {
1072        V1: {1082        V2: {
1073          id: {1083          id: {
1074            Concrete: {1084            Concrete: {
1075              parents: 1,1085              parents: 1,
1084        },1094        },
1085      };1095      };
1086      const destination = {1096      const destination = {
1087        V1: {1097        V2: {
1088          parents: 1,1098          parents: 1,
1089          interior: {1099          interior: {
1090            X2: [1100            X2: [
1139    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1149    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
11401150
1141    const quartzMultilocation = {1151    const quartzMultilocation = {
1142      V1: {1152      V2: {
1143        parents: 1,1153        parents: 1,
1144        interior: {1154        interior: {
1145          X1: {Parachain: QUARTZ_CHAIN},1155          X1: {Parachain: QUARTZ_CHAIN},
1212    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1222    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
12131223
1214    const quartzMultilocation = {1224    const quartzMultilocation = {
1215      V1: {1225      V2: {
1216        parents: 1,1226        parents: 1,
1217        interior: {1227        interior: {
1218          X1: {1228          X1: {
13411351
1342      console.log('2. Register asset location on Shiden');1352      console.log('2. Register asset location on Shiden');
1343      const assetLocation = {1353      const assetLocation = {
1344        V1: {1354        V2: {
1345          parents: 1,1355          parents: 1,
1346          interior: {1356          interior: {
1347            X1: {1357            X1: {
1433  itSub('Should connect to Shiden and send QTZ back', async ({helper}) => {1443  itSub('Should connect to Shiden and send QTZ back', async ({helper}) => {
1434    await usingShidenPlaygrounds(shidenUrl, async (helper) => {1444    await usingShidenPlaygrounds(shidenUrl, async (helper) => {
1435      const destination = {1445      const destination = {
1436        V1: {1446        V2: {
1437          parents: 1,1447          parents: 1,
1438          interior: {1448          interior: {
1439            X1: {1449            X1: {
1444      };1454      };
14451455
1446      const beneficiary = {1456      const beneficiary = {
1447        V1: {1457        V2: {
1448          parents: 0,1458          parents: 0,
1449          interior: {1459          interior: {
1450            X1: {1460            X1: {
1458      };1468      };
14591469
1460      const assets = {1470      const assets = {
1461        V1: [1471        V2: [
1462          {1472          {
1463            id: {1473            id: {
1464              Concrete: {1474              Concrete: {
1515    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1525    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
15161526
1517    const quartzMultilocation = {1527    const quartzMultilocation = {
1518      V1: {1528      V2: {
1519        parents: 1,1529        parents: 1,
1520        interior: {1530        interior: {
1521          X1: {Parachain: QUARTZ_CHAIN},1531          X1: {Parachain: QUARTZ_CHAIN},
1580    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1590    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
15811591
1582    const quartzMultilocation = {1592    const quartzMultilocation = {
1583      V1: {1593      V2: {
1584        parents: 1,1594        parents: 1,
1585        interior: {1595        interior: {
1586          X1: {1596          X1: {
modifiedtests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth
805  let uniqueParachainMultilocation: any;805  let uniqueParachainMultilocation: any;
806  let uniqueAccountMultilocation: any;806  let uniqueAccountMultilocation: any;
807  let uniqueCombinedMultilocation: any;807  let uniqueCombinedMultilocation: any;
808  let uniqueCombinedMultilocationAcala: any; // TODO remove when Acala goes V2
808809
809  let messageSent: any;810  let messageSent: any;
810811
823      };824      };
824825
825      uniqueParachainMultilocation = {826      uniqueParachainMultilocation = {
826        V1: {827        V2: {
827          parents: 1,828          parents: 1,
828          interior: {829          interior: {
829            X1: uniqueParachainJunction,830            X1: uniqueParachainJunction,
832      };833      };
833834
834      uniqueAccountMultilocation = {835      uniqueAccountMultilocation = {
835        V1: {836        V2: {
836          parents: 0,837          parents: 0,
837          interior: {838          interior: {
838            X1: uniqueAccountJunction,839            X1: uniqueAccountJunction,
839          },840          },
840        },841        },
841      };842      };
843
844      uniqueCombinedMultilocation = {
845        V2: {
846          parents: 1,
847          interior: {
848            X2: [uniqueParachainJunction, uniqueAccountJunction],
849          },
850        },
851      };
842852
843      uniqueCombinedMultilocation = {853      uniqueCombinedMultilocationAcala = {
844        V1: {854        V1: {
845          parents: 1,855          parents: 1,
846          interior: {856          interior: {
871      const id = {881      const id = {
872        Token: 'ACA',882        Token: 'ACA',
873      };883      };
874      const destination = uniqueCombinedMultilocation;884      const destination = uniqueCombinedMultilocationAcala;
875      await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');885      await helper.xTokens.transfer(alice, id, testAmount, destination, 'Unlimited');
876886
877      messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);887      messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
897      const destinationParachain = uniqueParachainMultilocation;907      const destinationParachain = uniqueParachainMultilocation;
898      const beneficiary = uniqueAccountMultilocation;908      const beneficiary = uniqueAccountMultilocation;
899      const assets = {909      const assets = {
900        V1: [{910        V2: [{
901          id: {911          id: {
902            Concrete: {912            Concrete: {
903              parents: 0,913              parents: 0,
1072  itSub('Should connect to Moonbeam and send UNQ back', async ({helper}) => {1082  itSub('Should connect to Moonbeam and send UNQ back', async ({helper}) => {
1073    await usingMoonbeamPlaygrounds(moonbeamUrl, async (helper) => {1083    await usingMoonbeamPlaygrounds(moonbeamUrl, async (helper) => {
1074      const asset = {1084      const asset = {
1075        V1: {1085        V2: {
1076          id: {1086          id: {
1077            Concrete: {1087            Concrete: {
1078              parents: 1,1088              parents: 1,
1087        },1097        },
1088      };1098      };
1089      const destination = {1099      const destination = {
1090        V1: {1100        V2: {
1091          parents: 1,1101          parents: 1,
1092          interior: {1102          interior: {
1093            X2: [1103            X2: [
1142    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1152    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
11431153
1144    const uniqueMultilocation = {1154    const uniqueMultilocation = {
1145      V1: {1155      V2: {
1146        parents: 1,1156        parents: 1,
1147        interior: {1157        interior: {
1148          X1: {Parachain: UNIQUE_CHAIN},1158          X1: {Parachain: UNIQUE_CHAIN},
1215    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1225    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
12161226
1217    const uniqueMultilocation = {1227    const uniqueMultilocation = {
1218      V1: {1228      V2: {
1219        parents: 1,1229        parents: 1,
1220        interior: {1230        interior: {
1221          X1: {1231          X1: {
13441354
1345      console.log('2. Register asset location on Astar');1355      console.log('2. Register asset location on Astar');
1346      const assetLocation = {1356      const assetLocation = {
1347        V1: {1357        V2: {
1348          parents: 1,1358          parents: 1,
1349          interior: {1359          interior: {
1350            X1: {1360            X1: {
1436  itSub('Should connect to Astar and send UNQ back', async ({helper}) => {1446  itSub('Should connect to Astar and send UNQ back', async ({helper}) => {
1437    await usingAstarPlaygrounds(astarUrl, async (helper) => {1447    await usingAstarPlaygrounds(astarUrl, async (helper) => {
1438      const destination = {1448      const destination = {
1439        V1: {1449        V2: {
1440          parents: 1,1450          parents: 1,
1441          interior: {1451          interior: {
1442            X1: {1452            X1: {
1447      };1457      };
14481458
1449      const beneficiary = {1459      const beneficiary = {
1450        V1: {1460        V2: {
1451          parents: 0,1461          parents: 0,
1452          interior: {1462          interior: {
1453            X1: {1463            X1: {
1461      };1471      };
14621472
1463      const assets = {1473      const assets = {
1464        V1: [1474        V2: [
1465          {1475          {
1466            id: {1476            id: {
1467              Concrete: {1477              Concrete: {
1517    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);1527    const [targetAccount] = await helper.arrange.createAccounts([targetAccountBalance], alice);
15181528
1519    const uniqueMultilocation = {1529    const uniqueMultilocation = {
1520      V1: {1530      V2: {
1521        parents: 1,1531        parents: 1,
1522        interior: {1532        interior: {
1523          X1: {Parachain: UNIQUE_CHAIN},1533          X1: {Parachain: UNIQUE_CHAIN},
1582    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);1592    const [targetAccount] = await helper.arrange.createAccounts([0n], alice);
15831593
1584    const uniqueMultilocation = {1594    const uniqueMultilocation = {
1585      V1: {1595      V2: {
1586        parents: 1,1596        parents: 1,
1587        interior: {1597        interior: {
1588          X1: {1598          X1: {