Remove duplicate types and reexport from concordium-contracts-common

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "concordium-grpc-api"]
 	path = concordium-grpc-api
 	url = ../concordium-grpc-api.git
-[submodule "concordium-contracts-common"]
-	path = concordium-contracts-common
-	url = ../concordium-contracts-common.git

CHANGELOG.md

@@ -1,6 +1,14 @@
 ## Unreleased changes
 
 - Expose macros for deriving `Serial` and `Deserial` from `concordium-contracts-common`.
+- Address method `is_alias_of` is now `is_alias`.
+- Replaced `ReceiveName` and `InitName` with `OwnedReceiveName` and `OwnedContractName` from `concordium-contracts-common`.
+- Remove `ContractAddress` and `Address` in favor of their equivalents in `concordium-contracts-common`.
+- `AccountAddress::new` is renamed to `account_address_from_registration_id`.
+- `Amount` now have a field `micro_ccd` instead of `microgtu`.
+- The default arithmetic (operator syntax, such as `+`, `-`, `*`) with `Amount` is now unchecked.
+- There are no longer implementations of `From<u64> for Amount` and `From<Amount> for u64` as the behavior of these are not obvious.
+  Instead, the functions `Amount::from_micro_ccd` or `Amount::from_ccd` and the getter `micro_ccd` should be used instead.
 
 ## 1.1.0
 

Cargo.toml

@@ -37,7 +37,7 @@ ecvrf = { version = "*", path = "./concordium-base/rust-src/ecvrf" }
 aggregate_sig = { version = "*", path = "./concordium-base/rust-src/aggregate_sig" }
 encrypted_transfers = { version = "*", path = "./concordium-base/rust-src/encrypted_transfers" }
 eddsa_ed25519 = { version = "*", path = "./concordium-base/rust-src/eddsa_ed25519/" }
-concordium-contracts-common = { version = "*", path = "./concordium-contracts-common/concordium-contracts-common", features = ["derive-serde", "sdk"]}
+concordium-contracts-common = { version = "*", path = "./concordium-base/concordium-contracts-common/concordium-contracts-common", features = ["derive-serde", "sdk"]}
 random_oracle = { version = "*", path = "./concordium-base/rust-src/random_oracle/" }
 num-bigint = "0.4"
 num-traits = "0.2"

examples/aliases.rs

