chore: also remove sol-types and contract

Author: Evalir

Cargo.toml

@@ -11,10 +11,7 @@ repository = "https://github.com/init4tech/zenith"
 license = "AGPL-3.0"
 
 [dependencies]
-alloy = { version = "=0.7.3", features = ["full", "json-rpc", "signer-aws", "rpc-types-mev"] }
-alloy-sol-types = { version = "0.8.11", features = ["json"] }
-alloy-rlp = { version = "0.3.4" }
-alloy-contract = { version = "=0.7.3", features = ["pubsub"] }
+alloy = { version = "=0.7.3", features = ["full", "json-rpc", "signer-aws", "rpc-types-mev", "rlp"] }
 
 serde = { version = "1.0.197", features = ["derive"] }
 

src/bindings.rs

@@ -2,7 +2,7 @@
 #![allow(missing_docs)]
 use alloy::primitives::{Address, Bytes, FixedBytes, U256};
 mod mint {
-    alloy::sol_types::sol!(
+    alloy::sol!(
         #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
         function mint(address to, uint256 amount);
     );
@@ -12,7 +12,7 @@ pub use mint::mintCall;
 mod zenith {
     use super::*;
 
-    alloy::sol_types::sol!(
+    alloy::sol!(
         #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
         #[sol(rpc)]
         Zenith,
@@ -106,7 +106,7 @@ mod zenith {
 mod passage {
     use super::*;
 
-    alloy::sol_types::sol!(
+    alloy::sol!(
         #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
         #[sol(rpc)]
         Passage,
@@ -206,7 +206,7 @@ mod passage {
 mod orders {
     use super::*;
 
-    alloy::sol_types::sol!(
+    alloy::sol!(
         #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
         #[sol(rpc)]
         Orders,
@@ -302,7 +302,7 @@ mod orders {
 mod transactor {
     use super::*;
 
-    alloy::sol_types::sol!(
+    alloy::sol!(
         #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
         #[sol(rpc)]
         Transactor,
@@ -357,7 +357,7 @@ mod transactor {
 
 mod rollup_passage {
 
-    alloy_sol_types::sol!(
+    alloy::sol!(
         #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
         #[sol(rpc)]
         RollupPassage,
@@ -380,7 +380,7 @@ mod rollup_passage {
 }
 
 mod bundle_helper {
-    alloy_sol_types::sol!(
+    alloy::sol!(
         #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
         #[sol(rpc)]
         BundleHelper,

src/block.rs

@@ -4,7 +4,7 @@ use crate::Zenith::BlockHeader as ZenithHeader;
 use alloy::consensus::TxEnvelope;
 use alloy::eips::eip2718::{Decodable2718, Encodable2718};
 use alloy::primitives::{keccak256, Address, B256};
-use alloy_rlp::Decodable;
+use alloy::rlp::Decodable;
 
 /// Zenith processes normal Ethereum txns.
 pub type ZenithTransaction = TxEnvelope;
@@ -216,7 +216,7 @@ where
     let encoded_txns = transactions.into_iter().map(|tx| C::encode(tx)).collect::<Vec<Vec<u8>>>();
 
     let mut buf = Vec::new();
-    alloy_rlp::Encodable::encode(&encoded_txns, &mut buf);
+    alloy::rlp::Encodable::encode(&encoded_txns, &mut buf);
     buf
 }