From 02802aa57ac05bd71a6dd319f2ad97023a8aa19d Mon Sep 17 00:00:00 2001
From: zerosnacks <zerosnacks@protonmail.com>
Date: Mon, 25 Mar 2024 16:52:52 +0000
Subject: [PATCH] merge in main

---
 .gitignore                                    | 2 +-
 Cargo.toml                                    | 5 -----
 examples/wallets/Cargo.toml                   | 1 -
 examples/wallets/examples/sign_permit_hash.rs | 3 ++-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index d8f4ddf8..a0e36f6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 .vscode
 .idea
 .env
-.DS_STORE
\ No newline at end of file
+.DS_Store
diff --git a/Cargo.toml b/Cargo.toml
index f2bb8b79..55a00649 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,11 +50,6 @@ alloy = { git = "https://github.com/alloy-rs/alloy", rev = "fd8f065", features =
     "transport-ws",
     "pubsub",
 ] }
-# TODO: sol! macro somehow requires this to be present
-alloy-sol-types = { version = "0.6.4", default-features = false, features = [
-    "std",
-] }
-
 
 # async
 tokio = "1"
diff --git a/examples/wallets/Cargo.toml b/examples/wallets/Cargo.toml
index 80bdd9e8..f51a5d36 100644
--- a/examples/wallets/Cargo.toml
+++ b/examples/wallets/Cargo.toml
@@ -12,7 +12,6 @@ repository.workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-alloy-sol-types.workspace = true
 
 eyre.workspace = true
 rand = "0.8.5"
diff --git a/examples/wallets/examples/sign_permit_hash.rs b/examples/wallets/examples/sign_permit_hash.rs
index cab7c093..4c1045a0 100644
--- a/examples/wallets/examples/sign_permit_hash.rs
+++ b/examples/wallets/examples/sign_permit_hash.rs
@@ -3,7 +3,8 @@
 use alloy::{
     primitives::{address, keccak256, U256},
     signers::{wallet::LocalWallet, Signer},
-    sol_types::{eip712_domain, sol, SolStruct},
+    sol,
+    sol_types::{eip712_domain, SolStruct},
 };
 use eyre::Result;
 use serde::Serialize;