Skip to content

Commit 65f26bd

Browse files
author
Bengt Lofgren
committed
create token account only creates usdc token account
1 parent 5992933 commit 65f26bd

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

solana/programs/matching-engine/src/fallback/processor/helpers.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use anchor_lang::prelude::*;
22

3+
use anchor_spl::mint::USDC;
34
use anchor_spl::token::spl_token;
45
use solana_program::program_pack::Pack;
56
use solana_program::{
@@ -145,11 +146,10 @@ pub fn create_account_reliably(
145146
/// * `data_len` - The length of the data to be written to the token account.
146147
/// * `accounts` - The accounts to be used in the CPI.
147148
/// * `signer_seeds` - The signer seeds to be used in the CPI.
148-
pub fn create_token_account_reliably(
149+
pub fn create_usdc_token_account_reliably(
149150
payer_pubkey: &Pubkey,
150151
account_pubkey_to_create: &Pubkey,
151152
owner_account_pubkey: &Pubkey,
152-
mint_pubkey: &Pubkey,
153153
token_account_lamports: u64,
154154
accounts: &[AccountInfo],
155155
signer_seeds: &[&[&[u8]]],
@@ -169,7 +169,7 @@ pub fn create_token_account_reliably(
169169
let init_token_account_ix = spl_token::instruction::initialize_account3(
170170
&spl_token::ID,
171171
account_pubkey_to_create,
172-
mint_pubkey,
172+
&USDC,
173173
owner_account_pubkey,
174174
)?;
175175

solana/programs/matching-engine/src/fallback/processor/place_initial_offer.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::helpers::create_account_reliably;
2-
use super::helpers::create_token_account_reliably;
2+
use super::helpers::create_usdc_token_account_reliably;
33
use super::helpers::require_min_account_infos_len;
44
use crate::state::MessageProtocol;
55
use crate::state::{
@@ -384,11 +384,10 @@ pub fn place_initial_offer_cctp_shim(
384384
];
385385
let auction_custody_token_signer_seeds = &[&auction_custody_token_seeds[..]];
386386

387-
create_token_account_reliably(
387+
create_usdc_token_account_reliably(
388388
&signer.key(),
389389
&auction_custody_token_pda,
390390
&auction_account.key(),
391-
&usdc.key(),
392391
auction_custody_token.lamports(),
393392
accounts,
394393
auction_custody_token_signer_seeds,

solana/programs/matching-engine/src/fallback/processor/prepare_order_response.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::io::Cursor;
33
use super::helpers::create_account_reliably;
44
use super::place_initial_offer::VaaMessageBodyHeader;
55
use super::FallbackMatchingEngineInstruction;
6-
use crate::fallback::helpers::create_token_account_reliably;
6+
use crate::fallback::helpers::create_usdc_token_account_reliably;
77
use crate::fallback::helpers::require_min_account_infos_len;
88
use crate::state::PreparedOrderResponseInfo;
99
use crate::state::PreparedOrderResponseSeeds;
@@ -461,11 +461,10 @@ pub fn prepare_order_response_cctp_shim(
461461
];
462462

463463
let prepared_custody_token_signer_seeds = &[&create_prepared_custody_token_seeds[..]];
464-
create_token_account_reliably(
464+
create_usdc_token_account_reliably(
465465
&signer.key(),
466466
&prepared_custody_token_pda,
467467
&prepared_order_response_pda,
468-
&usdc.key(),
469468
prepared_custody_token.lamports(),
470469
accounts,
471470
prepared_custody_token_signer_seeds,

0 commit comments

Comments
 (0)