Backports for beta (#1628)

* Remove soft-fork stuff. * Fix tests. * Fix "pending" parameter on RPC block requests (#1602) * Initial commit. * Pending blocks work. * Address grumbles. * Fix up for new API. * Fixed test
2016-07-15 16:44:27 +02:00
parent b7caa24c2e
commit 68dfae8f06
31 changed files with 103 additions and 26871 deletions
--- a/json/src/spec/engine.rs
+++ b/json/src/spec/engine.rs
@@ -53,8 +53,7 @@ mod tests {
 					"durationLimit": "0x0d",
 					"blockReward": "0x4563918244F40000",
 					"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-					"frontierCompatibilityModeLimit" : "0x",
-					"daoRescueSoftFork": true
+					"frontierCompatibilityModeLimit" : "0x"
 				}
 			}
 		}"#;
--- a/json/src/spec/ethash.rs
+++ b/json/src/spec/ethash.rs
@@ -42,9 +42,6 @@ pub struct EthashParams {
 	/// Homestead transition block number.
 	#[serde(rename="frontierCompatibilityModeLimit")]
 	pub frontier_compatibility_mode_limit: Uint,
-	/// DAO rescue soft-fork?
-	#[serde(rename="daoRescueSoftFork")]
-	pub dao_rescue_soft_fork: bool,
 }

 /// Ethash engine deserialization.
@@ -69,8 +66,7 @@ mod tests {
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar": "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0x42",
-				"daoRescueSoftFork": true
+				"frontierCompatibilityModeLimit": "0x42"
 			}
 		}"#;

--- a/json/src/spec/spec.rs
+++ b/json/src/spec/spec.rs
@@ -63,8 +63,7 @@ mod tests {
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit" : "0x",
-				"daoRescueSoftFork": false
+				"frontierCompatibilityModeLimit" : "0x"
 			}
 		}
 	},