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

MAINNET Upgrade December 2023 #84

Merged
merged 188 commits into from
Dec 11, 2023
Merged

MAINNET Upgrade December 2023 #84

merged 188 commits into from
Dec 11, 2023

Conversation

amarinkovic and others added 30 commits April 10, 2023 11:00
* feat: ensure token symbol is unique

* fix: some typos and comments

* fix: entity token uniqueness mapping and add test

* fix: include external tokens in uniqueness check

* test: LibERC token symbol

* feat: update entity token info

* doc: update generated markdown

* test: entity token info update

* Revert "doc: update generated markdown"

This reverts commit 96ed7ee.

# Conflicts:
#	docs/facets/IEntityFacet.md

* fix: linter issues

* test: failed ERC20 calls

* refactor: fix solidity parser in prettier
# Conflicts:
#	.env.example
#	Makefile
#	deployedAddresses.json
#	package.json
#	src/diamonds/nayms/AppStorage.sol
#	src/diamonds/nayms/libs/LibAdmin.sol
#	src/diamonds/nayms/libs/LibObject.sol
#	test/T01SmartDeploymentV1.t.sol.deleteme
#	test/T04Entity.t.sol
#	test/defaults/D03ProtocolDefaults.sol
* chore: ignore slither vscode files

* feat: scripted scheduling

* fix: update anvil bootstrap script

* refactor: deployment on anvil, makefile

* fix: makefile defaults and addresses

* fix: anvil bootstrap

* fix: anvil upgrade targets

* chore: add sepolia broadcasts

* chore: update sepolia broadcasts

---------

Co-authored-by: Kevin Park <[email protected]>
# Conflicts:
#	Makefile
@amarinkovic amarinkovic marked this pull request as ready for review December 11, 2023 08:21
@amarinkovic amarinkovic merged commit 03385a0 into main Dec 11, 2023
7 checks passed
@amarinkovic amarinkovic changed the title Next MAINNET upgrade MAINNET upgrade December 2023 Feb 29, 2024
@amarinkovic amarinkovic changed the title MAINNET upgrade December 2023 MAINNET Upgrade December 2023 Feb 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants