Commit Graph

27 Commits

Author SHA1 Message Date
zoruka 5956cb7be9 chore: merge develop 2022-12-20 08:34:40 -03:00
Felipe Mendes 22198e76e3
refactor: remove extension AccessControl from FleekAccessControl (#28)
* refactor: remove extension AccessControl from FleekAccessControl

* refactor: add version for roles

* test: add collection roles tests

* test: add more token role hardhat tests

* refactor: remove lib/forge-std

* feat: add role grant and revoke events

* test: add access control role event emit tests

* refactor: remove abstract keyword from FleekAccessControl

* Merge conflicts for #28 (#49)

* Add msg.sender to the triggered_by field in events

* Document methods and make everything camelCase

* Make event params all camelCase

* fix: forge-std submodule

* make vars camelCase, remove baseURI header, remove addTokenController and removeTokenController, update tests

Co-authored-by: EmperorOrokuSaki <artie.eth@gmail.com>
Co-authored-by: Shredder <110225819+EmperorOrokuSaki@users.noreply.github.com>
Co-authored-by: zoruka <zo.fmendes@gmail.com>

Co-authored-by: Janison Sivarajah <jsonsivar@gmail.com>
Co-authored-by: EmperorOrokuSaki <artie.eth@gmail.com>
Co-authored-by: Shredder <110225819+EmperorOrokuSaki@users.noreply.github.com>
2022-12-19 15:45:15 -03:00
zoruka 4dd1442e9d chore: merge develop 2022-12-17 09:03:08 -03:00
Felipe Mendes 4836dd0436
chore: precommit hooks (#18)
* chore: add husky and lint-staged

* chore: add postinstall script

* chore: add prepush test hook

* chore: add skip tests flag

* chore: remove skip tests flag

* chore: fix format command to verify json files
2022-12-16 14:57:49 -03:00
EmperorOrokuSaki 3351812acc Fix hardhat tests by removing the author field. 2022-12-15 21:41:07 +03:30
EmperorOrokuSaki 54f665b572 fix 2022-12-15 21:40:57 +03:30
zoruka f6510106cd test: add more token role hardhat tests 2022-12-15 21:32:03 +03:30
zoruka ea3a50f2a8 test: add collection roles tests 2022-12-15 21:32:03 +03:30
EmperorOrokuSaki ee520dcc73 fix erc721 2022-12-15 21:31:59 +03:30
EmperorOrokuSaki 1fd8ae7813 fix hardhat tests by removing the author arg 2022-12-13 00:03:48 +03:30
Felipe Mendes 94c364836e
feat: fleek erc721 (#5)
* wip: refactor on current nft contract

* wip: FleekERC721 contract

* refactor: FleekERC721

* feat: add token controller control functions

* fix: sintax wise issues for compilation

* Fix errors and make the contract environment ready for compiling.

* Remove fleekbuilds.sol & update erc721 with a fix

* Update config files.

* fix: working deploy

* Make set methods public, add comments and notes to clarify issues.

* Update package.json to add the deploy script & remove package-lock.json from the repository

* Add two deploy scripts for local and mumbai deployments, update hardhat config to match two types and package.json

* Update TokenURI and the metadata struct

* Update deploy script and package.json to match the mumbai deploy script

* Add setTokenName, setTokenDescription, setTokenImage

* Add events to all set functions

* Foundry init configs

* Add foundry tests init (name, symbol, placeholder functions)

* test: hardhat (#21)

* chore: update hardhat config

* test: add FleekERC721 tests and remove not used SitesNFTs suit

* test: verify ERC721 compatibility

* Content type on second abi.encodePacked call in tokenURI

* Fix abi encoding on tokenURI

* chore: update hardhat config

* test: add FleekERC721 tests and remove not used SitesNFTs suit

* test: verify ERC721 compatibility

* Content type on second abi.encodePacked call in tokenURI

* test: improve assertion using deep equality

* chore: remove 0.4.24 version from hardhat compilers

* refactor: clear empty bytes from bytes32

* refactor: change properties from bytes32 to string

Co-authored-by: janison <jsonsivar@gmail.com>

* feat: add interaction scripts

* feat: add function signature to remove token controllers on transfer functions

* Update test commands & add forge-cache and out to .gitignore

* refactor: change token controller role validation to _beforeTokenTransfer function

* refactor: remove upgradeTokenBuild and fix burn requirement

* refactor: add isTokenController and move _clearTokenControllers to FleekAccessControl contract

* refactor: remove localhost and wrong mumbai deployments

* refactor: rename polygonMumbai to mumbai

* refactor: remove twiced name on gitignore

* chore: mumbai deployments

* refactor: util script to get contract using hardhat defined network

* chore: move forge-std as a submodule

* chore: move forge-std as a submodule

Co-authored-by: EmperorOrokuSaki <artie.eth@gmail.com>
Co-authored-by: daltoncoder <71679972+daltoncoder@users.noreply.github.com>
Co-authored-by: janison <jsonsivar@gmail.com>
2022-12-12 16:56:17 -03:00
EmperorOrokuSaki 8437fe4e6e Make Burn TokenOwnerOnly & Add test suites 2022-12-08 02:05:32 +03:30
EmperorOrokuSaki e828ae9f63 add more foundry tests for edge cases 2022-12-08 01:31:39 +03:30
EmperorOrokuSaki a0adff1702 Remove cache files, add/fix tests, update contract to remove/change methods 2022-12-08 00:59:51 +03:30
EmperorOrokuSaki afb1f1e73b Fix token owner error 2022-12-07 18:38:08 +03:30
EmperorOrokuSaki 63820f7a87 update erc 2022-12-07 18:23:21 +03:30
EmperorOrokuSaki 50052860f7 add test suites 2022-12-07 18:16:23 +03:30
Felipe Mendes ef8baad617
test: hardhat (#21)
* chore: update hardhat config

* test: add FleekERC721 tests and remove not used SitesNFTs suit

* test: verify ERC721 compatibility

* Content type on second abi.encodePacked call in tokenURI

* Fix abi encoding on tokenURI

* chore: update hardhat config

* test: add FleekERC721 tests and remove not used SitesNFTs suit

* test: verify ERC721 compatibility

* Content type on second abi.encodePacked call in tokenURI

* test: improve assertion using deep equality

* chore: remove 0.4.24 version from hardhat compilers

* refactor: clear empty bytes from bytes32

* refactor: change properties from bytes32 to string

Co-authored-by: janison <jsonsivar@gmail.com>
2022-12-06 17:39:08 -03:00
EmperorOrokuSaki 700293b94b Add foundry tests init (name, symbol, placeholder functions) 2022-12-05 22:57:39 +03:30
Camila Sosa Morales 320a5a45e3
Add tests (#4)
* refactor: move strings declarations to contracts

* feat: added test for FleekSite contract, also did small refactor on SitesNFTs contract test

* refactor: renamed metadadUpdated event due to conflicts

* feat: added test for FleekSite contract
2022-11-29 11:23:39 -03:00
Felipe Mendes 80a0ae98c1
refactor: repo structure (#1)
* chore: update .gitignore folders and add testing script

* feat: sites nft interface

* refactor: implement interface in the contract file

* chore: apply code formatting
2022-11-23 09:09:39 -03:00
miguelToscano 388e31c81c removed console log 2022-10-12 16:38:40 -03:00
miguelToscano 5eccdf550d fixed overriden baseURI method 2022-10-12 16:37:46 -03:00
miguelToscano 9ef259d559 fixed minting permissions and added tests 2022-10-12 16:20:30 -03:00
miguelToscano e5b64ef8e6 added return statement 2022-10-11 16:02:35 -03:00
miguelToscano a872fe50f6 added tests 2022-10-11 15:32:05 -03:00
miguelToscano a5381f2d72 finished contract 2022-10-11 14:54:52 -03:00