diff --git a/Cargo.lock b/Cargo.lock index d7a6dc3..c91a026 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8644,7 +8644,6 @@ dependencies = [ "anyhow", "assert2", "async-trait", - "derive_more 1.0.0", "insta", "log", "paste", diff --git a/crates/wasm_client_anchor/Cargo.toml b/crates/wasm_client_anchor/Cargo.toml index 06d992d..c7287e6 100644 --- a/crates/wasm_client_anchor/Cargo.toml +++ b/crates/wasm_client_anchor/Cargo.toml @@ -20,7 +20,6 @@ crate-type = ["cdylib", "lib"] [dependencies] anchor-lang = { workspace = true } async-trait = { workspace = true } -derive_more = { workspace = true, features = ["debug"] } log = { workspace = true } paste = { workspace = true } retrier = { workspace = true } diff --git a/crates/wasm_client_anchor/src/lib.rs b/crates/wasm_client_anchor/src/lib.rs index eb8f5b5..4e6d93b 100644 --- a/crates/wasm_client_anchor/src/lib.rs +++ b/crates/wasm_client_anchor/src/lib.rs @@ -39,9 +39,9 @@ pub mod prelude { pub mod external { pub use anchor_lang; - pub use derive_more; pub use paste; pub use solana_sdk; pub use typed_builder; + pub use wallet_standard; pub use wasm_client_solana; } diff --git a/crates/wasm_client_anchor/src/macros.rs b/crates/wasm_client_anchor/src/macros.rs index 6c02ca3..73ccea0 100644 --- a/crates/wasm_client_anchor/src/macros.rs +++ b/crates/wasm_client_anchor/src/macros.rs @@ -19,7 +19,7 @@ macro_rules! base_create_request_builder { ), >; - #[derive($crate::external::derive_more::Debug, $crate::external::typed_builder::TypedBuilder)] + #[derive($crate::external::typed_builder::TypedBuilder)] pub struct [<$name_prefix Request>]< 'a, W: $crate::WalletAnchor + 'a, @@ -29,11 +29,9 @@ macro_rules! base_create_request_builder { /// This is the wallet / payer that will always sign the transaction. It should implement [`wasm_client_anchor::WalletAnchor`] to allow for async signing via wallets. pub wallet: &'a W, /// Provide the args to the anchor program endpoint. This will be transformed into the instruction data when processing the transaction. - #[debug("args")] #[builder(setter(into))] pub args: ::$program::instruction::$name_prefix, /// Provide the anchor accounts that will be used for the anchor instruction - #[debug("accounts")] pub accounts: ::$program::accounts::$accounts, /// Additional accounts which might be needed in a transfer hook / or in a future transaction when the transaction is saved on chain for a later date. #[builder(default)] @@ -49,7 +47,7 @@ macro_rules! base_create_request_builder { pub extra_instructions: Vec<$crate::external::solana_sdk::instruction::Instruction>, /// Options to be passed into the transaction being signed or sent. #[builder(default)] - pub options: SolanaSignAndSendTransactionOptions, + pub options: $crate::external::wallet_standard::SolanaSignAndSendTransactionOptions, } impl<'a, W: $crate::WalletAnchor + 'a> [<$name_prefix Request>]<'a, W> {} @@ -58,7 +56,7 @@ macro_rules! base_create_request_builder { impl<'a, W: $crate::WalletAnchor + 'a> $crate::AnchorRequestMethods<'a, W> for [<$name_prefix Request>]<'a, W> { - fn options(&self) -> SolanaSignAndSendTransactionOptions { + fn options(&self) -> $crate::external::wallet_standard::SolanaSignAndSendTransactionOptions { self.options.clone() }