We need to rebase (at least that's what we have been doing in the past) our changes on top of the latest upstream changes.

While doing so, I found big changes to contract deployment. This work was mostly done in ethereum-optimism#10106 and follow-ups.

### Tasks
- [x] Rebase op-geth, will fix https://github.com/celo-org/op-geth/issues/44
- [ ] https://github.com/celo-org/op-geth/issues/136
- [ ] https://github.com/celo-org/optimism/issues/137