Skip to content

fix(orchestrator): set undying/adder collators not validators by default #1247

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

Merged
pepoviola merged 5 commits into from
Aug 16, 2023
Merged

fix(orchestrator): set undying/adder collators not validators by default #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
853c74c
fix(orchestrator): set undying/adder collators not validators by default
pepoviola Aug 15, 2023
e6d914d
fmt
pepoviola Aug 15, 2023
b6af0e6
fix cmd generator for undying/adder collators
pepoviola Aug 15, 2023
38d77b1
fmt cmdGenerator
pepoviola Aug 16, 2023
c2c8ffb
better comments about ternary
pepoviola Aug 16, 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
2 changes: 1 addition & 1 deletion javascript/packages/orchestrator/src/cmdGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export async function genCmd(
const parachainIdArgIndex = args.findIndex((arg) =>
arg.includes("--parachain-id"),
);
args.splice(parachainIdArgIndex, 1);
if (parachainIdArgIndex >= 0) args.splice(parachainIdArgIndex, 1);
args.push(`--parachain-id ${parachainId}`);
}

Expand Down
12 changes: 11 additions & 1 deletion javascript/packages/orchestrator/src/configGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,11 +529,21 @@ async function getCollatorNodeFromConfig(
const ports = await getPorts(provider, collatorConfig);
const externalPorts = await getExternalPorts(provider, ports, collatorConfig);

// IFF the collator have explicit set the validator field we use that value,
// if not we set by default cumulus collators as `validators`, this implies that we will
// run those with this flag `--collator`.
const isValidator =
collatorConfig.validator !== undefined
? collatorConfig.validator
: cumulusBased
? true
: false;

const node: Node = {
name: collatorName,
key: getSha256(collatorName),
accounts: accountsForNode,
validator: collatorConfig.validator !== false ? true : false, // --collator and --force-authoring by default
validator: isValidator,
invulnerable: collatorConfig.invulnerable,
balance: collatorConfig.balance,
image: collatorConfig.image || DEFAULT_COLLATOR_IMAGE,
Expand Down