use RuntimeGenesisConfig in genesis config presets #451

dharjeezy · 2024-09-02T23:57:50Z

Makes use of RuntimeGenesisConfig to construct genesis config values for all runtimes.

closes #431

bkchr · 2024-09-03T20:15:41Z

@dharjeezy clippy is not happy.

github-actions · 2024-09-03T21:34:16Z

Review required! Latest push from author must always be reviewed

acatangiu · 2024-09-04T07:43:54Z

@dharjeezy please add a CHANGELOG entry too

CHANGELOG.md

Co-authored-by: Adrian Catangiu <[email protected]>

acatangiu · 2024-09-04T11:45:01Z

CHANGELOG.md

 - Added Polkadot <> Kusama bridge to support asset transfers between Asset Hubs ([polkadot-fellows/runtimes#108](https://github.com/polkadot-fellows/runtimes/pull/108))
-
 ### Fixed


Now the empty line was accidentally removed 😆 you need to bring it back (but empty, no whitespaces)

skunert · 2024-09-04T12:00:21Z

system-parachains/asset-hubs/asset-hub-kusama/src/genesis_config_presets.rs

+		aura_ext: Default::default(),
+		polkadot_xcm: PolkadotXcmConfig {
+			_config: Default::default(),
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
 		},
 		// no need to pass anything to aura, in fact it will panic if we do. Session will take care


This comment needs to go to line 58, at this position it does not make so much sense.

skunert · 2024-09-04T12:01:42Z

system-parachains/asset-hubs/asset-hub-polkadot/src/genesis_config_presets.rs

+		aura_ext: Default::default(),
+		polkadot_xcm: PolkadotXcmConfig {
+			_config: Default::default(),
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
 		},
 		// no need to pass anything to aura, in fact it will panic if we do. Session will take care


Same as above

acatangiu · 2024-09-09T09:06:10Z

@dharjeezy PR needs resolving merge conflicts

…sis-config # Conflicts: # CHANGELOG.md

bkchr · 2024-09-10T06:27:05Z

@dharjeezy the CI is still failing

bkontur · 2024-09-10T14:30:19Z

system-parachains/asset-hubs/asset-hub-kusama/src/genesis_config_presets.rs

+		aura: Default::default(),
+		aura_ext: Default::default(),
+		polkadot_xcm: PolkadotXcmConfig {
+			_config: Default::default(),
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+		},
+		assets: Default::default(),
+		foreign_assets: Default::default(),
+		parachain_system: Default::default(),
+		vesting: Default::default(),
+		pool_assets: Default::default(),


@dharjeezy Is it intentional to name all the genesis fields here? Could we just use ..Default::default(), for them? Every time we add a new pallet to the runtime, we would also need to add xyz = Default::default() here.

Suggested change

aura: Default::default(),

aura_ext: Default::default(),

polkadot_xcm: PolkadotXcmConfig {

_config: Default::default(),

safe_xcm_version: Some(SAFE_XCM_VERSION),

},

assets: Default::default(),

foreign_assets: Default::default(),

parachain_system: Default::default(),

vesting: Default::default(),

pool_assets: Default::default(),

polkadot_xcm: PolkadotXcmConfig {

_config: Default::default(),

safe_xcm_version: Some(SAFE_XCM_VERSION),

},

..Default::default(),

@michalkucharczyk wdyt here also?

..Default::default() shall be used.

Also adding link to related discussion: paritytech/polkadot-sdk#5327 (comment)

bkchr · 2024-09-11T09:54:57Z

@dharjeezy the "Workspace features" CI test is still failing.

dharjeezy · 2024-09-11T10:12:32Z

@dharjeezy the "Workspace features" CI test is still failing.

I see it is the coretime-polkadot-runtime benchmarks that is failing, when i tried running the coretime-polkadot-runtime benchmarks locally, they all seem to pass, i am still trying to figure out what the issue is.

bkontur · 2024-09-11T11:21:17Z

@dharjeezy the "Workspace features" CI test is still failing.

I see it is the coretime-polkadot-runtime benchmarks that is failing, when i tried running the coretime-polkadot-runtime benchmarks locally, they all seem to pass, i am still trying to figure out what the issue is.

hmm, I have a feeling that this might be related to the: paritytech/polkadot-sdk#5083 (comment), also we are working on fix: paritytech/polkadot-sdk#5655,

but to confirm my assumption, I will prepare a draft PR above this PR with frame-omni-bencher built from that branch with fix

bkontur · 2024-09-11T11:33:32Z

@dharjeezy the "Workspace features" CI test is still failing.

I see it is the coretime-polkadot-runtime benchmarks that is failing, when i tried running the coretime-polkadot-runtime benchmarks locally, they all seem to pass, i am still trying to figure out what the issue is.

hmm, I have a feeling that this might be related to the: paritytech/polkadot-sdk#5083 (comment), also we are working on fix: paritytech/polkadot-sdk#5655,

but to confirm my assumption, I will prepare a draft PR above this PR with frame-omni-bencher built from that branch with fix

@dharjeezy ok, no, ignore my previous comment,
the problem is that you accidentally removed SAFE_XCM_VERSION here: https://github.com/polkadot-fellows/runtimes/pull/451/files#diff-f5accd9c71b73f488f5376cf30987209be62e8c81ab3ca4e25c47e1fae65be9dL62-L64

now:

polkadot_xcm: PolkadotXcmConfig { _config: Default::default(), safe_xcm_version: None },

and should be:

		polkadot_xcm: PolkadotXcmConfig {
			_config: Default::default(),
			safe_xcm_version: Some(SAFE_XCM_VERSION),
		},

dharjeezy · 2024-09-11T11:45:55Z

polkadot_xcm: PolkadotXcmConfig {
_config: Default::default(),
safe_xcm_version: Some(SAFE_XCM_VERSION),
},

Ah...ok. Thank you

bkontur · 2024-09-11T13:31:25Z

system-parachains/constants/src/genesis_presets.rs

@@ -66,3 +67,20 @@ where

 /// The default XCM version to set in genesis config.
 pub const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
+
+pub fn remove_phantom_fields(value: &mut Value) {


@dharjeezy I think that we don't need to remove anything here, e.g. these phantoms... so I would revert remove_phantom_fields stuff. It is not enough just phantom, e.g. some of the pallets use _config or config or _phantom. The pallet's GeneisConfig should not serialize those, e.g. paritytech/polkadot-sdk@6226e84

@michalkucharczyk wdyt here?

[#serde(skip)] shall be used for phantom fields.

This means i have to open a PR in polkadot-sdk to include the [#serde(skip)] annotation for these pallets because they don't actually have them example is the pallet-bridge-messages pallet? @michalkucharczyk @bkontur

Yes, PR shall be opened. In that case, IMO we could keep this function until clean-up PR is merged (some annotations would be nice).

As alternative (and probably better solution) you could experiment with removing the fields that were not customized from the final JSON (see this discussion).

This means i have to open a PR in polkadot-sdk to include the [#serde(skip)] annotation for these pallets because they don't actually have them example is the pallet-bridge-messages pallet? @michalkucharczyk @bkontur

@dharjeezy actually, this pallet was fixed already in the master: https://github.com/paritytech/polkadot-sdk/blob/master/bridges/modules/messages/src/lib.rs#L539-L540, but if you have there any others, please feel free to open PR to polkadot-sdk

i just saw that it is now added, we will have to wait for a new release.

…sis-config # Conflicts: # CHANGELOG.md # system-parachains/encointer/src/genesis_config_presets.rs

bkontur · 2024-11-12T09:11:59Z

A new macro, build_struct_json_patch, is coming in the stable2412 release (e.g., paritytech/polkadot-sdk#6349). I suggest waiting for it and then cleaning up this PR afterward.

…sis-config # Conflicts: # CHANGELOG.md

dharjeezy · 2024-12-26T17:07:44Z

A new macro, build_struct_json_patch, is coming in the stable2412 release (e.g., paritytech/polkadot-sdk#6349). I suggest waiting for it and then cleaning up this PR afterward.

This PR is now ready to be merged @bkontur

dharjeezy added 2 commits September 3, 2024 00:57

use RuntimeGenesisConfig in genesis config presets

1ccb486

fmt

3f12e7c

bkchr approved these changes Sep 3, 2024

View reviewed changes

clippy fix

0e9243d

github-actions bot requested a review from bkchr September 3, 2024 21:34

acatangiu approved these changes Sep 4, 2024

View reviewed changes

change log

dcd050a

github-actions bot requested a review from acatangiu September 4, 2024 11:28

acatangiu approved these changes Sep 4, 2024

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Update CHANGELOG.md

fbf97c6

Co-authored-by: Adrian Catangiu <[email protected]>

github-actions bot requested a review from acatangiu September 4, 2024 11:40

acatangiu reviewed Sep 4, 2024

View reviewed changes

revert

a09b416

github-actions bot requested a review from acatangiu September 4, 2024 11:55

skunert approved these changes Sep 4, 2024

View reviewed changes

nit

83a9076

dharjeezy requested a review from skunert September 5, 2024 09:22

skunert approved these changes Sep 5, 2024

View reviewed changes

kianenigma approved these changes Sep 9, 2024

View reviewed changes

acatangiu approved these changes Sep 9, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into dami/use-runtime-gene…

529a574

…sis-config # Conflicts: # CHANGELOG.md

dharjeezy requested review from acatangiu and kianenigma September 9, 2024 14:00

bkontur reviewed Sep 10, 2024

View reviewed changes

remove phantom fields in serde_jsons

d6cca64

dharjeezy added 4 commits September 10, 2024 18:27

fmt

098bac9

clippy

ac021d9

fmt

79a3d5b

empty

1354b29

include polkadot xcm version

c3210cf

bkontur reviewed Sep 11, 2024

View reviewed changes

dharjeezy added 6 commits October 12, 2024 08:02

Merge remote-tracking branch 'origin/main' into dami/use-runtime-gene…

c4c5f35

…sis-config # Conflicts: # CHANGELOG.md # system-parachains/encointer/src/genesis_config_presets.rs

remove extra serde_json operation

4140168

remove serde_json from toml

6736951

bring back remove_phantom_fields for now

f725e7a

fmt

ef78c8e

fmt

b83513a

dharjeezy added 3 commits December 26, 2024 10:49

Merge remote-tracking branch 'origin/main' into dami/use-runtime-gene…

e1fe0c2

…sis-config # Conflicts: # CHANGELOG.md

remove_phantom_fields unneeded

de27440

fmt

ceedebb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

use RuntimeGenesisConfig in genesis config presets #451

use RuntimeGenesisConfig in genesis config presets #451

dharjeezy commented Sep 2, 2024 •

edited

Loading

bkchr commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

acatangiu commented Sep 4, 2024

acatangiu Sep 4, 2024

skunert Sep 4, 2024

skunert Sep 4, 2024

acatangiu commented Sep 9, 2024

bkchr commented Sep 10, 2024

bkontur Sep 10, 2024 •

edited

Loading

bkontur Sep 11, 2024

michalkucharczyk Sep 11, 2024

michalkucharczyk Sep 11, 2024

bkchr commented Sep 11, 2024

dharjeezy commented Sep 11, 2024

bkontur commented Sep 11, 2024

bkontur commented Sep 11, 2024

dharjeezy commented Sep 11, 2024

bkontur Sep 11, 2024

bkontur Sep 11, 2024

michalkucharczyk Sep 11, 2024

dharjeezy Sep 11, 2024

michalkucharczyk Sep 12, 2024

bkontur Sep 12, 2024

dharjeezy Sep 12, 2024

bkontur commented Nov 12, 2024

dharjeezy commented Dec 26, 2024

		- Added Polkadot <> Kusama bridge to support asset transfers between Asset Hubs ([polkadot-fellows/runtimes#108](https://github.com/polkadot-fellows/runtimes/pull/108))

		### Fixed

use RuntimeGenesisConfig in genesis config presets #451

Are you sure you want to change the base?

use RuntimeGenesisConfig in genesis config presets #451

Conversation

dharjeezy commented Sep 2, 2024 • edited Loading

bkchr commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

acatangiu commented Sep 4, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

acatangiu commented Sep 9, 2024

bkchr commented Sep 10, 2024

bkontur Sep 10, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bkchr commented Sep 11, 2024

dharjeezy commented Sep 11, 2024

bkontur commented Sep 11, 2024

bkontur commented Sep 11, 2024

dharjeezy commented Sep 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bkontur commented Nov 12, 2024

dharjeezy commented Dec 26, 2024

dharjeezy commented Sep 2, 2024 •

edited

Loading

bkontur Sep 10, 2024 •

edited

Loading