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
278 lines
14 KiB
Rust
278 lines
14 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/>.
|
|
|
|
//! Contract for private transactions tests.
|
|
|
|
extern crate common_types as types;
|
|
extern crate env_logger;
|
|
extern crate ethcore;
|
|
extern crate ethcore_io;
|
|
extern crate ethcore_private_tx;
|
|
extern crate ethkey;
|
|
extern crate keccak_hash as hash;
|
|
extern crate rustc_hex;
|
|
|
|
#[macro_use]
|
|
extern crate log;
|
|
|
|
use std::sync::Arc;
|
|
use rustc_hex::{FromHex, ToHex};
|
|
|
|
use types::ids::BlockId;
|
|
use types::transaction::{Transaction, Action};
|
|
use ethcore::CreateContractAddress;
|
|
use ethcore::client::BlockChainClient;
|
|
use ethcore::executive::{contract_address};
|
|
use ethcore::miner::Miner;
|
|
use ethcore::test_helpers::{generate_dummy_client, push_block_with_transactions};
|
|
use ethkey::{Secret, KeyPair, Signature};
|
|
use hash::keccak;
|
|
|
|
use ethcore_private_tx::{NoopEncryptor, Provider, ProviderConfig, StoringKeyProvider};
|
|
|
|
#[test]
|
|
fn private_contract() {
|
|
// This uses a simple private contract: contract Test1 { bytes32 public x; function setX(bytes32 _x) { x = _x; } }
|
|
let _ = ::env_logger::try_init();
|
|
let client = generate_dummy_client(0);
|
|
let chain_id = client.signing_chain_id();
|
|
let key1 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000011")).unwrap();
|
|
let _key2 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000012")).unwrap();
|
|
let key3 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000013")).unwrap();
|
|
let key4 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000014")).unwrap();
|
|
|
|
let signer = Arc::new(ethcore_private_tx::KeyPairSigner(vec![key1.clone(), key3.clone(), key4.clone()]));
|
|
|
|
let config = ProviderConfig{
|
|
validator_accounts: vec![key3.address(), key4.address()],
|
|
signer_account: None,
|
|
logs_path: None,
|
|
};
|
|
|
|
let io = ethcore_io::IoChannel::disconnected();
|
|
let miner = Arc::new(Miner::new_for_tests(&::ethcore::spec::Spec::new_test(), None));
|
|
let private_keys = Arc::new(StoringKeyProvider::default());
|
|
let pm = Arc::new(Provider::new(
|
|
client.clone(),
|
|
miner,
|
|
signer.clone(),
|
|
Box::new(NoopEncryptor::default()),
|
|
config,
|
|
io,
|
|
private_keys,
|
|
));
|
|
|
|
let (address, _) = contract_address(CreateContractAddress::FromSenderAndNonce, &key1.address(), &0.into(), &[]);
|
|
|
|
trace!("Creating private contract");
|
|
let private_contract_test = "6060604052341561000f57600080fd5b60d88061001d6000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c55699c146046578063bc64b76d14607457600080fd5b3415605057600080fd5b60566098565b60405180826000191660001916815260200191505060405180910390f35b3415607e57600080fd5b6096600480803560001916906020019091905050609e565b005b60005481565b8060008160001916905550505600a165627a7a723058206acbdf4b15ca4c2d43e1b1879b830451a34f1e9d02ff1f2f394d8d857e79d2080029".from_hex().unwrap();
|
|
let mut private_create_tx = Transaction::default();
|
|
private_create_tx.action = Action::Create;
|
|
private_create_tx.data = private_contract_test;
|
|
private_create_tx.gas = 200000.into();
|
|
let private_create_tx_signed = private_create_tx.sign(&key1.secret(), None);
|
|
let validators = vec![key3.address(), key4.address()];
|
|
let (public_tx, _) = pm.public_creation_transaction(BlockId::Latest, &private_create_tx_signed, &validators, 0.into()).unwrap();
|
|
let public_tx = public_tx.sign(&key1.secret(), chain_id);
|
|
trace!("Transaction created. Pushing block");
|
|
push_block_with_transactions(&client, &[public_tx]);
|
|
|
|
trace!("Querying default private state");
|
|
let mut query_tx = Transaction::default();
|
|
query_tx.action = Action::Call(address.clone());
|
|
query_tx.data = "0c55699c".from_hex().unwrap(); // getX
|
|
query_tx.gas = 50000.into();
|
|
query_tx.nonce = 1.into();
|
|
let query_tx = query_tx.sign(&key1.secret(), chain_id);
|
|
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
|
|
assert_eq!(&result.output[..], &("0000000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap()[..]));
|
|
assert_eq!(pm.get_validators(BlockId::Latest, &address).unwrap(), validators);
|
|
|
|
trace!("Modifying private state");
|
|
let mut private_tx = Transaction::default();
|
|
private_tx.action = Action::Call(address.clone());
|
|
private_tx.data = "bc64b76d2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap(); //setX(42)
|
|
private_tx.gas = 120000.into();
|
|
private_tx.nonce = 1.into();
|
|
let private_tx = private_tx.sign(&key1.secret(), None);
|
|
let private_contract_nonce = pm.get_contract_nonce(&address, BlockId::Latest).unwrap();
|
|
let private_state = pm.execute_private_transaction(BlockId::Latest, &private_tx).unwrap();
|
|
let nonced_state_hash = pm.calculate_state_hash(&private_state, private_contract_nonce);
|
|
let signatures: Vec<_> = [&key3, &key4].iter().map(|k|
|
|
Signature::from(::ethkey::sign(&k.secret(), &nonced_state_hash).unwrap().into_electrum())).collect();
|
|
let public_tx = pm.public_transaction(private_state, &private_tx, &signatures, 1.into(), 0.into()).unwrap();
|
|
let public_tx = public_tx.sign(&key1.secret(), chain_id);
|
|
push_block_with_transactions(&client, &[public_tx]);
|
|
|
|
trace!("Querying private state");
|
|
let mut query_tx = Transaction::default();
|
|
query_tx.action = Action::Call(address.clone());
|
|
query_tx.data = "0c55699c".from_hex().unwrap(); // getX
|
|
query_tx.gas = 50000.into();
|
|
query_tx.nonce = 2.into();
|
|
let query_tx = query_tx.sign(&key1.secret(), chain_id);
|
|
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
|
|
assert_eq!(&result.output[..], &("2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap()[..]));
|
|
assert_eq!(pm.get_validators(BlockId::Latest, &address).unwrap(), validators);
|
|
|
|
// Now try modification with just one signature
|
|
trace!("Modifying private state");
|
|
let mut private_tx = Transaction::default();
|
|
private_tx.action = Action::Call(address.clone());
|
|
private_tx.data = "bc64b76d2b00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap(); //setX(43)
|
|
private_tx.gas = 120000.into();
|
|
private_tx.nonce = 2.into();
|
|
let private_tx = private_tx.sign(&key1.secret(), None);
|
|
let private_state = pm.execute_private_transaction(BlockId::Latest, &private_tx).unwrap();
|
|
let private_state_hash = keccak(&private_state);
|
|
let signatures: Vec<_> = [&key4].iter().map(|k|
|
|
Signature::from(::ethkey::sign(&k.secret(), &private_state_hash).unwrap().into_electrum())).collect();
|
|
let public_tx = pm.public_transaction(private_state, &private_tx, &signatures, 2.into(), 0.into()).unwrap();
|
|
let public_tx = public_tx.sign(&key1.secret(), chain_id);
|
|
push_block_with_transactions(&client, &[public_tx]);
|
|
|
|
trace!("Querying private state");
|
|
let mut query_tx = Transaction::default();
|
|
query_tx.action = Action::Call(address.clone());
|
|
query_tx.data = "0c55699c".from_hex().unwrap(); // getX
|
|
query_tx.gas = 50000.into();
|
|
query_tx.nonce = 3.into();
|
|
let query_tx = query_tx.sign(&key1.secret(), chain_id);
|
|
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
|
|
assert_eq!(result.output, "2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap());
|
|
}
|
|
|
|
#[test]
|
|
fn call_other_private_contract() {
|
|
// This test verifies calls private contract methods from another one
|
|
// Two contract will be deployed
|
|
// The same contract A:
|
|
// contract Test1 {
|
|
// bytes32 public x;
|
|
// function setX(bytes32 _x) {
|
|
// x = _x;
|
|
// }
|
|
// }
|
|
// And the following contract B:
|
|
// contract Deployed {
|
|
// function setX(uint) {}
|
|
// function x() returns (uint) {}
|
|
//}
|
|
// contract Existing {
|
|
// Deployed dc;
|
|
// function Existing(address t) {
|
|
// dc = Deployed(t);
|
|
// }
|
|
// function getX() returns (uint) {
|
|
// return dc.x();
|
|
// }
|
|
// }
|
|
//ethcore_logger::init_log();
|
|
|
|
// Create client and provider
|
|
let client = generate_dummy_client(0);
|
|
let chain_id = client.signing_chain_id();
|
|
let key1 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000011")).unwrap();
|
|
let _key2 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000012")).unwrap();
|
|
let key3 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000013")).unwrap();
|
|
let key4 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000014")).unwrap();
|
|
let signer = Arc::new(ethcore_private_tx::KeyPairSigner(vec![key1.clone(), key3.clone(), key4.clone()]));
|
|
|
|
let config = ProviderConfig{
|
|
validator_accounts: vec![key3.address(), key4.address()],
|
|
signer_account: None,
|
|
logs_path: None,
|
|
};
|
|
|
|
let io = ethcore_io::IoChannel::disconnected();
|
|
let miner = Arc::new(Miner::new_for_tests(&::ethcore::spec::Spec::new_test(), None));
|
|
let private_keys = Arc::new(StoringKeyProvider::default());
|
|
let pm = Arc::new(Provider::new(
|
|
client.clone(),
|
|
miner,
|
|
signer.clone(),
|
|
Box::new(NoopEncryptor::default()),
|
|
config,
|
|
io,
|
|
private_keys.clone(),
|
|
));
|
|
|
|
// Deploy contract A
|
|
let (address_a, _) = contract_address(CreateContractAddress::FromSenderAndNonce, &key1.address(), &0.into(), &[]);
|
|
trace!("Creating private contract A");
|
|
let private_contract_a_test = "6060604052341561000f57600080fd5b60d88061001d6000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c55699c146046578063bc64b76d14607457600080fd5b3415605057600080fd5b60566098565b60405180826000191660001916815260200191505060405180910390f35b3415607e57600080fd5b6096600480803560001916906020019091905050609e565b005b60005481565b8060008160001916905550505600a165627a7a723058206acbdf4b15ca4c2d43e1b1879b830451a34f1e9d02ff1f2f394d8d857e79d2080029".from_hex().unwrap();
|
|
let mut private_create_tx1 = Transaction::default();
|
|
private_create_tx1.action = Action::Create;
|
|
private_create_tx1.data = private_contract_a_test;
|
|
private_create_tx1.gas = 200000.into();
|
|
private_create_tx1.nonce = 0.into();
|
|
let private_create_tx_signed = private_create_tx1.sign(&key1.secret(), None);
|
|
let validators = vec![key3.address(), key4.address()];
|
|
let (public_tx1, _) = pm.public_creation_transaction(BlockId::Latest, &private_create_tx_signed, &validators, 0.into()).unwrap();
|
|
let public_tx1 = public_tx1.sign(&key1.secret(), chain_id);
|
|
trace!("Transaction created. Pushing block");
|
|
push_block_with_transactions(&client, &[public_tx1]);
|
|
|
|
// Deploy contract B
|
|
let (address_b, _) = contract_address(CreateContractAddress::FromSenderAndNonce, &key1.address(), &1.into(), &[]);
|
|
trace!("Creating private contract B");
|
|
// Build constructor data
|
|
let mut deploy_data = "6060604052341561000f57600080fd5b6040516020806101c583398101604052808051906020019091905050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505061014a8061007b6000396000f300606060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680635197c7aa14610046575b600080fd5b341561005157600080fd5b61005961006f565b6040518082815260200191505060405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16630c55699c6000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15156100fe57600080fd5b6102c65a03f1151561010f57600080fd5b505050604051805190509050905600a165627a7a723058207f8994e02725b47d76ec73e5c54a338d27b306dd1c830276bff2d75fcd1a5c920029000000000000000000000000".to_string();
|
|
deploy_data.push_str(&address_a.as_bytes().to_vec().to_hex());
|
|
let private_contract_b_test = deploy_data.from_hex().unwrap();
|
|
let mut private_create_tx2 = Transaction::default();
|
|
private_create_tx2.action = Action::Create;
|
|
private_create_tx2.data = private_contract_b_test;
|
|
private_create_tx2.gas = 200000.into();
|
|
private_create_tx2.nonce = 1.into();
|
|
let private_create_tx_signed = private_create_tx2.sign(&key1.secret(), None);
|
|
let (public_tx2, _) = pm.public_creation_transaction(BlockId::Latest, &private_create_tx_signed, &validators, 0.into()).unwrap();
|
|
let public_tx2 = public_tx2.sign(&key1.secret(), chain_id);
|
|
trace!("Transaction created. Pushing block");
|
|
push_block_with_transactions(&client, &[public_tx2]);
|
|
|
|
// Let provider know, that it has access to both keys for A and B
|
|
private_keys.set_available_keys(&vec![address_a, address_b]);
|
|
|
|
// Call A.setx(42)
|
|
trace!("Modifying private state");
|
|
let mut private_tx = Transaction::default();
|
|
private_tx.action = Action::Call(address_a.clone());
|
|
private_tx.data = "bc64b76d2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap(); //setX(42)
|
|
private_tx.gas = 120000.into();
|
|
private_tx.nonce = 2.into();
|
|
let private_tx = private_tx.sign(&key1.secret(), None);
|
|
let private_contract_nonce = pm.get_contract_nonce(&address_b, BlockId::Latest).unwrap();
|
|
let private_state = pm.execute_private_transaction(BlockId::Latest, &private_tx).unwrap();
|
|
let nonced_state_hash = pm.calculate_state_hash(&private_state, private_contract_nonce);
|
|
let signatures: Vec<_> = [&key3, &key4].iter().map(|k|
|
|
Signature::from(::ethkey::sign(&k.secret(), &nonced_state_hash).unwrap().into_electrum())).collect();
|
|
let public_tx = pm.public_transaction(private_state, &private_tx, &signatures, 2.into(), 0.into()).unwrap();
|
|
let public_tx = public_tx.sign(&key1.secret(), chain_id);
|
|
push_block_with_transactions(&client, &[public_tx]);
|
|
|
|
// Call B.getX()
|
|
trace!("Querying private state");
|
|
let mut query_tx = Transaction::default();
|
|
query_tx.action = Action::Call(address_b.clone());
|
|
query_tx.data = "5197c7aa".from_hex().unwrap(); // getX
|
|
query_tx.gas = 50000.into();
|
|
query_tx.nonce = 3.into();
|
|
let query_tx = query_tx.sign(&key1.secret(), chain_id);
|
|
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
|
|
assert_eq!(&result.output[..], &("2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap()[..]));
|
|
}
|