Commit Graph

63 Commits

Author SHA1 Message Date
EmperorOrokuSaki 9e2c1368ca fix merge 2022-12-15 21:26:54 +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
zoruka 6e036f3b9e chore: readd removed submodule 2022-12-15 14:36:13 -03:00
zoruka 0c96f1db9d Merge branch 'develop' of github.com:fleekxyz/contracts into test/foundry 2022-12-15 14:31:40 -03:00
Camila Sosa Morales 6451208871
feat: minted site detail (#36)
* feat: add detail view. add home button component. add loading component

* feat: add tile info component

* style: change bg color and front family

* refactor: remove old file

* style: new style for detail view

* chore: fix comments

* refactor: change SiteNFTDetail type

* refactor: PR comments changes

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>
2022-12-14 18:28:15 -03:00
Camila Sosa Morales 09d24f9723
feat: mint site view (#15)
* wip: add routes

* refactor: add config for hot reload con vite.config.js

* wip: added chakra-ui. start with the form

* feat: add formik for form validation

* feat: added validation for addresses

* feat: add success/failure message. add onSubmit handler

* feat: add setSubmitting false

* feat: update metadata fields

* wip: add mocked function

* feat: mocked onSubmit funciton

* Apply suggestions from code review

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>

* Apply suggestions from code review

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>

* refactor: PR review changes

* feat: add validation for image urls. remove controller address

* reafctor: refactor fields validation

* refactor: create input field component

* style: add responsive styles. change bg color and font. change back button

* refactor: apply PR comments

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>
2022-12-13 09:32:55 -03:00
EmperorOrokuSaki 1fd8ae7813 fix hardhat tests by removing the author arg 2022-12-13 00:03:48 +03:30
EmperorOrokuSaki e3ce81e385 remove lib/forge-std 2022-12-13 00:01:05 +03:30
EmperorOrokuSaki d7c31a0985 remove deployments/localhost 2022-12-12 23:59:47 +03:30
EmperorOrokuSaki d1621cea50 fix merge conflicts. 2022-12-12 23:56:10 +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
Shredder 47c0b8d1bb
Merge branch 'feat/fleek-erc721' into test/foundry 2022-12-08 01:32:29 +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
zoruka b426d718f6 chore: fix conflicts 2022-12-07 15:49:08 -03:00
zoruka 9cf5a5ad9e feat: add function signature to remove token controllers on transfer functions 2022-12-07 15:44:02 -03:00
zoruka 07ad6b672a feat: add interaction scripts 2022-12-07 15:35:35 -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
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
EmperorOrokuSaki f10ef82985 Foundry init configs 2022-12-05 22:26:29 +03:30
Camila Sosa Morales 315672243b
UI 11: refactor vite.config.json (#20)
* refactor: refactor vite.config.json and tsconfig.json. Removed tsconfig.node.json. Added files to gitignore

* refactor: changes requested from review
2022-12-05 15:15:21 -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 970ede7f62 Update deploy script and package.json to match the mumbai deploy script 2022-12-05 20:56:15 +03:30
EmperorOrokuSaki afff3f6f7a Update TokenURI and the metadata struct 2022-12-05 20:53:23 +03:30
Shredder 56ea6ad16c
Merge pull request #17 from FleekHQ/EmperorOrokuSaki-patch-1
Zapier test
2022-12-02 01:32:04 +03:30
Shredder 6d1ada7fec
Zapier test 2022-12-02 01:30:27 +03:30
EmperorOrokuSaki a590717021 Add two deploy scripts for local and mumbai deployments, update hardhat config to match two types and package.json 2022-12-02 00:35:10 +03:30
EmperorOrokuSaki 2ae2dbd354 Update package.json to add the deploy script & remove package-lock.json from the repository 2022-12-02 00:26:14 +03:30
EmperorOrokuSaki a377fb9dd3 Make set methods public, add comments and notes to clarify issues. 2022-12-01 23:47:55 +03:30
Camila Sosa Morales c3f4030173
feat: boilerplate for UI (#14)
* feat: boilerplate for UI

* refactor: rename files. change default export for named export
2022-12-01 10:25:30 -03:00
daltoncoder 4700e992e6 fix: working deploy 2022-11-30 12:28:13 -05:00
EmperorOrokuSaki d6b343cfac Update config files. 2022-11-30 19:58:02 +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
miguelToscano f3c49a4261 added access control layer over nft updates 2022-11-10 00:15:56 -03:00
miguelToscano 570f0124a3 updated updateMethod 2022-11-09 15:01:33 -03:00