refactor: move uint into unionlabs-primitives and split linea types

Cargo.toml

@@ -172,6 +172,7 @@ members = [
   "lib/ibc-classic-spec",
   "lib/state-lens-light-client-types",
   "lib/create3",
+  "lib/linea-types",
 ]
 
 [workspace.package]
@@ -229,6 +230,7 @@ tendermint-light-client-types = { path = "lib/tendermint-light-client-types", de
 tendermint-verifier           = { path = "lib/tendermint-verifier", default-features = false }
 
 linea-light-client-types = { path = "lib/linea-light-client-types", default-features = false }
+linea-types              = { path = "lib/linea-types", default-features = false }
 linea-zktrie             = { path = "lib/linea-zktrie", default-features = false }
 
 ibc-solidity           = { path = "lib/ibc-solidity", default-features = false }
@@ -272,8 +274,6 @@ voyager-core    = { path = "lib/voyager-core", default-features = false }
 voyager-message = { path = "lib/voyager-message", default-features = false }
 voyager-vm      = { path = "lib/voyager-vm", default-features = false }
 
-voyager-consensus-module-tendermint = { path = "voyager/modules/consensus/tendermint", default-features = false }
-
 # external dependencies
 milagro_bls    = { git = "https://github.com/Snowfork/milagro_bls", rev = "bc2b5b5e8d48b7e2e1bfaa56dc2d93e13cb32095", default-features = false }
 tendermint-rpc = { git = "https://github.com/unionlabs/tendermint-rs", branch = "v0.39.1-bn254", default-features = false }
@@ -307,7 +307,6 @@ ethabi                   = { version = "18.0.0", default-features = false }
 frame-support-procedural = { version = "30.0.0", default-features = false }
 futures                  = { version = "0.3.28", default-features = false }
 generic-array            = { version = "0.14.7", default-features = false }
-go-parse-duration        = { version = "0.1.1", default-features = false }
 hex                      = { version = "0.4.3", default-features = false }
 hex-literal              = { version = "0.4.1", default-features = false }
 jsonrpsee                = { version = "0.24.2", default-features = false }
@@ -322,7 +321,6 @@ ripemd                   = { version = "0.1.3", default-features = false }
 rlp                      = { version = "0.5.2", default-features = false }
 schemars                 = { version = "0.8.3", default-features = false }
 serde                    = { version = "1.0.0", default-features = false }
-serde-json-wasm          = { version = "1.0.0", default-features = false }
 serde_json               = { version = "1.0.0", default-features = false, features = ["alloc"] }        # serde-json requires one of "std" or "alloc"
 serde_with               = { version = "3.7.0", default-features = false, features = ["macros"] }
 sha2                     = { version = "0.10.7", default-features = false }

clippy.toml

@@ -1 +1 @@
-disallowed-types = [{ path = "primitive_types::U256", reason = "use unionlabs::uint::U256" }]
+disallowed-types = [{ path = "primitive_types::U256", reason = "use unionlabs::primimtives::U256" }]

cosmwasm/ibc-union/light-clients/arbitrum/src/client.rs

@@ -146,7 +146,7 @@ impl IbcClient for ArbitrumLightClient {
 //         primitives::{H160, H256},
 //         ibc::core::client::height::Height,
 //         id::ClientId,
-//         uint::U256,
+//         primitives::U256,
 //     };
 
 //     use super::{

cosmwasm/ibc-union/light-clients/ethereum/src/client.rs

@@ -15,8 +15,11 @@ use evm_storage_verifier::{
 use ibc_union_light_client::{IbcClientCtx, IbcClientError};
 use ibc_union_msg::lightclient::Status;
 use unionlabs::{
-    encoding::Bincode, ensure, ethereum::ibc_commitment_key, ibc::core::client::height::Height,
-    primitives::H256, uint::U256,
+    encoding::Bincode,
+    ensure,
+    ethereum::ibc_commitment_key,
+    ibc::core::client::height::Height,
+    primitives::{H256, U256},
 };
 
 use crate::{errors::Error, verification::VerificationContext};

cosmwasm/ibc-union/light-clients/ethereum/src/errors.rs

@@ -1,7 +1,7 @@
 use beacon_api_types::Slot;
 use cosmwasm_std::StdError;
 use ibc_union_light_client::IbcClientError;
-use unionlabs::{primitives::H256, uint::U256};
+use unionlabs::primitives::{H256, U256};
 
 use crate::client::EthereumLightClient;
 

cosmwasm/ibc-union/light-clients/linea/src/client.rs

@@ -26,8 +26,7 @@ use unionlabs::{
         account::ZkAccount,
         proof::{InclusionProof, NonInclusionProof},
     },
-    primitives::H256,
-    uint::U256,
+    primitives::{H256, U256},
 };
 
 use crate::errors::Error;

cosmwasm/ibc-union/light-clients/movement/src/client.rs

@@ -8,8 +8,7 @@ use unionlabs::{
         account::AccountAddress, storage_proof::StorageProof, transaction_info::TransactionInfo,
     },
     encoding::Bincode,
-    primitives::H256,
-    uint::U256,
+    primitives::{H256, U256},
 };
 
 use crate::error::Error;

cosmwasm/ibc-union/light-clients/scroll/src/client.rs

@@ -181,7 +181,7 @@ pub fn verify_header(
 //         google::protobuf::any::Any,
 //         primitives::{H160, H256},
 //         ibc::core::client::height::Height,
-//         uint::U256,
+//         primitives::U256,
 //     };
 
 //     use super::{

cosmwasm/ibc-union/light-clients/state-lens-ics23-mpt/src/client.rs

@@ -10,8 +10,7 @@ use unionlabs::{
     encoding::{Bincode, DecodeAs},
     ethereum::{ibc_commitment_key, keccak256},
     ibc::core::commitment::merkle_proof::MerkleProof,
-    primitives::H256,
-    uint::U256,
+    primitives::{H256, U256},
 };
 
 use crate::errors::Error;

cosmwasm/ibc-union/light-clients/state-lens-ics23-mpt/src/errors.rs

@@ -3,8 +3,7 @@ use cosmwasm_std::StdError;
 use ibc_union_light_client::IbcClientError;
 use unionlabs::{
     ibc::core::client::height::Height,
-    primitives::{Bytes, H256},
-    uint::U256,
+    primitives::{Bytes, H256, U256},
 };
 
 use crate::client::StateLensIcs23MptLightClient;

cosmwasm/ucs02-nft/src/contract.rs

@@ -16,7 +16,7 @@ use ics721::{
     execute::Ics721Execute, ibc::Ics721Ibc, query::Ics721Query, NonFungibleTokenPacketData,
 };
 use thiserror::Error;
-use unionlabs::uint::U256;
+use unionlabs::primitives::U256;
 
 pub const CHANNEL_VERSION: Map<&str, Version> = Map::new("channel_version");
 

lib/arbitrum-light-client-types/src/client_state.rs

@@ -1,5 +1,7 @@
 use unionlabs::{
-    bounded::BoundedU32, ibc::core::client::height::Height, primitives::H160, uint::U256,
+    bounded::BoundedU32,
+    ibc::core::client::height::Height,
+    primitives::{H160, U256},
 };
 
 #[derive(Debug, Clone, PartialEq)]

lib/arbitrum-light-client-types/src/l2_header.rs

@@ -1,9 +1,6 @@
 use rlp::Encodable;
 use sha3::{Digest, Keccak256};
-use unionlabs::{
-    primitives::{H160, H2048, H256, H64},
-    uint::U256,
-};
+use unionlabs::primitives::{H160, H2048, H256, H64, U256};
 
 #[derive(Debug, Clone, PartialEq, rlp::RlpEncodable)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

lib/arbitrum-verifier/src/lib.rs

@@ -5,8 +5,7 @@ use evm_storage_verifier::{verify_account_storage_root, verify_storage_proof};
 use sha3::{Digest, Keccak256};
 use unionlabs::{
     ethereum::slot::{MappingKey, Slot},
-    primitives::H256,
-    uint::U256,
+    primitives::{H256, U256},
 };
 
 #[derive(thiserror::Error, Debug, PartialEq, Clone)]

lib/beacon-api-types/src/execution_payload.rs

@@ -1,7 +1,4 @@
-use unionlabs::{
-    primitives::{Bytes, H160, H256},
-    uint::U256,
-};
+use unionlabs::primitives::{Bytes, H160, H256, U256};
 #[cfg(feature = "ssz")]
 use {
     crate::{

lib/beacon-api-types/src/execution_payload_header.rs

@@ -1,7 +1,4 @@
-use unionlabs::{
-    primitives::{Bytes, H160, H256},
-    uint::U256,
-};
+use unionlabs::primitives::{Bytes, H160, H256, U256};
 #[cfg(feature = "ssz")]
 use {
     crate::{BYTES_PER_LOGS_BLOOM, MAX_EXTRA_DATA_BYTES},

lib/berachain-light-client-types/src/client_state.rs

@@ -1,4 +1,4 @@
-use unionlabs::{primitives::H160, uint::U256};
+use unionlabs::primitives::{H160, U256};
 
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

lib/chain-utils/src/arbitrum.rs

@@ -17,8 +17,7 @@ use unionlabs::{
             ethereum::{self, storage_proof::StorageProof},
         },
     },
-    primitives::{H160, H256},
-    uint::U256,
+    primitives::{H160, H256, U256},
     validated::ValidateT,
 };
 

lib/chain-utils/src/berachain.rs

@@ -26,9 +26,8 @@ use unionlabs::{
         },
     },
     option_unwrap,
-    primitives::H160,
+    primitives::{H160, U256},
     result_unwrap,
-    uint::U256,
 };
 
 use crate::{

lib/chain-utils/src/ethereum.rs

@@ -37,8 +37,7 @@ use unionlabs::{
         NextConnectionSequencePath, NextSequenceAckPath, NextSequenceRecvPath,
         NextSequenceSendPath, ReceiptPath,
     },
-    primitives::{H160, H256},
-    uint::U256,
+    primitives::{H160, H256, U256},
     ErrorReporter,
 };
 

lib/chain-utils/src/scroll.rs

@@ -14,8 +14,7 @@ use unionlabs::{
         lightclients::{ethereum, scroll},
     },
     id::ClientId,
-    primitives::{H160, H256},
-    uint::U256,
+    primitives::{H160, H256, U256},
 };
 
 use crate::{

lib/cometbls-groth16-verifier/src/lib.rs

@@ -12,7 +12,10 @@ use constants::*;
 use hex_literal::hex;
 use sha3::Digest;
 use substrate_bn::G1;
-use unionlabs::{primitives::H256, uint::U256, ByteArrayExt};
+use unionlabs::{
+    primitives::{H256, U256},
+    ByteArrayExt,
+};
 
 mod constants;
 

lib/ethereum-light-client-types/src/client_state.rs

@@ -1,8 +1,7 @@
 use beacon_api_types::{ForkParameters, PresetBaseKind};
 use unionlabs::{
     ibc::core::client::height::Height,
-    primitives::{H160, H256},
-    uint::U256,
+    primitives::{H160, H256, U256},
 };
 
 #[derive(Debug, Clone, PartialEq)]

lib/ethereum-light-client-types/src/header.rs

@@ -24,9 +24,8 @@ mod tests {
     };
     use unionlabs::{
         encoding::{Bincode, Json},
-        primitives::{H160, H256, H384, H768},
+        primitives::{H160, H256, H384, H768, U256},
         test_utils::assert_codec_iso,
-        uint::U256,
     };
 
     use super::*;

lib/ethereum-light-client-types/src/light_client_update.rs

@@ -90,9 +90,8 @@ mod tests {
     };
     use unionlabs::{
         encoding::{Bincode, Json},
-        primitives::{H160, H256, H384, H768},
+        primitives::{H160, H256, H384, H768, U256},
         test_utils::assert_codec_iso,
-        uint::U256,
     };
 
     use super::*;

lib/ethereum-light-client-types/src/storage_proof.rs

@@ -1,4 +1,4 @@
-use unionlabs::{primitives::Bytes, uint::U256};
+use unionlabs::primitives::{Bytes, U256};
 
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -13,8 +13,8 @@ pub struct StorageProof {
 mod tests {
     use unionlabs::{
         encoding::{Bincode, Json},
+        primitives::U256,
         test_utils::assert_codec_iso,
-        uint::U256,
     };
 
     use super::*;

lib/evm-storage-verifier/src/lib.rs

@@ -5,8 +5,7 @@ use rlp::RlpDecodable;
 use trie_db::{Trie, TrieDBBuilder};
 use unionlabs::{
     ensure,
-    primitives::{H160, H256},
-    uint::U256,
+    primitives::{H160, H256, U256},
 };
 
 use crate::rlp_node_codec::{keccak_256, EthLayout, KeccakHasher};