Skip to content

Commit aa5e461

Browse files
a5-picklea5-pickle
authored
solana: add target chain fix for prepare order (#177)
Co-authored-by: A5 Pickle <a5-pickle@users.noreply.github.com>
1 parent d5f4a1d commit aa5e461

File tree

11 files changed

+176
-124
lines changed

11 files changed

+176
-124
lines changed

‎solana/programs/token-router/src/composite/mod.rs

+35
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use common::{
88
messages::raw::LiquidityLayerMessage,
99
wormhole_cctp_solana::wormhole::VaaAccount,
1010
};
11+
use matching_engine::state::RouterEndpoint;
1112

1213
#[derive(Accounts)]
1314
pub struct Usdc<'info> {
@@ -162,3 +163,37 @@ pub struct AdminMut<'info> {
162163
)]
163164
pub custodian: Account<'info, Custodian>,
164165
}
166+
167+
/// Registered router endpoint representing a foreign Token Router. This account may have a CCTP
168+
/// domain encoded if this route is CCTP-enabled. For this instruction, it is required that
169+
/// [RouterEndpoint::cctp_domain] is `Some(value)`.
170+
///
171+
/// Seeds must be \["registered_emitter", chain.to_be_bytes()\].
172+
#[derive(Accounts)]
173+
pub struct RegisteredEndpoint<'info> {
174+
#[account(
175+
seeds = [
176+
RouterEndpoint::SEED_PREFIX,
177+
endpoint.chain.to_be_bytes().as_ref(),
178+
],
179+
bump = endpoint.bump,
180+
seeds::program = matching_engine::id(),
181+
constraint = {
182+
require!(
183+
endpoint.protocol != matching_engine::state::MessageProtocol::None,
184+
TokenRouterError::EndpointDisabled
185+
);
186+
187+
true
188+
}
189+
)]
190+
endpoint: Box<Account<'info, RouterEndpoint>>,
191+
}
192+
193+
impl<'info> Deref for RegisteredEndpoint<'info> {
194+
type Target = Account<'info, RouterEndpoint>;
195+
196+
fn deref(&self) -> &Self::Target {
197+
&self.endpoint
198+
}
199+
}

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

+6-17
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,18 @@ pub struct PlaceMarketOrderCctp<'info> {
5959
)]
6060
prepared_custody_token: Box<Account<'info, token::TokenAccount>>,
6161

62-
/// Registered router endpoint representing a foreign Token Router. This account may have a
63-
/// CCTP domain encoded if this route is CCTP-enabled. For this instruction, it is required that
64-
/// [RouterEndpoint::cctp_domain] is `Some(value)`.
65-
///
66-
/// Seeds must be \["registered_emitter", target_chain.to_be_bytes()\].
6762
#[account(
68-
seeds = [
69-
matching_engine::state::RouterEndpoint::SEED_PREFIX,
70-
router_endpoint.chain.to_be_bytes().as_ref(),
71-
],
72-
bump = router_endpoint.bump,
73-
seeds::program = matching_engine::id(),
7463
constraint = {
7564
require_eq!(
76-
router_endpoint.chain,
65+
target_router_endpoint.chain,
7766
prepared_order.target_chain,
7867
TokenRouterError::InvalidTargetRouter,
7968
);
8069
8170
true
8271
}
8372
)]
84-
router_endpoint: Box<Account<'info, matching_engine::state::RouterEndpoint>>,
73+
target_router_endpoint: RegisteredEndpoint<'info>,
8574

