Merge pull request #60 from Mint-Gold-Dust/develop

Rafael450 · web-flow · commit 857be2b4baa4 · 2023-06-05T16:55:12.000-03:00
Develop
diff --git a/.openzeppelin/unknown-31337.json b/.openzeppelin/unknown-31337.json
diff --git a/contracts/marketplace/MintGoldDustERC1155.sol b/contracts/marketplace/MintGoldDustERC1155.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.18;
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
 import "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155URIStorage.sol";
-
 import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155URIStorageUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/CountersUpgradeable.sol";
 import "./MintGoldDustCompany.sol";
@@ -60,7 +59,7 @@ contract MintGoldDustERC1155 is
         address to,
         uint256 tokenId,
         uint256 amount
-    ) public override {
+    ) public override whenNotPaused {
         safeTransferFrom(from, to, tokenId, amount, "");
     }
 
diff --git a/contracts/marketplace/MintGoldDustERC721.sol b/contracts/marketplace/MintGoldDustERC721.sol
@@ -49,7 +49,7 @@ contract MintGoldDustERC721 is
         address _to,
         uint256 _tokenId,
         uint256 _amount
-    ) public override {
+    ) public override whenNotPaused {
         _transfer(_from, _to, _tokenId);
     }
 
@@ -122,6 +122,7 @@ contract MintGoldDustERC721 is
         public
         view
         override(ERC721Upgradeable, ERC721URIStorageUpgradeable)
