Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade seal0 calls to seal1 #1053

Merged
merged 2 commits into from
Nov 26, 2021
Merged

Upgrade seal0 calls to seal1 #1053

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b4a7cd
Upgrade `seal_instantiate` to `seal1`
cmichi Nov 26, 2021
f2c62ff
Upgrade `seal_terminate` to `seal1`
cmichi Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 17 additions & 23 deletions crates/env/src/engine/on_chain/ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,22 +201,6 @@ mod sys {

#[link(wasm_import_module = "seal0")]
extern "C" {
pub fn seal_instantiate(
init_code_ptr: Ptr32<[u8]>,
init_code_len: u32,
gas: u64,
endowment_ptr: Ptr32<[u8]>,
endowment_len: u32,
input_ptr: Ptr32<[u8]>,
input_len: u32,
address_ptr: Ptr32Mut<[u8]>,
address_len_ptr: Ptr32Mut<u32>,
output_ptr: Ptr32Mut<[u8]>,
output_len_ptr: Ptr32Mut<u32>,
salt_ptr: Ptr32<[u8]>,
salt_len: u32,
) -> ReturnCode;

pub fn seal_transfer(
account_id_ptr: Ptr32<[u8]>,
account_id_len: u32,
Expand All @@ -243,8 +227,6 @@ mod sys {
) -> ReturnCode;
pub fn seal_clear_storage(key_ptr: Ptr32<[u8]>);

pub fn seal_terminate(beneficiary_ptr: Ptr32<[u8]>, beneficiary_len: u32) -> !;

pub fn seal_call_chain_extension(
func_id: u32,
input_ptr: Ptr32<[u8]>,
Expand Down Expand Up @@ -306,6 +288,22 @@ mod sys {

#[link(wasm_import_module = "seal1")]
extern "C" {
pub fn seal_instantiate(
init_code_ptr: Ptr32<[u8]>,
gas: u64,
endowment_ptr: Ptr32<[u8]>,
input_ptr: Ptr32<[u8]>,
input_len: u32,
address_ptr: Ptr32Mut<[u8]>,
address_len_ptr: Ptr32Mut<u32>,
output_ptr: Ptr32Mut<[u8]>,
output_len_ptr: Ptr32Mut<u32>,
salt_ptr: Ptr32<[u8]>,
salt_len: u32,
) -> ReturnCode;

pub fn seal_terminate(beneficiary_ptr: Ptr32<[u8]>) -> !;

pub fn seal_random(
subject_ptr: Ptr32<[u8]>,
subject_len: u32,
Expand Down Expand Up @@ -358,10 +356,8 @@ pub fn instantiate(
unsafe {
sys::seal_instantiate(
Ptr32::from_slice(code_hash),
code_hash.len() as u32,
gas_limit,
Ptr32::from_slice(endowment),
endowment.len() as u32,
Ptr32::from_slice(input),
input.len() as u32,
Ptr32Mut::from_slice(out_address),
Expand Down Expand Up @@ -458,9 +454,7 @@ pub fn get_storage(key: &[u8], output: &mut &mut [u8]) -> Result {
}

pub fn terminate(beneficiary: &[u8]) -> ! {
unsafe {
sys::seal_terminate(Ptr32::from_slice(beneficiary), beneficiary.len() as u32)
}
unsafe { sys::seal_terminate(Ptr32::from_slice(beneficiary)) }
}

pub fn call_chain_extension(func_id: u32, input: &[u8], output: &mut &mut [u8]) -> u32 {
Expand Down