8675
/// CHECK: Seeds must be \["Bridge"\] (Wormhole Core Bridge program).
8776
#[account(mut)]
@@ -172,7 +161,7 @@ pub struct PlaceMarketOrderCctp<'info> {
172161
///
173162
/// See [burn_and_publish](wormhole_cctp_solana::cpi::burn_and_publish) for more details.
174163
pub fn place_market_order_cctp(ctx: Context<PlaceMarketOrderCctp>) -> Result<()> {
175-
match ctx.accounts.router_endpoint.protocol {
164+
match ctx.accounts.target_router_endpoint.protocol {
176165
matching_engine::state::MessageProtocol::Cctp { domain } => {
177166
handle_place_market_order_cctp(ctx, domain)
178167
}
@@ -192,7 +181,7 @@ fn handle_place_market_order_cctp(
192181
let prepared_custody_token = &ctx.accounts.prepared_custody_token;
193182
let token_program = &ctx.accounts.token_program;
194183
let system_program = &ctx.accounts.system_program;
195-
let router_endpoint = &ctx.accounts.router_endpoint;
184+
let target_router_endpoint = &ctx.accounts.target_router_endpoint;
196185

197186
let order_info = &ctx.accounts.prepared_order.info;
198187

@@ -268,10 +257,10 @@ fn handle_place_market_order_cctp(
268257
),
269258
wormhole_cctp_solana::cpi::BurnAndPublishArgs {
270259
burn_source: order_info.src_token.into(),
271-
destination_caller: router_endpoint.address,
260+
destination_caller: target_router_endpoint.address,
272261
destination_cctp_domain,
273262
amount: prepared_custody_token.amount,
274-
mint_recipient: router_endpoint.mint_recipient,
263+
mint_recipient: target_router_endpoint.mint_recipient,
275264
wormhole_message_nonce: common::WORMHOLE_MESSAGE_NONCE,
276265
payload: common::messages::Fill {
277266
source_chain: SOLANA_CHAIN,

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

+13
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,19 @@ pub struct PrepareMarketOrder<'info> {
117117

118118
usdc: Usdc<'info>,
119119

120+
#[account(
121+
constraint = {
122+
require_eq!(
123+
target_router_endpoint.chain,
124+
args.target_chain,
125+
TokenRouterError::InvalidTargetRouter,
126+
);
127+
128+
true
129+
}
130+
)]
131+
target_router_endpoint: RegisteredEndpoint<'info>,
132+
120133
token_program: Program<'info, token::Token>,
121134
system_program: Program<'info, System>,
122135
}

‎solana/programs/token-router/src/processor/redeem_fill/cctp.rs

+3-15
Original file line numberDiff line numberDiff line change
@@ -115,35 +115,23 @@ pub struct RedeemCctpFill<'info> {
115115
///
116116
/// Seeds must be \["registered_emitter", target_chain.to_be_bytes()\].
117117
#[account(
118-
seeds = [
119-
matching_engine::state::RouterEndpoint::SEED_PREFIX,
120-
router_endpoint.chain.to_be_bytes().as_ref(),
121-
],
122-
bump = router_endpoint.bump,
123-
seeds::program = matching_engine::id(),
124118
constraint = {
125-
require!(
126-
router_endpoint.protocol != matching_engine::state::MessageProtocol::None,
127-
TokenRouterError::EndpointDisabled
128-
);
129-
130119
// Validate that this message originated from a registered emitter.
131-
let endpoint = &router_endpoint;
132120
let emitter = fill_vaa.load_unchecked().emitter_info();
133121
require_eq!(
134122
emitter.chain,
135-
endpoint.chain,
123+
source_router_endpoint.chain,
136124
TokenRouterError::InvalidSourceRouter
137125
);
138126
require!(
139-
emitter.address == endpoint.address,
127+
emitter.address == source_router_endpoint.address,
140128
TokenRouterError::InvalidSourceRouter
141129
);
142130
143131
true
144132
}
145133
)]
146-
router_endpoint: Box<Account<'info, matching_engine::state::RouterEndpoint>>,
134+
source_router_endpoint: RegisteredEndpoint<'info>,
147135

148136
cctp: CctpReceiveMessage<'info>,
149137

‎solana/ts/src/idl/json/token_router.json

+18-12
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,11 @@
400400
"writable": true
401401
},
402402
{
403-
"name": "router_endpoint",
404-
"docs": [
405-
"Registered router endpoint representing a foreign Token Router. This account may have a",
406-
"CCTP domain encoded if this route is CCTP-enabled. For this instruction, it is required that",
407-
"[RouterEndpoint::cctp_domain] is `Some(value)`.",
408-
"",
409-
"Seeds must be \\[\"registered_emitter\", target_chain.to_be_bytes()\\]."
403+
"name": "target_router_endpoint",
404+
"accounts": [
405+
{
406+
"name": "endpoint"
407+
}
410408
]
411409
},
412410
{
@@ -582,6 +580,14 @@
582580
}
583581
]
584582
},
583+
{
584+
"name": "target_router_endpoint",
585+
"accounts": [
586+
{
587+
"name": "endpoint"
588+
}
589+
]
590+
},
585591
{
586592
"name": "token_program"
587593
},
@@ -667,11 +673,11 @@
667673
]
668674
},
669675
{
670-
"name": "router_endpoint",
671-
"docs": [
672-
"Registered emitter account representing a Circle Integration on another network.",
673-
"",
674-
"Seeds must be \\[\"registered_emitter\", target_chain.to_be_bytes()\\]."
676+
"name": "source_router_endpoint",
677+
"accounts": [
678+
{
679+
"name": "endpoint"
680+
}
675681
]
676682
},
677683
{

‎solana/ts/src/idl/ts/token_router.ts

+18-12
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,11 @@ export type TokenRouter = {
406406
"writable": true
407407
},
408408
{
409-
"name": "routerEndpoint",
410-
"docs": [
411-
"Registered router endpoint representing a foreign Token Router. This account may have a",
412-
"CCTP domain encoded if this route is CCTP-enabled. For this instruction, it is required that",
413-
"[RouterEndpoint::cctp_domain] is `Some(value)`.",
414-
"",
415-
"Seeds must be \\[\"registered_emitter\", target_chain.to_be_bytes()\\]."
409+
"name": "targetRouterEndpoint",
410+
"accounts": [
411+
{
412+
"name": "endpoint"
413+
}
416414
]
417415
},
418416
{
@@ -588,6 +586,14 @@ export type TokenRouter = {
588586
}
589587
]
590588
},
589+
{
590+
"name": "targetRouterEndpoint",
591+
"accounts": [
592+
{
593+
"name": "endpoint"
594+
}
595+
]
596+
},
591597
{
592598
"name": "tokenProgram"
593599
},
@@ -673,11 +679,11 @@ export type TokenRouter = {
673679
]
674680
},
675681
{
676-
"name": "routerEndpoint",
677-
"docs": [
678-
"Registered emitter account representing a Circle Integration on another network.",
679-
"",
680-
"Seeds must be \\[\"registered_emitter\", target_chain.to_be_bytes()\\]."
682+
"name": "sourceRouterEndpoint",
683+
"accounts": [
684+
{
685+
"name": "endpoint"
686+
}
681687
]
682688
},
683689
{

0 commit comments

Comments
 (0)