Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

all: rename internal 1559 gas fields, add support for graphql #23010

Merged
merged 2 commits into from
Jun 8, 2021
Merged

all: rename internal 1559 gas fields, add support for graphql #23010

merged 2 commits into from
Jun 8, 2021

Conversation

karalabe
Copy link
Member

@karalabe karalabe commented Jun 7, 2021

No description provided.

@karalabe karalabe added the london label Jun 7, 2021
@karalabe karalabe added this to the 1.10.4 milestone Jun 7, 2021
@holiman
Copy link
Contributor

holiman commented Jun 7, 2021

So, this changes feeCap to gasFeeCap, and tip to `gasTipCap.

	GasFeeCap        *hexutil.Big      `json:"maxFeePerGas,omitempty"`
	GasTipCap        *hexutil.Big      `json:"maxPriorityFeePerGas,omitempty"`

I agree it's a step forward, and think it's better than what we have now -- but I would personally prefer MaxFeePerGas and MaxPriorityFeePerGas, and live with the longer names.

holiman
holiman reviewed Jun 7, 2021
View reviewed changes
cmd/evm/testdata/10/txs.json Outdated
Comment on lines 14 to 15
"gasFeeCap" : "0xfa0",
"gasTipCap" : "0x0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess these should really map the actual json names, rather than what we use internally

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are these used?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you run what's in the readme for that folder. But I just checked, it works fine now!

core/state_processor_test.go Outdated
@@ -146,25 +146,25 @@ func TestStateProcessorErrors(t *testing.T) {
txs: []*types.Transaction{
mkDynamicTx(0, common.Address{}, params.TxGas, big.NewInt(0), big.NewInt(0)),
},
want: "could not apply tx 0 [0xc4ab868fef0c82ae0387b742aee87907f2d0fc528fc6ea0a021459fb0fc4a4a8]: fee cap less than block base fee: address 0x71562b71999873DB5b286dF957af199Ec94617F7, feeCap: 0 baseFee: 875000000",
want: "could not apply tx 0 [0xc4ab868fef0c82ae0387b742aee87907f2d0fc528fc6ea0a021459fb0fc4a4a8]: fee cap less than block base fee: address 0x71562b71999873DB5b286dF957af199Ec94617F7, gasFeeCap: 0 baseFee: 875000000",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe these also should use the 'public' names, not the internal

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@karalabe
Copy link
Member Author

karalabe commented Jun 8, 2021

I agree it's a step forward, and think it's better than what we have now -- but I would personally prefer MaxFeePerGas and MaxPriorityFeePerGas, and live with the longer names.

I'm kind of against that. It's important to keep the codebase consistent.

holiman
holiman approved these changes Jun 8, 2021
View reviewed changes
Copy link
Contributor

@holiman holiman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@holiman holiman merged commit c503f98 into ethereum:master Jun 8, 2021
@dubuqingfeng dubuqingfeng mentioned this pull request Jun 26, 2021
Merged
atif-konasl pushed a commit to frozeman/pandora-execution-engine that referenced this pull request Oct 15, 2021
@karalabe @atif-konasl
all: rename internal 1559 gas fields, add support for graphql (ethere…
17a529a 
…um#23010)

* all: rename internal 1559 gas fields, add support for graphql

* cmd/evm/testdata, core: use public 1559 gas names on API surfaces
This was referenced Sep 23, 2022
Closed
Merged
@gzliudan gzliudan mentioned this pull request May 17, 2024
Merged
19 tasks
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Aug 26, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
d8e35a1
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Aug 26, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
d2827e7
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Aug 26, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
726c1cd
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 2, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
f6ee7e5
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 6, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
f34d0f0
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 9, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
7bcf8d8
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 9, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
4c6a722
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 9, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
ca049d7
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 12, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
22fa72f
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 12, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
86a0840
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 19, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
7e55e33
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 19, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
07f3004
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 21, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
fc43249
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 22, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
525803b
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 22, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
849c6d4
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 23, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
35fc859
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 26, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
008bbf2
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 26, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
140c5d4
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Sep 27, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
572f436
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 9, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
237273e
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 17, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
17544f4
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 18, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
8328615
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 25, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
f43e715
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 25, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
02bd102
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 29, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
b31f1b1
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 30, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
f322b36
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 31, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
e1b0659
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Oct 31, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
4d6fd7b
gzliudan added a commit to gzliudan/XDPoSChain that referenced this pull request Nov 1, 2024
@gzliudan
all: rename internal 1559 gas fields (ethereum#23010)
4c096de
wanwiset25 pushed a commit to XinFinOrg/XDPoSChain that referenced this pull request Nov 13, 2024
@gzliudan @wanwiset25
all: rename internal 1559 gas fields (ethereum#23010)
58f9258
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@holiman holiman holiman approved these changes

@gballet gballet Awaiting requested review from gballet gballet is a code owner

@MariusVanDerWijden MariusVanDerWijden Awaiting requested review from MariusVanDerWijden MariusVanDerWijden is a code owner

@rjl493456442 rjl493456442 Awaiting requested review from rjl493456442 rjl493456442 is a code owner

Assignees
No one assigned
Labels
london
Projects
None yet
Milestone
1.10.4
Development

Successfully merging this pull request may close these issues.
3 participants
@karalabe @holiman @rjl493456442