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

Post QS2 audit updates #69

Merged
merged 96 commits into from
Oct 2, 2023
Merged

Post QS2 audit updates #69

merged 96 commits into from
Oct 2, 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 <kevin@fruitful.gg>
# Conflicts:
#	Makefile
Copy link
Contributor

@tgeorgas tgeorgas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved

export MAINNET=1
export SEPOLIA=11155111
export LOCAL=123
export LOCAL_ID=123
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

local should be 31337. ID 123 is for some network called fuse sparknet: https://chainlist.org/chain/123

@tgeorgas tgeorgas closed this Oct 2, 2023
@tgeorgas tgeorgas reopened this Oct 2, 2023
@tgeorgas tgeorgas merged commit 2d5c25b into main Oct 2, 2023
9 of 11 checks passed
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.

None yet

3 participants