Includes https://github.com/ethereum-optimism/op-geth/pull/23

Pulling these changes into the monorepo so that things can be
integrated with `op-e2e`