Add support for Aventus chains and allow force decorating relay chainspec (useful for solo chains)

javascript/packages/orchestrator/src/chain-decorators/aventus.ts

@@ -0,0 +1,28 @@
+import { Node } from "../sharedTypes";
+
+// Aventus genesis node key type
+export type GenesisNodeKey = [string, string, { [key: string]: string }];
+
+export function getNodeKey(node: Node, useStash = true): GenesisNodeKey {
+  const { sr_stash, sr_account, ed_account } = node.accounts;
+
+  const address = useStash ? sr_stash.address : sr_account.address;
+
+  const key: GenesisNodeKey = [
+    address,
+    address,
+    {
+      aura: sr_account.address,
+      grandpa: ed_account.address,
+      authority_discovery: sr_account.address,
+      im_online: sr_account.address,
+      avn: sr_account.address,
+    },
+  ];
+
+  return key;
+}
+
+export default {
+  getNodeKey,
+};

javascript/packages/orchestrator/src/chain-decorators/index.ts

@@ -12,6 +12,7 @@
   GenericEvm = "generic_evm",
   LocalV = "local_v",
   MainnetLocalV = "mainnet_local_v",
+  Aventus = "aventus",
 }
 
 interface Decorator {
@@ -31,6 +32,7 @@
 import moonbeam from "./moonbeam";
 import oak from "./oak";
 import generic_evm from "./generic-evm";
+import aventus from "./aventus";
 
 function whichChain(chain_name: string, force_decorator?: string): CHAIN {
   const chain = force_decorator ? force_decorator : chain_name;
@@ -47,9 +49,15 @@
   if (/local-v/.test(chain)) return CHAIN.LocalV;
   if (/mainnet-local-v/.test(chain)) return CHAIN.MainnetLocalV;
   if (/generic-evm/.test(chain)) return CHAIN.GenericEvm;
+  if (/vow-net|avn-chain/.test(chain)) return CHAIN.Aventus;
 
   return CHAIN.Generic;
 }
+const aventusDecorators: Decorator = Object.keys(aventus).reduce(
+  (memo, fn) => {
+    memo[fn] = (aventus as Decorator)[fn];
+  return memo;
+}, Object.create({}));
 
 const moonbeamDecorators: Decorator = Object.keys(moonbeam).reduce(
   (memo, fn) => {
@@ -136,6 +144,7 @@
   mainnet_local_v: MainnetLocalVDecorators,
   generic: {},
   generic_evm: GenericEvmDecorators,
+  aventus: aventusDecorators,
 };
 
 function decorate(chain: CHAIN, fns: Function[]) {

javascript/packages/orchestrator/src/chainSpec.ts

@@ -756,7 +756,7 @@
         validatorKeys.push(node.accounts.sr_stash.address);
 
         if (keyType === "session") {
-          const chain = whichChain(networkSpec.relaychain.chain);
+          const chain = whichChain(networkSpec.relaychain.chain, networkSpec.relaychain.force_decorator);
           const [decoratedGetNodeKey] = decorate(chain, [getNodeKey]);
           const key = decoratedGetNodeKey(node);
           await addAuthority(specPath, node, key);

javascript/packages/orchestrator/src/configGenerator.ts

@@ -126,6 +126,7 @@ export async function generateNetworkSpec(
         config.relaychain?.max_nominations || DEFAULT_MAX_NOMINATIONS,
       nodes: [],
       chain: config.relaychain.chain || DEFAULT_CHAIN,
+      force_decorator: config.relaychain.force_decorator,
       overrides: globalOverrides,
       defaultResources: config.relaychain.default_resources,
       defaultPrometheusPrefix:

javascript/packages/orchestrator/src/configTypes.ts

@@ -35,6 +35,7 @@ export interface RelayChainConfig {
   default_substrate_cli_args_version?: SubstrateCliArgsVersion;
   default_keystore_key_types?: string[];
   chain: string;
+  force_decorator?: string;
   chain_spec_path?: string;
   chain_spec_command?: string;
   default_args?: string[];
@@ -66,6 +67,7 @@ export interface ComputedNetwork {
     genesis?: JSON | ObjectJSON;
     defaultResources?: Resources;
     delayNetworkSettings?: DelayNetworkSettings;
+    force_decorator?: string;
   };
   parachains: Parachain[];
   types: any;