* parity-version: bump beta to 1.11.6 * scripts: remove md5 checksums (#8884) * Add support for --chain tobalaba * Convert indents to tabs :) * Fixes for misbehavior reporting in AuthorityRound (#8998) * aura: only report after checking for repeated skipped primaries * aura: refactor duplicate code for getting epoch validator set * aura: verify_external: report on validator set contract instance * aura: use correct validator set epoch number when reporting * aura: use epoch set when verifying blocks * aura: report skipped primaries when generating seal * aura: handle immediate transitions * aura: don't report skipped steps from genesis to first block * aura: fix reporting test * aura: refactor duplicate code to handle immediate_transitions * aura: let reporting fail on verify_block_basic * aura: add comment about possible failure of reporting * Only return error log for rustls (#9025) * Transaction Pool improvements (#8470) * Don't use ethereum_types in transaction pool. * Hide internal insertion_id. * Fix tests. * Review grumbles. * Improve should_replace on NonceAndGasPrice (#8980) * Additional tests for NonceAndGasPrice::should_replace. * Fix should_replace in the distinct sender case. * Use natural priority ordering to simplify should_replace. * Minimal effective gas price in the queue (#8934) * Minimal effective gas price. * Fix naming, add test * Fix minimal entry score and add test. * Fix worst_transaction. * Remove effective gas price threshold. * Don't leak gas_price decisions out of Scoring. * Never drop local transactions from different senders. (#9002) * Recently rejected cache for transaction queue (#9005) * Store recently rejected transactions. * Don't cache AlreadyImported rejections. * Make the size of transaction verification queue dependent on pool size. * Add a test for recently rejected. * Fix logging for recently rejected. * Make rejection cache smaller. * obsolete test removed * obsolete test removed * Construct cache with_capacity. * Optimize pending transactions filter (#9026) * rpc: return unordered transactions in pending transactions filter * ethcore: use LruCache for nonce cache Only clear the nonce cache when a block is retracted * Revert "ethcore: use LruCache for nonce cache" This reverts commit b382c19abdb9985be1724c3b8cde83906da07d68. * Use only cached nonces when computing pending hashes. * Give filters their own locks, so that they don't block one another. * Fix pending transaction count if not sealing. * Clear cache only when block is enacted. * Fix RPC tests. * Address review comments. * A last bunch of txqueue performance optimizations (#9024) * Clear cache only when block is enacted. * Add tracing for cull. * Cull split. * Cull after creating pending block. * Add constant, remove sync::read tracing. * Reset debug. * Remove excessive tracing. * Use struct for NonceCache. * Fix build * Remove warnings. * Fix build again. * miner: add missing macro use for trace_time * ci: remove md5 merge leftovers
199 lines
5.0 KiB
Rust
199 lines
5.0 KiB
Rust
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity 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 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. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use ethereum_types::{U256, H256};
|
|
use ethkey::{Random, Generator};
|
|
use rustc_hex::FromHex;
|
|
use transaction::{self, Transaction, SignedTransaction, UnverifiedTransaction};
|
|
|
|
use pool::{verifier, VerifiedTransaction};
|
|
|
|
#[derive(Clone)]
|
|
pub struct Tx {
|
|
pub nonce: u64,
|
|
pub gas: u64,
|
|
pub gas_price: u64,
|
|
}
|
|
|
|
impl Default for Tx {
|
|
fn default() -> Self {
|
|
Tx {
|
|
nonce: 123,
|
|
gas: 21_000,
|
|
gas_price: 1,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Tx {
|
|
pub fn gas_price(gas_price: u64) -> Self {
|
|
Tx {
|
|
gas_price,
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
pub fn signed(self) -> SignedTransaction {
|
|
let keypair = Random.generate().unwrap();
|
|
self.unsigned().sign(keypair.secret(), None)
|
|
}
|
|
|
|
pub fn signed_pair(self) -> (SignedTransaction, SignedTransaction) {
|
|
let (tx1, tx2, _) = self.signed_triple();
|
|
(tx1, tx2)
|
|
}
|
|
|
|
pub fn signed_triple(mut self) -> (SignedTransaction, SignedTransaction, SignedTransaction) {
|
|
let keypair = Random.generate().unwrap();
|
|
let tx1 = self.clone().unsigned().sign(keypair.secret(), None);
|
|
self.nonce += 1;
|
|
let tx2 = self.clone().unsigned().sign(keypair.secret(), None);
|
|
self.nonce += 1;
|
|
let tx3 = self.unsigned().sign(keypair.secret(), None);
|
|
|
|
|
|
(tx1, tx2, tx3)
|
|
}
|
|
|
|
pub fn signed_replacement(mut self) -> (SignedTransaction, SignedTransaction) {
|
|
let keypair = Random.generate().unwrap();
|
|
let tx1 = self.clone().unsigned().sign(keypair.secret(), None);
|
|
self.gas_price += 1;
|
|
let tx2 = self.unsigned().sign(keypair.secret(), None);
|
|
|
|
(tx1, tx2)
|
|
}
|
|
|
|
pub fn unsigned(self) -> Transaction {
|
|
Transaction {
|
|
action: transaction::Action::Create,
|
|
value: U256::from(100),
|
|
data: "3331600055".from_hex().unwrap(),
|
|
gas: self.gas.into(),
|
|
gas_price: self.gas_price.into(),
|
|
nonce: self.nonce.into()
|
|
}
|
|
}
|
|
|
|
pub fn big_one(self) -> SignedTransaction {
|
|
let keypair = Random.generate().unwrap();
|
|
let tx = Transaction {
|
|
action: transaction::Action::Create,
|
|
value: U256::from(100),
|
|
data: include_str!("../res/big_transaction.data").from_hex().unwrap(),
|
|
gas: self.gas.into(),
|
|
gas_price: self.gas_price.into(),
|
|
nonce: self.nonce.into()
|
|
};
|
|
tx.sign(keypair.secret(), None)
|
|
}
|
|
}
|
|
pub trait TxExt: Sized {
|
|
type Out;
|
|
type Verified;
|
|
type Hash;
|
|
|
|
fn hash(&self) -> Self::Hash;
|
|
|
|
fn local(self) -> Self::Out;
|
|
|
|
fn retracted(self) -> Self::Out;
|
|
|
|
fn unverified(self) -> Self::Out;
|
|
|
|
fn verified(self) -> Self::Verified;
|
|
}
|
|
|
|
impl<A, B, O, V, H> TxExt for (A, B) where
|
|
A: TxExt<Out=O, Verified=V, Hash=H>,
|
|
B: TxExt<Out=O, Verified=V, Hash=H>,
|
|
{
|
|
type Out = (O, O);
|
|
type Verified = (V, V);
|
|
type Hash = (H, H);
|
|
|
|
fn hash(&self) -> Self::Hash { (self.0.hash(), self.1.hash()) }
|
|
fn local(self) -> Self::Out { (self.0.local(), self.1.local()) }
|
|
fn retracted(self) -> Self::Out { (self.0.retracted(), self.1.retracted()) }
|
|
fn unverified(self) -> Self::Out { (self.0.unverified(), self.1.unverified()) }
|
|
fn verified(self) -> Self::Verified { (self.0.verified(), self.1.verified()) }
|
|
}
|
|
|
|
impl TxExt for SignedTransaction {
|
|
type Out = verifier::Transaction;
|
|
type Verified = VerifiedTransaction;
|
|
type Hash = H256;
|
|
|
|
fn hash(&self) -> Self::Hash {
|
|
UnverifiedTransaction::hash(self)
|
|
}
|
|
|
|
fn local(self) -> Self::Out {
|
|
verifier::Transaction::Local(self.into())
|
|
}
|
|
|
|
fn retracted(self) -> Self::Out {
|
|
verifier::Transaction::Retracted(self.into())
|
|
}
|
|
|
|
fn unverified(self) -> Self::Out {
|
|
verifier::Transaction::Unverified(self.into())
|
|
}
|
|
|
|
fn verified(self) -> Self::Verified {
|
|
VerifiedTransaction::from_pending_block_transaction(self)
|
|
}
|
|
}
|
|
|
|
impl TxExt for Vec<SignedTransaction> {
|
|
type Out = Vec<verifier::Transaction>;
|
|
type Verified = Vec<VerifiedTransaction>;
|
|
type Hash = Vec<H256>;
|
|
|
|
fn hash(&self) -> Self::Hash {
|
|
self.iter().map(|tx| tx.hash()).collect()
|
|
}
|
|
|
|
fn local(self) -> Self::Out {
|
|
self.into_iter().map(Into::into).map(verifier::Transaction::Local).collect()
|
|
}
|
|
|
|
fn retracted(self) -> Self::Out {
|
|
self.into_iter().map(Into::into).map(verifier::Transaction::Retracted).collect()
|
|
}
|
|
|
|
fn unverified(self) -> Self::Out {
|
|
self.into_iter().map(Into::into).map(verifier::Transaction::Unverified).collect()
|
|
}
|
|
|
|
fn verified(self) -> Self::Verified {
|
|
self.into_iter().map(VerifiedTransaction::from_pending_block_transaction).collect()
|
|
}
|
|
}
|
|
|
|
pub trait PairExt {
|
|
type Type;
|
|
|
|
fn into_vec(self) -> Vec<Self::Type>;
|
|
}
|
|
|
|
impl<A> PairExt for (A, A) {
|
|
type Type = A;
|
|
fn into_vec(self) -> Vec<A> {
|
|
vec![self.0, self.1]
|
|
}
|
|
}
|