gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Integrate Message into Transaction

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-29 10:05:06 -06:00
committed by Grimes
parent 98d60e6124
commit 31f8b6d352
14 changed files with 197 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
programs/exchange_api/src/exchange_transaction.rs
View File

@@ -21,10 +21,12 @@ impl ExchangeTransaction {
let space = mem::size_of::<ExchangeState>() as u64;
let create_ix = SystemInstruction::new_program_account(owner_id, new, 1, space, &id());
let request_ix = ExchangeInstruction::new_account_request(owner_id, new);
let mut tx = Transaction::new_unsigned_instructions(vec![create_ix, request_ix]);
tx.fee = fee;
tx.sign(&[owner], recent_blockhash);
tx
Transaction::new_signed_instructions(
&[owner],
vec![create_ix, request_ix],
recent_blockhash,
fee,
)
}
pub fn new_transfer_request(
@@ -39,10 +41,7 @@ impl ExchangeTransaction {
let owner_id = &owner.pubkey();
let request_ix =
ExchangeInstruction::new_transfer_request(owner_id, to, from, token, tokens);
let mut tx = Transaction::new_unsigned_instructions(vec![request_ix]);
tx.fee = fee;
tx.sign(&[owner], recent_blockhash);
tx
Transaction::new_signed_instructions(&[owner], vec![request_ix], recent_blockhash, fee)
}
#[allow(clippy::too_many_arguments)]
@@ -71,10 +70,12 @@ impl ExchangeTransaction {
src_account,
dst_account,
);
let mut tx = Transaction::new_unsigned_instructions(vec![create_ix, request_ix]);
tx.fee = fee;
tx.sign(&[owner], recent_blockhash);
tx
Transaction::new_signed_instructions(
&[owner],
vec![create_ix, request_ix],
recent_blockhash,
fee,
)
}
pub fn new_trade_cancellation(
@@ -86,10 +87,7 @@ impl ExchangeTransaction {
) -> Transaction {
let owner_id = &owner.pubkey();
let request_ix = ExchangeInstruction::new_trade_cancellation(owner_id, trade, account);
let mut tx = Transaction::new_unsigned_instructions(vec![request_ix]);
tx.fee = fee;
tx.sign(&[owner], recent_blockhash);
tx
Transaction::new_signed_instructions(&[owner], vec![request_ix], recent_blockhash, fee)
}
pub fn new_swap_request(
@@ -115,9 +113,11 @@ impl ExchangeTransaction {
from_trade_account,
profit_account,
);
let mut tx = Transaction::new_unsigned_instructions(vec![create_ix, request_ix]);
tx.fee = fee;
tx.sign(&[owner], recent_blockhash);
tx
Transaction::new_signed_instructions(
&[owner],
vec![create_ix, request_ix],
recent_blockhash,
fee,
)
}
}