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

Commit 69257a6

Browse files
samkim-cryptosamkim-crypto
authored
[token-client] Make close_context_state_account and close_record_account variable order consistent (#7174)
* rename `confidential_transfer_close_context_state` to `confidential_transfer_close_context_state_account` * shift order of `lamport_destination_account` and `record_account_authority` in `confidential_transfer_close_record_account`
1 parent 7440e4b commit 69257a6

File tree

4 files changed

+38
-38
lines changed

4 files changed

+38
-38
lines changed

‎token/cli/src/command.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,19 +1662,19 @@ async fn command_transfer(
16621662
// close context state accounts
16631663
let close_context_state_signer = &[&context_state_authority];
16641664
let _ = try_join!(
1665-
token.confidential_transfer_close_context_state(
1665+
token.confidential_transfer_close_context_state_account(
16661666
&equality_proof_pubkey,
16671667
&sender,
16681668
&context_state_authority_pubkey,
16691669
close_context_state_signer
16701670
),
1671-
token.confidential_transfer_close_context_state(
1671+
token.confidential_transfer_close_context_state_account(
16721672
&ciphertext_validity_proof_pubkey,
16731673
&sender,
16741674
&context_state_authority_pubkey,
16751675
close_context_state_signer
16761676
),
1677-
token.confidential_transfer_close_context_state(
1677+
token.confidential_transfer_close_context_state_account(
16781678
&range_proof_pubkey,
16791679
&sender,
16801680
&context_state_authority_pubkey,
@@ -3402,13 +3402,13 @@ async fn command_deposit_withdraw_confidential_tokens(
34023402
// close context state account
34033403
let close_context_state_signer = &[&context_state_authority];
34043404
let _ = try_join!(
3405-
token.confidential_transfer_close_context_state(
3405+
token.confidential_transfer_close_context_state_account(
34063406
&equality_proof_context_state_pubkey,
34073407
&token_account_address,
34083408
&context_state_authority_pubkey,
34093409
close_context_state_signer
34103410
),
3411-
token.confidential_transfer_close_context_state(
3411+
token.confidential_transfer_close_context_state_account(
34123412
&range_proof_context_state_pubkey,
34133413
&token_account_address,
34143414
&context_state_authority_pubkey,

‎token/client/src/token.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2355,15 +2355,15 @@ where
23552355
pub async fn confidential_transfer_close_record_account<S: Signers>(
23562356
&self,
23572357
record_account: &Pubkey,
2358-
record_authority: &Pubkey,
2359-
receiver: &Pubkey,
2358+
lamport_destination_account: &Pubkey,
2359+
record_account_authority: &Pubkey,
23602360
signing_keypairs: &S,
23612361
) -> TokenResult<T::Output> {
23622362
self.process_ixs(
23632363
&[spl_record::instruction::close_account(
23642364
record_account,
2365-
record_authority,
2366-
receiver,
2365+
record_account_authority,
2366+
lamport_destination_account,
23672367
)],
23682368
signing_keypairs,
23692369
)
@@ -2448,7 +2448,7 @@ where
24482448
}
24492449

24502450
/// Close a ZK Token proof program context state
2451-
pub async fn confidential_transfer_close_context_state<S: Signers>(
2451+
pub async fn confidential_transfer_close_context_state_account<S: Signers>(
24522452
&self,
24532453
context_state_account: &Pubkey,
24542454
lamport_destination_account: &Pubkey,

‎token/program-2022-test/tests/confidential_transfer.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ async fn configure_account_with_option<S: Signers>(
110110
token
111111
.confidential_transfer_close_record_account(
112112
&pubkey_validity_proof_record_account.pubkey(),
113-
&record_account_authority.pubkey(),
114113
account,
114+
&record_account_authority.pubkey(),
115115
&[&record_account_authority],
116116
)
117117
.await
@@ -152,7 +152,7 @@ async fn configure_account_with_option<S: Signers>(
152152
.await;
153153

154154
token
155-
.confidential_transfer_close_context_state(
155+
.confidential_transfer_close_context_state_account(
156156
&pubkey_validity_proof_context_account.pubkey(),
157157
account,
158158
&context_account_authority.pubkey(),
@@ -637,8 +637,8 @@ async fn empty_account_with_option<S: Signers>(
637637
token
638638
.confidential_transfer_close_record_account(
639639
&zero_ciphertext_proof_record_account.pubkey(),
640-
&record_account_authority.pubkey(),
641640
account,
641+
&record_account_authority.pubkey(),
642642
&[&record_account_authority],
643643
)
644644
.await
@@ -685,7 +685,7 @@ async fn empty_account_with_option<S: Signers>(
685685
.await;
686686

687687
token
688-
.confidential_transfer_close_context_state(
688+
.confidential_transfer_close_context_state_account(
689689
&zero_ciphertext_proof_context_account.pubkey(),
690690
account,
691691
&context_account_authority.pubkey(),
@@ -1054,8 +1054,8 @@ async fn withdraw_with_option<S: Signers>(
10541054
token
10551055
.confidential_transfer_close_record_account(
10561056
&equality_proof_record_account.pubkey(),
1057-
&record_account_authority.pubkey(),
10581057
source_account,
1058+
&record_account_authority.pubkey(),
10591059
&[&record_account_authority],
10601060
)
10611061
.await
@@ -1064,8 +1064,8 @@ async fn withdraw_with_option<S: Signers>(
10641064
token
10651065
.confidential_transfer_close_record_account(
10661066
&range_proof_record_account.pubkey(),
1067-
&record_account_authority.pubkey(),
10681067
source_account,
1068+
&record_account_authority.pubkey(),
10691069
&[&record_account_authority],
10701070
)
10711071
.await
@@ -1135,7 +1135,7 @@ async fn withdraw_with_option<S: Signers>(
11351135
.await;
11361136

11371137
token
1138-
.confidential_transfer_close_context_state(
1138+
.confidential_transfer_close_context_state_account(
11391139
&equality_proof_context_account.pubkey(),
11401140
source_account,
11411141
&context_account_authority.pubkey(),
@@ -1145,7 +1145,7 @@ async fn withdraw_with_option<S: Signers>(
11451145
.unwrap();
11461146

11471147
token
1148-
.confidential_transfer_close_context_state(
1148+
.confidential_transfer_close_context_state_account(
11491149
&range_proof_context_account.pubkey(),
11501150
source_account,
11511151
&context_account_authority.pubkey(),
@@ -1426,8 +1426,8 @@ async fn confidential_transfer_with_option<S: Signers>(
14261426
token
14271427
.confidential_transfer_close_record_account(
14281428
&equality_proof_record_account.pubkey(),
1429-
&record_account_authority.pubkey(),
14301429
source_account,
1430+
&record_account_authority.pubkey(),
14311431
&[&record_account_authority],
14321432
)
14331433
.await
@@ -1436,8 +1436,8 @@ async fn confidential_transfer_with_option<S: Signers>(
14361436
token
14371437
.confidential_transfer_close_record_account(
14381438
&ciphertext_validity_proof_record_account.pubkey(),
1439-
&record_account_authority.pubkey(),
14401439
source_account,
1440+
&record_account_authority.pubkey(),
14411441
&[&record_account_authority],
14421442
)
14431443
.await
@@ -1446,8 +1446,8 @@ async fn confidential_transfer_with_option<S: Signers>(
14461446
token
14471447
.confidential_transfer_close_record_account(
14481448
&range_proof_record_account.pubkey(),
1449-
&record_account_authority.pubkey(),
14501449
source_account,
1450+
&record_account_authority.pubkey(),
14511451
&[&record_account_authority],
14521452
)
14531453
.await
@@ -1548,7 +1548,7 @@ async fn confidential_transfer_with_option<S: Signers>(
15481548
.await;
15491549

15501550
token
1551-
.confidential_transfer_close_context_state(
1551+
.confidential_transfer_close_context_state_account(
15521552
&equality_proof_context_account.pubkey(),
15531553
source_account,
15541554
&context_account_authority.pubkey(),
@@ -1558,7 +1558,7 @@ async fn confidential_transfer_with_option<S: Signers>(
15581558
.unwrap();
15591559

15601560
token
1561-
.confidential_transfer_close_context_state(
1561+
.confidential_transfer_close_context_state_account(
15621562
&ciphertext_validity_proof_context_account.pubkey(),
15631563
source_account,
15641564
&context_account_authority.pubkey(),
@@ -1568,7 +1568,7 @@ async fn confidential_transfer_with_option<S: Signers>(
15681568
.unwrap();
15691569

15701570
token
1571-
.confidential_transfer_close_context_state(
1571+
.confidential_transfer_close_context_state_account(
15721572
&range_proof_context_account.pubkey(),
15731573
source_account,
15741574
&context_account_authority.pubkey(),
@@ -2024,8 +2024,8 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
20242024
token
20252025
.confidential_transfer_close_record_account(
20262026
&equality_proof_record_account.pubkey(),
2027-
&record_account_authority.pubkey(),
20282027
source_account,
2028+
&record_account_authority.pubkey(),
20292029
&[&record_account_authority],
20302030
)
20312031
.await
@@ -2034,8 +2034,8 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
20342034
token
20352035
.confidential_transfer_close_record_account(
20362036
&transfer_amount_ciphertext_validity_proof_record_account.pubkey(),
2037-
&record_account_authority.pubkey(),
20382037
source_account,
2038+
&record_account_authority.pubkey(),
20392039
&[&record_account_authority],
20402040
)
20412041
.await
@@ -2044,8 +2044,8 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
20442044
token
20452045
.confidential_transfer_close_record_account(
20462046
&fee_sigma_proof_record_account.pubkey(),
2047-
&record_account_authority.pubkey(),
20482047
source_account,
2048+
&record_account_authority.pubkey(),
20492049
&[&record_account_authority],
20502050
)
20512051
.await
@@ -2054,8 +2054,8 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
20542054
token
20552055
.confidential_transfer_close_record_account(
20562056
&fee_ciphertext_validity_proof_record_account.pubkey(),
2057-
&record_account_authority.pubkey(),
20582057
source_account,
2058+
&record_account_authority.pubkey(),
20592059
&[&record_account_authority],
20602060
)
20612061
.await
@@ -2064,8 +2064,8 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
20642064
token
20652065
.confidential_transfer_close_record_account(
20662066
&range_proof_record_account.pubkey(),
2067-
&record_account_authority.pubkey(),
20682067
source_account,
2068+
&record_account_authority.pubkey(),
20692069
&[&record_account_authority],
20702070
)
20712071
.await
@@ -2209,7 +2209,7 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
22092209
.await;
22102210

22112211
token
2212-
.confidential_transfer_close_context_state(
2212+
.confidential_transfer_close_context_state_account(
22132213
&equality_proof_context_account.pubkey(),
22142214
source_account,
22152215
&context_account_authority.pubkey(),
@@ -2219,7 +2219,7 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
22192219
.unwrap();
22202220

22212221
token
2222-
.confidential_transfer_close_context_state(
2222+
.confidential_transfer_close_context_state_account(
22232223
&transfer_amount_ciphertext_validity_proof_context_account.pubkey(),
22242224
source_account,
22252225
&context_account_authority.pubkey(),
@@ -2229,7 +2229,7 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
22292229
.unwrap();
22302230

22312231
token
2232-
.confidential_transfer_close_context_state(
2232+
.confidential_transfer_close_context_state_account(
22332233
&percentage_with_cap_proof_context_account.pubkey(),
22342234
source_account,
22352235
&context_account_authority.pubkey(),
@@ -2239,7 +2239,7 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
22392239
.unwrap();
22402240

22412241
token
2242-
.confidential_transfer_close_context_state(
2242+
.confidential_transfer_close_context_state_account(
22432243
&fee_ciphertext_validity_proof_context_account.pubkey(),
22442244
source_account,
22452245
&context_account_authority.pubkey(),
@@ -2249,7 +2249,7 @@ async fn confidential_transfer_with_fee_with_option<S: Signers>(
22492249
.unwrap();
22502250

22512251
token
2252-
.confidential_transfer_close_context_state(
2252+
.confidential_transfer_close_context_state_account(
22532253
&range_proof_context_account.pubkey(),
22542254
source_account,
22552255
&context_account_authority.pubkey(),

‎token/program-2022-test/tests/confidential_transfer_fee.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,8 @@ async fn withdraw_withheld_tokens_from_mint_with_option<S: Signers>(
534534
token
535535
.confidential_transfer_close_record_account(
536536
&record_account.pubkey(),
537-
&record_account_authority.pubkey(),
538537
destination_account,
538+
&record_account_authority.pubkey(),
539539
&[&record_account_authority],
540540
)
541541
.await
@@ -587,7 +587,7 @@ async fn withdraw_withheld_tokens_from_mint_with_option<S: Signers>(
587587
.await;
588588

589589
token
590-
.confidential_transfer_close_context_state(
590+
.confidential_transfer_close_context_state_account(
591591
&context_account.pubkey(),
592592
destination_account,
593593
&context_account_authority.pubkey(),
@@ -859,8 +859,8 @@ async fn withdraw_withheld_tokens_from_accounts_with_option<S: Signers>(
859859
token
860860
.confidential_transfer_close_record_account(
861861
&record_account.pubkey(),
862-
&record_account_authority.pubkey(),
863862
destination_account,
863+
&record_account_authority.pubkey(),
864864
&[&record_account_authority],
865865
)
866866
.await
@@ -913,7 +913,7 @@ async fn withdraw_withheld_tokens_from_accounts_with_option<S: Signers>(
913913
.await;
914914

915915
token
916-
.confidential_transfer_close_context_state(
916+
.confidential_transfer_close_context_state_account(
917917
&context_account.pubkey(),
918918
destination_account,
919919
&context_account_authority.pubkey(),

0 commit comments

Comments
 (0)