pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 06:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not call externalities without Ext being set (#3436)

Browse Source 
* Do not call externalities without `Ext` being set

* Fix compare and set

* Bump runtime version.

* Bump hashmap_core
This commit is contained in:
Bastian Köcher
2019-08-19 12:52:39 +02:00
committed by Gavin Wood
parent 017752df41
commit 3b0af8bbf4
4 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/executor/src/wasm_executor.rs
+46 -12
View File
@@ -663,7 +663,12 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
.map_err(|_| "Invalid attempt to get id in ext_ed25519_public_keys")?;
let key_type = KeyTypeId(id);
let keys = runtime_io::ed25519_public_keys(key_type).encode();
let keys = this.ext
.keystore()
.ok_or("No `keystore` associated for the current context!")?
.read()
.ed25519_public_keys(key_type)
.encode();
let len = keys.len() as u32;
let offset = this.heap.allocate(len)? as u32;
@@ -717,7 +722,12 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
.map_err(|_| "Seed not a valid utf8 string in ext_sr25119_generate")
).transpose()?;
let pubkey = runtime_io::ed25519_generate(key_type, seed);
let pubkey = this.ext
.keystore()
.ok_or("No `keystore` associated for the current context!")?
.write()
.ed25519_generate_new(key_type, seed)
.map_err(|_| "`ed25519` key generation failed")?;
this.memory.set(out, pubkey.as_ref())
.map_err(|_| "Invalid attempt to set out in ext_ed25519_generate".into())
@@ -741,7 +751,15 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
let msg = this.memory.get(msg_data, msg_len as usize)
.map_err(|_| "Invalid attempt to get message in ext_ed25519_sign")?;
let signature = runtime_io::ed25519_sign(key_type, &ed25519::Public(pubkey), &msg);
let pub_key = ed25519::Public::try_from(pubkey.as_ref())
.map_err(|_| "Invalid `ed25519` public key")?;
let signature = this.ext
.keystore()
.ok_or("No `keystore` associated for the current context!")?
.read()
.ed25519_key_pair(key_type, &pub_key)
.map(|k| k.sign(msg.as_ref()));
match signature {
Some(signature) => {
@@ -759,7 +777,12 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
.map_err(|_| "Invalid attempt to get id in ext_sr25519_public_keys")?;
let key_type = KeyTypeId(id);
let keys = runtime_io::sr25519_public_keys(key_type).encode();
let keys = this.ext
.keystore()
.ok_or("No `keystore` associated for the current context!")?
.read()
.sr25519_public_keys(key_type)
.encode();
let len = keys.len() as u32;
let offset = this.heap.allocate(len)? as u32;
@@ -813,7 +836,12 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
)
.transpose()?;
let pubkey = runtime_io::sr25519_generate(key_type, seed);
let pubkey = this.ext
.keystore()
.ok_or("No `keystore` associated for the current context!")?
.write()
.sr25519_generate_new(key_type, seed)
.map_err(|_| "`sr25519` key generation failed")?;
this.memory.set(out, pubkey.as_ref())
.map_err(|_| "Invalid attempt to set out in ext_sr25519_generate".into())
@@ -837,7 +865,15 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
let msg = this.memory.get(msg_data, msg_len as usize)
.map_err(|_| "Invalid attempt to get message in ext_sr25519_sign")?;
let signature = runtime_io::sr25519_sign(key_type, &sr25519::Public(pubkey), &msg);
let pub_key = sr25519::Public::try_from(pubkey.as_ref())
.map_err(|_| "Invalid `sr25519` public key")?;
let signature = this.ext
.keystore()
.ok_or("No `keystore` associated for the current context!")?
.read()
.sr25519_key_pair(key_type, &pub_key)
.map(|k| k.sign(msg.as_ref()));
match signature {
Some(signature) => {
@@ -877,11 +913,9 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
Ok(0)
},
ext_is_validator() -> u32 => {
Ok(if runtime_io::is_validator() {
1
} else {
0
})
this.ext.offchain()
.map(|o| if o.is_validator() { 1 } else { 0 })
.ok_or("Calling unavailable API ext_is_validator: wasm".into())
},
ext_submit_transaction(msg_data: *const u8, len: u32) -> u32 => {
let extrinsic = this.memory.get(msg_data, len as usize)
@@ -986,7 +1020,7 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
.map_err(|_| "OOB while ext_local_storage_compare_and_set: wasm")?;
let res = {
if old_value == u32::max_value() {
if old_value_len == u32::max_value() {
this.ext.offchain()
.map(|api| api.local_storage_compare_and_set(kind, &key, None, &new_value))
.ok_or_else(|| "Calling unavailable API ext_local_storage_compare_and_set: wasm")?