Skip to content
Open
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
972 changes: 480 additions & 492 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ tag-message = "Publish {{crate_name}} v{{version}}"
consolidate-commits = false

[workspace.metadata.cli]
solana = "3.1.8"
solana = "4.0.0"
12 changes: 6 additions & 6 deletions clients/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ console = "0.16.3"
futures = "0.3"
serde = "1.0.219"
serde_json = "1.0.150"
solana-account-decoder = "4.0.0-beta.7"
solana-account-decoder = "4.0.0"
solana-clap-v3-utils = { version = "3.1.14", features = ["agave-unstable-api"] }
solana-cli-config = { version = "4.0.0-beta.7", features = ["agave-unstable-api"] }
solana-cli-output = { version = "4.0.0-beta.7", features = ["agave-unstable-api"] }
solana-client = { version = "4.0.0-beta.7", features = ["agave-unstable-api"] }
solana-cli-config = { version = "4.0.0", features = ["agave-unstable-api"] }
solana-cli-output = { version = "4.0.0", features = ["agave-unstable-api"] }
solana-client = { version = "4.0.0", features = ["agave-unstable-api"] }
solana-commitment-config = "3.1.1"
solana-logger = "3.0.0"
solana-remote-wallet = { version = "3.1.0", features = ["agave-unstable-api"] }
solana-sdk = "3.0.0"
solana-system-interface = "3.2.0"
solana-system-interface = "3.1.0"
solana-zk-sdk = "6.0.1"
solana-zk-sdk-pod = "0.1.2"
spl-associated-token-account-interface = { version = "2.0.0" }
Expand All @@ -47,7 +47,7 @@ tokio = "1.52"
[dev-dependencies]
solana-nonce = "3.1.0"
solana-sdk-ids = "3.1.0"
solana-test-validator = { version = "4.0.0-beta.7", features = ["agave-unstable-api"] }
solana-test-validator = { version = "4.0.0", features = ["agave-unstable-api"] }
assert_cmd = "2.2.2"
libtest-mimic = "0.8"
serial_test = "3.4.0"
Expand Down
20 changes: 10 additions & 10 deletions clients/rust-legacy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,28 @@ bytemuck = "1.25.0"
futures = "0.3.32"
futures-util = "0.3"
solana-account = "3.2.0"
solana-address = "2.6.0"
solana-banks-client = { version = "4.0.0-beta.7", optional = true }
solana-banks-interface = { version = "4.0.0-beta.7", optional = true }
solana-address = "2.5.0"
solana-banks-client = { version = "4.0.0", optional = true }
solana-banks-interface = { version = "4.0.0", optional = true }
solana-compute-budget-interface = "3.0.0"
solana-cli-output = { version = "4.0.0-beta.7", features = ["agave-unstable-api"], optional = true }
solana-cli-output = { version = "4.0.0", features = ["agave-unstable-api"], optional = true }
solana-hash = "4.2.0"
solana-instruction = "3.0.0"
solana-message = "3.0.0"
solana-packet = "4.1.0"
solana-program-error = "3.0.1"
solana-program-pack = "3.1.0"
solana-program-test = { version = "4.0.0-beta.7", optional = true, features = ["agave-unstable-api"] }
solana-rpc-client = "4.0.0-beta.7"
solana-rpc-client-api = "4.0.0-beta.7"
solana-program-test = { version = "4.0.0", optional = true, features = ["agave-unstable-api"] }
solana-rpc-client = "4.0.0"
solana-rpc-client-api = "4.0.0"
solana-signature = "3.0.0"
solana-signer = "3.0.0"
solana-system-interface = "3.2.0"
solana-system-interface = "3.1.0"
solana-transaction = "3.0.0"
solana-zk-sdk = "6.0.1"
spl-associated-token-account-interface = { version = "2.0.0" }
spl-elgamal-registry = { version = "0.5.0", path = "../../confidential/elgamal-registry", features = ["no-entrypoint"] }
spl-memo-interface = "2.1.0"
spl-memo-interface = "2.0.0"
spl-record = { version = "0.4.0", features = ["no-entrypoint"] }
spl-token-interface = "3.0.0"
spl-token-confidential-transfer-proof-extraction = { path = "../../confidential/proof-extraction", version = "0.6.0" }
Expand All @@ -67,7 +67,7 @@ async-trait = "0.1"
borsh = "1.6.1"
bytemuck = "1.25.0"
futures-util = "0.3"
solana-program-test = { version = "4.0.0-beta.7", features = ["agave-unstable-api"] }
solana-program-test = { version = "4.0.0", features = ["agave-unstable-api"] }
solana-sdk = "3.0.0"
solana-sdk-ids = "3.1.0"
spl-instruction-padding-interface = "1.0.0"
Expand Down
16 changes: 8 additions & 8 deletions clients/rust-legacy/tests/cpi_guard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ async fn test_cpi_guard_burn() {
..
} = context.token_context.unwrap();