+        whenNotPaused
         returns (string memory)
     {
         return super.tokenURI(tokenId);
diff --git a/contracts/marketplace/MintGoldDustMarketplace.sol b/contracts/marketplace/MintGoldDustMarketplace.sol
@@ -5,6 +5,7 @@ import "@openzeppelin/contracts/utils/Counters.sol";
 import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 import "./MintGoldDustCompany.sol";
 import "./MintGoldDustERC721.sol";
 import "./MintGoldDustNFT.sol";
@@ -29,7 +30,10 @@ error MintGoldDustCollectorMintDataNotMatch();
 /// and also a virtual function that each children should have a specif implementation.
 /// @author Mint Gold Dust LLC
 /// @custom:contact klvh@mintgolddust.io
-abstract contract MintGoldDustMarketplace is Initializable {
+abstract contract MintGoldDustMarketplace is
+    Initializable,
+    PausableUpgradeable
+{
     /**
      *
      * @notice MintGoldDustMarketplace is composed by other two contracts.
@@ -1098,7 +1102,9 @@ abstract contract MintGoldDustMarketplace is Initializable {
      *                    - contractAddress: The MintGoldDustERC1155 or the MintGoldDustERC721 address.
      *                    - seller: The seller of the marketItem.
      */
-    function purchaseNft(SaleDTO memory _saleDTO) external payable {
+    function purchaseNft(
+        SaleDTO memory _saleDTO
+    ) external payable whenNotPaused {
         executePurchaseNftFlow(_saleDTO, msg.sender, msg.value);
     }
 
@@ -1480,6 +1486,23 @@ abstract contract MintGoldDustMarketplace is Initializable {
         _;
     }
 
+    /// @notice Pause the contract
+    function pauseContract() public isowner {
+        _pause();
+    }
+
+    /// @notice Unpause the contract
+    function unpauseContract() public isowner {
+        _unpause();
+    }
+
+    modifier isowner() {
+        if (msg.sender != mgdCompany.owner()) {
+            revert MGDCompanyUnauthorized();
+        }
+        _;
+    }
+
     /// @notice Fallbacks will forward funds to Mint Gold Dust LLC
     fallback() external payable {
         payable(mgdCompany.owner()).transfer(msg.value);
diff --git a/contracts/marketplace/MintGoldDustMarketplaceAuction.sol b/contracts/marketplace/MintGoldDustMarketplaceAuction.sol
@@ -160,7 +160,7 @@ contract MintGoldDustMarketplaceAuction is
         uint256 _amount,
         address _contractAddress,
         uint256 _price
-    ) public override {
+    ) public override whenNotPaused {
         SaleDTO memory _saleDTO = SaleDTO(
             _tokenId,
             _amount,
@@ -412,7 +412,7 @@ contract MintGoldDustMarketplaceAuction is
      *                  - contractAddress: is a MintGoldDustNFT address.
      *                  - seller: is the address of the seller of this tokenId.
      */
-    function placeBid(BidDTO memory _bidDTO) public payable {
+    function placeBid(BidDTO memory _bidDTO) public payable whenNotPaused {
         /// @dev verifications
         isNotCreator(_bidDTO);
         isNotLastBidder(_bidDTO);
@@ -439,7 +439,7 @@ contract MintGoldDustMarketplaceAuction is
      *                  - contractAddress: is a MintGoldDustNFT address.
      *                  - seller: is the address of the seller of this tokenId.
      */
-    function endAuction(BidDTO memory _bidDTO) public {
+    function endAuction(BidDTO memory _bidDTO) public whenNotPaused {
         isTokenIdListed(_bidDTO.tokenId, _bidDTO.contractAddress);
 
         if (
diff --git a/contracts/marketplace/MintGoldDustNFT.sol b/contracts/marketplace/MintGoldDustNFT.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.18;
 
 import "@openzeppelin/contracts/utils/Counters.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 import "./MintGoldDustCompany.sol";
 import "./MintGoldDustMemoir.sol";
 
@@ -11,7 +12,7 @@ error MGDnftUnauthorized();
 error NumberOfCollaboratorsAndPercentagesNotMatch();
 error TheTotalPercentageCantBeGreaterThan100();
 
-abstract contract MintGoldDustNFT is Initializable {
+abstract contract MintGoldDustNFT is Initializable, PausableUpgradeable {
     // Add your custom code and functions here
     /**
      *
@@ -99,7 +100,13 @@ abstract contract MintGoldDustNFT is Initializable {
         uint256 _royaltyPercent,
         uint256 _amount,
         string calldata _memoir
-    ) public payable validPercentage(_royaltyPercent) returns (uint256) {
+    )
+        public
+        payable
+        validPercentage(_royaltyPercent)
+        whenNotPaused
+        returns (uint256)
+    {
         uint256 newTokenId = executeMintFlow(
             _tokenURI,
             _royaltyPercent,
@@ -118,7 +125,7 @@ abstract contract MintGoldDustNFT is Initializable {
         uint256 _amount,
         address _sender,
         string calldata _memoir
-    ) public validPercentage(_royaltyPercent) returns (uint256) {
+    ) public validPercentage(_royaltyPercent) whenNotPaused returns (uint256) {
         uint256 newTokenId = executeMintFlow(
             _tokenURI,
             _royaltyPercent,
@@ -159,7 +166,7 @@ abstract contract MintGoldDustNFT is Initializable {
         uint256[] calldata _ownersPercentage,
         uint256 _amount,
         string calldata _memoir
-    ) external returns (uint256) {
+    ) external whenNotPaused returns (uint256) {
         if (_ownersPercentage.length != _newOwners.length + 1) {
             revert NumberOfCollaboratorsAndPercentagesNotMatch();
         }
@@ -176,7 +183,7 @@ abstract contract MintGoldDustNFT is Initializable {
         uint256 _amount,
         address _sender,
         string calldata _memoir
-    ) external returns (uint256) {
+    ) external whenNotPaused returns (uint256) {
         if (_ownersPercentage.length != _newOwners.length + 1) {
             revert NumberOfCollaboratorsAndPercentagesNotMatch();
         }
@@ -243,6 +250,23 @@ abstract contract MintGoldDustNFT is Initializable {
         );
     }
 
+    /// @notice Pause the contract
+    function pauseContract() public isowner {
+        _pause();
+    }
+
+    /// @notice Unpause the contract
+    function unpauseContract() public isowner {
+        _unpause();
+    }
+
+    modifier isowner() {
+        if (msg.sender != mintGoldDustCompany.owner()) {
+            revert MGDCompanyUnauthorized();
+        }
+        _;
+    }
+
     modifier validPercentage(uint256 percentage) {
         if (percentage > mintGoldDustCompany.maxRoyalty()) {
             revert MGDnftRoyaltyInvalidPercentage();
diff --git a/contracts/marketplace/MintGoldDustSetPrice.sol b/contracts/marketplace/MintGoldDustSetPrice.sol
@@ -130,7 +130,7 @@ contract MintGoldDustSetPrice is
         uint256 _amount,
         address _contractAddress,
         uint256 _price
-    ) public override {
+    ) public override whenNotPaused {
         SaleDTO memory _saleDTO = SaleDTO(
             _tokenId,
             _amount,
@@ -165,7 +165,7 @@ contract MintGoldDustSetPrice is
         uint256 _price,
         address _contractAddress,
         address _seller
-    ) public {
+    ) public whenNotPaused {
         mustBeMintGoldDustERC721Or1155(_contractAddress);
         isTokenIdListed(_tokenId, _contractAddress);
         isSeller(_tokenId, _contractAddress, _seller);
@@ -208,7 +208,9 @@ contract MintGoldDustSetPrice is
      *                    - contractAddress: The MintGoldDustERC1155 or the MintGoldDustERC721 address.
      *                    - seller: The seller of the marketItem.
      */
-    function delistNft(DelistDTO memory _delistDTO) public nonReentrant {
+    function delistNft(
+        DelistDTO memory _delistDTO
+    ) public nonReentrant whenNotPaused {
         mustBeMintGoldDustERC721Or1155(_delistDTO.contractAddress);
         isTokenIdListed(_delistDTO.tokenId, _delistDTO.contractAddress);
         isSeller(_delistDTO.tokenId, _delistDTO.contractAddress, msg.sender);
@@ -269,7 +271,7 @@ contract MintGoldDustSetPrice is
         CollectorMintDTO memory _collectorMintDTO,
         bytes32 _messageHash,
         bytes memory _artistSignature
-    ) public payable {
+    ) public payable whenNotPaused {
         mustBeMintGoldDustERC721Or1155(_collectorMintDTO.contractAddress);
 
         MintGoldDustNFT _mintGoldDustNFT;
diff --git a/test/MintGoldDustMarketplaceAuctionERC1155.ts b/test/MintGoldDustMarketplaceAuctionERC1155.ts
@@ -755,14 +755,14 @@ describe("\nMGDAuction.sol Smart Contract \n************___************\n \nThis
           )
         );
 
-        expect(parseFloat(fromWei(bidderBalanceBefore)).toFixed(4)).to.be.equal(
+        expect(parseFloat(fromWei(bidderBalanceBefore)).toFixed(3)).to.be.equal(
           parseFloat(
             fromWei(
               ethers.BigNumber.from(bidderBalanceAfter)
                 .add(toWei(priceToPurchase))
                 .add(ethers.BigNumber.from(gasPrice).mul(gasLimit))
             )
-          ).toFixed(4)
+          ).toFixed(3)
         );
 
         // Verify if the end time was set to 24 hours after the first bid greater than zero.
