dae5d75dd6
* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
134 lines
3.9 KiB
Rust
134 lines
3.9 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Evm input params.
|
|
use ethereum_types::{U256, H256, Address};
|
|
use bytes::Bytes;
|
|
use hash::{keccak, KECCAK_EMPTY};
|
|
use ethjson;
|
|
|
|
use call_type::CallType;
|
|
|
|
use std::sync::Arc;
|
|
|
|
/// Transaction value
|
|
#[derive(Clone, Debug)]
|
|
pub enum ActionValue {
|
|
/// Value that should be transfered
|
|
Transfer(U256),
|
|
/// Apparent value for transaction (not transfered)
|
|
Apparent(U256)
|
|
}
|
|
|
|
/// Type of the way parameters encoded
|
|
#[derive(Clone, Debug)]
|
|
pub enum ParamsType {
|
|
/// Parameters are included in code
|
|
Embedded,
|
|
/// Parameters are passed in data section
|
|
Separate,
|
|
}
|
|
|
|
impl ActionValue {
|
|
/// Returns action value as U256.
|
|
pub fn value(&self) -> U256 {
|
|
match *self {
|
|
ActionValue::Transfer(x) | ActionValue::Apparent(x) => x
|
|
}
|
|
}
|
|
|
|
/// Returns the transfer action value of the U256-convertable raw value
|
|
pub fn transfer<T: Into<U256>>(transfer_value: T) -> ActionValue {
|
|
ActionValue::Transfer(transfer_value.into())
|
|
}
|
|
|
|
/// Returns the apparent action value of the U256-convertable raw value
|
|
pub fn apparent<T: Into<U256>>(apparent_value: T) -> ActionValue {
|
|
ActionValue::Apparent(apparent_value.into())
|
|
}
|
|
}
|
|
|
|
// TODO: should be a trait, possible to avoid cloning everything from a Transaction(/View).
|
|
/// Action (call/create) input params. Everything else should be specified in Externalities.
|
|
#[derive(Clone, Debug)]
|
|
pub struct ActionParams {
|
|
/// Address of currently executed code.
|
|
pub code_address: Address,
|
|
/// Hash of currently executed code.
|
|
pub code_hash: Option<H256>,
|
|
/// Receive address. Usually equal to code_address,
|
|
/// except when called using CALLCODE.
|
|
pub address: Address,
|
|
/// Sender of current part of the transaction.
|
|
pub sender: Address,
|
|
/// Transaction initiator.
|
|
pub origin: Address,
|
|
/// Gas paid up front for transaction execution
|
|
pub gas: U256,
|
|
/// Gas price.
|
|
pub gas_price: U256,
|
|
/// Transaction value.
|
|
pub value: ActionValue,
|
|
/// Code being executed.
|
|
pub code: Option<Arc<Bytes>>,
|
|
/// Input data.
|
|
pub data: Option<Bytes>,
|
|
/// Type of call
|
|
pub call_type: CallType,
|
|
/// Param types encoding
|
|
pub params_type: ParamsType,
|
|
}
|
|
|
|
impl Default for ActionParams {
|
|
/// Returns default ActionParams initialized with zeros
|
|
fn default() -> ActionParams {
|
|
ActionParams {
|
|
code_address: Address::zero(),
|
|
code_hash: Some(KECCAK_EMPTY),
|
|
address: Address::zero(),
|
|
sender: Address::zero(),
|
|
origin: Address::zero(),
|
|
gas: U256::zero(),
|
|
gas_price: U256::zero(),
|
|
value: ActionValue::Transfer(U256::zero()),
|
|
code: None,
|
|
data: None,
|
|
call_type: CallType::None,
|
|
params_type: ParamsType::Separate,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<ethjson::vm::Transaction> for ActionParams {
|
|
fn from(t: ethjson::vm::Transaction) -> Self {
|
|
let address: Address = t.address.into();
|
|
ActionParams {
|
|
code_address: Address::zero(),
|
|
code_hash: Some(keccak(&*t.code)),
|
|
address: address,
|
|
sender: t.sender.into(),
|
|
origin: t.origin.into(),
|
|
code: Some(Arc::new(t.code.into())),
|
|
data: Some(t.data.into()),
|
|
gas: t.gas.into(),
|
|
gas_price: t.gas_price.into(),
|
|
value: ActionValue::Transfer(t.value.into()),
|
|
call_type: match address.is_zero() { true => CallType::None, false => CallType::Call }, // TODO @debris is this correct?
|
|
params_type: ParamsType::Separate,
|
|
}
|
|
}
|
|
}
|