add feralfile exhibition v4_2 & feralfile token contracts #41

hvthhien · 2024-05-21T07:10:02Z

Story link: https://github.com/bitmark-inc/feral-file/issues/2273

contracts/FeralfileToken.sol

contracts/FeralfileArtworkV4_2.sol

github-actions · 2024-05-23T08:33:42Z

contracts/FeralfileArtworkV4_2.sol

+    {
+        return 
+            Base64.encode(
+                abi.encodePacked(


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: String exceeds 32 bytes

github-actions · 2024-05-23T08:33:42Z

contracts/FeralfileArtworkV4_2.sol

+        );
+
+        string memory json = string(
+            abi.encodePacked(


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: String exceeds 32 bytes

Makefile

contracts/FeralfileArtworkV4_2.sol

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+    /// @param s_ - part of signature for validating parameters integrity
+    /// @param v_ - part of signature for validating parameters integrity
+    /// @param saleData_ - the sale data
+    function buyArtworks(


⚠️ [solhint] _{reported by reviewdog 🐶}
Function has cyclomatic complexity 10 but allowed no more than 7

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+        uint8 v_,
+        SaleData calldata saleData_
+    ) external payable override {
+        require(_selling, "FeralfileExhibitionV4: sale is not started");


⚠️ [solhint] _{reported by reviewdog 🐶}
Error message for require is too long: 42 counted / 32 allowed

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+        uint8 v_,
+        SaleData calldata saleData_
+    ) external payable override {
+        require(_selling, "FeralfileExhibitionV4: sale is not started");


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: String exceeds 32 bytes

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+        uint8 v_,
+        SaleData calldata saleData_
+    ) external payable override {
+        require(_selling, "FeralfileExhibitionV4: sale is not started");


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: Use Custom Errors instead of require statements

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+
+        saleData_.payByVaultContract
+            ? vault.payForSale(r_, s_, v_, saleData_)
+            : require(


⚠️ [solhint] _{reported by reviewdog 🐶}
Error message for require is too long: 45 counted / 32 allowed

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+        // Call the transfer function of the ERC20 contract
+        if (coinsTransferAmount > 0 && _erc20Token.balanceOf(address(this)) > coinsTransferAmount * 10**18) {
+            bool success = _erc20Token.transfer(saleData_.destination, coinsTransferAmount * 10**18);
+            require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: String exceeds 32 bytes

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+        // Call the transfer function of the ERC20 contract
+        if (coinsTransferAmount > 0 && _erc20Token.balanceOf(address(this)) > coinsTransferAmount * 10**18) {
+            bool success = _erc20Token.transfer(saleData_.destination, coinsTransferAmount * 10**18);
+            require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: Use Custom Errors instead of require statements

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+            require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");
+        }
+
+        require(


⚠️ [solhint] _{reported by reviewdog 🐶}
Error message for require is too long: 44 counted / 32 allowed

github-actions · 2024-05-28T10:05:53Z

contracts/FeralfileArtworkV4_2.sol

+            require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");
+        }
+
+        require(


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: String exceeds 32 bytes

github-actions · 2024-05-28T10:05:54Z

contracts/FeralfileArtworkV4_2.sol

+            require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");
+        }
+
+        require(


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: Use Custom Errors instead of require statements

jollyjoker992 · 2024-05-28T10:29:44Z

contracts/FeralfileArtworkV4_2.sol

+        uint256 mintAmount = coinAmount - tokenInfo.coinAmount;
+        if (mintAmount > 0) {
+            address owner = ownerOf(tokenId);
+            _erc20Token.mint(owner, mintAmount * 10**18);


Should call decimal() from token contract instead of hard-coding the 18 decimals.

jollyjoker992 · 2024-05-28T10:30:28Z

contracts/FeralfileArtworkV4_2.sol

+        // mint token for the owner
+        uint256 mintAmount = coinAmount - tokenInfo.coinAmount;
+        if (mintAmount > 0) {
+            address owner = ownerOf(tokenId);


I'm confirming with Sean if we should mint to the current NFT owner or the first owner.

jollyjoker992 · 2024-05-28T10:37:05Z

contracts/FeralfileArtworkV4_2.sol

+        uint8 v_,
+        SaleData calldata saleData_
+    ) external payable override {
+        require(_selling, "FeralfileExhibitionV4: sale is not started");


Why don't we just call super.buyArtwork instead? The coin transfer part could be done after that, it's OK to do them separately.
I know using the same loop could reduce a bit gas fee but it would be just a little bit. Copy the code from the parent contract would make it harder to maintain the shared logic between those contracts. Please consider.

we cannot call super.buyArtwork since the function was defined as external in the base contract. To do this we might need to change the access modifier in the base contract.

jollyjoker992 · 2024-05-28T10:38:04Z

contracts/FeralfileArtworkV4_2.sol

+        }
+
+        // Call the transfer function of the ERC20 contract
+        if (coinsTransferAmount > 0 && _erc20Token.balanceOf(address(this)) > coinsTransferAmount * 10**18) {


if possible, please create a private function to get exact amount of coin instead of putting multiple magic values.
Reference here.

jollyjoker992

Can you ask some more test for the coin balance after purchasing and update token info?

github-actions · 2024-05-29T02:17:31Z

contracts/FeralfileArtworkV4_2.sol

+    /// @param s_ - part of signature for validating parameters integrity
+    /// @param v_ - part of signature for validating parameters integrity
+    /// @param saleData_ - the sale data
+    function buyArtworks(


⚠️ [solhint] _{reported by reviewdog 🐶}
Function has cyclomatic complexity 11 but allowed no more than 7

github-actions · 2024-05-29T02:17:31Z

contracts/FeralfileArtworkV4_2.sol

+            uint256 coinUnits = _convertToTokenUnits(coinsTransferAmount);
+            if (_erc20Token.balanceOf(address(this)) > coinUnits) {
+                bool success = _erc20Token.transfer(saleData_.destination, coinUnits);
+                require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");


⚠️ [solhint] _{reported by reviewdog 🐶}
Error message for require is too long: 53 counted / 32 allowed

github-actions · 2024-05-29T02:17:31Z

contracts/FeralfileArtworkV4_2.sol

+            uint256 coinUnits = _convertToTokenUnits(coinsTransferAmount);
+            if (_erc20Token.balanceOf(address(this)) > coinUnits) {
+                bool success = _erc20Token.transfer(saleData_.destination, coinUnits);
+                require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: String exceeds 32 bytes

github-actions · 2024-05-29T02:17:32Z

contracts/FeralfileArtworkV4_2.sol

+            uint256 coinUnits = _convertToTokenUnits(coinsTransferAmount);
+            if (_erc20Token.balanceOf(address(this)) > coinUnits) {
+                bool success = _erc20Token.transfer(saleData_.destination, coinUnits);
+                require(success, "FeralfileExhibitionV4: FeralfileToken transfer failed");


⚠️ [solhint] _{reported by reviewdog 🐶}
GC: Use Custom Errors instead of require statements

github-actions bot reviewed May 21, 2024

View reviewed changes

hvthhien force-pushed the add_feralfil_token_contract branch from 7a3929f to ee681d0 Compare May 21, 2024 07:18

add feralfile token contract

a6e0c3a

hvthhien force-pushed the add_feralfil_token_contract branch from ee681d0 to a6e0c3a Compare May 21, 2024 07:20

github-actions bot reviewed May 21, 2024

View reviewed changes

contracts/FeralfileToken.sol Show resolved Hide resolved

github-actions bot reviewed May 22, 2024

View reviewed changes

contracts/FeralfileToken.sol Outdated Show resolved Hide resolved

contracts/FeralfileToken.sol Outdated Show resolved Hide resolved

contracts/FeralfileToken.sol Outdated Show resolved Hide resolved

add batchMint supported

50f6bfe

hvthhien force-pushed the add_feralfil_token_contract branch from 769b9dc to 50f6bfe Compare May 22, 2024 03:19

github-actions bot reviewed May 22, 2024

View reviewed changes

contracts/FeralfileToken.sol Outdated Show resolved Hide resolved

contracts/FeralfileToken.sol Outdated Show resolved Hide resolved

contracts/FeralfileToken.sol Outdated Show resolved Hide resolved

github-actions bot reviewed May 22, 2024

View reviewed changes

contracts/FeralfileArtworkV4_2.sol Show resolved Hide resolved

contracts/FeralfileArtworkV4_2.sol Show resolved Hide resolved

contracts/FeralfileArtworkV4_2.sol Outdated Show resolved Hide resolved

add FeralfileArtworkV4_2 contract

4ae7c2f

hvthhien force-pushed the add_feralfil_token_contract branch from f2449bc to 4ae7c2f Compare May 22, 2024 08:38

update tests

0e0c7d1

github-actions bot pushed a commit that referenced this pull request May 23, 2024

Generate ABIs for PR #41

56d890f

update abi gen

fc2331f

hvthhien force-pushed the add_feralfil_token_contract branch from 56d890f to fc2331f Compare May 23, 2024 02:58

Generate ABIs for PR #41

3bb7a53

hvthhien requested a review from jollyjoker992 May 23, 2024 03:07

update contract

5b9dfc7

github-actions bot reviewed May 23, 2024

View reviewed changes

github-actions bot pushed a commit that referenced this pull request May 23, 2024

Generate ABIs for PR #41

11a8480

udpate rename

3dc7fbc

hvthhien force-pushed the add_feralfil_token_contract branch from 11a8480 to 3dc7fbc Compare May 23, 2024 09:05

github-actions bot pushed a commit that referenced this pull request May 23, 2024

Generate ABIs for PR #41

3bbdf4f

jollyjoker992 reviewed May 23, 2024

View reviewed changes

Makefile Show resolved Hide resolved

jollyjoker992 reviewed May 23, 2024

View reviewed changes

Makefile Outdated Show resolved Hide resolved

jollyjoker992 reviewed May 23, 2024

View reviewed changes

contracts/FeralfileArtworkV4_2.sol Outdated Show resolved Hide resolved

jollyjoker992 reviewed May 23, 2024

View reviewed changes

contracts/FeralfileArtworkV4_2.sol Outdated Show resolved Hide resolved

jollyjoker992 reviewed May 23, 2024

View reviewed changes

contracts/FeralfileArtworkV4_2.sol Outdated Show resolved Hide resolved

jollyjoker992 reviewed May 23, 2024

View reviewed changes

contracts/FeralfileArtworkV4_2.sol Outdated Show resolved Hide resolved

github-actions bot pushed a commit that referenced this pull request May 24, 2024

Generate ABIs for PR #41

a9cb9b8

jollyjoker992 approved these changes May 24, 2024

View reviewed changes

jollyjoker992 added the DO NOT MERGE label May 24, 2024

adjust animation url fallback placeholder value

86fc450

hvthhien force-pushed the add_feralfil_token_contract branch from a9cb9b8 to 86fc450 Compare May 24, 2024 09:48

github-actions bot pushed a commit that referenced this pull request May 24, 2024

Generate ABIs for PR #41

3bd3a71

update token uri response format

15a83fe

hvthhien force-pushed the add_feralfil_token_contract branch from 3bd3a71 to 15a83fe Compare May 28, 2024 02:30

github-actions bot pushed a commit that referenced this pull request May 28, 2024

Generate ABIs for PR #41

544afe0

update contract to mint & transfer erc20 token

eae8c9e

hvthhien force-pushed the add_feralfil_token_contract branch from 544afe0 to eae8c9e Compare May 28, 2024 10:05

github-actions bot reviewed May 28, 2024

View reviewed changes

github-actions bot pushed a commit that referenced this pull request May 28, 2024

Generate ABIs for PR #41

13c94ac

jollyjoker992 reviewed May 28, 2024

View reviewed changes

jollyjoker992 requested changes May 28, 2024

View reviewed changes

refactor function for reuse

e1b774e

hvthhien force-pushed the add_feralfil_token_contract branch from 13c94ac to e1b774e Compare May 29, 2024 02:17

github-actions bot reviewed May 29, 2024

View reviewed changes

github-actions bot pushed a commit that referenced this pull request May 29, 2024

Generate ABIs for PR #41

8007707

update test

7bf26c7

hvthhien force-pushed the add_feralfil_token_contract branch from 8007707 to 7bf26c7 Compare May 29, 2024 04:26

Generate ABIs for PR #41

0b6972b

hvthhien requested a review from jollyjoker992 May 29, 2024 06:23

hvthhien changed the title ~~add feralfile token contract~~ add feralfile exhibition v4_2 contract May 29, 2024

hvthhien changed the title ~~add feralfile exhibition v4_2 contract~~ add feralfile exhibition v4_2 & feralfile token contracts May 29, 2024

jollyjoker992 added Archive and removed DO NOT MERGE labels Jun 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add feralfile exhibition v4_2 & feralfile token contracts #41

add feralfile exhibition v4_2 & feralfile token contracts #41

hvthhien commented May 21, 2024 •

edited

Loading

github-actions bot May 23, 2024

github-actions bot May 23, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

github-actions bot May 28, 2024

jollyjoker992 May 28, 2024

jollyjoker992 May 28, 2024

jollyjoker992 May 28, 2024

hvthhien May 28, 2024

jollyjoker992 May 28, 2024

jollyjoker992 left a comment

github-actions bot May 29, 2024

github-actions bot May 29, 2024

github-actions bot May 29, 2024

github-actions bot May 29, 2024

add feralfile exhibition v4_2 & feralfile token contracts #41

Are you sure you want to change the base?

add feralfile exhibition v4_2 & feralfile token contracts #41

Conversation

hvthhien commented May 21, 2024 • edited Loading

github-actions bot May 23, 2024

Choose a reason for hiding this comment

github-actions bot May 23, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

github-actions bot May 28, 2024

Choose a reason for hiding this comment

jollyjoker992 May 28, 2024

Choose a reason for hiding this comment

jollyjoker992 May 28, 2024

Choose a reason for hiding this comment

jollyjoker992 May 28, 2024

Choose a reason for hiding this comment

hvthhien May 28, 2024

Choose a reason for hiding this comment

jollyjoker992 May 28, 2024

Choose a reason for hiding this comment

jollyjoker992 left a comment

Choose a reason for hiding this comment

github-actions bot May 29, 2024

Choose a reason for hiding this comment

github-actions bot May 29, 2024

Choose a reason for hiding this comment

github-actions bot May 29, 2024

Choose a reason for hiding this comment

github-actions bot May 29, 2024

Choose a reason for hiding this comment

hvthhien commented May 21, 2024 •

edited

Loading