Merge pull request #335 from Concordium/limemloh/cor-2411-misc-tools-update-genesis-creator-to-use-sdk-genesis

Use genesis generate functionality from SDK

Author: limemloh

Cargo.lock

@@ -1,6 +1,6 @@
 use crate::api_types::ErrorDetail;
 use crate::types::{ServerError, ValidationError};
-use anyhow::{Context, Result};
+use anyhow::Result;
 use concordium_rust_sdk::common::cbor;
 use concordium_rust_sdk::common::cbor::CborSerialize;
 use concordium_rust_sdk::types::RegisteredData;
@@ -9,7 +9,7 @@ use std::collections::HashMap;
 pub fn anchor_to_registered_data(
     anchor: &impl CborSerialize,
 ) -> Result<RegisteredData, ServerError> {
-    let cbor = cbor::cbor_encode(anchor).context("cbor encode anchor")?;
+    let cbor = cbor::cbor_encode(anchor);
     let register_data =
         RegisteredData::try_from(cbor).map_err(ServerError::AnchorPublicInfoTooBig)?;
     Ok(register_data)

credential-verification-service/src/api/util.rs

@@ -46,10 +46,7 @@ async fn test_create_verification_request_and_verify() {
         verification_request.anchor_transaction_hash,
         fixtures::chain::transaction_status_finalized(
             verification_request.anchor_transaction_hash,
-            cbor::cbor_encode(&request_anchor)
-                .unwrap()
-                .try_into()
-                .unwrap(),
+            cbor::cbor_encode(&request_anchor).try_into().unwrap(),
         ),
     );
 

credential-verification-service/tests/integration_test_rest/create_verification_request_and_verify.rs

@@ -32,7 +32,6 @@ async fn test_verify_account_based() {
         fixtures::chain::transaction_status_finalized(
             verify_fixture.anchor_txn_hash,
             cbor::cbor_encode(&verify_fixture.anchor)
-                .unwrap()
                 .try_into()
                 .unwrap(),
         ),
@@ -93,7 +92,6 @@ async fn test_verify_identity_based() {
         fixtures::chain::transaction_status_finalized(
             verify_fixture.anchor_txn_hash,
             cbor::cbor_encode(&verify_fixture.anchor)
-                .unwrap()
                 .try_into()
                 .unwrap(),
         ),
@@ -143,7 +141,6 @@ async fn test_verify_anchor_status_committed() {
         fixtures::chain::transaction_status_committed(
             verify_fixture.anchor_txn_hash,
             cbor::cbor_encode(&verify_fixture.anchor)
-                .unwrap()
                 .try_into()
                 .unwrap(),
         ),
@@ -193,7 +190,6 @@ async fn test_verify_fail() {
         fixtures::chain::transaction_status_finalized(
             verify_fixture.anchor_txn_hash,
             cbor::cbor_encode(&verify_fixture.anchor)
-                .unwrap()
                 .try_into()
                 .unwrap(),
         ),
@@ -332,7 +328,6 @@ async fn test_verify_account_credential_not_found() {
         fixtures::chain::transaction_status_finalized(
             verify_fixture.anchor_txn_hash,
             cbor::cbor_encode(&verify_fixture.anchor)
-                .unwrap()
                 .try_into()
                 .unwrap(),
         ),
@@ -374,7 +369,6 @@ async fn test_verify_identity_based_multistatement_both_invalid() {
         fixtures::chain::transaction_status_finalized(
             verify_fixture.anchor_txn_hash,
             cbor::cbor_encode(&verify_fixture.anchor)
-                .unwrap()
                 .try_into()
                 .unwrap(),
         ),

credential-verification-service/tests/integration_test_rest/verify.rs

@@ -1021,7 +1021,7 @@ impl Generate for SponsoredTransactionGenerator {
             self.expiry,
             self.token_id.clone(),
             [operation].into_iter().collect(),
-        )?
+        )
         .extend()
         .add_sponsor(self.sponsor.address, 1)
         .expect("Can add sponsor account")

deps/concordium-rust-sdk

@@ -23,7 +23,6 @@ use concordium_rust_sdk::{
 use futures::{future, stream, StreamExt, TryStreamExt};
 use rand::{rngs::StdRng, seq::SliceRandom, Rng, SeedableRng};
 use rust_decimal::Decimal;
-use std::collections::HashMap;
 use std::{path::PathBuf, str::FromStr};
 
 #[derive(Debug, Args)]
@@ -212,7 +211,7 @@ impl PltOperationGenerator {
 
             async move {
                 let hash = client_clone
-                    .send_account_transaction(txn?)
+                    .send_account_transaction(txn)
                     .await
                     .context("send add allow list txn")?;
 
@@ -365,7 +364,7 @@ impl Generate for PltOperationGenerator {
             expiry,
             token_info.token_id.clone(),
             operations.into_iter().collect(),
-        )?;
+        );
 
         self.nonce.next_mut();
 
@@ -499,7 +498,6 @@ impl Generate for CreatePltGenerator {
             initial_supply: Some(self.initial_supply),
             mintable: Some(mint_burn),
             burnable: Some(mint_burn),
-            additional: HashMap::new(),
         };
 
         let create_plt = CreatePlt {
@@ -508,9 +506,7 @@ impl Generate for CreatePltGenerator {
                 "5c5c2645db84a7026d78f2501740f60a8ccb8fae5c166dc2428077fd9a699a4a",
             )?,
             decimals: Self::DECIMALS,
-            initialization_parameters: RawCbor::from(cbor::cbor_encode(
-                &initialization_parameters,
-            )?),
+            initialization_parameters: RawCbor::from(cbor::cbor_encode(&initialization_parameters)),
         };
 
         let payload = UpdatePayload::CreatePlt(create_plt);

generator/src/generator.rs

@@ -17,8 +17,6 @@ anyhow.workspace = true
 chrono = {workspace = true, features = ["serde"] }
 serde = { workspace = true, features = ["derive"] }
 rand.workspace = true
-ed25519-dalek.workspace = true
-gcd.workspace = true
-rayon.workspace = true
-sha2.workspace = true
+tracing.workspace = true
+tracing-subscriber = { workspace = true, features = ["fmt"] }
 

generator/src/plt.rs

@@ -2,7 +2,7 @@
 use concordium_rust_sdk::{common::SerdeDeserialize, id::types::AccountAddress};
 use std::path::PathBuf;
 
-use crate::config::ProtocolConfig;
+use crate::config::ProtocolConfigToml;
 
 /// Configuration struct for specifying protocol version, the genesis
 /// parameters, the foundation account and where to find genesis accounts,
@@ -13,7 +13,7 @@ use crate::config::ProtocolConfig;
 pub struct AssembleGenesisConfig {
     /// Protocol specific configurations.
     #[serde(flatten)]
-    pub protocol: ProtocolConfig,
+    pub protocol: ProtocolConfigToml,
     /// Address of the account to set as the initial foundation account.
     pub foundation_account: AccountAddress,
     /// A file with a list of accounts that should be assembled into