Merge pull request #104 from Concordium/web3id-revision

Web3id revision

examples/create-initial-accounts.rs

@@ -108,7 +108,7 @@ async fn main() -> anyhow::Result<()> {
                     )]
                     .into_iter()
                     .collect(),
-                    threshold: SignatureThreshold(1),
+                    threshold: SignatureThreshold::ONE,
                 };
                 let prf_key = SecretKey::<ArCurve>::generate_non_zero(&mut csprng);
                 let cred_id_exponent = prf_key.prf_exponent(0).expect("We were very unlucky.");

examples/v2_create_initial_accounts.rs

@@ -113,7 +113,7 @@ async fn main() -> anyhow::Result<()> {
                     )]
                     .into_iter()
                     .collect(),
-                    threshold: SignatureThreshold(1),
+                    threshold: SignatureThreshold::ONE,
                 };
                 let prf_key = SecretKey::<ArCurve>::generate_non_zero(&mut csprng);
                 let cred_id_exponent = prf_key.prf_exponent(0).expect("We were very unlucky.");

src/cis4.rs

@@ -13,7 +13,7 @@ use crate::{
 pub use concordium_base::{cis2_types::MetadataUrl, cis4_types::*};
 use concordium_base::{
     constants::MAX_PARAMETER_LEN,
-    contracts_common::{self, AccountAddress},
+    contracts_common,
     hashes::TransactionHash,
     smart_contracts::{ExceedsParameterSize, OwnedParameter},
     web3id::{CredentialHolderId, Web3IdSigner, REVOKE_DOMAIN_STRING},
@@ -43,6 +43,19 @@ impl From<RejectReason> for Cis4QueryError {
     fn from(value: RejectReason) -> Self { Self::NodeRejected(value) }
 }
 
+impl Cis4QueryError {
+    /// Check if the error variant is a logic error, i.e., the query
+    /// was received by the node which attempted to execute it, and it failed.
+    /// If so, extract the reason for execution failure.
+    pub fn is_contract_error(&self) -> Option<&crate::types::RejectReason> {
+        if let Self::NodeRejected(e) = self {
+            Some(e)
+        } else {
+            None
+        }
+    }
+}
+
 #[derive(thiserror::Error, Debug)]
 /// An error that can occur when sending CIS4 update transactions.
 pub enum Cis4TransactionError {
@@ -115,20 +128,20 @@ impl Cis4Contract {
         self.view_raw("revocationKeys", parameter, bi).await
     }
 
-    /// Look up the issuer's metadata URL.
-    pub async fn issuer_metadata(
+    /// Look up the credential registry's metadata.
+    pub async fn registry_metadata(
         &mut self,
         bi: impl IntoBlockIdentifier,
-    ) -> Result<MetadataUrl, Cis4QueryError> {
+    ) -> Result<RegistryMetadata, Cis4QueryError> {
         let parameter = OwnedParameter::empty();
-        self.view_raw("issuerMetadata", parameter, bi).await
+        self.view_raw("registryMetadata", parameter, bi).await
     }
 
-    /// Look up the issuer's account address.
-    pub async fn issuer_address(
+    /// Look up the issuer's public key.
+    pub async fn issuer(
         &mut self,
         bi: impl IntoBlockIdentifier,
-    ) -> Result<AccountAddress, Cis4QueryError> {
+    ) -> Result<IssuerKey, Cis4QueryError> {
         let parameter = OwnedParameter::empty();
 
         self.view_raw("issuer", parameter, bi).await
@@ -174,9 +187,9 @@ impl Cis4Contract {
             .await
     }
 
-    /// Revoke a credential as an issuer.
+    /// Revoke a credential as the holder.
     ///
-    /// The extra nonce that must be provided is the owner's nonce inside the
+    /// The extra nonce that must be provided is the holder's nonce inside the
     /// contract. The signature on this revocation message is set to expire at
     /// the same time as the transaction.
     pub async fn revoke_credential_as_holder(
@@ -218,12 +231,13 @@ impl Cis4Contract {
             .await
     }
 
-    /// Revoke a credential as a revoker.
+    /// Revoke a credential as another party, distinct from issuer or holder.
     ///
-    /// The extra nonce that must be provided is the owner's nonce inside the
-    /// contract. The signature on this revocation message is set to expire at
+    /// The extra nonce that must be provided is the nonce associated with the
+    /// key that signs the revocation message.
+    /// The signature on this revocation message is set to expire at
     /// the same time as the transaction.
-    pub async fn revoke_credential_as_revoker(
+    pub async fn revoke_credential_other(
         &mut self,
         signer: &impl transactions::ExactSizeTransactionSigner,
         metadata: &Cis4TransactionMetadata,
@@ -261,7 +275,7 @@ impl Cis4Contract {
         parameter_vec.extend_from_slice(&to_sign[REVOKE_DOMAIN_STRING.len()..]);
         let parameter = OwnedParameter::try_from(parameter_vec)?;
 
-        self.update_raw(signer, metadata, "revokeCredentialHolder", parameter)
+        self.update_raw(signer, metadata, "revokeCredentialOther", parameter)
             .await
     }
 }

src/types/mod.rs

@@ -2280,7 +2280,7 @@ impl WalletAccount {
             keys.insert(ci, public);
         }
         AccountAccessStructure {
-            threshold: AccountThreshold::try_from(self.keys.threshold.0).unwrap(),
+            threshold: self.keys.threshold,
             keys,
         }
     }

src/types/smart_contracts.rs

@@ -1,12 +1,12 @@
 //! Types related to smart contracts.
 
 use super::{Address, ContractAddress, Energy, RejectReason};
+pub use concordium_base::smart_contracts::*;
 use concordium_base::{
     common::{types::Amount, SerdeDeserialize, SerdeSerialize},
     id::types::AccountAddress,
     transactions::UpdateContractPayload,
 };
-pub use concordium_base::{constants::MAX_ALLOWED_INVOKE_ENERGY, smart_contracts::*};
 /// Re-export of common helper functionality for smart contract, such as types
 /// and serialization specific for smart contracts.
 pub use concordium_contracts_common::{

src/v2/conversions.rs

@@ -643,13 +643,8 @@ impl TryFrom<SignatureThreshold> for crate::id::types::SignatureThreshold {
 
     fn try_from(value: SignatureThreshold) -> Result<Self, Self::Error> {
         if let Ok(v) = u8::try_from(value.value) {
-            if v == 0 {
-                Err(tonic::Status::internal(
-                    "Unexpected zero signature threshold.",
-                ))
-            } else {
-                Ok(Self(v))
-            }
+            crate::id::types::SignatureThreshold::try_from(v)
+                .map_err(|_| tonic::Status::internal("Unexpected zero signature threshold."))
         } else {
             Err(tonic::Status::internal("Unexpected signature threshold."))
         }