@@ -18,12 +18,7 @@ fn main() -> anyhow::Result<()> {
 
     if let Some((head, rest)) = app.addresses.split_first() {
         for addr in rest {
-            anyhow::ensure!(
-                addr.is_alias_of(head),
-                "{} is not an alias of {}.",
-                addr,
-                head
-            );
+            anyhow::ensure!(addr.is_alias(head), "{} is not an alias of {}.", addr, head);
         }
     }
 

examples/balance-summary.rs

@@ -1,7 +1,6 @@
 //! List accounts with the most liquid balance, and total stake, total amount,
 //! and total liquid amount of accounts. Additionally list contracts with at
 //! most CCD owned.
-use anyhow::Context;
 use clap::AppSettings;
 use concordium_rust_sdk::{endpoints, types::hashes::BlockHash};
 use crypto_common::types::Amount;
@@ -110,43 +109,37 @@ async fn main() -> anyhow::Result<()> {
                 let info = client.get_account_info(acc, &block).await?;
                 let additional_stake = info
                     .account_stake
-                    .map_or(Amount::from(0), |baker_delegator| {
+                    .map_or(Amount::zero(), |baker_delegator| {
                         baker_delegator.staked_amount()
                     });
-                let additional_liquid_amount = info.account_amount.microccd
-                    - std::cmp::max(
-                        additional_stake.microccd,
-                        info.account_release_schedule.total.microccd,
-                    );
+                let additional_liquid_amount = info.account_amount
+                    - std::cmp::max(additional_stake, info.account_release_schedule.total);
                 Ok::<_, anyhow::Error>((
                     acc,
                     additional_stake,
                     info.account_amount,
                     info.account_release_schedule.total,
-                    Amount::from(additional_liquid_amount),
+                    additional_liquid_amount,
                 ))
             }
         },
         app.num,
     )
     .await;
     let mut out = Vec::new();
-    let mut staked_amount: Amount = 0.into();
-    let mut total_amount: Amount = 0.into();
-    let mut locked_amount: Amount = 0.into();
-    let mut liquid_amount: Amount = 0.into();
+    let mut staked_amount = Amount::zero();
+    let mut total_amount = Amount::zero();
+    let mut locked_amount = Amount::zero();
+    let mut liquid_amount = Amount::zero();
 
     while let Some(res) = receiver.recv().await {
         let (acc, additional_stake, additional_amount, additional_scheduled, additional_liquid) =
             res?;
-        staked_amount = (staked_amount + additional_stake)
-            .context("Total staked amount exceeds u64. This should not happen.")?;
-        total_amount = (total_amount + additional_amount)
-            .context("Total amount exceeds u64. This should not happen.")?;
-        locked_amount = (locked_amount + additional_scheduled)
-            .context("Total amount exceeds u64. This should not happen.")?;
-        liquid_amount = (liquid_amount + additional_liquid)
-            .context("Total amount exceeds u64. This should not happen.")?;
+        staked_amount += additional_stake;
+        total_amount += additional_amount;
+        locked_amount += additional_scheduled;
+        liquid_amount += additional_liquid;
+
         out.push((acc, additional_liquid, additional_amount));
     }
 
@@ -168,7 +161,7 @@ async fn main() -> anyhow::Result<()> {
     }
 
     // Now also handle contracts.
-    let mut total_contract_amount = Amount::from(0);
+    let mut total_contract_amount = Amount::zero();
     let contracts = client.get_instances(&block).await?;
     let mut cout = Vec::new();
     for ccs in contracts.chunks(app.num).map(Vec::from) {
@@ -182,8 +175,8 @@ async fn main() -> anyhow::Result<()> {
         }
         for res in futures::future::join_all(handles).await {
             let (addr, info) = res??;
-            total_contract_amount = (total_contract_amount + info.amount())
-                .context("Total amount exceeds u64. This should not happen.")?;
+            total_contract_amount += info.amount();
+
             cout.push((addr, info));
         }
     }
@@ -192,7 +185,7 @@ async fn main() -> anyhow::Result<()> {
     for (addr, info) in cout.iter().take(20) {
         println!(
             "{}: at <{}, {}> owns {}",
-            <&str as From<_>>::from(info.name()),
+            info.name().as_contract_name().get_chain_name(),
             addr.index,
             addr.subindex,
             info.amount()

examples/collisions.rs

@@ -31,8 +31,11 @@ async fn main() -> anyhow::Result<()> {
     println!("There are {} accounts.", bi.len());
     for i in 0..32 {
         let mut tmp = bi.clone();
-        let compare =
-            |l: &AccountAddress, r: &AccountAddress| l.as_ref()[0..i].cmp(&r.as_ref()[0..i]);
+        let compare = |l: &AccountAddress, r: &AccountAddress| {
+            let l_bytes: &[u8] = l.as_ref();
+            let r_bytes: &[u8] = r.as_ref();
+            l_bytes[0..i].cmp(&r_bytes[0..i])
+        };
         tmp.sort_by(compare);
         tmp.dedup_by(|l, r| compare(l, r).is_eq());
         if tmp.len() < bi.len() {

examples/create-initial-accounts.rs

@@ -14,16 +14,18 @@ use concordium_rust_sdk::{
         curve_arithmetic::Curve,
         dodis_yampolskiy_prf::SecretKey,
         types::{
-            AccountAddress, AccountCredential, AccountCredentialMessage, AccountKeys,
-            AttributeList, CredentialData, CredentialPublicKeys, IpData, PublicCredentialData,
+            AccountCredential, AccountCredentialMessage, AccountKeys, AttributeList,
+            CredentialData, CredentialPublicKeys, IpData, PublicCredentialData,
             PublicInformationForIp, SignatureThreshold, YearMonth,
         },
     },
     types::transactions::{BlockItem, Payload},
 };
 use id::{
-    constants::AttributeKind, curve_arithmetic::Value, pedersen_commitment::Randomness,
-    types::AttributeTag,
+    constants::AttributeKind,
+    curve_arithmetic::Value,
+    pedersen_commitment::Randomness,
+    types::{account_address_from_registration_id, AttributeTag},
 };
 use rand::thread_rng;
 use std::path::PathBuf;
@@ -127,7 +129,7 @@ async fn main() -> anyhow::Result<()> {
                         threshold: cdata.get_threshold(),
                     },
                 };
-                let address = AccountAddress::new(&pub_info_for_ip.reg_id);
+                let address = account_address_from_registration_id(&pub_info_for_ip.reg_id);
                 let icdi = id::identity_provider::create_initial_cdi(
                     &ip_data.public_ip_info,
                     pub_info_for_ip,

examples/generator.rs

@@ -1,7 +1,10 @@
 use anyhow::Context;
 use clap::AppSettings;
 use concordium_rust_sdk::{
-    common::{types::TransactionTime, SerdeDeserialize, SerdeSerialize},
+    common::{
+        types::{Amount, TransactionTime},
+        SerdeDeserialize, SerdeSerialize,
+    },
     endpoints,
     id::types::{AccountAddress, AccountKeys},
     types::{
@@ -90,7 +93,7 @@ async fn main() -> anyhow::Result<()> {
                 nonce,
                 expiry,
                 accounts[count % accounts.len()],
-                0.into(),
+                Amount::zero(),
             );
             nonce.next_mut();
             count += 1;

examples/list-account-balances.rs

@@ -83,9 +83,9 @@ async fn main() -> anyhow::Result<()> {
     let total_accounts = accounts.len();
     let mut num_bakers = 0;
     let mut num_initial = 0;
-    let mut total_staked_amount: Amount = 0.into();
-    let mut total_delegated_amount: Amount = 0.into();
-    let mut total_amount: Amount = 0.into();
+    let mut total_staked_amount = Amount::zero();
+    let mut total_delegated_amount = Amount::zero();
+    let mut total_amount = Amount::zero();
 
     let mut acc_balances = Vec::with_capacity(accounts.len());
     for accs in accounts.chunks(app.num).map(Vec::from) {
@@ -107,22 +107,20 @@ async fn main() -> anyhow::Result<()> {
                 match account_stake {
                     AccountStakingInfo::Baker { staked_amount, .. } => {
                         num_bakers += 1;
-                        total_staked_amount = (total_staked_amount + staked_amount)
-                            .context("Total staked amount exceeds u64. This should not happen.")?;
+                        total_staked_amount += staked_amount;
                         true
                     }
                     AccountStakingInfo::Delegated { staked_amount, .. } => {
-                        total_delegated_amount = (total_delegated_amount + staked_amount)
-                            .context("Total staked amount exceeds u64. This should not happen.")?;
+                        total_delegated_amount += staked_amount;
+
                         false
                     }
                 }
             } else {
                 false
             };
 
-            total_amount = (total_amount + info.account_amount)
-                .context("Total amount exceeds u64. This should not happen.")?;
+            total_amount += info.account_amount;
 
             let acc_type =
                 info.account_credentials
@@ -168,12 +166,12 @@ async fn main() -> anyhow::Result<()> {
     println!(
         "Total amount of staked CCD is {}, which amounts to {:.2}%.",
         total_staked_amount,
-        (u64::from(total_staked_amount) as f64 / u64::from(total_amount) as f64) * 100f64
+        (total_staked_amount.micro_ccd() as f64 / total_amount.micro_ccd() as f64) * 100f64
     );
     println!(
         "Total amount of delegated CCD is {}, which amounts to {:.2}%.",
         total_delegated_amount,
-        (u64::from(total_delegated_amount) as f64 / u64::from(total_amount) as f64) * 100f64
+        (total_delegated_amount.micro_ccd() as f64 / total_amount.micro_ccd() as f64) * 100f64
     );
 
     Ok(())

examples/postgres.rs

@@ -44,11 +44,9 @@ async fn main() -> anyhow::Result<()> {
     .await;
 
     let rows = db
-        .query_contract(
-            ContractAddress::new(0.into(), 0.into()),
-            20,
-            QueryOrder::Ascending { start: None },
-        )
+        .query_contract(ContractAddress::new(0, 0), 20, QueryOrder::Ascending {
+            start: None,
+        })
         .await?;
     rows.for_each(|entry| async move {
         println!("{:?}", entry);
@@ -64,11 +62,9 @@ async fn main() -> anyhow::Result<()> {
     .await;
 
     let rows = db
-        .query_contract(
-            ContractAddress::new(0.into(), 0.into()),
-            20,
-            QueryOrder::Descending { start: None },
-        )
+        .query_contract(ContractAddress::new(0, 0), 20, QueryOrder::Descending {
+            start: None,
+        })
         .await?;
     rows.for_each(|entry| async move {
         println!("{:?}", entry);

examples/total-stake.rs

@@ -53,9 +53,9 @@ async fn main() -> anyhow::Result<()> {
         } = pool
         {
             active_bakers += 1;
-            equity += u64::from(current_payday_status.baker_equity_capital);
-            delegated += u64::from(current_payday_status.delegated_capital);
-            effective += u64::from(current_payday_status.effective_stake);
+            equity += current_payday_status.baker_equity_capital.micro_ccd();
+            delegated += current_payday_status.delegated_capital.micro_ccd();
+            effective += current_payday_status.effective_stake.micro_ccd();
         }
     }
     println!("There are {} bakers.", active_bakers);
@@ -67,7 +67,10 @@ async fn main() -> anyhow::Result<()> {
         "Total equity capital is {} CCD",
         Amount::from_micro_ccd(equity)
     );
-    println!("Total delegated stake is {} CCD", Amount::from(delegated));
+    println!(
+        "Total delegated stake is {} CCD",
+        Amount::from_micro_ccd(delegated)
+    );
 
     Ok(())
 }