feat: replace BaseWallet with BaseWallet2

aries/agents/rust/mediator/src/aries_agent/client/mod.rs

@@ -39,7 +39,7 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         oob_invite: OOBInvitation,
     ) -> Result<(InviteeConnection<ClientRequestSent>, EncryptionEnvelope), String> {
         // Generate keys
-        let (pw_did, pw_vk) = self
+        let did_data = self
             .wallet
             .create_and_store_my_did(None, None)
             .await
@@ -48,7 +48,10 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         let mock_ledger = MockLedger {}; // not good. to be dealt later
         let client_conn = InviteeConnection::<ClientInit>::new_invitee(
             "foo".into(),
-            PairwiseInfo { pw_did, pw_vk },
+            PairwiseInfo {
+                pw_did: did_data.did().into(),
+                pw_vk: did_data.verkey().base58(),
+            },
         )
         .accept_invitation(&mock_ledger, AnyInvitation::Oob(oob_invite.clone()))
         .await

aries/agents/rust/mediator/src/aries_agent/mod.rs

@@ -92,12 +92,12 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         routing_keys: Vec<String>,
         service_endpoint: url::Url,
     ) -> Result<(), AriesVcxCoreError> {
-        let (_, vk) = self.wallet.create_and_store_my_did(None, None).await?;
+        let did_data = self.wallet.create_and_store_my_did(None, None).await?;
         let service = AriesService {
             id: "#inline".to_owned(),
             type_: "did-communication".to_owned(),
             priority: 0,
-            recipient_keys: vec![vk],
+            recipient_keys: vec![did_data.verkey().base58()],
             routing_keys,
             service_endpoint,
         };
@@ -170,7 +170,7 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
             .thread
             .map(|t| t.thid)
             .unwrap_or(request.id);
-        let (did, vk) = self
+        let did_data = self
             .wallet
             .create_and_store_my_did(None, None)
             .await
@@ -188,8 +188,8 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
             self.wallet.as_ref(),
             thread_id,
             old_vk.clone(),
-            did,
-            vk.clone(),
+            did_data.did().into(),
+            did_data.verkey().base58(),
             self.service.as_ref().unwrap().service_endpoint.clone(),
             self.service.as_ref().unwrap().routing_keys.clone(),
         )
@@ -209,7 +209,8 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         let auth_pubkey = their_keys
             .first()
             .ok_or("No recipient key for client :/ ?".to_owned())?;
-        self.create_account(auth_pubkey, &vk, &their_diddoc).await?;
+        self.create_account(auth_pubkey, &did_data.verkey().base58(), &their_diddoc)
+            .await?;
         Ok(packed_response_envelope)
     }
 

aries/agents/rust/mediator/src/didcomm_handlers/connection.rs

@@ -1,3 +1,4 @@
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::connection::Connection;
 
 use super::{unhandled_aries_message, utils::prelude::*, ArcAgent};

aries/agents/rust/mediator/src/didcomm_handlers/forward.rs

@@ -1,3 +1,4 @@
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::{notification::ack::Ack, routing::Forward};
 
 use super::{utils::prelude::*, ArcAgent};

aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs

@@ -1,3 +1,4 @@
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::coordinate_mediation::{
     CoordinateMediation, MediateGrant, MediateGrantContent, MediateGrantDecorators,
 };

aries/agents/rust/mediator/src/didcomm_handlers/mod.rs

@@ -1,5 +1,6 @@
 use std::fmt::Debug;
 
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use axum::{body::Bytes, extract::State, Json};
 use messages::AriesMessage;
 use serde::{Deserialize, Serialize};

aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs

@@ -1,3 +1,4 @@
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::pickup::Pickup;
 
 use super::utils::prelude::*;

aries/agents/rust/mediator/tests/mediator-coord-protocol.rs

