Skip to content

Commit

Permalink
Merge pull request #525 from ethereum/disableEip
Browse files Browse the repository at this point in the history
Fix BLOCKHASH cost in Constantinople
  • Loading branch information
winsvega committed Oct 12, 2018
2 parents 0fe8119 + a69eb76 commit 95a3092
Show file tree
Hide file tree
Showing 217 changed files with 4,815 additions and 5,313 deletions.
180 changes: 90 additions & 90 deletions BlockchainTests/bcMultiChainTest/CallContractFromNotBestBlock.json

Large diffs are not rendered by default.

300 changes: 150 additions & 150 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainB.json

Large diffs are not rendered by default.

300 changes: 150 additions & 150 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainBCallContractFormA.json

Large diffs are not rendered by default.

368 changes: 184 additions & 184 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainB_BlockHash.json

Large diffs are not rendered by default.

258 changes: 129 additions & 129 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainB_blockorder1.json

Large diffs are not rendered by default.

258 changes: 129 additions & 129 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainB_blockorder2.json

Large diffs are not rendered by default.

258 changes: 129 additions & 129 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainB_difficultyB.json

Large diffs are not rendered by default.

468 changes: 234 additions & 234 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainBtoChainA.json

Large diffs are not rendered by default.

552 changes: 276 additions & 276 deletions BlockchainTests/bcMultiChainTest/ChainAtoChainBtoChainAtoChainB.json

Large diffs are not rendered by default.

306 changes: 153 additions & 153 deletions BlockchainTests/bcMultiChainTest/UncleFromSideChain.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"randomStatetest109BC_Byzantium" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
"lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
"filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
"lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
"source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json",
"sourceHash" : "e35442cdf880e84bc653cde4efcd68f5abd2d199aec815d891343514568d21a4"
"sourceHash" : "8600961399c533b95f421eae82439808aeffa46bb4cf1382db581d53c5aa486a"
},
"blocks" : [
{
Expand Down Expand Up @@ -118,10 +118,10 @@
"randomStatetest109BC_Constantinople" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
"lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
"filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
"lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
"source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json",
"sourceHash" : "e35442cdf880e84bc653cde4efcd68f5abd2d199aec815d891343514568d21a4"
"sourceHash" : "8600961399c533b95f421eae82439808aeffa46bb4cf1382db581d53c5aa486a"
},
"blocks" : [
{
Expand All @@ -131,19 +131,19 @@
"difficulty" : "0x020000",
"extraData" : "",
"gasLimit" : "0x7fffffffffffffff",
"gasUsed" : "0xa524",
"hash" : "0x4b39194e5747e10985f723a36cd1bebd29db4ee68c427a083a46b221ebb0e74b",
"gasUsed" : "0xa218",
"hash" : "0x27fd5789f16cfec619f7dd85001614fd9b37f757b3b37c4d6dec8412a6ece194",
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"nonce" : "0x0000000000000000",
"number" : "0x01",
"parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
"receiptTrie" : "0x0cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8",
"stateRoot" : "0x225b3230900f2bc25e1bd2f98ed90d6d940c684c68b2d68d0b5d88403ba1e83c",
"receiptTrie" : "0x6899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840",
"stateRoot" : "0xd2e71b4412401146135aa0c85cc264842d5a410ea8ba4e198f3a576fb2ca62c3",
"timestamp" : "0x03e8",
"transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
"uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
"rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0225b3230900f2bc25e1bd2f98ed90d6d940c684c68b2d68d0b5d88403ba1e83ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
"rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d2e71b4412401146135aa0c85cc264842d5a410ea8ba4e198f3a576fb2ca62c3a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06899214c67b8a4ef38e0acce95cb3fc91d1ee7eccac59fbddbef1a3269e3d840b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
"transactions" : [
{
"data" : "0x42",
Expand Down Expand Up @@ -180,7 +180,7 @@
"uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
"genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
"lastblockhash" : "0x4b39194e5747e10985f723a36cd1bebd29db4ee68c427a083a46b221ebb0e74b",
"lastblockhash" : "0x27fd5789f16cfec619f7dd85001614fd9b37f757b3b37c4d6dec8412a6ece194",
"network" : "Constantinople",
"postState" : {
"0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
Expand All @@ -192,14 +192,14 @@
}
},
"0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "0x1bc16d674ec8a552",
"balance" : "0x1bc16d674ec8a246",
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0x00",
"storage" : {
}
},
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x0de0b6b3a761d43c",
"balance" : "0x0de0b6b3a761d748",
"code" : "",
"nonce" : "0x01",
"storage" : {
Expand Down Expand Up @@ -234,10 +234,10 @@
"randomStatetest109BC_EIP150" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
"lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
"filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
"lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
"source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json",
"sourceHash" : "e35442cdf880e84bc653cde4efcd68f5abd2d199aec815d891343514568d21a4"
"sourceHash" : "8600961399c533b95f421eae82439808aeffa46bb4cf1382db581d53c5aa486a"
},
"blocks" : [
{
Expand Down Expand Up @@ -350,10 +350,10 @@
"randomStatetest109BC_EIP158" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
"lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
"filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
"lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
"source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json",
"sourceHash" : "e35442cdf880e84bc653cde4efcd68f5abd2d199aec815d891343514568d21a4"
"sourceHash" : "8600961399c533b95f421eae82439808aeffa46bb4cf1382db581d53c5aa486a"
},
"blocks" : [
{
Expand Down Expand Up @@ -466,10 +466,10 @@
"randomStatetest109BC_Frontier" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
"lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
"filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
"lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
"source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json",
"sourceHash" : "e35442cdf880e84bc653cde4efcd68f5abd2d199aec815d891343514568d21a4"
"sourceHash" : "8600961399c533b95f421eae82439808aeffa46bb4cf1382db581d53c5aa486a"
},
"blocks" : [
{
Expand Down Expand Up @@ -582,10 +582,10 @@
"randomStatetest109BC_Homestead" : {
"_info" : {
"comment" : "",
"filledwith" : "testeth 1.5.0.dev2-65+commit.3be27deb",
"lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
"filledwith" : "testeth 1.5.0.dev2-72+commit.ff0ca2db",
"lllcversion" : "Version: 0.5.0-develop.2018.10.10+commit.06200b4b.Linux.g++",
"source" : "src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json",
"sourceHash" : "e35442cdf880e84bc653cde4efcd68f5abd2d199aec815d891343514568d21a4"
"sourceHash" : "8600961399c533b95f421eae82439808aeffa46bb4cf1382db581d53c5aa486a"
},
"blocks" : [
{
Expand Down

0 comments on commit 95a3092

Please sign in to comment.