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
openethereum · Jul 15, 2016 · 68dfae8 · 68dfae8
1 parent b7caa24
commit 68dfae8
Show file tree

Hide file tree

Showing 31 changed files with 103 additions and 26,871 deletions.
diff --git a/ethcore/res/ethereum/frontier.json b/ethcore/res/ethereum/frontier.json
@@ -9,8 +9,7 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0x118c30",
-				"daoRescueSoftFork": false
+				"frontierCompatibilityModeLimit": "0x118c30"
 			}
 		}
 	},