forked from solana-labs/solana
-
Notifications
You must be signed in to change notification settings - Fork 254
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move wasm impl for SystemInstruction to system-instruction crate
- Loading branch information
1 parent
fbfd243
commit eb55c82
Showing
6 changed files
with
130 additions
and
112 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,112 +1,3 @@ | ||
//! `SystemInstruction` Javascript interface | ||
#![cfg(target_arch = "wasm32")] | ||
#![allow(non_snake_case)] | ||
use { | ||
crate::{instruction::Instruction, pubkey::Pubkey, system_instruction::*}, | ||
wasm_bindgen::prelude::*, | ||
}; | ||
|
||
#[wasm_bindgen] | ||
impl SystemInstruction { | ||
pub fn createAccount( | ||
from_pubkey: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
lamports: u64, | ||
space: u64, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
create_account(from_pubkey, to_pubkey, lamports, space, owner) | ||
} | ||
|
||
pub fn createAccountWithSeed( | ||
from_pubkey: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
base: &Pubkey, | ||
seed: &str, | ||
lamports: u64, | ||
space: u64, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
create_account_with_seed(from_pubkey, to_pubkey, base, seed, lamports, space, owner) | ||
} | ||
|
||
pub fn assign(pubkey: &Pubkey, owner: &Pubkey) -> Instruction { | ||
assign(pubkey, owner) | ||
} | ||
|
||
pub fn assignWithSeed( | ||
pubkey: &Pubkey, | ||
base: &Pubkey, | ||
seed: &str, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
assign_with_seed(pubkey, base, seed, owner) | ||
} | ||
|
||
pub fn transfer(from_pubkey: &Pubkey, to_pubkey: &Pubkey, lamports: u64) -> Instruction { | ||
transfer(from_pubkey, to_pubkey, lamports) | ||
} | ||
|
||
pub fn transferWithSeed( | ||
from_pubkey: &Pubkey, | ||
from_base: &Pubkey, | ||
from_seed: String, | ||
from_owner: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
lamports: u64, | ||
) -> Instruction { | ||
transfer_with_seed( | ||
from_pubkey, | ||
from_base, | ||
from_seed, | ||
from_owner, | ||
to_pubkey, | ||
lamports, | ||
) | ||
} | ||
|
||
pub fn allocate(pubkey: &Pubkey, space: u64) -> Instruction { | ||
allocate(pubkey, space) | ||
} | ||
|
||
pub fn allocateWithSeed( | ||
address: &Pubkey, | ||
base: &Pubkey, | ||
seed: &str, | ||
space: u64, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
allocate_with_seed(address, base, seed, space, owner) | ||
} | ||
|
||
pub fn createNonceAccount( | ||
from_pubkey: &Pubkey, | ||
nonce_pubkey: &Pubkey, | ||
authority: &Pubkey, | ||
lamports: u64, | ||
) -> js_sys::Array { | ||
let instructions = create_nonce_account(from_pubkey, nonce_pubkey, authority, lamports); | ||
instructions.into_iter().map(JsValue::from).collect() | ||
} | ||
|
||
pub fn advanceNonceAccount(nonce_pubkey: &Pubkey, authorized_pubkey: &Pubkey) -> Instruction { | ||
advance_nonce_account(nonce_pubkey, authorized_pubkey) | ||
} | ||
|
||
pub fn withdrawNonceAccount( | ||
nonce_pubkey: &Pubkey, | ||
authorized_pubkey: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
lamports: u64, | ||
) -> Instruction { | ||
withdraw_nonce_account(nonce_pubkey, authorized_pubkey, to_pubkey, lamports) | ||
} | ||
|
||
pub fn authorizeNonceAccount( | ||
nonce_pubkey: &Pubkey, | ||
authorized_pubkey: &Pubkey, | ||
new_authority: &Pubkey, | ||
) -> Instruction { | ||
authorize_nonce_account(nonce_pubkey, authorized_pubkey, new_authority) | ||
} | ||
} | ||
//! Left empty because deleting this module would technically be a breaking change, | ||
//! but there was never anything you could import from here. | ||
// TODO: delete this in next breaking change. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
//! `SystemInstruction` Javascript interface | ||
#![allow(non_snake_case)] | ||
use { | ||
crate::{ | ||
advance_nonce_account, allocate, allocate_with_seed, assign, assign_with_seed, | ||
authorize_nonce_account, create_account, create_account_with_seed, create_nonce_account, | ||
transfer, transfer_with_seed, withdraw_nonce_account, SystemInstruction, | ||
}, | ||
solana_instruction::Instruction, | ||
solana_pubkey::Pubkey, | ||
wasm_bindgen::prelude::*, | ||
}; | ||
|
||
#[wasm_bindgen] | ||
impl SystemInstruction { | ||
pub fn createAccount( | ||
from_pubkey: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
lamports: u64, | ||
space: u64, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
create_account(from_pubkey, to_pubkey, lamports, space, owner) | ||
} | ||
|
||
pub fn createAccountWithSeed( | ||
from_pubkey: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
base: &Pubkey, | ||
seed: &str, | ||
lamports: u64, | ||
space: u64, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
create_account_with_seed(from_pubkey, to_pubkey, base, seed, lamports, space, owner) | ||
} | ||
|
||
pub fn assign(pubkey: &Pubkey, owner: &Pubkey) -> Instruction { | ||
assign(pubkey, owner) | ||
} | ||
|
||
pub fn assignWithSeed( | ||
pubkey: &Pubkey, | ||
base: &Pubkey, | ||
seed: &str, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
assign_with_seed(pubkey, base, seed, owner) | ||
} | ||
|
||
pub fn transfer(from_pubkey: &Pubkey, to_pubkey: &Pubkey, lamports: u64) -> Instruction { | ||
transfer(from_pubkey, to_pubkey, lamports) | ||
} | ||
|
||
pub fn transferWithSeed( | ||
from_pubkey: &Pubkey, | ||
from_base: &Pubkey, | ||
from_seed: String, | ||
from_owner: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
lamports: u64, | ||
) -> Instruction { | ||
transfer_with_seed( | ||
from_pubkey, | ||
from_base, | ||
from_seed, | ||
from_owner, | ||
to_pubkey, | ||
lamports, | ||
) | ||
} | ||
|
||
pub fn allocate(pubkey: &Pubkey, space: u64) -> Instruction { | ||
allocate(pubkey, space) | ||
} | ||
|
||
pub fn allocateWithSeed( | ||
address: &Pubkey, | ||
base: &Pubkey, | ||
seed: &str, | ||
space: u64, | ||
owner: &Pubkey, | ||
) -> Instruction { | ||
allocate_with_seed(address, base, seed, space, owner) | ||
} | ||
|
||
pub fn createNonceAccount( | ||
from_pubkey: &Pubkey, | ||
nonce_pubkey: &Pubkey, | ||
authority: &Pubkey, | ||
lamports: u64, | ||
) -> js_sys::Array { | ||
let instructions = create_nonce_account(from_pubkey, nonce_pubkey, authority, lamports); | ||
instructions.into_iter().map(JsValue::from).collect() | ||
} | ||
|
||
pub fn advanceNonceAccount(nonce_pubkey: &Pubkey, authorized_pubkey: &Pubkey) -> Instruction { | ||
advance_nonce_account(nonce_pubkey, authorized_pubkey) | ||
} | ||
|
||
pub fn withdrawNonceAccount( | ||
nonce_pubkey: &Pubkey, | ||
authorized_pubkey: &Pubkey, | ||
to_pubkey: &Pubkey, | ||
lamports: u64, | ||
) -> Instruction { | ||
withdraw_nonce_account(nonce_pubkey, authorized_pubkey, to_pubkey, lamports) | ||
} | ||
|
||
pub fn authorizeNonceAccount( | ||
nonce_pubkey: &Pubkey, | ||
authorized_pubkey: &Pubkey, | ||
new_authority: &Pubkey, | ||
) -> Instruction { | ||
authorize_nonce_account(nonce_pubkey, authorized_pubkey, new_authority) | ||
} | ||
} |