Move Linea light client types (#3136)

- refactor(linea-light-client): move types
- chore: fmt
- fix(unionlabs): remove invalid import
- fix(linea): imports
- fix(linea): imports 2
- fix(linea): fix final rename errors

Author: benluelo

Cargo.lock

@@ -75,6 +75,7 @@ members = [
   "light-clients/tendermint-light-client/types",
 
   "light-clients/linea-light-client",
+  "light-clients/linea-light-client/types",
 
   "tools/generate-rust-sol-bindings",
   "tools/devnet-utils",
@@ -173,8 +174,9 @@ tendermint-light-client       = { path = "light-clients/tendermint-light-client"
 tendermint-light-client-types = { path = "light-clients/tendermint-light-client/types", default-features = false }
 tendermint-verifier           = { path = "lib/tendermint-verifier", default-features = false }
 
-linea-verifier = { path = "lib/linea-verifier", default-features = false }
-linea-zktrie   = { path = "lib/linea-zktrie", default-features = false }
+linea-light-client-types = { path = "light-clients/linea-light-client/types", default-features = false }
+linea-verifier           = { path = "lib/linea-verifier", default-features = false }
+linea-zktrie             = { path = "lib/linea-zktrie", default-features = false }
 
 gnark-key-parser               = { path = "lib/gnark-key-parser", default-features = false }
 gnark-mimc                     = { path = "lib/gnark-mimc", default-features = false }

Cargo.toml

@@ -12,17 +12,18 @@ workspace = true
 test-include = ["lib/scroll-verifier/tests"]
 
 [dependencies]
-ethereum-verifier = { workspace = true }
-ethers-core       = { workspace = true }
-gnark-mimc        = { workspace = true }
-hex               = { workspace = true }
-hex-literal       = { workspace = true }
-linea-zktrie      = { workspace = true }
-rlp               = { workspace = true }
-scroll-codec      = { workspace = true }
-serde             = { workspace = true }
-serde-utils       = { workspace = true }
-serde_json        = { workspace = true }
-sha3              = { workspace = true }
-thiserror         = { workspace = true }
-unionlabs         = { workspace = true }
+ethereum-verifier        = { workspace = true }
+ethers-core              = { workspace = true }
+gnark-mimc               = { workspace = true }
+hex                      = { workspace = true }
+hex-literal              = { workspace = true }
+linea-light-client-types = { workspace = true }
+linea-zktrie             = { workspace = true }
+rlp                      = { workspace = true }
+scroll-codec             = { workspace = true }
+serde                    = { workspace = true }
+serde-utils              = { workspace = true }
+serde_json               = { workspace = true }
+sha3                     = { workspace = true }
+thiserror                = { workspace = true }
+unionlabs                = { workspace = true }

lib/linea-verifier/Cargo.toml

@@ -2,10 +2,10 @@ use core::fmt::Debug;
 
 use ethereum_verifier::verify::{verify_account_storage_root, verify_storage_proof};
 use gnark_mimc::new_mimc_constants_bls12_377;
+use linea_light_client_types::{ClientState, Header};
 use unionlabs::{
     ethereum::slot::{MappingKey, Slot},
     hash::H256,
-    ibc::lightclients::linea::{client_state::ClientState, header::Header},
     linea::account::ZkAccount,
     uint::U256,
 };
@@ -93,13 +93,8 @@ pub fn state_root_hashes_mapping_key(slot: &U256, l2_block_number: &U256) -> U25
 #[cfg(test)]
 mod tests {
     use hex_literal::hex;
-    use unionlabs::{
-        ibc::{
-            core::client::height::Height,
-            lightclients::linea::{client_state::ClientState, header::Header},
-        },
-        uint::U256,
-    };
+    use linea_light_client_types::{ClientState, Header};
+    use unionlabs::{ibc::core::client::height::Height, uint::U256};
 
     use crate::{state_root_hashes_mapping_key, verify_header};
 

lib/linea-verifier/src/lib.rs

@@ -1,6 +1,5 @@
 pub mod ethereum;
 pub mod evm_in_cosmos;
-pub mod linea;
 pub mod movement;
 pub mod scroll;
 pub mod wasm;