feedback

bindings_ffi/src/mls.rs

@@ -206,7 +206,6 @@ impl FfiSignatureRequest {
         account_address: String,
         chain_id: u64,
         block_number: u64,
-        hash: Vec<u8>,
     ) -> Result<(), GenericError> {
         let mut inner = self.inner.lock().await;
         let account_id = AccountId::new_evm(chain_id, account_address);
@@ -216,9 +215,6 @@ impl FfiSignatureRequest {
             account_id,
             block_number,
             chain_id,
-            hash.try_into().map_err(|_| GenericError::Generic {
-                err: "Hash byte array is wrong length. (Should be 32)".to_string(),
-            })?,
         );
         inner
             .add_signature(signature, self.scw_verifier.clone().as_ref())

bindings_wasm/src/mls_client.rs

@@ -165,7 +165,6 @@ impl WasmClient {
     chain_id: u64,
     account_address: String,
     block_number: u64,
-    hash: Uint8Array,
   ) -> Result<(), JsError> {
     if self.is_registered() {
       return Err(JsError::new(
@@ -180,10 +179,6 @@ impl WasmClient {
       account_id,
       block_number,
       chain_id,
-      hash
-        .to_vec()
-        .try_into()
-        .map_err(|_| JsError::new("Hash byte array is wrong length. (Should be 32)"))?,
     );
 
     self.signatures.insert(

xmtp_id/src/associations/serialization.rs

@@ -176,9 +176,6 @@ impl TryFrom<SignatureWrapperProto> for UnverifiedSignature {
                     sig.account_id.try_into()?,
                     sig.block_number,
                     sig.chain_id,
-                    sig.hash
-                        .try_into()
-                        .map_err(|_| DeserializationError::InvalidHash)?,
                 ),
             ),
         };

xmtp_id/src/associations/unverified.rs

@@ -11,7 +11,10 @@ use super::{
     AccountId, Action, AddAssociation, CreateInbox, IdentityUpdate, RevokeAssociation,
     SignatureError,
 };
+use ethers::{abi::AbiEncode, types::H256};
 use futures::future::try_join_all;
+use sha2::Digest;
+use xmtp_cryptography::hash::sha256_bytes;
 use xmtp_proto::xmtp::message_contents::SignedPublicKey as LegacySignedPublicKeyProto;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -295,14 +298,12 @@ impl UnverifiedSignature {
         account_id: AccountId,
         block_number: u64,
         chain_id: u64,
-        hash: [u8; 32],
     ) -> Self {
         Self::SmartContractWallet(UnverifiedSmartContractWalletSignature::new(
             signature,
             account_id,
             block_number,
             chain_id,
-            hash,
         ))
     }
 
@@ -358,8 +359,11 @@ impl UnverifiedSmartContractWalletSignature {
         account_id: AccountId,
         block_number: u64,
         chain_id: u64,
-        hash: [u8; 32],
     ) -> Self {
+        let hash = sha256_bytes(&signature_bytes)
+            .try_into()
+            .expect("SHA256 hash should be 32 bytes");
+
         Self {
             signature_bytes,
             account_id,