Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for chain spec modifier commands #909

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Add support for chain spec modifier commands #909

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
da03c1b
Add support for chain spec modifier commands
Fahrrader Apr 8, 2023
9a67e5e
Address comments on chain spec modifiers
Fahrrader Apr 12, 2023
a4addae
fix: chain spec mutator working file directory + fatal error handling
Fahrrader Apr 19, 2023
f504bf1
feat(chain spec mutator): README + examplle
Fahrrader Apr 19, 2023
9f51226
test(chain spec mutator): test components + add to CI
Fahrrader Apr 19, 2023
52cfef4
refactor(chain spec mutator): chain spec parsing error
Fahrrader Apr 19, 2023
6af5c09
style(chain spec mutator): fix lint problems
Fahrrader Apr 19, 2023
3bb1add
test(chain spec mutator): fix improper return
Fahrrader Apr 20, 2023
f830ed3
test(chain spec mutator): fix faulty mutator script
Fahrrader Apr 20, 2023
9eb2766
refactor(chainSpec): remove error swallowing
Fahrrader Apr 20, 2023
eb87b67
Merge branch 'main' into feat/chain-spec-mutator
Fahrrader May 15, 2023
1be03dd
Merge branch 'main' into feat/chain-spec-mutator
Fahrrader Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 44 additions & 52 deletions javascript/packages/orchestrator/src/chainSpec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,64 +756,56 @@ export async function customizePlainRelayChain(
specPath: string,
networkSpec: ComputedNetwork,
): Promise<void> {
try {
// Relay-chain spec customization logic
const plainRelayChainSpec = readAndParseChainSpec(specPath);
const keyType = specHaveSessionsKeys(plainRelayChainSpec)
? "session"
: "aura";

// Clear all defaults
clearAuthorities(specPath);

// add balances for nodes
await addBalances(specPath, networkSpec.relaychain.nodes);

// add authorities for nodes
const validatorKeys = [];
for (const node of networkSpec.relaychain.nodes) {
if (node.validator) {
validatorKeys.push(node.accounts.sr_stash.address);

if (keyType === "session") {
const key = getNodeKey(node);
await addAuthority(specPath, node, key);
} else {
await addAuraAuthority(specPath, node.name, node.accounts!);
await addGrandpaAuthority(specPath, node.name, node.accounts!);
}

await addStaking(specPath, node);
// Relay-chain spec customization logic
const plainRelayChainSpec = readAndParseChainSpec(specPath);
const keyType = specHaveSessionsKeys(plainRelayChainSpec)
? "session"
: "aura";

// Clear all defaults
clearAuthorities(specPath);

// add balances for nodes
await addBalances(specPath, networkSpec.relaychain.nodes);

// add authorities for nodes
const validatorKeys = [];
for (const node of networkSpec.relaychain.nodes) {
if (node.validator) {
validatorKeys.push(node.accounts.sr_stash.address);

if (keyType === "session") {
const key = getNodeKey(node);
await addAuthority(specPath, node, key);
} else {
await addAuraAuthority(specPath, node.name, node.accounts!);
await addGrandpaAuthority(specPath, node.name, node.accounts!);
}
}

if (networkSpec.relaychain.randomNominatorsCount) {
await generateNominators(
specPath,
networkSpec.relaychain.randomNominatorsCount,
networkSpec.relaychain.maxNominations,
validatorKeys,
);
await addStaking(specPath, node);
}
}

if (networkSpec.relaychain.genesis) {
await changeGenesisConfig(specPath, networkSpec.relaychain.genesis);
}
if (networkSpec.relaychain.randomNominatorsCount) {
await generateNominators(
specPath,
networkSpec.relaychain.randomNominatorsCount,
networkSpec.relaychain.maxNominations,
validatorKeys,
);
}

if (networkSpec.hrmp_channels) {
await addHrmpChannelsToGenesis(specPath, networkSpec.hrmp_channels);
}
if (networkSpec.relaychain.genesis) {
await changeGenesisConfig(specPath, networkSpec.relaychain.genesis);
}

// modify the plain chain spec with any custom commands
for (const cmd of networkSpec.relaychain.chainSpecModifierCommands) {
await runCommandWithChainSpec(specPath, cmd, networkSpec.configBasePath);
}
} catch (err) {
Copy link
Author

@Fahrrader Fahrrader Apr 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding the last commit, I believe we shouldn't let the process go on if a step in chain spec customization has failed. By removing the try-catch structure from customizePlainRelayChain, the error would go into the spawn's try-catch structure where it would print it out, dump the logs and exit the process. This was the way it was done prior to displacement of the relay's plain chain spec customization to chainSpec.ts, too.

console.log(
`\n ${decorators.red("Unexpected error: ")} \t ${decorators.bright(
err,
)}\n`,
);
if (networkSpec.hrmp_channels) {
await addHrmpChannelsToGenesis(specPath, networkSpec.hrmp_channels);
}

// modify the plain chain spec with any custom commands
for (const cmd of networkSpec.relaychain.chainSpecModifierCommands) {
await runCommandWithChainSpec(specPath, cmd, networkSpec.configBasePath);
}
}
export default {
Expand Down