git.delta.rocks / unique-network / refs/commits / 667f02faac6f

difftreelog

Merge pull request #1048 from UniqueNetwork/ci/lxcm-trace

Yaroslav Bolyukin2024-01-09parents: #647ca2a #2e027a9.patch.diff
in: master
feat(baedeker): add xcm logs through rewrites

4 files changed

modified.baedeker/rewrites.example.jsonnetdiffbeforeafterboth
--- a/.baedeker/rewrites.example.jsonnet
+++ b/.baedeker/rewrites.example.jsonnet
@@ -6,13 +6,20 @@
 };
 
 function(prev, repoDir)
-  (import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({
-    'bin/unique': '%s/target/release/unique-collator' % repoDir,
-    'bin/polkadot': { dockerImage: 'uniquenetwork/builder-polkadot:%s' % dotenv.POLKADOT_MAINNET_BRANCH },
-    'bin/acala': { dockerImage: 'uniquenetwork/builder-acala:%s' % dotenv.ACALA_BUILD_BRANCH },
-    'bin/moonbeam': { dockerImage: 'uniquenetwork/builder-moonbeam:%s' % dotenv.MOONBEAM_BUILD_BRANCH },
-    'bin/cumulus': { dockerImage: 'uniquenetwork/builder-cumulus:%s' % dotenv.STATEMINE_BUILD_BRANCH },
-    'bin/astar': { dockerImage: 'uniquenetwork/builder-astar:%s' % dotenv.ASTAR_BUILD_BRANCH },
-    'bin/polkadex': { dockerImage: 'uniquenetwork/builder-polkadex:%s' % dotenv.POLKADEX_BUILD_BRANCH },
-    'bin/hydradx': { dockerImage: 'uniquenetwork/builder-hydraDx:%s' % dotenv.HYDRADX_BUILD_BRANCH },
-  })(prev)
+  (import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths(
+    {
+      'bin/unique': '%s/target/release/unique-collator' % repoDir,
+      'bin/polkadot': { dockerImage: 'uniquenetwork/builder-polkadot:%s' % dotenv.POLKADOT_MAINNET_BRANCH },
+      'bin/acala': { dockerImage: 'uniquenetwork/builder-acala:%s' % dotenv.ACALA_BUILD_BRANCH },
+      'bin/moonbeam': { dockerImage: 'uniquenetwork/builder-moonbeam:%s' % dotenv.MOONBEAM_BUILD_BRANCH },
+      'bin/cumulus': { dockerImage: 'uniquenetwork/builder-cumulus:%s' % dotenv.STATEMINE_BUILD_BRANCH },
+      'bin/astar': { dockerImage: 'uniquenetwork/builder-astar:%s' % dotenv.ASTAR_BUILD_BRANCH },
+      'bin/polkadex': { dockerImage: 'uniquenetwork/builder-polkadex:%s' % dotenv.POLKADEX_BUILD_BRANCH },
+      'bin/hydradx': { dockerImage: 'uniquenetwork/builder-hydraDx:%s' % dotenv.HYDRADX_BUILD_BRANCH },
+    },
+    extra_node_mixin={
+      extraArgs+: [
+        '-lxcm=trace',
+      ],
+    },
+  )(prev)
modified.baedeker/xcm-opal.jsonnetdiffbeforeafterboth
--- a/.baedeker/xcm-opal.jsonnet
+++ b/.baedeker/xcm-opal.jsonnet
@@ -19,9 +19,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
 	},
@@ -38,9 +35,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -58,9 +52,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
modified.baedeker/xcm-quartz.jsonnetdiffbeforeafterboth
before · .baedeker/xcm-quartz.jsonnet
1local2m = import 'baedeker-library/mixin/spec.libsonnet',3;45function(relay_spec)67local relay = {8	name: 'relay',9	bin: 'bin/polkadot',10	validatorIdAssignment: 'staking',11	spec: {Genesis:{12		chain: relay_spec,13		modify:: m.genericRelay($, hrmp = std.join([], [14			// [[$.parachains[a].paraId, $.parachains[b].paraId, 8, 512], [$.parachains[b].paraId, $.parachains[a].paraId, 8, 512]],15			// for [a, b] in [16			// 	['quartz', 'karura'],17			// 	['quartz', 'moonriver'],18			// 	['quartz', 'statemine'],19			// 	['quartz', 'shiden'],20			// ]21		])),22	}},23	nodes: {24		[name]: {25			bin: $.bin,26			wantedKeys: 'relay',27			extraArgs: [28				"-lxcm=trace"29			],30		},31		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']32	},33};3435local quartz = {36	name: 'quartz',37	bin: 'bin/unique',38	paraId: 1001,39	spec: {Genesis:{40		modify:: m.genericPara($),41	}},42	nodes: {43		[name]: {44			bin: $.bin,45			wantedKeys: 'para',46			extraArgs: [47				"-lxcm=trace"48			],49		},50		for name in ['alice', 'bob']51	},52};5354local karura = {55	name: 'karura',56	bin: 'bin/acala',57	paraId: 1002,58	spec: {Genesis:{59		chain: 'karura-dev',60		modify:: bdk.mixer([61			m.genericPara($),62			function(prev) prev {id+: '-local'},63		]),64	}},65	nodes: {66		[name]: {67			bin: $.bin,68			wantedKeys: 'para',69			extraArgs: [70				"-lxcm=trace"71			],72		},73		for name in ['alice', 'bob']74	},75};7677local moonriver = {78	name: 'moonriver',79	bin: 'bin/moonbeam',80	signatureSchema: 'Ethereum',81	paraId: 1003,82	spec: {Genesis:{83		chain: 'moonriver-local',84		specFilePrefix: 'moonriver-local-',85		modify:: m.genericPara($),86	}},87	nodes: {88		[name]: {89			bin: $.bin,90			wantedKeys: 'para-nimbus',91			extraArgs: [92				"-lxcm=trace"93			],94		},95		for name in ['alith', 'baltathar']96	},97};9899local statemine = {100	name: 'statemine',101	bin: 'bin/cumulus',102	paraId: 1004,103	spec: {Genesis:{104		chain: 'statemine-local',105		modify:: m.genericPara($),106	}},107	nodes: {108		[name]: {109			bin: $.bin,110			wantedKeys: 'para',111			extraArgs: [112				"-lxcm=trace"113			],114		},115		for name in ['alice', 'bob']116	},117};118119local shiden = {120	name: 'shiden',121	bin: 'bin/astar',122	paraId: 1005,123	spec: {Genesis:{124		chain: 'shiden-dev',125		modify:: m.genericPara($),126	}},127	nodes: {128		[name]: {129			bin: $.bin,130			wantedKeys: 'para',131			extraArgs: [132				"-lxcm=trace"133			],134		},135		for name in ['alice', 'bob']136	},137};138139relay + {140	parachains: {141		[para.name]: para,142		for para in [quartz, karura, moonriver, statemine, shiden]143	},144}
after · .baedeker/xcm-quartz.jsonnet
1local2m = import 'baedeker-library/mixin/spec.libsonnet',3;45function(relay_spec)67local relay = {8	name: 'relay',9	bin: 'bin/polkadot',10	validatorIdAssignment: 'staking',11	spec: {Genesis:{12		chain: relay_spec,13		modify:: m.genericRelay($, hrmp = std.join([], [14			// [[$.parachains[a].paraId, $.parachains[b].paraId, 8, 512], [$.parachains[b].paraId, $.parachains[a].paraId, 8, 512]],15			// for [a, b] in [16			// 	['quartz', 'karura'],17			// 	['quartz', 'moonriver'],18			// 	['quartz', 'statemine'],19			// 	['quartz', 'shiden'],20			// ]21		])),22	}},23	nodes: {24		[name]: {25			bin: $.bin,26			wantedKeys: 'relay',27		},28		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']29	},30};3132local quartz = {33	name: 'quartz',34	bin: 'bin/unique',35	paraId: 1001,36	spec: {Genesis:{37		modify:: m.genericPara($),38	}},39	nodes: {40		[name]: {41			bin: $.bin,42			wantedKeys: 'para',43		},44		for name in ['alice', 'bob']45	},46};4748local karura = {49	name: 'karura',50	bin: 'bin/acala',51	paraId: 1002,52	spec: {Genesis:{53		chain: 'karura-dev',54		modify:: bdk.mixer([55			m.genericPara($),56			function(prev) prev {id+: '-local'},57		]),58	}},59	nodes: {60		[name]: {61			bin: $.bin,62			wantedKeys: 'para',63		},64		for name in ['alice', 'bob']65	},66};6768local moonriver = {69	name: 'moonriver',70	bin: 'bin/moonbeam',71	signatureSchema: 'Ethereum',72	paraId: 1003,73	spec: {Genesis:{74		chain: 'moonriver-local',75		specFilePrefix: 'moonriver-local-',76		modify:: m.genericPara($),77	}},78	nodes: {79		[name]: {80			bin: $.bin,81			wantedKeys: 'para-nimbus',82		},83		for name in ['alith', 'baltathar']84	},85};8687local statemine = {88	name: 'statemine',89	bin: 'bin/cumulus',90	paraId: 1004,91	spec: {Genesis:{92		chain: 'statemine-local',93		modify:: m.genericPara($),94	}},95	nodes: {96		[name]: {97			bin: $.bin,98			wantedKeys: 'para',99		},100		for name in ['alice', 'bob']101	},102};103104local shiden = {105	name: 'shiden',106	bin: 'bin/astar',107	paraId: 1005,108	spec: {Genesis:{109		chain: 'shiden-dev',110		modify:: m.genericPara($),111	}},112	nodes: {113		[name]: {114			bin: $.bin,115			wantedKeys: 'para',116		},117		for name in ['alice', 'bob']118	},119};120121relay + {122	parachains: {123		[para.name]: para,124		for para in [quartz, karura, moonriver, statemine, shiden]125	},126}
modified.baedeker/xcm-unique.jsonnetdiffbeforeafterboth
--- a/.baedeker/xcm-unique.jsonnet
+++ b/.baedeker/xcm-unique.jsonnet
@@ -25,9 +25,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly']
 	},
@@ -44,9 +41,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -67,9 +61,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -89,9 +80,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para-nimbus',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alith', 'baltathar']
 	},
@@ -109,9 +97,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para-ed',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -129,9 +114,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -149,9 +131,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -170,9 +149,6 @@
 			bin: $.bin,
 			wantedKeys: 'para',
 			legacyRpc: true,
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},