Fix account deserilization error

entropyxyz · May 13, 2024 · 9f844ee · 9f844ee
1 parent 89255ad
commit 9f844ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/crates/threshold-signature-server/src/signing_client/api.rs b/crates/threshold-signature-server/src/signing_client/api.rs
@@ -143,6 +143,7 @@ pub async fn proactive_refresh(
                     key,
                     value: serialized_key_share,
                     proactive_refresh: true,
+                    sig_request_address: None,
                 };
 
                 app_state.kv_store.kv().delete(&new_key_info.key).await?;

diff --git a/crates/threshold-signature-server/src/user/api.rs b/crates/threshold-signature-server/src/user/api.rs
@@ -95,6 +95,7 @@ pub struct UserRegistrationInfo {
     pub value: Vec<u8>,
     /// Is this a proactive refresh message
     pub proactive_refresh: bool,
+    pub sig_request_address: Option<SubxtAccountId32>,
 }
 
 /// Type that gets stored for request limit checks
@@ -331,6 +332,7 @@ async fn setup_dkg(
             key: string_verifying_key,
             value: serialized_key_share,
             proactive_refresh: false,
+            sig_request_address: Some(sig_request_address.clone()),
         };
         send_key(
             &api,
@@ -414,8 +416,9 @@ pub async fn receive_key(
         let registering = is_registering(
             &api,
             &rpc,
-            &SubxtAccountId32::from_str(&user_registration_info.key)
-                .map_err(|_| UserErr::StringError("Account Conversion"))?,
+            &user_registration_info.sig_request_address.ok_or_else(|| {
+                UserErr::OptionUnwrapError("Failed to unwrap account".to_string())
+            })?,
         )
         .await?;
 

diff --git a/crates/threshold-signature-server/src/user/tests.rs b/crates/threshold-signature-server/src/user/tests.rs
@@ -790,6 +790,7 @@ async fn test_send_and_receive_keys() {
 
     let alice = AccountKeyring::Alice;
     let program_manager = AccountKeyring::Dave;
+    let signature_request_account = subxtAccountId32(alice.pair().public().0);
 
     let cxt = test_context_stationary().await;
     setup_client().await;
@@ -805,6 +806,7 @@ async fn test_send_and_receive_keys() {
         key: alice.to_account_id().to_string(),
         value: share.clone(),
         proactive_refresh: false,
+        sig_request_address: Some(signature_request_account.clone()),
     };
 
     let (signer_alice, _) = get_signer_and_x25519_secret_from_mnemonic(DEFAULT_MNEMONIC).unwrap();
@@ -888,6 +890,7 @@ async fn test_send_and_receive_keys() {
         key: alice.to_account_id().to_string(),
         value: some_other_share.clone(),
         proactive_refresh: false,
+        sig_request_address: Some(signature_request_account.clone()),
     };
 
     let signed_message = serde_json::to_string(
@@ -929,6 +932,7 @@ async fn test_send_and_receive_keys() {
         key: "MNEMONIC".to_string(),
         value: share.clone(),
         proactive_refresh: false,
+        sig_request_address: Some(signature_request_account.clone()),
     };
 
     let signed_message = serde_json::to_string(
@@ -958,6 +962,7 @@ async fn test_send_and_receive_keys() {
         key: alice.to_account_id().to_string(),
         value: b"This will not deserialize to KeyShare<KeyParams>".to_vec(),
         proactive_refresh: false,
+        sig_request_address: Some(signature_request_account.clone()),
     };
 
     let signed_message = serde_json::to_string(