Merge pull request #376 from Concordium/fix-decode-cbor-rbac

fix: update base reference, update to decode cbor for token authoriza…

Author: squirer

Cargo.toml

@@ -9,6 +9,7 @@ readme = "README.md"
 include = ["src/", "examples/", "CHANGELOG.md"]
 description = "An SDK to use the Concordium blockchain."
 repository = "https://github.com/Concordium/concordium-rust-sdk"
+resolver = "3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

concordium-base

@@ -1028,7 +1028,6 @@ mod tests {
                 mintable: None,
                 burnable: None,
                 paused,
-                additional: HashMap::new(),
             }
         }
 
@@ -1042,7 +1041,6 @@ mod tests {
                 .then_some(TokenModuleAccountState {
                     allow_list,
                     deny_list,
-                    additional: HashMap::new(),
                 })
                 .map(|s| cbor::cbor_encode(&s).into());
 

src/protocol_level_tokens/token_client.rs

@@ -18,20 +18,21 @@ use crate::{
         CredentialRegistrationID, Energy, Memo, Nonce, RegisteredData, SpecialTransactionOutcome,
         TransactionStatus, UpdateSequenceNumber,
     },
-    v2::generated::plt::TokenAuthorizations,
 };
 use anyhow::Context;
 use concordium_base::{
     base::{AccountIndex, BlockHeight, Epoch, GenesisIndex},
     common::{
         self,
+        cbor::cbor_decode,
         types::{TransactionSignature, TransactionSignaturesV1, TransactionTime},
     },
     contracts_common::{
         AccountAddress, AccountAddressParseError, Amount, ContractAddress, OwnedContractName,
         OwnedParameter, OwnedReceiveName, ReceiveName,
     },
     hashes::HashFromStrError,
+    protocol_level_tokens::TokenAuthorizations,
     transactions::{BlockItem, EncodedPayload, PayloadLike},
 };
 pub use endpoints::{QueryError, QueryResult, RPCError, RPCResult};
@@ -2042,7 +2043,16 @@ impl Client {
 
         let response = self.client.get_token_authorizations(request).await?;
 
-        Ok(response.into_inner())
+        let cbor_enc_token_authorizations = response.into_inner();
+
+        let details = cbor_enc_token_authorizations
+            .details
+            .ok_or_else(|| tonic::Status::internal("missing CBOR details"))?;
+
+        let decoded_token_authorizations = cbor_decode::<TokenAuthorizations>(&details.value)
+            .map_err(|e| RPCError::ParseError(e.into()))?;
+
+        Ok(decoded_token_authorizations)
     }
 
     /// Get the block items included in a given block.