Merge pull request #131 from Concordium/protocol-p7

Support genesis generation for protocol version 7
Concordium · Dec 15, 2023 · 6421dca · 6421dca
2 parents 8499659 + fb7ce19
commit 6421dca
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 10 deletions.
diff --git a/chain-prometheus-exporter/Cargo.lock b/chain-prometheus-exporter/Cargo.lock
diff --git a/deps/concordium-rust-sdk b/deps/concordium-rust-sdk
diff --git a/generator/Cargo.lock b/generator/Cargo.lock
diff --git a/genesis-creator/CHANGELOG.md b/genesis-creator/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- Support genesis data format of protocol version 7.
+
 ## 0.2.0
 
 - Support genesis data format of protocol version 6.

diff --git a/genesis-creator/Cargo.lock b/genesis-creator/Cargo.lock
diff --git a/genesis-creator/src/config.rs b/genesis-creator/src/config.rs
@@ -250,6 +250,10 @@ pub enum ProtocolConfig {
     P6 {
         parameters: GenesisParametersConfigV1,
     },
+    #[serde(rename = "7")]
+    P7 {
+        parameters: GenesisParametersConfigV1,
+    },
 }
 
 impl ProtocolConfig {
@@ -261,6 +265,7 @@ impl ProtocolConfig {
             ProtocolConfig::P4 { .. } => ProtocolVersion::P4,
             ProtocolConfig::P5 { .. } => ProtocolVersion::P5,
             ProtocolConfig::P6 { .. } => ProtocolVersion::P6,
+            ProtocolConfig::P7 { .. } => ProtocolVersion::P7,
         }
     }
 }
diff --git a/genesis-creator/src/genesis.rs b/genesis-creator/src/genesis.rs
@@ -594,6 +594,10 @@ pub enum GenesisData {
         core:          CoreGenesisParametersV1,
         initial_state: GenesisStateCPV2,
     },
+    P7 {
+        core:          CoreGenesisParametersV1,
+        initial_state: GenesisStateCPV2,
+    },
 }
 
 impl GenesisData {
@@ -661,6 +665,16 @@ impl GenesisData {
                 core.serial(&mut hasher);
                 initial_state.serial(&mut hasher);
             }
+            GenesisData::P7 {
+                core,
+                initial_state,
+            } => {
+                ProtocolVersion::P7.serial(&mut hasher);
+                // tag of initial genesis
+                0u8.serial(&mut hasher);
+                core.serial(&mut hasher);
+                initial_state.serial(&mut hasher);
+            }
         }
         let bytes: [u8; 32] = hasher.finalize().into();
         bytes.into()
@@ -688,6 +702,7 @@ pub fn make_genesis_data_cpv0(
         ProtocolVersion::P4 => None,
         ProtocolVersion::P5 => None,
         ProtocolVersion::P6 => None,
+        ProtocolVersion::P7 => None,
     }
 }
 
@@ -755,6 +770,16 @@ impl Serial for GenesisData {
                 core.serial(out);
                 initial_state.serial(out)
             }
+            GenesisData::P7 {
+                core,
+                initial_state,
+            } => {
+                9u8.serial(out);
+                // tag of initial genesis
+                0u8.serial(out);
+                core.serial(out);
+                initial_state.serial(out)
+            }
         }
     }
 }
diff --git a/genesis-creator/src/lib.rs b/genesis-creator/src/lib.rs
@@ -971,7 +971,7 @@ pub fn handle_assemble(config_path: &Path, verbose: bool) -> anyhow::Result<()>
                 }
             }
         }
-        ProtocolConfig::P6 { parameters } => {
+        ProtocolConfig::P6 { parameters } | ProtocolConfig::P7 { parameters } => {
             let update_keys = read_json(&make_relative(config_path, &config.governance_keys)?)?;
 
             let initial_state = GenesisStateCPV2 {
@@ -983,9 +983,17 @@ pub fn handle_assemble(config_path: &Path, verbose: bool) -> anyhow::Result<()>
                 leadership_election_nonce: parameters.leadership_election_nonce,
                 accounts,
             };
-            GenesisData::P6 {
-                core: parameters.core.try_into()?,
-                initial_state,
+            let core = parameters.core.try_into()?;
+            match protocol_version {
+                ProtocolVersion::P6 => GenesisData::P6 {
+                    core,
+                    initial_state,
+                },
+                ProtocolVersion::P7 => GenesisData::P7 {
+                    core,
+                    initial_state,
+                },
+                _ => unreachable!("Already checked."),
             }
         }
     };
@@ -1189,7 +1197,7 @@ pub fn handle_generate(config_path: &Path, verbose: bool) -> anyhow::Result<()>
                 }
             }
         }
-        ProtocolConfig::P6 { parameters } => {
+        ProtocolConfig::P6 { parameters } | ProtocolConfig::P7 { parameters } => {
             let update_keys = updates_v1(config.out.update_keys, config.updates)?;
 
             let initial_state = GenesisStateCPV2 {
@@ -1201,9 +1209,17 @@ pub fn handle_generate(config_path: &Path, verbose: bool) -> anyhow::Result<()>
                 leadership_election_nonce: parameters.leadership_election_nonce,
                 accounts,
             };
-            GenesisData::P6 {
-                core: parameters.core.try_into()?,
-                initial_state,
+            let core = parameters.core.try_into()?;
+            match protocol_version {
+                ProtocolVersion::P6 => GenesisData::P6 {
+                    core,
+                    initial_state,
+                },
+                ProtocolVersion::P7 => GenesisData::P7 {
+                    core,
+                    initial_state,
+                },
+                _ => unreachable!("Already checked."),
             }
         }
     };

diff --git a/id-verifier/Cargo.lock b/id-verifier/Cargo.lock
diff --git a/kpi-tracker/Cargo.lock b/kpi-tracker/Cargo.lock
diff --git a/recover-id-object/Cargo.lock b/recover-id-object/Cargo.lock
diff --git a/state-compare/Cargo.lock b/state-compare/Cargo.lock
+8 −1		CHANGELOG.md
+1 −0		Cargo.toml
+1 −1		concordium-base
+0 −1		examples/balance-summary.rs
+0 −1		examples/list-account-balances.rs
+29 −69		examples/list-account-creations.rs
+31 −72		examples/list-all-transactions.rs
+34 −55		examples/list-number-account-transactions.rs
+2 −2		examples/v2_banpeers.rs
+1 −2		examples/v2_get_block_transaction_events.rs
+613 −0		src/indexer.rs
+2 −0		src/lib.rs
+181 −2		src/types/mod.rs
+2 −0		src/v2/conversions.rs
+6 −11		src/v2/generated/concordium.v2.rs
+37 −8		src/v2/mod.rs
+1 −1		src/v2/proto_schema_version.rs