Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["crates/*", "encoders/*", "examples/*"]
members = ["crates/*", "encoders/*" ]
resolver = "2"

[workspace.package]
Expand Down Expand Up @@ -38,31 +38,31 @@ reqwest = { version = "0.12.11", features = ["json"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = "0.10"
solana-account = { version = "2" , features = ["bincode"] }
solana-account-decoder = "2"
solana-account-decoder-client-types = "2"
solana-address-lookup-table-interface = { version = "2", features = [
solana-account = { version = "3.1.0" , features = ["bincode"] }
solana-account-decoder = "3"
solana-account-decoder-client-types = "3"
solana-address-lookup-table-interface = { version = "3", features = [
"bincode",
"bytemuck",
] }
solana-compute-budget-interface = { version = "2" }
solana-client = "2"
solana-commitment-config = "2"
solana-compute-budget-interface = { version = "3" }
solana-client = "3"
solana-commitment-config = "3"
solana-hash = "2"
solana-instruction = { version = "2", default-features = false, features = ["borsh", "std"] }
solana-message = { version = "2" }
solana-pubkey = { version = "2", features = ["serde", "borsh", "curve25519"] }
solana-rpc-client = { version = "2" }
solana-rpc-client-api = { version = "2" }
solana-rpc-client-types = { version = "2" }
solana-signer = { version = "2" }
solana-signature = { version = "2" }
solana-system-interface = { version = "1" , features = ["bincode"] }
solana-transaction = { version = "2" }
solana-keypair = "2"
spl-associated-token-account = "7"
spl-memo = "6"
spl-token = { version = "7" }
solana-instruction = { version = "3", default-features = false, features = ["borsh", "std"] }
solana-message = { version = "3" }
solana-pubkey = { version = "3", features = ["serde", "borsh", "curve25519"] }
solana-rpc-client = { version = "3" }
solana-rpc-client-api = { version = "3" }
solana-rpc-client-types = { version = "3" }
solana-signer = { version = "3" }
solana-signature = { version = "3" }
solana-system-interface = { version = "2" , features = ["bincode"] }
solana-transaction = { version = "3" }
solana-keypair = "3"
spl-associated-token-account = "8"
spl-memo-interface = { version = "2" }
spl-token = { version = "9" }
syn = { version = "1", features = ["full"] }
thiserror = { version = "2", default-features = false }
tokio = { version = "1", features = ["rt", "time", "signal", "macros"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/instruction-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ solana-pubkey = { workspace = true }

[dev-dependencies]
anyhow = { workspace = true }
spl-memo = { workspace = true }
spl-memo-interface = { workspace = true }

[lints]
workspace = true
8 changes: 4 additions & 4 deletions crates/instruction-builder/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ mod tests {
];

let instruction_builder = InstructionBuilder::builder()
.program_id(spl_memo::id())
.program_id(spl_memo_interface::v3::id())
.accounts(base_accounts.clone())
.params(memo)
.build()
Expand All @@ -83,7 +83,7 @@ mod tests {
instruction.accounts.len(),
base_accounts.len() + remaining_accounts.len()
);
assert_eq!(instruction.program_id, spl_memo::id());
assert_eq!(instruction.program_id, spl_memo_interface::v3::id());
}

#[test]
Expand All @@ -92,13 +92,13 @@ mod tests {
let accounts = vec![AccountMeta::new_readonly(Pubkey::new_unique(), true)];

let builder = InstructionBuilder::builder()
.program_id(spl_memo::id())
.program_id(spl_memo_interface::v3::id())
.accounts(accounts.clone())
.params(memo)
.build();

let instruction = builder.instruction();
assert_eq!(instruction.program_id, spl_memo::id());
assert_eq!(instruction.program_id, spl_memo_interface::v3::id());
assert_eq!(instruction.accounts.len(), accounts.len());
}
}
2 changes: 1 addition & 1 deletion examples/circle-cctp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ solana-rpc-client-api = { workspace = true }
solana-signer = { workspace = true }
solana-system-interface = { workspace = true }
soly = { version = "0.1.1-rc.2" }
spl-memo = { workspace = true }
#spl-memo-interface = { workspace = true }
spl-token = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tracing = { workspace = true }
Expand Down
Loading