Skip to content

Commit

Permalink
fix nimbus incorrect gasusage on blobhash opcode
Browse files Browse the repository at this point in the history
  • Loading branch information
@winsvega
winsvega committed Jul 26, 2023
1 parent 2f40d7f commit 06e2767
Show file tree
Hide file tree
Showing 13 changed files with 607 additions and 112 deletions.
50 changes: 16 additions & 34 deletions EIPTests/BlockchainTests/StateTests/stEIP4844-blobtransactions/blobhashListBounds3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@
"_info" : {
"comment" : "BLOB006",
"filling-rpc-server" : "Nimbus-t8n 0.1.2",
"filling-tool-version" : "retesteth-0.3.1-cancun+commit.09bf8dba.Linux.g++",
"generatedTestHash" : "492e21de2e679a5f7e3411fe1b7fb45a3289fe32b49b501c3a1cadd572e038fc",
"filling-tool-version" : "retesteth-0.3.1-cancun+commit.03664c94.Linux.g++",
"generatedTestHash" : "6067bd45c98bf7af8fdb99d94324b2b891fddfad306d5c2aa4c3e90254aa7477",
"lllcversion" : "Version: 0.5.14-develop.2023.7.11+commit.c58ab2c6.mod.Linux.g++",
"solidity" : "Version: 0.8.20+commit.a1b79de6.Linux.g++",
"source" : "src/EIPTestsFiller/StateTests/stEIP4844-blobtransactions/blobhashListBounds3Filler.yml",
"sourceHash" : "2b9ca4ba344e669e2af510e4e202708207b501d7771413c5c60e23a6a327cbb3"
"sourceHash" : "669957f3940c9739a4849457edc3f910602f2295d95441f8baf98ee2dd9efbec"
},
"blocks" : [
{
"blockHeader" : {
"baseFeePerGas" : "0x07",
"bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"dataGasUsed" : "0x280000",
"dataGasUsed" : "0x060000",
"difficulty" : "0x00",
"excessDataGas" : "0x00",
"extraData" : "0x00",
"gasLimit" : "0x1000000000",
"gasUsed" : "0x28b86d",
"hash" : "0x54ce1280bfd4cf8414fe85a8f9c247cb2d78431fdebe063d8a182322450db9ec",
"gasUsed" : "0x6ab1",
"hash" : "0x14fabf2ddc7f9d07611e4f8a8324a4489d73d742fa8cf937624dac22e993d79b",
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
"nonce" : "0x0000000000000000",
"number" : "0x01",
"parentHash" : "0x5dc51e3a379b9771cd90d4b588a5c7ce943e333f611066dfabaaad0cbfb92dd4",
"receiptTrie" : "0x8c6f0adab35df97b8241664b1b4e8a0dc94fff4f20f1d2fd2081a5f35905587d",
"stateRoot" : "0xe2a215ff049e785e1235eae0908cc53e1dd4248a810c196907cf4c468a5c71d4",
"receiptTrie" : "0xf8ec0dcb724906966cbcae8f5c9671267fa89655fccb06586636d29adacafa3c",
"stateRoot" : "0x52196f6444dac6b01163ab7f09586ce9b5a961c271708b5a3fb3d5a862266722",
"timestamp" : "0x03e8",
"transactionsTrie" : "0x48420a7215e81cc3bbb39e00dd60271288575fb4640ef7af88f29d5a3276db3b",
"transactionsTrie" : "0x7fc973c1b4d1a304ac77e99d19b6fcf8ac461e0098a10ea4e2b42d0588dee7f8",
"uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
},
"rlp" : "0xf9058cf9021ea05dc51e3a379b9771cd90d4b588a5c7ce943e333f611066dfabaaad0cbfb92dd4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2a215ff049e785e1235eae0908cc53e1dd4248a810c196907cf4c468a5c71d4a048420a7215e81cc3bbb39e00dd60271288575fb4640ef7af88f29d5a3276db3ba08c6f0adab35df97b8241664b1b4e8a0dc94fff4f20f1d2fd2081a5f35905587db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080018510000000008328b86d8203e800a0000000000000000000000000000000000000000000000000000000000002000088000000000000000007a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218328000080f90366b9036303f9035f01800285012a05f200833d090094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a000f85bf85994095e7baea6a6c7c4c2dfeb977efac326af552d87f842a00000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000010af90294a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0001a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0002a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0003a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0004a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0005a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0006a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0007a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0008a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0009a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0010a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0011a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0012a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0013a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0014a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0015a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0016a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0017a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0018a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0019a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f002080a07b67348718a49b5e7c6f882030873feb198315051ae4b257fbd99bcc14777f53a0375219ba48b2694622d8aab97d44fc7eb2902678e51369bcc74fae65c4bab628c0c0",
"rlp" : "0xf90359f9021da05dc51e3a379b9771cd90d4b588a5c7ce943e333f611066dfabaaad0cbfb92dd4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052196f6444dac6b01163ab7f09586ce9b5a961c271708b5a3fb3d5a862266722a07fc973c1b4d1a304ac77e99d19b6fcf8ac461e0098a10ea4e2b42d0588dee7f8a0f8ec0dcb724906966cbcae8f5c9671267fa89655fccb06586636d29adacafa3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001851000000000826ab18203e800a0000000000000000000000000000000000000000000000000000000000002000088000000000000000007a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218306000080f90134b9013103f9012d01800285012a05f200833d090094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a000f85bf85994095e7baea6a6c7c4c2dfeb977efac326af552d87f842a00000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000010af863a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0001a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0002a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f000380a0787d491816e6b21187fc25ee71bc1dd2240b41de89852c21f7a518101dc28bc2a05b5dbb0592f2fdc391efe1e9c6181e54f1b817d07d6f5c7767c7267529528e20c0c0",
"transactions" : [
{
"accessList" : [
Expand All @@ -49,24 +49,7 @@
"blobVersionedHashes" : [
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0001",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0002",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0003",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0004",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0005",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0006",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0007",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0008",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0009",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0010",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0011",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0012",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0013",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0014",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0015",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0016",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0017",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0018",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0019",
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0020"
"0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0003"
],
"chainId" : "0x01",
"data" : "0x00",
Expand All @@ -75,8 +58,8 @@
"maxFeePerGas" : "0x012a05f200",
"maxPriorityFeePerGas" : "0x02",
"nonce" : "0x00",
"r" : "0x7b67348718a49b5e7c6f882030873feb198315051ae4b257fbd99bcc14777f53",
"s" : "0x375219ba48b2694622d8aab97d44fc7eb2902678e51369bcc74fae65c4bab628",
"r" : "0x787d491816e6b21187fc25ee71bc1dd2240b41de89852c21f7a518101dc28bc2",
"s" : "0x5b5dbb0592f2fdc391efe1e9c6181e54f1b817d07d6f5c7767c7267529528e20",
"sender" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
"type" : "0x03",
Expand Down Expand Up @@ -113,26 +96,25 @@
"withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
},
"genesisRLP" : "0xf90220f9021aa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0538353a3893bdc8daa9eb125f6680804fc6f63e07ba1a1b65329614325528a54a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008080851000000000808000a0000000000000000000000000000000000000000000000000000000000002000088000000000000000008a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421822000821000c0c0c0",
"lastblockhash" : "0x54ce1280bfd4cf8414fe85a8f9c247cb2d78431fdebe063d8a182322450db9ec",
"lastblockhash" : "0x14fabf2ddc7f9d07611e4f8a8324a4489d73d742fa8cf937624dac22e993d79b",
"network" : "Cancun",
"postState" : {
"0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0x0de0b6b3a76586a0",
"code" : "0x600a4960005500",
"nonce" : "0x00",
"storage" : {
"0x00" : "0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065f0011"
}
},
"0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
"balance" : "0x5170da",
"balance" : "0xd562",
"code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x0de0b6b3a5f3fd8b",
"balance" : "0x0de0b6b3a758b927",
"code" : "0x",
"nonce" : "0x01",
"storage" : {
Expand Down
Loading

0 comments on commit 06e2767

Please sign in to comment.