revert UA pallet changes

Author: PierreOssun

pallets/unified-accounts/src/lib.rs

@@ -76,7 +76,6 @@ use frame_support::{
     },
 };
 use frame_system::{ensure_signed, pallet_prelude::*};
-pub use pallet::*;
 use pallet_evm::AddressMapping;
 use precompile_utils::keccak256;
 use sp_core::{H160, H256, U256};
@@ -87,6 +86,8 @@ use sp_runtime::{
 };
 use sp_std::marker::PhantomData;
 
+pub use pallet::*;
+
 pub mod weights;
 pub use weights::WeightInfo;
 
@@ -192,8 +193,7 @@ pub mod pallet {
             );
 
             // recover evm address from signature
-            let payload_hash = Self::build_signing_payload(&who);
-            let address = Self::verify_signature(&signature, payload_hash)
+            let address = Self::verify_signature(&who, &signature)
                 .ok_or(Error::<T>::UnexpectedSignatureFormat)?;
 
             ensure!(evm_address == address, Error::<T>::InvalidSignature);
@@ -296,13 +296,12 @@ impl<T: Config> Pallet<T> {
         keccak_256(&payload)
     }
 
-    pub fn recover_pubkey(sig: &EvmSignature, payload_hash: [u8; 32]) -> Option<[u8; 64]> {
-        sp_io::crypto::secp256k1_ecdsa_recover(sig, &payload_hash).ok()
-    }
+    pub fn verify_signature(who: &T::AccountId, sig: &EvmSignature) -> Option<EvmAddress> {
+        let payload_hash = Self::build_signing_payload(who);
 
-    pub fn verify_signature(sig: &EvmSignature, payload_hash: [u8; 32]) -> Option<EvmAddress> {
-        Self::recover_pubkey(sig, payload_hash)
+        sp_io::crypto::secp256k1_ecdsa_recover(sig, &payload_hash)
             .map(|pubkey| H160::from(H256::from_slice(&keccak_256(&pubkey))))
+            .ok()
     }
 
     fn build_domain_separator() -> [u8; 32] {

pallets/unified-accounts/src/tests.rs

@@ -32,12 +32,12 @@ use sp_runtime::{traits::StaticLookup, AccountId32, MultiAddress};
 /// EIP712 Payload struct
 #[derive(Eip712, EthAbiType, Clone)]
 #[eip712(
-        name = "Astar EVM Claim",
-        version = "1",
-        chain_id = 1024,
-        // mock genisis hash
-        raw_salt = "0x4545454545454545454545454545454545454545454545454545454545454545"
-    )]
+name = "Astar EVM Claim",
+version = "1",
+chain_id = 1024,
+// mock genisis hash
+raw_salt = "0x4545454545454545454545454545454545454545454545454545454545454545"
+)]
 struct Claim {
     substrate_address: Bytes,
 }
@@ -83,7 +83,7 @@ fn eip712_signature_verify_works() {
         let sig = UnifiedAccounts::eth_sign_prehash(&claim_hash, &alice_secret());
         assert_eq!(
             Some(UnifiedAccounts::eth_address(&alice_secret())),
-            UnifiedAccounts::verify_signature(&sig, claim_hash),
+            UnifiedAccounts::verify_signature(&ALICE, &sig),
             "signature verification should work"
         );
     });
@@ -397,35 +397,3 @@ fn charging_storage_fee_should_not_reap_account() {
         );
     });
 }
-
-#[test]
-fn recover_public_key_works() {
-    ExtBuilder::default().build().execute_with(|| {
-        let claim = Claim {
-            substrate_address: ALICE.encode().into(),
-        };
-
-        let claim_hash = UnifiedAccounts::build_signing_payload(&ALICE);
-        // assert signing payload is correct
-        assert_eq!(
-            claim.encode_eip712().unwrap(),
-            claim_hash,
-            "signing payload should match"
-        );
-
-        // sign the payload
-        let signature = UnifiedAccounts::eth_sign_prehash(&claim_hash, &alice_secret());
-
-        let expected_pubkey =
-            &libsecp256k1::PublicKey::from_secret_key(&alice_secret()).serialize()[1..65];
-
-        // assert public key recovery works
-        assert_eq!(
-            expected_pubkey,
-            UnifiedAccounts::recover_pubkey(&signature, claim_hash)
-                .unwrap()
-                .as_ref(),
-            "recover public key should work"
-        );
-    });
-}