Skip to content

Interop: Update Inputs (rebased)#12204

Merged
protolambda merged 7 commits intodevelopfrom
interop-inputs-2
Oct 8, 2024
Merged

Interop: Update Inputs (rebased)#12204
protolambda merged 7 commits intodevelopfrom
interop-inputs-2

Conversation

@axelKingsley
Copy link
Copy Markdown
Contributor

this is a recreation of
#12094

but I didn't want to potentially mess up proto's original branch with bad rebase choices.

I pulled in develop and used the -X theirs strategy, and then used rebase -i to remove all the redundant commits that were stuck in the PR. I looked over the PR and compared to the git diff HEAD~~ and it looks like it correctly removed just the parts that already got merged. But if I got that wrong, I can move back to the original branch.

@protolambda
Copy link
Copy Markdown
Contributor

Edited the BlockRef commit to drop an unrelated change to contracts lib sub-module, and rebased on develop to sort out issues with the diff

@protolambda
Copy link
Copy Markdown
Contributor

Fixed a test that still relied on the old RPC, and dropped a TODO from code for which I opened an issue: #12357

@protolambda protolambda marked this pull request as ready for review October 7, 2024 17:46
@protolambda protolambda requested review from a team as code owners October 7, 2024 17:46
@protolambda protolambda enabled auto-merge October 7, 2024 17:55
@semgrep-app
Copy link
Copy Markdown
Contributor

semgrep-app bot commented Oct 8, 2024

Semgrep found 4 sol-style-return-arg-fmt findings:

Named return arguments to functions must be appended with an underscore (_)

Ignore this finding from sol-style-return-arg-fmt.

Semgrep found 2 sol-style-malformed-revert findings:

  • packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
  • packages/contracts-bedrock/scripts/deploy/Deploy.s.sol

Malformed revert statement style.

Ignore this finding from sol-style-malformed-revert.

Semgrep found 22 sol-style-input-arg-fmt findings:

Inputs to functions must be prepended with an underscore (_)

Ignore this finding from sol-style-input-arg-fmt.

@protolambda protolambda added this pull request to the merge queue Oct 8, 2024
Merged via the queue into develop with commit dee44ec Oct 8, 2024
@protolambda protolambda deleted the interop-inputs-2 branch October 8, 2024 14:44
samlaf pushed a commit to samlaf/optimism that referenced this pull request Nov 10, 2024
* op-node,op-supervisor: feed local-unsafe/local-safe/l1-finalized data to supervisor

* op-node,op-service,op-e2e: wip, fix interop op-node tests

* post-rebase compilation fixes

* BlockRef

* op-supervisor: fix service test, cleanup todo

* op-supervisor: link TODO comments to issue

* interop: fix e2e action test

---------

Co-authored-by: protolambda <proto@protolambda.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants