Commit Graph

61 Commits

Author SHA1 Message Date
Felipe Mendes fc20f02b7f
feat: add app access points and libraries clean up (#69)
* feat: add mirror mapping and management

* test: add mirrors tests

* chore: add new functions header comments

* feat: add isMirrorVerified function

* feat: add list of mirrors to token

* feat: add require minted to appMirrors function

* chore: update solidity compiler on hardhat config

* refactor: add token id to other mirror events

* refactor: change from mirror to access point and update its metadata

* test: updates tests due to contract changes

* refactor: clean up string parser from main contract

* refactor: remove wronge requirement comments

* refactor: strings library (#71)

* refactor: move string parse functions to a library

* refactor: remove not used modifier

* refactor: move svg generation to library

* refactor: remove source from aps

* refactor: rename accessPoint function
2023-01-18 11:39:44 -03:00
EmperorOrokuSaki 69de99467f Fix the HardHat decoding bug by adding base URI to _generateSVG() and updating foundry tests 2023-01-11 18:55:51 +03:30
EmperorOrokuSaki 9013bd9faf Change _generateSVG() mutability to pure from view 2023-01-11 17:46:33 +03:30
EmperorOrokuSaki 75ae5fa440 Move calling _genenrateSVG() to tokenURI() from mint() 2023-01-11 17:36:50 +03:30
EmperorOrokuSaki 810739c740 Add optimization to hardhat config & comment the tokenURI hardhat test 2023-01-09 19:48:17 +03:30
EmperorOrokuSaki 090c1e1477 Add SVG generation test and function. 2023-01-09 18:52:04 +03:30
Felipe Mendes 6c901a6001
Release/0.0.1 fixes (#60)
* Update LICENSE

* Update README.md

* Update local_deploy.js

* Update FleekERC721.sol

* fix: mumbai deploy args

* fix: fix comments release (#61)

Co-authored-by: Janison Sivarajah <jsonsivar@gmail.com>
Co-authored-by: Camila Sosa Morales <camisosa@fleek.co>
2022-12-22 14:21:00 -03:00
EmperorOrokuSaki 90dc8c3bfc add header docs for modifiers and constructors. 2022-12-22 17:38:24 +03:30
EmperorOrokuSaki 3ec0827ac1 add function headers for accesscontrole.sol 2022-12-20 18:17:43 +03:30
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 d151b80319 fix tokenURI return json 2022-12-15 21:46:29 +03:30
EmperorOrokuSaki 54f665b572 fix 2022-12-15 21:40:57 +03:30
zoruka 5900488532 chore: add clear token function comment 2022-12-15 21:32:03 +03:30
zoruka f6510106cd test: add more token role hardhat tests 2022-12-15 21:32:03 +03:30
zoruka f6f48ba206 refactor: add version for roles 2022-12-15 21:32:03 +03:30
EmperorOrokuSaki ee520dcc73 fix erc721 2022-12-15 21:31:59 +03:30
EmperorOrokuSaki 5411e03675 fixing merge conflicts from rebasing 2022-12-15 21:19:42 +03:30
EmperorOrokuSaki a4679036b2 fix rebase conflict 2022-12-15 21:12:25 +03:30
Shredder 8b40a0a140
Make event params all camelCase 2022-12-14 20:39:58 +03:30
EmperorOrokuSaki d1621cea50 fix merge conflicts. 2022-12-12 23:56:10 +03:30
EmperorOrokuSaki 7ac1502885 Document methods and make everything camelCase 2022-12-12 23:43:41 +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 3cf9be4528 Add msg.sender to the triggered_by field in events 2022-12-12 18:42:00 +03:30
zoruka 45118cb930 refactor: add isTokenController and move _clearTokenControllers to FleekAccessControl contract 2022-12-08 10:22:08 -03:00
zoruka 12a7a2cdf9 refactor: remove upgradeTokenBuild and fix burn requirement 2022-12-08 10:10:57 -03:00
zoruka 752bbb896a refactor: change token controller role validation to _beforeTokenTransfer function 2022-12-08 10:00:49 -03:00
EmperorOrokuSaki 8437fe4e6e Make Burn TokenOwnerOnly & Add test suites 2022-12-08 02:05:32 +03:30
Shredder 47c0b8d1bb
Merge branch 'feat/fleek-erc721' into test/foundry 2022-12-08 01:32:29 +03:30
EmperorOrokuSaki a0adff1702 Remove cache files, add/fix tests, update contract to remove/change methods 2022-12-08 00:59:51 +03:30
zoruka 9cf5a5ad9e feat: add function signature to remove token controllers on transfer functions 2022-12-07 15:44:02 -03:00
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
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 17da15ae97 Add events to all set functions 2022-12-05 21:29:46 +03:30
EmperorOrokuSaki f450a3e8b7 Add setTokenName, setTokenDescription, setTokenImage 2022-12-05 20:59:27 +03:30
EmperorOrokuSaki afff3f6f7a Update TokenURI and the metadata struct 2022-12-05 20:53:23 +03:30
EmperorOrokuSaki a377fb9dd3 Make set methods public, add comments and notes to clarify issues. 2022-12-01 23:47:55 +03:30
EmperorOrokuSaki 6f9fb74fee Remove fleekbuilds.sol & update erc721 with a fix 2022-11-30 19:56:46 +03:30
EmperorOrokuSaki 8286b71c84 Fix errors and make the contract environment ready for compiling. 2022-11-30 16:56:28 +03:30
zoruka c9578c88fd fix: sintax wise issues for compilation 2022-11-29 11:59:19 -03:00
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
zoruka 7891068b9a feat: add token controller control functions 2022-11-28 15:49:38 -03:00
Felipe Mendes e07d6852ab refactor: FleekERC721 2022-11-28 15:36:26 -03:00
zoruka 2c4c5ed59f wip: FleekERC721 contract 2022-11-28 09:50:45 -03:00
zoruka 3f37d82aca wip: refactor on current nft contract 2022-11-24 14:11:42 -03:00
Felipe Mendes 3a316a6fea
feat: add fleek site nft interfaces and implementation (#2)
* feat: add fleek site nft interfaces and implementation

* refactor: rename contracts and interfaces

* refactor: replace FleekAccessControl with AccessControl from open zeppelin

* refactor: split structure in public variables

* feat: add Fleek and FleekSite constructors

* refactor: remove getMetadata functions
2022-11-24 09:19:45 -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