grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix executive. Syncs to 62509.

Browse Source
This commit is contained in:
Gav Wood
2016-01-15 18:56:28 +01:00
parent 24ed819c51
commit 2eead090d5
8 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/evm/ext.rs
View File

@@ -8,10 +8,10 @@ use env_info::*;
pub trait Ext {
/// Returns a value for given key.
fn sload(&self, key: &H256) -> H256;
fn storage_at(&self, key: &H256) -> H256;
/// Stores a value for given key.
fn sstore(&mut self, key: H256, value: H256);
fn set_storage_at(&mut self, key: H256, value: H256);
/// Returns address balance.
fn balance(&self, address: &Address) -> U256;

4
src/evm/jit.rs
View File

@@ -175,14 +175,14 @@ impl<'a> evmjit::Ext for ExtAdapter<'a> {
fn sload(&self, index: *const evmjit::I256, out_value: *mut evmjit::I256) {
unsafe {
let i = H256::from_jit(&*index);
let o = self.ext.sload(&i);
let o = self.ext.storage_at(&i);
*out_value = o.into_jit();
}
}
fn sstore(&mut self, index: *const evmjit::I256, value: *const evmjit::I256) {
unsafe {
self.ext.sstore(H256::from_jit(&*index), H256::from_jit(&*value));
self.ext.set_storage_at(H256::from_jit(&*index), H256::from_jit(&*value));
}
}

4
src/evm/tests.rs
View File

@@ -26,11 +26,11 @@ impl FakeExt {
}
impl Ext for FakeExt {
fn sload(&self, key: &H256) -> H256 {
fn storage_at(&self, key: &H256) -> H256 {
self.store.get(key).unwrap_or(&H256::new()).clone()
}
fn sstore(&mut self, key: H256, value: H256) {
fn set_storage_at(&mut self, key: H256, value: H256) {
self.store.insert(key, value);
}