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.

Sign up for GitHub

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

Jump to bottom

Token symbol uniqueness #57

Merged
merged 12 commits into from Apr 10, 2023
Merged

Token symbol uniqueness #57

merged 12 commits into from Apr 10, 2023

Conversation

amarinkovic
Copy link
Member

@amarinkovic amarinkovic commented Mar 31, 2023 •
edited

  • Makes sure when entity tokenization is enabled, that the token symbol is unique on the marketplace
  • It should not be possible for an entity token to have the same symbol as one of the supported external tokens
  • Provide system admin with the ability to update token symbol and name

@melks
Copy link

melks commented Mar 31, 2023

Task linked: CU-861mdpnac Ensure participation token symbol uniqueness

@amarinkovic amarinkovic changed the title Ensure participation token symbol uniqueness [CU-861mdpnac] Ensure participation token symbol uniqueness Mar 31, 2023
@amarinkovic amarinkovic changed the title Ensure participation token symbol uniqueness Token symbol uniqueness Apr 6, 2023
github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 6, 2023
View reviewed changes
src/erc20/LibERC20.sol Dismissed Show dismissed Hide dismissed
src/erc20/LibERC20.sol Dismissed Show dismissed Hide dismissed
src/erc20/LibERC20.sol Dismissed Show dismissed Hide dismissed
src/erc20/LibERC20.sol Dismissed Show dismissed Hide dismissed
src/erc20/LibERC20.sol Dismissed Show dismissed Hide dismissed
src/erc20/LibERC20.sol Dismissed Show dismissed Hide dismissed
@amarinkovic amarinkovic marked this pull request as ready for review April 6, 2023 11:16
@amarinkovic amarinkovic changed the base branch from main to dev April 10, 2023 07:28
@amarinkovic amarinkovic merged commit 8d76456 into dev Apr 10, 2023
5 checks passed
@amarinkovic amarinkovic deleted the token-symbol-uniqueness branch April 10, 2023 09:00
@amarinkovic amarinkovic mentioned this pull request Jun 2, 2023
Merged
tgeorgas added a commit that referenced this pull request Oct 2, 2023
@amarinkovic @kevin-fruitful @tgeorgas
Post QS2 audit updates (#69)
2d5c25b 
* Token symbol uniqueness (#57)

* 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

* ci: fix branch scopes

* feat: add support for sepolia

* feat: run anvil in docker

* chore: remove a CI step not needed anymore

* ci: reformat test workflow summary

* ci: reformat test workflow summary

* fix: sepolia upgrade hash make target

* Update local node scripts (#64)

* 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>

* chore: add make commands to initialize and upgrade a new diamond on anvil

* refactor: align boostrap with new deployment scripts

* fix: prep upgrade script method ref

* feat: script anvil upgrade flow

* chore: update gitignore for mnemonic files

* ci: fix upgrade hash report

* chore: remove stale goerli broadcasts

* fix: upgrade stack too deep error

* refactor: add some makefile targets for sepolia

* fix: write the array of selectors to the same memory location to avoid stack too deep

* chore: add deploy-contract-sepolia command, commit broadcast files

* chore: minor makefile arg fix

* chore: sepolia upgrade broadcasts

* refactor(prep-upgrade): pull out generate function

* chore: update prettier config

* ci: don't generate upgrade hashes

* chore: bump to v3.5.0

* feat: .env format proposal

* feat: .env format proposal

* chore: add sepolia broadcasts, acl facet updated

* fix: add back simple policy info struct (#68)

struct without the arrays is needed for web3j compatibility

* Hotfix execute limit offer (#67)

* fix(erc20-wrapper): allowance function modifiers

* doc: update interface reference

* fix: remove duplicate target

* feat: add forking makefile targets

* fix: deploy-mainnet-fork permissions

* chore: upgrade sepolia diamond to v3.5.1

* ci: fix coverage env vars

* fix: mainnet fork target for owner balance

* Emit dividend withdrawn event (#59)

* Deployer adapter script (#70)

* feat: initial deployer script adapter

* feat: script upgrade procedure

* feat(deployer): add fork support

* refactor: improve logging

* fix: mainnet fork support

* feat: add dry run option

* refactor: improve flow and arguments for mainnet operation

* refactor: better logging and argument handling

* Enhance Fee and Commission Payment Routing for Marketplace and Policies (#66)

* chore(deployer): fix mainnet fork upgrade flow

* Refactor fees (#72)

* refactor(fees): update fee schedule struct and mapping (WiP)

* fix: compilation errors after refactoring

* fix: trading fee payment

* fix: remove non-default fee schedule

* refactor: make getSigner pure

* refactor: pass fee config externally as arrays instead of struct

* chore: cleanup left over comments

* doc: add replaceMakerBP natspec

* fix: unique id for default fee schedule regardless of type

* refactor: generic fee paid event

* test: dynamic array size for comparing fee schedules

* chore: fix formatting

---------

Co-authored-by: Aleksandar Marinković <aleksandar@Aleksandars-MacBook-Pro.local>

* chore: deployer script output formatting

* chore: upgrade sepolia to v3.6.0

* chore(verification-util): pull out network into vars

* rerfactor: generic fee schedule getter

* chore: bump package version to v3.6.1

* doc: fix natspec

* chore: broadcasts for v3.6.1

* chore: remove hotfix test

this test is no longer relevant

* fix: add view modifier to isObjectTokenizable

* test(fees): trading fees coverage

* test(fees): fix variable name typo

* feat(fees): add zero premium fee support for platform

* fix premium fee tests to consider stakeholder fees

* chore: clean up pre policy setup in tests; clean up unused foundry props

* chore: fix linter

* chore: add platform flag for running docker on ARM CPUs

* Calculate the trading fee on matching offer(s) schedule (#74)

Co-authored-by: Kevin Park <kevin@fruitful.gg>

* Fork Sanity Tests for Contract Upgrades (#76)

* fix: calculate fee allocations breakdown

* fix: setup default fee schedules inthe init diamond

* fix: reintroduce order matching rounding parameter

* fix: dividend withdraw fuzz test

* chore: 4x the number of max rejects for fuzzing

* Update access control part 1 (#77)

* Withdraw restriction (#78)

* fix: add contract verification to deployer script

* chore: ignore macos files

* chore: upgrade sepolia to v3.6.2

* chore: update email in package.json

* Roles part 1  refinement (#79)

* chore: upgrade sepolia to v3.6.3 smart contracts

* refactor: deployer only to verify when not forking

* fix: deployer account resolution

* doc: deployer script explainer

* Prevent role demotion (IM-24357) (#80)

* test: hRoles - pretty print roles

* feat: update SmartDeploy to pass in init diamond address

* feat: command anvil-upgrade-init-addr

* fix: prepare for upgrade, add custom init and getters

* chore: update forge-std

* deployment: add helper commands for anvil deployment; add script to deploy state updating contract

* chore: gitignore generated file

* chore: add custom solhit config in script folder

* test: add cHr helper method to pretty print commission receivers

* chore: remove redundant getter

* chore: fix typos

* chore: remove redundant scripts for deploying contracts

* deployment: update prep-upgrade.js to take in an init contract address

---------

Co-authored-by: Kevin Park <kevin@fruitful.gg>
Co-authored-by: Theodore Georgas <contact@theodoregeorgas.com>
Co-authored-by: Aleksandar Marinković <aleksandar@Aleksandars-MacBook-Pro.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevin-fruitful kevin-fruitful Awaiting requested review from kevin-fruitful

@tgeorgas tgeorgas Awaiting requested review from tgeorgas

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@amarinkovic @melks