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

Introducing Scripts

Browse Source 
A sequence of instructions. A client compiles the script and then uses
the compiled script to construction a transaction. Then it adds a
adds a blockhash, signs the transaction, and sends it off for
processing.
This commit is contained in:
Greg Fitzgerald
2019-03-16 14:30:10 -06:00
committed by Grimes
parent 55cdbedb52
commit ae4d14a2ad
6 changed files with 268 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/src/transaction.rs
View File

@ -71,7 +71,10 @@ impl<P, Q> GenericInstruction<P, Q> {
}
pub type Instruction = GenericInstruction<Pubkey, (Pubkey, bool)>;
pub type Script = Vec<Instruction>;
pub type CompiledInstruction = GenericInstruction<u8, u8>;
pub type CompiledScript = Vec<CompiledInstruction>;
impl CompiledInstruction {
pub fn serialize_with(mut writer: &mut Cursor<&mut [u8]>, ix: &Self) -> Result<(), Error> {
@ -163,12 +166,12 @@ pub struct Transaction {
pub program_ids: Vec<Pubkey>,
/// Programs that will be executed in sequence and committed in one atomic transaction if all
/// succeed.
pub instructions: Vec<CompiledInstruction>,
pub instructions: CompiledScript,
}
impl Transaction {
pub fn new(instructions: Vec<Instruction>) -> Self {
TransactionCompiler::new(instructions).compile()
pub fn new(script: Script) -> Self {
TransactionCompiler::new(script).compile()
}
pub fn new_with_blockhash_and_fee<T: Serialize>(
@ -224,7 +227,7 @@ impl Transaction {
recent_blockhash: Hash,
fee: u64,
program_ids: Vec<Pubkey>,
instructions: Vec<CompiledInstruction>,
instructions: CompiledScript,
) -> Self {
let mut account_keys: Vec<_> = from_keypairs
.iter()
@ -466,7 +469,7 @@ impl<'a> serde::de::Visitor<'a> for TransactionVisitor {
let program_ids: Vec<Pubkey> =
deserialize_vec_with(&mut rd, Transaction::deserialize_pubkey)
.map_err(Error::custom)?;
let instructions: Vec<CompiledInstruction> =
let instructions: CompiledScript =
deserialize_vec_with(&mut rd, CompiledInstruction::deserialize_from)
.map_err(Error::custom)?;
Ok(Transaction {