Backporting to beta #3149

arkpar · 2016-11-03T18:35:13Z

No description provided.

rphmeier · 2016-11-03T18:45:19Z

This looks like it includes the changes in next-hardfork -- we shouldn't backport any of those until they're in.

gavofyork · 2016-11-03T19:16:18Z

ethcore/src/miner/banning_queue.rs

@@ -0,0 +1,339 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.


Banning functionality shouldn't be making it into 1.3 series.

Merg leftover. It is not even included in the build. Removed anyway

gavofyork · 2016-11-03T19:17:05Z

looks like the banning queue functionality was accidentally included here. it's not part of the EIPs and shouldn't be making it into 1.3 series.

Update transaction tests validation.

coveralls · 2016-11-03T21:10:58Z

Changes Unknown when pulling fb3f385 on backporting into * on beta*.

gavofyork · 2016-11-03T21:24:06Z

ethcore/build.rs

@@ -18,6 +18,6 @@ extern crate ethcore_ipc_codegen;

 fn main() {
 	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
-	ethcore_ipc_codegen::derive_ipc("src/client/traits.rs").unwrap();


don't remember changing this file...

gavofyork · 2016-11-03T21:24:45Z

ethcore/src/client/chain_notify.rs

@@ -15,12 +15,10 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use util::numbers::*;
-use ipc::{IpcConfig, BinaryConvertError};


don't remember changing this file

gavofyork · 2016-11-03T21:25:06Z

ethcore/src/client/mod.rs

@@ -30,13 +30,17 @@ pub use self::test_client::{TestBlockChainClient, EachBlockWith};
 pub use types::trace_filter::Filter as TraceFilter;
 pub use executive::{Executed, Executive, TransactOptions};
 pub use env_info::{LastHashes, EnvInfo};
-pub use self::chain_notify::{ChainNotify, ChainNotifyClient};


don't remember these changes.

gavofyork · 2016-11-03T21:26:14Z

ethcore/src/miner/transaction_queue.rs

@@ -21,55 +21,6 @@
 //! transaction's nonce and next nonce expected from this sender). If nonces are equal transaction's gas price is used
 //! for comparison (higher gas price = higher priority).
 //!
-//! # Usage Example


don't remember removing all of this

NikVolf · 2016-11-03T21:26:50Z

@gavofyork you used Option<u8> in one of the new methods, and it cannot be serialized for ipc, so this ipc-related changes are backported from master where ipc codegen is not executed until feature is on (unlike it is in beta, where it is always executed)

arkpar · 2016-11-03T21:27:08Z

I've disabled IPC code generation in this PR because #2976 brakes it. IPC codegen is already disabled in master.

gavofyork · 2016-11-03T21:27:46Z

ethstore/src/dir/disk.rs

@@ -162,7 +162,8 @@ mod test {
 	#[test]
 	fn should_create_new_account() {
 		// given
-		let dir = env::temp_dir();
+		let mut dir = env::temp_dir();


don't remember changing this

gavofyork · 2016-11-03T21:28:04Z

ipc/codegen/src/lib.rs

@@ -49,7 +49,7 @@ include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 include!("lib.rs.in");

 #[cfg(feature = "with-syntex")]
-pub fn register(reg: &mut syntex::Registry) {
+pub fn register_cleaner(reg: &mut syntex::Registry) {


don't remember changing this file.

gavofyork · 2016-11-03T21:28:32Z

ipc/hypervisor/src/service.rs.in

@@ -34,7 +34,7 @@ pub struct HypervisorService {
 	check_list: RwLock<HashMap<IpcModuleId, bool>>,
 }

-#[derive(Ipc)]
+#[ipc]


this and the similar changes following were not EIP related.

gavofyork · 2016-11-03T21:28:55Z

parity/main.rs

@@ -119,11 +118,6 @@ fn start() -> Result<String, String> {
 fn main() {
 	// Always print backtrace on panic.
 	::std::env::set_var("RUST_BACKTRACE", "1");
-	// just redirect to the sync::main()
-	if std::env::args().nth(1).map_or(false, |arg| arg == "sync") {


not EIP related.

gavofyork · 2016-11-03T21:29:04Z

parity/modules.rs

@@ -25,10 +25,6 @@ use self::ipc_deps::*;
 use ethcore_logger::Config as LogConfig;

 pub mod service_urls {
-	pub const CLIENT: &'static str = "ipc:///tmp/parity-chain.ipc";


not EIP related

gavofyork · 2016-11-03T21:30:09Z

sync/src/api.rs

-	pub network_id: U256,
+	pub network_id: usize,
+	/// Main "eth" subprotocol name.
+	pub subprotocol_name: [u8; 3],


extra subprotocol_name field is from unrelated EXP PR, i think

gavofyork · 2016-11-03T21:30:22Z

sync/src/api.rs

@@ -49,7 +51,8 @@ impl Default for SyncConfig {
 	fn default() -> SyncConfig {
 		SyncConfig {
 			max_download_ahead_blocks: 20000,
-			network_id: U256::from(1),
+			network_id: 1,
+			subprotocol_name: *b"eth",


subprotocol_name was from the EXP PR, i think

gavofyork · 2016-11-03T21:30:57Z

sync/src/api.rs

@@ -90,8 +93,6 @@ impl EthSync {
 	}
 }

-#[derive(Ipc)]
-#[ipc(client_ident="SyncClient")]


not from the EIP PR

gavofyork · 2016-11-03T21:31:05Z

sync/src/api.rs

@@ -185,8 +186,6 @@ pub trait ManageNetwork : Send + Sync {
 }


-#[derive(Ipc)]


not from the EIP PR

gavofyork · 2016-11-03T21:31:21Z

sync/src/lib.rs

@@ -91,7 +91,7 @@ mod api {
 	include!(concat!(env!("OUT_DIR"), "/api.rs"));
 }

-pub use api::{EthSync, SyncProvider, SyncClient, NetworkManagerClient, ManageNetwork, SyncConfig,
+pub use api::{EthSync, SyncProvider, ManageNetwork, SyncConfig,


not from the EIP PR

gavofyork · 2016-11-03T21:31:26Z

test.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 # Running Parity Full Test Sute

-FEATURES="json-tests ipc"
+FEATURES="json-tests"


not from the EIP PR

gavofyork · 2016-11-03T21:31:35Z

test.sh


 case $1 in
    --no-json)
-    FEATURES="ipc"
+    FEATURES=""


not from the EIP PR

gavofyork · 2016-11-03T21:32:33Z

quite a few changes from the EXP ~~and some IPC changes~~ seem to have been brought in - was that intentional?

gavofyork · 2016-11-03T21:34:22Z

seems the IPC changes were intentional - the partial EXP changes not so much?

arkpar · 2016-11-03T21:37:58Z

EXP support is already in beta. Looks like it was not properly merged before.

gavofyork · 2016-11-03T21:39:12Z

fair enough

The front-end for each hard-fork, also EIP-160.

a991265

arkpar added the A8-backport 🕸 Pull request is already reviewed well in another branch. label Nov 3, 2016

arkpar added the A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. label Nov 3, 2016

gavofyork reviewed Nov 3, 2016

View reviewed changes

gavofyork added A4-gotissues 💥 Pull request is reviewed and has significant issues which must be addressed. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. A8-backport 🕸 Pull request is already reviewed well in another branch. labels Nov 3, 2016

gavofyork and others added 21 commits November 3, 2016 20:47

Address EIP161 a/c

eb018a4

Include EIP-161b

e426fb6

EIP-161 part d.

a84fa93

Fixed tests

acb28e1

Fix test build.

846bd37

Fix one test, add another.

49808df

Fix use of bloom & renaming.

e6ad198

Initial groundwork for EIP-155

3bc5c37

Fix minor bug.

e8e8fa7

Fix all tests finally.

04083ad

ipc backports

e4f3c6f

Resolve IPC issues

d3cbe46

Fixed tests

048e087

Rest of EIP-155.

c0d44f9

Add tests for EIP-155 algorithm.

0bd5642

Update transaction tests validation.

Address grumbles.

061068c

Remove unused code.

40e68ed

Fix SUICIDE gas mechanism and add consensus tests.

731ac39

Remove commented code.

5f66879

Set Frontier hardfork block number

e6ef5c6

Transaction tests,

379f9f3

gavofyork added the M4-core ⛓ Core client code / Rust. label Nov 3, 2016

gavofyork reviewed Nov 3, 2016

View reviewed changes

sync/src/api.rs

@@ -90,8 +93,6 @@ impl EthSync {

}

}

#[derive(Ipc)]

#[ipc(client_ident="SyncClient")]

Copy link

Contributor

gavofyork Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not from the EIP PR

gavofyork reviewed Nov 3, 2016

View reviewed changes

sync/src/api.rs

@@ -185,8 +186,6 @@ pub trait ManageNetwork : Send + Sync {

}

#[derive(Ipc)]

Copy link

Contributor

gavofyork Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not from the EIP PR

gavofyork reviewed Nov 3, 2016

View reviewed changes

test.sh

case $1 in

--no-json)

FEATURES="ipc"

FEATURES=""

Copy link

Contributor

gavofyork Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not from the EIP PR

gavofyork closed this Nov 3, 2016

gavofyork reopened this Nov 3, 2016

gavofyork added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Nov 3, 2016

gavofyork merged commit 6a4408c into beta Nov 3, 2016

gavofyork deleted the backporting branch November 3, 2016 21:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backporting to beta #3149

Backporting to beta #3149

arkpar commented Nov 3, 2016

rphmeier commented Nov 3, 2016

gavofyork Nov 3, 2016

arkpar Nov 3, 2016

gavofyork commented Nov 3, 2016

coveralls commented Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

NikVolf commented Nov 3, 2016 •

edited

arkpar commented Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016 •

edited

gavofyork Nov 3, 2016 •

edited

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork Nov 3, 2016

gavofyork commented Nov 3, 2016 •

edited

gavofyork commented Nov 3, 2016

arkpar commented Nov 3, 2016

gavofyork commented Nov 3, 2016

		@@ -185,8 +186,6 @@ pub trait ManageNetwork : Send + Sync {
		}


		#[derive(Ipc)]

Backporting to beta #3149

Backporting to beta #3149

Conversation

arkpar commented Nov 3, 2016

rphmeier commented Nov 3, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gavofyork commented Nov 3, 2016

coveralls commented Nov 3, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NikVolf commented Nov 3, 2016 • edited

arkpar commented Nov 3, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gavofyork Nov 3, 2016 • edited

Choose a reason for hiding this comment

gavofyork Nov 3, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gavofyork commented Nov 3, 2016 • edited

gavofyork commented Nov 3, 2016

arkpar commented Nov 3, 2016

gavofyork commented Nov 3, 2016

NikVolf commented Nov 3, 2016 •

edited

gavofyork Nov 3, 2016 •

edited

gavofyork Nov 3, 2016 •

edited

gavofyork commented Nov 3, 2016 •

edited