@@ -1,6 +1,6 @@
 mod common;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use aries_vcx_core::wallet::base_wallet::DidWallet;
 use messages::{
     msg_fields::protocols::coordinate_mediation::{
         keylist_update::{KeylistUpdateItem, KeylistUpdateItemAction},
@@ -69,14 +69,14 @@ async fn test_mediate_keylist_update_add() -> Result<()> {
     let (agent, mut aries_transport, our_verkey, their_diddoc) =
         gen_mediator_connected_agent().await?;
     // prepare request message
-    let (_, new_vk) = agent
+    let did_data = agent
         .get_wallet_ref()
         .create_and_store_my_did(None, None)
         .await?;
     let keylist_update_request = KeylistUpdate::builder()
         .content(KeylistUpdateContent {
             updates: vec![KeylistUpdateItem {
-                recipient_key: new_vk,
+                recipient_key: did_data.verkey().base58(),
                 action: KeylistUpdateItemAction::Add,
             }],
         })
@@ -120,14 +120,14 @@ async fn test_mediate_keylist_query() -> Result<()> {
     let (agent, mut aries_transport, our_verkey, their_diddoc) =
         gen_mediator_connected_agent().await?;
     // prepare request message: add key
-    let (_, new_vk) = agent
+    let did_data = agent
         .get_wallet_ref()
         .create_and_store_my_did(None, None)
         .await?;
     let keylist_update_request = KeylistUpdate::builder()
         .content(KeylistUpdateContent {
             updates: vec![KeylistUpdateItem {
-                recipient_key: new_vk,
+                recipient_key: did_data.verkey().base58(),
                 action: KeylistUpdateItemAction::Add,
             }],
         })
@@ -188,14 +188,14 @@ async fn test_mediate_keylist_update_remove() -> Result<()> {
     let (agent, mut aries_transport, our_verkey, their_diddoc) =
         gen_mediator_connected_agent().await?;
     // prepare request message: add key
-    let (_, new_vk) = agent
+    let did_data = agent
         .get_wallet_ref()
         .create_and_store_my_did(None, None)
         .await?;
     let keylist_update_request = KeylistUpdate::builder()
         .content(KeylistUpdateContent {
             updates: vec![KeylistUpdateItem {
-                recipient_key: new_vk.clone(),
+                recipient_key: did_data.verkey().base58(),
                 action: KeylistUpdateItemAction::Add,
             }],
         })
@@ -220,7 +220,7 @@ async fn test_mediate_keylist_update_remove() -> Result<()> {
     let keylist_update_request = KeylistUpdate::builder()
         .content(KeylistUpdateContent {
             updates: vec![KeylistUpdateItem {
-                recipient_key: new_vk,
+                recipient_key: did_data.verkey().base58(),
                 action: KeylistUpdateItemAction::Remove,
             }],
         })

aries/aries_vcx/src/common/keys.rs

@@ -42,19 +42,16 @@ pub async fn rotate_verkey_apply(
         ));
     }
 
-    wallet
-        .replace_did_keys_apply(did)
-        .await
-        .map_err(|err| err.into())
+    Ok(wallet.replace_did_key_apply(did).await?)
 }
 
 pub async fn rotate_verkey(
     wallet: &impl BaseWallet,
     indy_ledger_write: &impl IndyLedgerWrite,
     did: &str,
 ) -> VcxResult<()> {
-    let trustee_temp_verkey = wallet.replace_did_keys_start(did).await?;
-    rotate_verkey_apply(wallet, indy_ledger_write, did, &trustee_temp_verkey).await
+    let trustee_verkey = wallet.replace_did_key_start(did, None).await?;
+    rotate_verkey_apply(wallet, indy_ledger_write, did, &trustee_verkey.base58()).await
 }
 
 pub async fn get_verkey_from_ledger(

aries/aries_vcx/src/common/ledger/transactions.rs

@@ -83,14 +83,21 @@ pub async fn add_new_did(
     submitter_did: &str,
     role: Option<&str>,
 ) -> VcxResult<(String, String)> {
-    let (did, verkey) = wallet.create_and_store_my_did(None, None).await?;
+    let did_data = wallet.create_and_store_my_did(None, None).await?;
 
     let res = indy_ledger_write
-        .publish_nym(wallet, submitter_did, &did, Some(&verkey), None, role)
+        .publish_nym(
+            wallet,
+            submitter_did,
+            did_data.did(),
+            Some(&did_data.verkey().base58()),
+            None,
+            role,
+        )
         .await?;
     check_response(&res)?;
 
-    Ok((did, verkey))
+    Ok((did_data.did().into(), did_data.verkey().base58()))
 }
 
 pub async fn get_service(ledger: &impl IndyLedgerRead, did: &String) -> VcxResult<AriesService> {

aries/aries_vcx/src/common/signing.rs

@@ -4,6 +4,7 @@ use messages::msg_fields::protocols::connection::{
     response::{ConnectionSignature, ResponseContent},
     ConnectionData,
 };
+use public_key::{Key, KeyType};
 use time;
 
 use crate::{errors::error::prelude::*, utils::base64::URL_SAFE_LENIENT};
@@ -27,7 +28,9 @@ async fn get_signature_data(
     let mut sig_data = now.to_be_bytes().to_vec();
     sig_data.extend(data.as_bytes());
 
-    let signature = wallet.sign(key, &sig_data).await?;
+    let signature = wallet
+        .sign(&Key::from_base58(key, KeyType::Ed25519)?, &sig_data)
+        .await?;
 
     Ok((signature, sig_data))
 }
@@ -64,7 +67,14 @@ pub async fn decode_signed_connection_response(
 
     let sig_data = base64url_decode(&response.connection_sig.sig_data)?;
 
-    if !wallet.verify(their_vk, &sig_data, &signature).await? {
+    if !wallet
+        .verify(
+            &Key::from_base58(their_vk, KeyType::Ed25519)?,
+            &sig_data,
+            &signature,
+        )
+        .await?
+    {
         return Err(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
             "ConnectionResponse signature is invalid for original Invite recipient key",

aries/aries_vcx/src/protocols/connection/pairwise_info.rs

@@ -10,7 +10,10 @@ pub struct PairwiseInfo {
 
 impl PairwiseInfo {
     pub async fn create(wallet: &impl BaseWallet) -> VcxResult<PairwiseInfo> {
-        let (pw_did, pw_vk) = wallet.create_and_store_my_did(None, None).await?;
-        Ok(PairwiseInfo { pw_did, pw_vk })
+        let did_data = wallet.create_and_store_my_did(None, None).await?;
+        Ok(PairwiseInfo {
+            pw_did: did_data.did().into(),
+            pw_vk: did_data.verkey().base58(),
+        })
     }
 }

aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs

@@ -150,7 +150,7 @@ pub async fn jws_sign_attach(
         let b64_protected =
             base64::engine::Engine::encode(&URL_SAFE_NO_PAD, protected_header.to_string());
         let sign_input = format!("{}.{}", b64_protected, attach_base64).into_bytes();
-        let signed = wallet.sign(&verkey.base58(), &sign_input).await?;
+        let signed = wallet.sign(&verkey, &sign_input).await?;
         let signature_base64 = base64::engine::Engine::encode(&URL_SAFE_NO_PAD, signed);
 
         let jws = {