Jg/1 13 12 merge - Githubissues

ethereum-optimism / op-geth

GNU Lesser General Public License v3.0

254 stars 652 forks source link

Jg/1 13 12 merge #296

Closed trianglesphere closed 2 months ago

trianglesphere commented 2 months ago

Description

Pulling in upstream 1.13.12. I did not look at anything but the conflicts. Makefile added a new field. http/rpc changed some field names. Transaction Marshalling added support for blob transactions.

TODO: Do we need to remove / disable blob tx support?

Conflicts: Makefile core/types/transaction_marshalling.go rpc/http.go

sebastianst commented 2 months ago

We need to adapt the miner tip from https://github.com/ethereum/go-ethereum/pull/28933