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

[release] v2.7.1 (#11430)

Browse Source 
* Revert "[Trace] Distinguish between `create` and `create2` (#11311)" (#11427)

This reverts commit 87e1080581.

* Bump version

* Changelog

* Update publish-docker.sh (#11428)

Add :latest tag to building stable releases

Co-authored-by: s3krit <pugh@s3kr.it>
This commit is contained in:
David
2020-01-30 17:13:40 +01:00
committed by GitHub
parent aa0a703e7c
commit 6885be06a4
28 changed files with 167 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ethcore/wasm/src/runtime.rs
View File

@@ -16,7 +16,7 @@
use std::cmp;
use ethereum_types::{BigEndianHash, U256, H256, Address};
use vm::{self, ActionType};
use vm::{self, CallType};
use wasmi::{self, MemoryRef, RuntimeArgs, RuntimeValue, Error as InterpreterError, Trap, TrapKind};
use super::panic_payload;
@@ -384,7 +384,7 @@ impl<'a> Runtime<'a> {
fn do_call(
&mut self,
use_val: bool,
call_type: ActionType,
call_type: CallType,
args: RuntimeArgs,
)
-> Result<RuntimeValue>
@@ -445,8 +445,8 @@ impl<'a> Runtime<'a> {
let call_result = self.ext.call(
&gas.into(),
match call_type { ActionType::DelegateCall => &self.context.sender, _ => &self.context.address },
match call_type { ActionType::Call | ActionType::StaticCall => &address, _ => &self.context.address },
match call_type { CallType::DelegateCall => &self.context.sender, _ => &self.context.address },
match call_type { CallType::Call | CallType::StaticCall => &address, _ => &self.context.address },
val,
&payload,
&address,
@@ -487,17 +487,17 @@ impl<'a> Runtime<'a> {
/// Message call
fn ccall(&mut self, args: RuntimeArgs) -> Result<RuntimeValue> {
self.do_call(true, ActionType::Call, args)
self.do_call(true, CallType::Call, args)
}
/// Delegate call
fn dcall(&mut self, args: RuntimeArgs) -> Result<RuntimeValue> {
self.do_call(false, ActionType::DelegateCall, args)
self.do_call(false, CallType::DelegateCall, args)
}
/// Static call
fn scall(&mut self, args: RuntimeArgs) -> Result<RuntimeValue> {
self.do_call(false, ActionType::StaticCall, args)
self.do_call(false, CallType::StaticCall, args)
}
fn return_address_ptr(&mut self, ptr: u32, val: Address) -> Result<()>