refactor(deps): reuse aws and gcp package from alloy (#11573)

* use alloy 1.0.30, reuse aws and gcp package from alloy

* Update crates/wallets/src/wallet_signer.rs

* chore: style

Co-Authored-By: Akshat Arora <[email protected]>

* update

* Update crates/wallets/Cargo.toml

Co-authored-by: DaniPopes <[email protected]>

---------

Co-authored-by: 0xrusowsky <[email protected]>
Co-authored-by: zerosnacks <[email protected]>
Co-authored-by: DaniPopes <[email protected]>
Co-authored-by: Akshat Arora <[email protected]>

Author: 5 people

Cargo.lock

@@ -227,12 +227,12 @@ alloy-pubsub = { version = "1.0.23", default-features = false }
 alloy-rpc-client = { version = "1.0.23", default-features = false }
 alloy-rpc-types = { version = "1.0.23", default-features = true }
 alloy-serde = { version = "1.0.23", default-features = false }
-alloy-signer = { version = "1.0.23", default-features = false }
-alloy-signer-aws = { version = "1.0.23", default-features = false }
-alloy-signer-gcp = { version = "1.0.23", default-features = false }
-alloy-signer-ledger = { version = "1.0.23", default-features = false }
-alloy-signer-local = { version = "1.0.23", default-features = false }
-alloy-signer-trezor = { version = "1.0.23", default-features = false }
+alloy-signer = { version = "1.0.30", default-features = false }
+alloy-signer-aws = { version = "1.0.30", default-features = false }
+alloy-signer-gcp = { version = "1.0.30", default-features = false }
+alloy-signer-ledger = { version = "1.0.30", default-features = false }
+alloy-signer-local = { version = "1.0.30", default-features = false }
+alloy-signer-trezor = { version = "1.0.30", default-features = false }
 alloy-transport = { version = "1.0.23", default-features = false }
 alloy-transport-http = { version = "1.0.23", default-features = false }
 alloy-transport-ipc = { version = "1.0.23", default-features = false }
@@ -292,8 +292,6 @@ tikv-jemallocator = "0.6"
 
 # misc
 auto_impl = "1"
-aws-config = { version = "1", default-features = true }
-aws-sdk-kms = { version = "1", default-features = false }
 bytes = "1.10"
 walkdir = "2"
 prettyplease = "0.2"

Cargo.toml

@@ -27,15 +27,10 @@ alloy-dyn-abi.workspace = true
 
 # aws-kms
 alloy-signer-aws = { workspace = true, features = ["eip712"], optional = true }
-aws-config = { workspace = true, default-features = true, optional = true }
-aws-sdk-kms = { workspace = true, default-features = false, optional = true }
+aws-config = { version = "1", default-features = true, optional = true }
 
 # gcp-kms
 alloy-signer-gcp = { workspace = true, features = ["eip712"], optional = true }
-gcloud-sdk = { version = "0.27.3", features = [
-  "google-cloud-kms-v1",
-  "google-longrunning",
-], optional = true }
 
 async-trait.workspace = true
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
@@ -51,5 +46,5 @@ eth-keystore = "0.5.0"
 tokio = { workspace = true, features = ["macros"] }
 
 [features]
-aws-kms = ["dep:alloy-signer-aws", "dep:aws-config", "dep:aws-sdk-kms"]
-gcp-kms = ["dep:alloy-signer-gcp", "dep:gcloud-sdk"]
+aws-kms = ["dep:alloy-signer-aws", "dep:aws-config"]
+gcp-kms = ["dep:alloy-signer-gcp"]

crates/wallets/Cargo.toml

@@ -19,3 +19,6 @@ pub use multi_wallet::MultiWalletOpts;
 pub use raw_wallet::RawWalletOpts;
 pub use wallet::WalletOpts;
 pub use wallet_signer::{PendingSigner, WalletSigner};
+
+#[cfg(feature = "aws-kms")]
+use aws_config as _;

crates/wallets/src/lib.rs

@@ -12,11 +12,11 @@ use async_trait::async_trait;
 use std::path::PathBuf;
 
 #[cfg(feature = "aws-kms")]
-use {alloy_signer_aws::AwsSigner, aws_config::BehaviorVersion, aws_sdk_kms::Client as AwsClient};
+use alloy_signer_aws::{AwsSigner, aws_config::BehaviorVersion, aws_sdk_kms::Client as AwsClient};
 
 #[cfg(feature = "gcp-kms")]
-use {
-    alloy_signer_gcp::{GcpKeyRingRef, GcpSigner, GcpSignerError, KeySpecifier},
+use alloy_signer_gcp::{
+    GcpKeyRingRef, GcpSigner, GcpSignerError, KeySpecifier,
     gcloud_sdk::{
         GoogleApi,
         google::cloud::kms::v1::key_management_service_client::KeyManagementServiceClient,
@@ -56,7 +56,8 @@ impl WalletSigner {
     pub async fn from_aws(key_id: String) -> Result<Self> {
         #[cfg(feature = "aws-kms")]
         {
-            let config = aws_config::load_defaults(BehaviorVersion::latest()).await;
+            let config =
+                alloy_signer_aws::aws_config::load_defaults(BehaviorVersion::latest()).await;
             let client = AwsClient::new(&config);
 
             Ok(Self::Aws(AwsSigner::new(client, key_id, None).await?))