Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream 20230905 #37

Merged
merged 11 commits into from
Sep 5, 2023
Merged

Conversation

jyellick
Copy link

@jyellick jyellick commented Sep 5, 2023

Simple conflict-free merge of the upstream codebase

@jyellick jyellick force-pushed the jyellick/merge-upstream-20230905 branch from 937de28 to 21faee6 Compare September 5, 2023 14:04
@jyellick jyellick changed the base branch from boba-develop to develop September 5, 2023 14:25
@jyellick jyellick merged commit 22c4ec5 into develop Sep 5, 2023
boyuan-chen pushed a commit that referenced this pull request Oct 22, 2024
* feat: add superchain erc20 baseline (#37)

* feat: add superchain erc20 baseline

* feat: make superchain ERC20 simpler

* fix: small version fix and tests

* test: fix test name

* test: remove unused import

* feat: making baseline abstract

* fix: interfaces to comply with the new interface checker

* fix: import paths and empty line

* fix: lint line

---------

Co-authored-by: 0xng <ng@defi.sucks>
Co-authored-by: 0xng <87835144+0xng@users.noreply.github.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.

5 participants