Merge 1.14.0 #345
Merge 1.14.0 #345
Conversation
|
We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2 |
| if err != nil { | ||
| panic(fmt.Sprintf("CallDefaults failed: %v", err)) | ||
| } | ||
| return args.ToMessage(baseFee, globalGasCap, header, nil, runMode, chainID, gasLimitNotSetByUser) // we pass a nil to avoid another recursion |
There was a problem hiding this comment.
I'd like to hear more about that.
Also: @Tristan-Wilson
There was a problem hiding this comment.
Earlier there was no concept of CallDefaults before calling ToMessage, but now there is.
So when we recurse in ToMessage for
// Arbitrum: raise the gas cap to ignore L1 costs so that it's compute-only
if state != nil {
We need to call CallDefaults to set the new globalGasCap (updated by InterceptRPCGasCap) again.
But because the CallDefaults was already called earlier the the args.Gas is already set to a non zero value (even though this value was not given by the user).
So to allow us to update args.Gas even to though it is set, i introduced a new input to function CallDefaults called gasLimitNotSetByUser which will help in determining whether we should be updating args.Gas even if it holds a non zero value (cause this non zero value was not set by the user).
amsanghi
force-pushed
the
merge-1.14.0
branch
from
3aaaa04
to
cf49bca
Compare
fixes: NIT-2673
Merge upstream geth's v1.14.0 release into our geth fork:https://github.com/ethereum/go-ethereum/releases/tag/v1.14.0
nitro PR- OffchainLabs/nitro#2500
Testing done
geth and nitro tests pass