certusone
/
wormhole-icco
mirror of https://github.com/certusone/wormhole-icco.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add loop for seal_sale

This commit is contained in:
Karl Kempe 2022-06-01 02:08:32 +00:00
parent 770803d466
commit f5a73c5508
2 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
anchor-contributor/programs/anchor-contributor/src/lib.rs
View File

@ -1,8 +1,8 @@
use anchor_lang::prelude::*;
use anchor_lang::solana_program::borsh::try_from_slice_unchecked;
use anchor_lang::solana_program::instruction::Instruction;
use anchor_lang::solana_program::program::invoke_signed;
use anchor_lang::solana_program::system_instruction::transfer;
use anchor_lang::solana_program::borsh::try_from_slice_unchecked;
use anchor_spl::*;
mod constants;
@ -15,7 +15,7 @@ mod wormhole;
use constants::*;
use context::*;
use error::*;
use state::sale::verify_conductor_vaa;
use state::sale::{get_conductor_address, get_conductor_chain, verify_conductor_vaa};
use wormhole::*;
declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS");
@ -45,11 +45,11 @@ pub mod anchor_contributor {
let accepted_account_address =
sale.get_associated_accepted_address(&ctx.program_id, token_index)?;
/*
/*
token::transfer(
CpiContext::new(
ctx.accounts.token_program.to_account_info(),
token::Transfer {
token::Transfer {
from: ctx.accounts.buyer.to_account_info(),
to: ctx.accounts.sale.to_account_info(),
authority: ctx.accounts.sale.to_account_info()
@ -81,20 +81,20 @@ pub mod anchor_contributor {
let vaa_payload = sale.serialize_contributions(clock.unix_timestamp)?;
// Send WH Message
let bridge_data:BridgeData = try_from_slice_unchecked(&ctx.accounts.wormhole_config.data.borrow_mut())?;
let bridge_data: BridgeData =
try_from_slice_unchecked(&ctx.accounts.wormhole_config.data.borrow_mut())?;
//Send Fee
invoke_signed(
&transfer(
&ctx.accounts.payer.key(),
&ctx.accounts.wormhole_fee_collector.key(),
bridge_data.config.fee
bridge_data.config.fee,
),
&[
ctx.accounts.payer.to_account_info(),
ctx.accounts.wormhole_fee_collector.to_account_info()
ctx.accounts.wormhole_fee_collector.to_account_info(),
],
&[]
&[],
)?;
//Send Post Msg Tx
@ -118,7 +118,8 @@ pub mod anchor_contributor {
payload: vaa_payload,
consistency_level: wormhole::ConsistencyLevel::Confirmed,
},
).try_to_vec()?,
)
.try_to_vec()?,
};
invoke_signed(
@ -134,12 +135,10 @@ pub mod anchor_contributor {
ctx.accounts.rent.to_account_info(),
ctx.accounts.system_program.to_account_info(),
],
&[
&[
&b"emitter".as_ref(),
&[*ctx.bumps.get("wormhole_derived_emitter").unwrap()]
]
]
&[&[
&b"emitter".as_ref(),
&[*ctx.bumps.get("wormhole_derived_emitter").unwrap()],
]],
)?;
Ok(())
@ -156,6 +155,14 @@ pub mod anchor_contributor {
let sale_token_account = sale.associated_sale_token_address;
// TODO: need to bridge collateral over to recipient (total_collateral minus excess_collateral)
// TODO: set up cfg flag to just use constants instead of these getters
let conductor_chain = get_conductor_chain()?;
let conductor_address = get_conductor_address()?;
for total in &sale.totals {
let amount = total.contributions;
// token bridge transfer this amount over to conductor_address on conductor_chain
}
Ok(())
}

31
anchor-contributor/programs/anchor-contributor/src/state/sale.rs
View File

@ -332,28 +332,35 @@ pub fn verify_conductor_vaa<'info>(
) -> Result<MessageData> {
let msg = get_message_data(&vaa_account)?;
let conductor_chain: u16 = CONDUCTOR_CHAIN
.to_string()
.parse()
.expect("invalid conductor chain");
let conductor_address = hex::decode(CONDUCTOR_ADDRESS).expect("invalid conductor address");
let conductor_address: [u8; 32] = conductor_address
.try_into()
.expect("invalid conductor address");
require!(
vaa_account.to_account_info().owner == &Pubkey::from_str(CORE_BRIDGE_ADDRESS).unwrap(),
SaleError::InvalidVaaAction
);
require!(
msg.emitter_chain == conductor_chain,
msg.emitter_chain == get_conductor_chain()?,
SaleError::InvalidConductor
);
require!(
msg.emitter_address == conductor_address,
msg.emitter_address == get_conductor_address()?,
SaleError::InvalidConductor
);
require!(msg.payload[0] == payload_type, SaleError::InvalidVaaAction);
Ok(msg)
}
// TODO: set up cfg flag to just use constants instead of these getters
pub fn get_conductor_chain() -> Result<u16> {
let conductor_chain: u16 = CONDUCTOR_CHAIN
.to_string()
.parse()
.expect("invalid conductor chain");
Ok(conductor_chain)
}
pub fn get_conductor_address() -> Result<[u8; 32]> {
let conductor_address = hex::decode(CONDUCTOR_ADDRESS).expect("invalid conductor address");
let conductor_address: [u8; 32] = conductor_address
.try_into()
.expect("invalid conductor address");
Ok(conductor_address)
}