merge in main

alloy-rs · Mar 25, 2024 · 02802aa · 02802aa
1 parent 76e7544
commit 02802aa
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@
 .vscode
 .idea
 .env
-.DS_STORE
+.DS_Store
diff --git 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
@@ -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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
     .vscode
     .idea
     .env
-    .DS_STORE
+    .DS_Store