Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
4c7053ba
Unverified
Commit
4c7053ba
authored
Aug 22, 2023
by
Felix Lange
Committed by
GitHub
Aug 22, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: add BeaconRoot to header in GenerateChain (#27974)
Fixes an error in tests of internal/ethapi.
parent
8d249298
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
15 additions
and
14 deletions
+15
-14
chain_makers.go
core/chain_makers.go
+1
-0
eth_getBlockReceipts-block-with-blob-tx.json
...api/testdata/eth_getBlockReceipts-block-with-blob-tx.json
+1
-1
eth_getBlockReceipts-block-with-contract-create-tx.json
...a/eth_getBlockReceipts-block-with-contract-create-tx.json
+1
-1
eth_getBlockReceipts-block-with-dynamic-fee-tx.json
...tdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json
+1
-1
eth_getBlockReceipts-block-with-legacy-contract-call-tx.json
..._getBlockReceipts-block-with-legacy-contract-call-tx.json
+2
-2
eth_getBlockReceipts-block-with-legacy-transfer-tx.json
...a/eth_getBlockReceipts-block-with-legacy-transfer-tx.json
+1
-1
eth_getBlockReceipts-tag-latest.json
...rnal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json
+1
-1
eth_getTransactionReceipt-blob-tx.json
...al/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json
+1
-1
eth_getTransactionReceipt-create-contract-tx.json
...estdata/eth_getTransactionReceipt-create-contract-tx.json
+1
-1
eth_getTransactionReceipt-create-contract-with-access-list.json
...tTransactionReceipt-create-contract-with-access-list.json
+1
-1
eth_getTransactionReceipt-dynamic-tx-with-logs.json
...tdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json
+1
-1
eth_getTransactionReceipt-normal-transfer-tx.json
...estdata/eth_getTransactionReceipt-normal-transfer-tx.json
+1
-1
eth_getTransactionReceipt-with-logs.json
.../ethapi/testdata/eth_getTransactionReceipt-with-logs.json
+2
-2
No files found.
core/chain_makers.go
View file @
4c7053ba
...
...
@@ -411,6 +411,7 @@ func makeHeader(chain consensus.ChainReader, parent *types.Block, state *state.S
excessBlobGas
:=
eip4844
.
CalcExcessBlobGas
(
parentExcessBlobGas
,
parentBlobGasUsed
)
header
.
ExcessBlobGas
=
&
excessBlobGas
header
.
BlobGasUsed
=
new
(
uint64
)
header
.
BeaconRoot
=
new
(
common
.
Hash
)
}
return
header
}
...
...
internal/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json
View file @
4c7053ba
...
...
@@ -2,7 +2,7 @@
{
"blobGasPrice"
:
"0x1"
,
"blobGasUsed"
:
"0x20000"
,
"blockHash"
:
"0x
2ffcbc982ea819900e22b96c72bc85c8c64e080b9479d1c68ee49f55564816e7
"
,
"blockHash"
:
"0x
e724dfd4349861f4dceef2bc4df086d0a3d88858214f6bee9fcf1bebd1edc2a6
"
,
"blockNumber"
:
"0x6"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x5208"
,
...
...
internal/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json
View file @
4c7053ba
[
{
"blockHash"
:
"0x
c7f8a266e8bee4e36fd6374ebb280b16b4ec881e865f9d69e3c8743a71f0197e
"
,
"blockHash"
:
"0x
1e7dcf3abe8bf05d32367a5dc387caa32578b15871bf8b3cbeedf2d8d530f844
"
,
"blockNumber"
:
"0x2"
,
"contractAddress"
:
"0xae9bea628c4ce503dcfd7e305cab4e29e7476592"
,
"cumulativeGasUsed"
:
"0xcf50"
,
...
...
internal/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json
View file @
4c7053ba
[
{
"blockHash"
:
"0x
a85ac2ee14add4cf9e92f1a023b4c9eac355266f9e87e70bdcd557d848c61305
"
,
"blockHash"
:
"0x
ffa737e6ce9a9162ffd411dd06169114b3ed5ee9fc1474a2625c92548e4455e0
"
,
"blockNumber"
:
"0x4"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x538d"
,
...
...
internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json
View file @
4c7053ba
[
{
"blockHash"
:
"0x
790f05c0ce7b6add0c7b1e8a777811738c540436e898ae6b09688dacc6581254
"
,
"blockHash"
:
"0x
173dcd9d22ce71929cd17e84ea88702a0f84d6244c6898d2a4f48722e494fe9c
"
,
"blockNumber"
:
"0x3"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x5e28"
,
...
...
@@ -19,7 +19,7 @@
"blockNumber"
:
"0x3"
,
"transactionHash"
:
"0xeaf3921cbf03ba45bad4e6ab807b196ce3b2a0b5bacc355b6272fa96b11b4287"
,
"transactionIndex"
:
"0x0"
,
"blockHash"
:
"0x
790f05c0ce7b6add0c7b1e8a777811738c540436e898ae6b09688dacc6581254
"
,
"blockHash"
:
"0x
173dcd9d22ce71929cd17e84ea88702a0f84d6244c6898d2a4f48722e494fe9c
"
,
"logIndex"
:
"0x0"
,
"removed"
:
false
}
...
...
internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json
View file @
4c7053ba
[
{
"blockHash"
:
"0x
698945ab39ebe6cecff84886b3142630cf03a74b2c19eec8043534463a6ff60b
"
,
"blockHash"
:
"0x
a8a067b3cb3b9ddc6cfb8317bfd08b266fcf9994fc870c1f7ed394acecfadf39
"
,
"blockNumber"
:
"0x1"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x5208"
,
...
...
internal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json
View file @
4c7053ba
...
...
@@ -2,7 +2,7 @@
{
"blobGasPrice"
:
"0x1"
,
"blobGasUsed"
:
"0x20000"
,
"blockHash"
:
"0x
2ffcbc982ea819900e22b96c72bc85c8c64e080b9479d1c68ee49f55564816e7
"
,
"blockHash"
:
"0x
e724dfd4349861f4dceef2bc4df086d0a3d88858214f6bee9fcf1bebd1edc2a6
"
,
"blockNumber"
:
"0x6"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x5208"
,
...
...
internal/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json
View file @
4c7053ba
{
"blobGasPrice"
:
"0x1"
,
"blobGasUsed"
:
"0x20000"
,
"blockHash"
:
"0x
2ffcbc982ea819900e22b96c72bc85c8c64e080b9479d1c68ee49f55564816e7
"
,
"blockHash"
:
"0x
e724dfd4349861f4dceef2bc4df086d0a3d88858214f6bee9fcf1bebd1edc2a6
"
,
"blockNumber"
:
"0x6"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x5208"
,
...
...
internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json
View file @
4c7053ba
{
"blockHash"
:
"0x
c7f8a266e8bee4e36fd6374ebb280b16b4ec881e865f9d69e3c8743a71f0197e
"
,
"blockHash"
:
"0x
1e7dcf3abe8bf05d32367a5dc387caa32578b15871bf8b3cbeedf2d8d530f844
"
,
"blockNumber"
:
"0x2"
,
"contractAddress"
:
"0xae9bea628c4ce503dcfd7e305cab4e29e7476592"
,
"cumulativeGasUsed"
:
"0xcf50"
,
...
...
internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json
View file @
4c7053ba
{
"blockHash"
:
"0x
0ccd45c62e8af3a4cd7db1045c2bfeffe5c027749506ec94a744c11f69e5c785
"
,
"blockHash"
:
"0x
3fadc5bc916018a326732be829a2565b3acb960a8406f0f151a5e1fa971ea7dd
"
,
"blockNumber"
:
"0x5"
,
"contractAddress"
:
"0xfdaa97661a584d977b4d3abb5370766ff5b86a18"
,
"cumulativeGasUsed"
:
"0xe01c"
,
...
...
internal/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json
View file @
4c7053ba
{
"blockHash"
:
"0x
a85ac2ee14add4cf9e92f1a023b4c9eac355266f9e87e70bdcd557d848c61305
"
,
"blockHash"
:
"0x
ffa737e6ce9a9162ffd411dd06169114b3ed5ee9fc1474a2625c92548e4455e0
"
,
"blockNumber"
:
"0x4"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x538d"
,
...
...
internal/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json
View file @
4c7053ba
{
"blockHash"
:
"0x
698945ab39ebe6cecff84886b3142630cf03a74b2c19eec8043534463a6ff60b
"
,
"blockHash"
:
"0x
a8a067b3cb3b9ddc6cfb8317bfd08b266fcf9994fc870c1f7ed394acecfadf39
"
,
"blockNumber"
:
"0x1"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x5208"
,
...
...
internal/ethapi/testdata/eth_getTransactionReceipt-with-logs.json
View file @
4c7053ba
{
"blockHash"
:
"0x
790f05c0ce7b6add0c7b1e8a777811738c540436e898ae6b09688dacc6581254
"
,
"blockHash"
:
"0x
173dcd9d22ce71929cd17e84ea88702a0f84d6244c6898d2a4f48722e494fe9c
"
,
"blockNumber"
:
"0x3"
,
"contractAddress"
:
null
,
"cumulativeGasUsed"
:
"0x5e28"
,
...
...
@@ -18,7 +18,7 @@
"blockNumber"
:
"0x3"
,
"transactionHash"
:
"0xeaf3921cbf03ba45bad4e6ab807b196ce3b2a0b5bacc355b6272fa96b11b4287"
,
"transactionIndex"
:
"0x0"
,
"blockHash"
:
"0x
790f05c0ce7b6add0c7b1e8a777811738c540436e898ae6b09688dacc6581254
"
,
"blockHash"
:
"0x
173dcd9d22ce71929cd17e84ea88702a0f84d6244c6898d2a4f48722e494fe9c
"
,
"logIndex"
:
"0x0"
,
"removed"
:
false
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment