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

Commit 88aa397

Browse files
a5-picklea5-pickle
authored
solana: add sender option (#118)
Co-authored-by: A5 Pickle <[email protected]>
1 parent 799cd04 commit 88aa397

File tree

6 files changed

+255
-60
lines changed

6 files changed

+255
-60
lines changed

‎solana/programs/token-router/src/error.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ pub enum TokenRouterError {
2525
AlreadyOwner = 0x204,
2626
NoTransferOwnershipRequest = 0x206,
2727
NotPendingOwner = 0x208,
28+
MissingAuthority = 0x20a,
29+
TooManyAuthorities = 0x20b,
2830

2931
InsufficientAmount = 0x400,
3032
MinAmountOutTooHigh = 0x402,

‎solana/programs/token-router/src/processor/market_order/prepare.rs‎

Lines changed: 43 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ pub struct PrepareMarketOrder<'info> {
1717

1818
custodian: CheckedCustodian<'info>,
1919

20-
/// The auction participant needs to set approval to this PDA.
20+
/// The auction participant needs to set approval to this PDA if the sender (signer) is not
21+
/// provided.
2122
///
2223
/// CHECK: Seeds must be \["transfer-authority", prepared_order.key(), args.hash()\].
2324
#[account(
@@ -28,7 +29,11 @@ pub struct PrepareMarketOrder<'info> {
2829
],
2930
bump,
3031
)]
31-
transfer_authority: UncheckedAccount<'info>,
32+
program_transfer_authority: Option<UncheckedAccount<'info>>,
33+
34+
/// Sender, who has the authority to transfer assets from the sender token account. If this
35+
/// account is not provided, the program transfer authority account must be some account.
36+
sender: Option<Signer<'info>>,
3237

3338
#[account(
3439
init,
@@ -164,22 +169,41 @@ pub fn prepare_market_order(
164169
redeemer_message,
165170
});
166171

167-
// Finally transfer amount to custody token account.
168-
token::transfer(
169-
CpiContext::new_with_signer(
170-
ctx.accounts.token_program.to_account_info(),
171-
token::Transfer {
172-
from: ctx.accounts.sender_token.to_account_info(),
173-
to: ctx.accounts.prepared_custody_token.to_account_info(),
174-
authority: ctx.accounts.transfer_authority.to_account_info(),
175-
},
176-
&[&[
177-
TRANSFER_AUTHORITY_SEED_PREFIX,
178-
ctx.accounts.prepared_order.key().as_ref(),
179-
&hashed_args.0,
180-
&[ctx.bumps.transfer_authority],
181-
]],
172+
// Finally transfer amount to custody token account. We perform exclusive or because we do not
173+
// want to allow specifying more than one authority.
174+
match (
175+
ctx.accounts.sender.as_ref(),
176+
ctx.accounts.program_transfer_authority.as_ref(),
177+
) {
178+
(Some(sender), None) => token::transfer(
179+
CpiContext::new(
180+
ctx.accounts.token_program.to_account_info(),
181+
token::Transfer {
182+
from: ctx.accounts.sender_token.to_account_info(),
183+
to: ctx.accounts.prepared_custody_token.to_account_info(),
184+
authority: sender.to_account_info(),
185+
},
186+
),
187+
amount_in,
182188
),
183-
amount_in,
184-
)
189+
(None, Some(program_transfer_authority)) => token::transfer(
190+
CpiContext::new_with_signer(
191+
ctx.accounts.token_program.to_account_info(),
192+
token::Transfer {
193+
from: ctx.accounts.sender_token.to_account_info(),
194+
to: ctx.accounts.prepared_custody_token.to_account_info(),
195+
authority: program_transfer_authority.to_account_info(),
196+
},
197+
&[&[
198+
TRANSFER_AUTHORITY_SEED_PREFIX,
199+
ctx.accounts.prepared_order.key().as_ref(),
200+
&hashed_args.0,
201+
&[ctx.bumps.program_transfer_authority.unwrap()],
202+
]],
203+
),
204+
amount_in,
205+
),
206+
(None, None) => err!(TokenRouterError::MissingAuthority),
207+
(Some(_), Some(_)) => err!(TokenRouterError::TooManyAuthorities),
208+
}
185209
}

