Remove Prover - deprecated EIP-712 implementation

src/connector.rs

@@ -1,14 +1,15 @@
 use crate::fungible_token::*;
 use crate::parameters::*;
 use crate::sdk;
-use crate::types::{AccountId, Balance, EthAddress, Gas, PromiseResult, Proof, ERR_FAILED_PARSE};
+use crate::types::{
+    AccountId, Balance, EthAddress, Gas, PromiseResult, Proof, SdkUnwrap, ERR_FAILED_PARSE,
+};
 
 use crate::admin_controlled::{AdminControlled, PausedMask};
 use crate::deposit_event::*;
 use crate::engine::Engine;
 use crate::json::parse_json;
 use crate::prelude::*;
-use crate::prover::validate_eth_address;
 use crate::storage::{self, EthConnectorStorageId, KeyPrefix};
 #[cfg(feature = "log")]
 use alloc::format;
@@ -110,7 +111,8 @@ impl EthConnectorContract {
         // Get initial contract arguments
         let contract_data = EthConnector {
             prover_account: args.prover_account,
-            eth_custodian_address: validate_eth_address(args.eth_custodian_address),
+            eth_custodian_address: crate::types::validate_eth_address(args.eth_custodian_address)
+                .sdk_unwrap(),
         };
         // Save eth-connector specific data
         sdk::save_contract(

src/lib.rs

@@ -28,7 +28,6 @@ mod fungible_token;
 mod json;
 mod log_entry;
 mod precompiles;
-mod prover;
 pub mod sdk;
 
 #[cfg(test)]

src/types.rs

@@ -117,6 +117,33 @@ fn long_signature(name: &str, params: &[ParamType]) -> Hash {
     H256::from(result)
 }
 
+#[derive(Debug)]
+pub enum ValidationError {
+    EthAddressFailedDecode,
+    WrongEthAddress,
+}
+
+impl AsRef<[u8]> for ValidationError {
+    fn as_ref(&self) -> &[u8] {
+        match self {
+            Self::EthAddressFailedDecode => b"FAILED_DECODE_ETH_ADDRESS",
+            Self::WrongEthAddress => b"WRONG_ETH_ADDRESS",
+        }
+    }
+}
+
+/// Validate Etherium address from string and return EthAddress
+pub fn validate_eth_address(address: String) -> Result<EthAddress, ValidationError> {
+    let data = hex::decode(address).map_err(|_| ValidationError::EthAddressFailedDecode)?;
+    if data.len() != 20 {
+        return Err(ValidationError::WrongEthAddress);
+    }
+    assert_eq!(data.len(), 20, "ETH_WRONG_ADDRESS_LENGTH");
+    let mut result = [0u8; 20];
+    result.copy_from_slice(&data);
+    Ok(result)
+}
+
 #[derive(Default, BorshDeserialize, BorshSerialize, Clone)]
 #[cfg_attr(test, derive(serde::Deserialize, serde::Serialize))]
 pub struct Proof {
@@ -128,6 +155,19 @@ pub struct Proof {
     pub proof: Vec<Vec<u8>>,
 }
 
+impl Proof {
+    pub fn get_key(&self) -> String {
+        let mut data = self.log_index.try_to_vec().unwrap();
+        data.extend(self.receipt_index.try_to_vec().unwrap());
+        data.extend(self.header_data.clone());
+        sdk::sha256(&data[..])
+            .0
+            .iter()
+            .map(|n| n.to_string())
+            .collect()
+    }
+}
+
 /// Newtype to distinguish balances (denominated in Wei) from other U256 types.
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Default)]
 pub struct Wei(U256);
@@ -226,8 +266,6 @@ pub enum ErrorKind {
     InvalidEcRecoverSignature,
 }
 
-pub type Result<T> = core::result::Result<T, ErrorKind>;
-
 #[allow(dead_code)]
 pub fn u256_to_arr(value: &U256) -> [u8; 32] {
     let mut result = [0u8; 32];