Merge branch 'master' into evm

This commit is contained in:
Tomusdrw
2016-01-17 11:41:46 +01:00
3 changed files with 20 additions and 12 deletions

View File

@@ -3,7 +3,7 @@
"engineName": "Ethash",
"params": {
"accountStartNonce": "0x00",
"frontierCompatibilityModeLimit": "0xf4240",
"frontierCompatibilityModeLimit": "0xDBBA0",
"maximumExtraDataSize": "0x20",
"tieBreakingGas": false,
"minGasLimit": "0x1388",

View File

@@ -3,7 +3,7 @@
"engineName": "Ethash",
"params": {
"accountStartNonce": "0x0100000",
"frontierCompatibilityModeLimit": "0xf4240",
"frontierCompatibilityModeLimit": "0xDBBA0",
"maximumExtraDataSize": "0x20",
"tieBreakingGas": false,
"minGasLimit": "0x1388",