‎solana/target/idl/token_router.json‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,11 +522,22 @@
522522
]
523523
},
524524
{
525-
"name": "transfer_authority",
525+
"name": "program_transfer_authority",
526526
"docs": [
527-
"The auction participant needs to set approval to this PDA.",
527+
"The auction participant needs to set approval to this PDA if the sender (signer) is not",
528+
"provided.",
528529
""
529-
]
530+
],
531+
"optional": true
532+
},
533+
{
534+
"name": "sender",
535+
"docs": [
536+
"Sender, who has the authority to transfer assets from the sender token account. If this",
537+
"account is not provided, the program transfer authority account must be some account."
538+
],
539+
"signer": true,
540+
"optional": true
530541
},
531542
{
532543
"name": "prepared_order",
@@ -1123,6 +1134,14 @@
11231134
"code": 6520,
11241135
"name": "NotPendingOwner"
11251136
},
1137+
{
1138+
"code": 6522,
1139+
"name": "TooManyAuthorities"
1140+
},
1141+
{
1142+
"code": 6524,
1143+
"name": "MissingAuthority"
1144+
},
11261145
{
11271146
"code": 7024,
11281147
"name": "InsufficientAmount"

‎solana/target/types/token_router.ts‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,11 +528,22 @@ export type TokenRouter = {
528528
]
529529
},
530530
{
531-
"name": "transferAuthority",
531+
"name": "programTransferAuthority",
532532
"docs": [
533-
"The auction participant needs to set approval to this PDA.",
533+
"The auction participant needs to set approval to this PDA if the sender (signer) is not",
534+
"provided.",
534535
""
535-
]
536+
],
537+
"optional": true
538+
},
539+
{
540+
"name": "sender",
541+
"docs": [
542+
"Sender, who has the authority to transfer assets from the sender token account. If this",
543+
"account is not provided, the program transfer authority account must be some account."
544+
],
545+
"signer": true,
546+
"optional": true
536547
},
537548
{
538549
"name": "preparedOrder",
@@ -1129,6 +1140,14 @@ export type TokenRouter = {
11291140
"code": 6520,
11301141
"name": "notPendingOwner"
11311142
},
1143+
{
1144+
"code": 6522,
1145+
"name": "tooManyAuthorities"
1146+
},
1147+
{
1148+
"code": 6524,
1149+
"name": "missingAuthority"
1150+
},
11321151
{
11331152
"code": 7024,
11341153
"name": "insufficientAmount"

‎solana/ts/src/tokenRouter/index.ts‎

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,15 @@ export class TokenRouterProgram {
324324
accounts: {
325325
preparedOrder: PublicKey;
326326
senderToken: PublicKey;
327-
sender?: PublicKey;
327+
senderTokenAuthority?: PublicKey;
328328
},
329329
args: PrepareMarketOrderArgs,
330330
): Promise<{ transferAuthority: PublicKey; ix: TransactionInstruction }> {
331331
const { preparedOrder, senderToken } = accounts;
332332
const { amountIn } = args;
333333

334-
let { sender } = accounts;
335-
sender ??= await (async () => {
334+
let { senderTokenAuthority } = accounts;
335+
senderTokenAuthority ??= await (async () => {
336336
const tokenAccount = await splToken.getAccount(
337337
this.program.provider.connection,
338338
senderToken,
@@ -344,7 +344,12 @@ export class TokenRouterProgram {
344344

345345
return {
346346
transferAuthority,
347-
ix: splToken.createApproveInstruction(senderToken, transferAuthority, sender, amountIn),
347+
ix: splToken.createApproveInstruction(
348+
senderToken,
349+
transferAuthority,
350+
senderTokenAuthority,
351+
amountIn,
352+
),
348353
};
349354
}
350355

@@ -353,19 +358,39 @@ export class TokenRouterProgram {
353358
payer: PublicKey;
354359
preparedOrder: PublicKey;
355360
senderToken: PublicKey;
361+
senderTokenAuthority?: PublicKey;
356362
refundToken?: PublicKey;
357-
sender?: PublicKey;
363+
programTransferAuthority?: PublicKey | null;
364+
sender?: PublicKey | null;
358365
},
359-
args: PrepareMarketOrderArgs,
360-
): Promise<[approveIx: TransactionInstruction, prepareIx: TransactionInstruction]> {
361-
const { payer, preparedOrder, senderToken, sender } = accounts;
362-
let { refundToken } = accounts;
366+
args: { useTransferAuthority?: boolean } & PrepareMarketOrderArgs,
367+
): Promise<[approveIx: TransactionInstruction | null, prepareIx: TransactionInstruction]> {
368+
const { payer, preparedOrder, senderToken, senderTokenAuthority } = accounts;
369+
370+
let { refundToken, programTransferAuthority, sender } = accounts;
363371
refundToken ??= senderToken;
364372

365-
const { transferAuthority, ix: approveIx } = await this.approveTransferAuthorityIx(
366-
{ preparedOrder, senderToken, sender },
367-
args,
368-
);
373+
let { useTransferAuthority } = args;
374+
useTransferAuthority ??= true;
375+
376+
let approveIx: TransactionInstruction | null = null;
377+
378+
if (sender === undefined) {
379+
sender = null;
380+
}
381+
382+
if (programTransferAuthority === undefined) {
383+
if (useTransferAuthority) {
384+
const approveResult = await this.approveTransferAuthorityIx(
385+
{ preparedOrder, senderToken, senderTokenAuthority },
386+
args,
387+
);
388+
programTransferAuthority = approveResult.transferAuthority;
389+
approveIx = approveResult.ix;
390+
} else {
391+
programTransferAuthority = null;
392+
}
393+
}
369394

370395
const prepareIx = await this.program.methods
371396
.prepareMarketOrder({
@@ -376,7 +401,9 @@ export class TokenRouterProgram {
376401
.accounts({
377402
payer,
378403
custodian: this.checkedCustodianComposite(),
379-
transferAuthority,
404+
programTransferAuthority,
405+
// @ts-ignore Sender can be null.
406+
sender,
380407
preparedOrder,
381408
senderToken,
382409
refundToken,

0 commit comments

Comments
 (0)