let mk_burn = |authority, do_checked| {
let mk_burn = |authority, do_checked, amount| {
wrap_instruction(
spl_instruction_padding_interface::id(),
if do_checked {
Expand All @@ -390,7 +390,7 @@ async fn test_cpi_guard_burn() {
token.get_address(),
&authority,
&[],
1,
amount,
9,
)
.unwrap()
Expand All @@ -401,7 +401,7 @@ async fn test_cpi_guard_burn() {
token.get_address(),
&authority,
&[],
1,
amount,
)
.unwrap()
},
Expand Down Expand Up @@ -441,7 +441,7 @@ async fn test_cpi_guard_burn() {

// user-auth cpi burn with cpi guard doesn't work
let error = token_obj
.process_ixs(&[mk_burn(alice.pubkey(), do_checked)], &[&alice])
.process_ixs(&[mk_burn(alice.pubkey(), do_checked, 1)], &[&alice])
.await
.unwrap_err();
assert_eq!(error, client_error(TokenError::CpiGuardBurnBlocked));
Expand All @@ -462,7 +462,7 @@ async fn test_cpi_guard_burn() {
.unwrap();

let error = token_obj
.process_ixs(&[mk_burn(alice.pubkey(), do_checked)], &[&alice])
.process_ixs(&[mk_burn(alice.pubkey(), do_checked, 2)], &[&alice])
.await
.unwrap_err();
assert_eq!(error, client_error(TokenError::CpiGuardBurnBlocked));
Expand All @@ -483,7 +483,7 @@ async fn test_cpi_guard_burn() {
.unwrap();

token_obj
.process_ixs(&[mk_burn(bob.pubkey(), do_checked)], &[&bob])
.process_ixs(&[mk_burn(bob.pubkey(), do_checked, 1)], &[&bob])
.await
.unwrap();
amount -= 1;
Expand All @@ -498,10 +498,10 @@ async fn test_cpi_guard_burn() {
.unwrap();

token_obj
.process_ixs(&[mk_burn(alice.pubkey(), do_checked)], &[&alice])
.process_ixs(&[mk_burn(alice.pubkey(), do_checked, 3)], &[&alice])
.await
.unwrap();
amount -= 1;
amount -= 3;

let alice_state = token_obj.get_account_info(&alice.pubkey()).await.unwrap();
assert_eq!(alice_state.base.amount, amount);
Expand Down
2 changes: 1 addition & 1 deletion confidential/elgamal-registry-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = { workspace = true }

[dependencies]
bytemuck = { version = "1.25.0", features = ["derive"] }
solana-address = { version = "2.6.0", features = ["curve25519"] }
solana-address = { version = "2.5.0", features = ["curve25519"] }
solana-instruction = "3.0.0"
solana-program-error = "3.0.1"
solana-sdk-ids = "3.1.0"
Expand Down
4 changes: 2 additions & 2 deletions confidential/elgamal-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ no-entrypoint = []
[dependencies]
bytemuck = { version = "1.25.0", features = ["derive"] }
solana-account-info = "3.1.1"
solana-address = "2.6.0"
solana-address = "2.5.0"
solana-cpi = "3.1.0"
solana-instruction = "3.0.0"
solana-msg = "3.1.0"
Expand All @@ -23,7 +23,7 @@ solana-program-error = "3.0.1"
solana-rent = "3.0.0"
solana-sdk-ids = "3.1.0"
solana-security-txt = "1.1.3"
solana-system-interface = { version = "3.2.0", features = ["bincode"] }
solana-system-interface = { version = "3.1.0", features = ["bincode"] }
solana-sysvar = { version = "3.0.0", features = ["bincode"] }
solana-zk-elgamal-proof-interface = "0.1.2"
spl-elgamal-registry-interface = { version = "0.2.0", path = "../elgamal-registry-interface" }
Expand Down
4 changes: 2 additions & 2 deletions confidential/proof-extraction/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ edition = { workspace = true }
[dependencies]
bytemuck = "1.25.0"
solana-account-info = "3.1.1"
solana-address = "2.6.0"
solana-address = "2.5.0"
solana-curve25519 = "4.0.1"
solana-instruction = "3.0.0"
solana-instructions-sysvar = "3.0.1"
solana-instructions-sysvar = "3.0.0"
solana-msg = { version = "3.1.0", default-features = false, features = ["alloc"] }
solana-program-error = "3.0.1"
solana-sdk-ids = "3.1.0"
Expand Down
4 changes: 2 additions & 2 deletions interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ num-derive = "0.4"
num-traits = { version = "0.2", features = ["libm"], default-features = false }
num_enum = { version = "0.7.6", default-features = false }
solana-account-info = "3.1.1"
solana-address = { version = "2.6.0", features = ["bytemuck", "nullable"] }
solana-address = { version = "2.5.0", features = ["bytemuck", "nullable"] }
solana-instruction = { version = "3.0.0", default-features = false }
solana-nullable = { version = "1.1.1", features = ["bytemuck"] }
solana-program-error = "3.0.1"
Expand All @@ -45,7 +45,7 @@ getrandom = { version = "0.2", features = ["js"] }
base64 = "0.22.1"
proptest = "1.11"
serde_json = "1.0.150"
solana-address = { version = "2.6.0", features = ["curve25519"] }
solana-address = { version = "2.5.0", features = ["curve25519"] }
spl-token-2022-interface = { path = ".", features = ["serde"] }
spl-token-interface = { version = "3.0" }
strum = "0.28"
Expand Down
6 changes: 3 additions & 3 deletions program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ zk-ops = []
bytemuck = { version = "1.25.0", features = ["derive"] }
num_enum = "0.7.6"
solana-account-info = "3.1.1"
solana-address = { version = "2.6.0", features = ["bytemuck", "nullable"] }
solana-address = { version = "2.5.0", features = ["bytemuck", "nullable"] }
solana-clock = "3.1.0"
solana-cpi = "3.1.0"
solana-instruction = "3.0.0"
Expand All @@ -36,12 +36,12 @@ solana-rent = "3.0.0"
solana-sdk-ids = "3.1.0"
solana-security-txt = "1.1.3"
solana-sysvar = { version = "3.0.0", features = ["bincode"] }
solana-system-interface = { version = "3.2.0", features = ["bincode"] }
solana-system-interface = { version = "3.1.0", features = ["bincode"] }
solana-zero-copy = { version = "1.1.1", features = ["bytemuck"] }
solana-zk-sdk-pod = "0.1.2"
solana-zk-elgamal-proof-interface = "0.1.2"
spl-elgamal-registry-interface = { version = "0.2.0", path = "../confidential/elgamal-registry-interface" }
spl-memo-interface = { version = "2.1" }
spl-memo-interface = { version = "2.0" }
spl-token-2022-interface = { version = "3.0.0", path = "../interface" }
spl-token-confidential-transfer-ciphertext-arithmetic = { version = "0.5.0", path = "../confidential/ciphertext-arithmetic" }
spl-token-confidential-transfer-proof-extraction = { version = "0.6.0", path = "../confidential/proof-extraction" }
Expand Down
Loading