Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Revert "[token-2022] Add support for reading proofs from record accou… #7084

Merged
merged 1 commit into from
Jul 31, 2024
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
4 changes: 0 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions token/cli/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ use {
},
spl_token_client::{
client::{ProgramRpcClientSendTransaction, RpcClientResponse},
proof_generation::ProofAccount,
token::{ComputeUnitLimit, ExtensionInitializationParams, Token},
},
spl_token_group_interface::state::TokenGroup,
Expand Down Expand Up @@ -3349,7 +3348,7 @@ async fn command_deposit_withdraw_confidential_tokens(
.confidential_transfer_withdraw(
&token_account_address,
&owner,
Some(&ProofAccount::ContextAccount(context_state_pubkey)),
Some(&context_state_pubkey),
amount,
decimals,
Some(withdraw_account_info),
Expand Down
3 changes: 0 additions & 3 deletions token/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ version = "0.11.0"

[dependencies]
async-trait = "0.1"
bincode = "1.3.2"
bytemuck = "1.16.3"
curve25519-dalek = "3.2.1"
futures = "0.3.30"
futures-util = "0.3"
Expand All @@ -28,7 +26,6 @@ spl-associated-token-account = { version = "4.0.0", path = "../../associated-tok
spl-memo = { version = "5.0", path = "../../memo/program", features = [
"no-entrypoint",
] }
spl-record = { version = "0.2.0", path = "../../record/program", features = ["no-entrypoint"] }
spl-token = { version = "6.0", path = "../program", features = [
"no-entrypoint",
] }
Expand Down
6 changes: 0 additions & 6 deletions token/client/src/proof_generation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use {
curve25519_dalek::scalar::Scalar,
solana_sdk::pubkey::Pubkey,
spl_token_2022::{
error::TokenError,
extension::confidential_transfer::{
Expand All @@ -33,11 +32,6 @@ use {
},
};

pub enum ProofAccount {
ContextAccount(Pubkey),
RecordAccount(Pubkey, u32),
}

/// The main logic to create the five split proof data for a transfer with fee.
#[allow(clippy::too_many_arguments)]
pub fn transfer_with_fee_split_proof_data(
Expand Down
Loading
Loading