--- a/tests/package.json +++ b/tests/package.json @@ -47,6 +47,7 @@ "testEthNesting": "yarn _test './**/eth/nesting/**/*.*test.ts'", "testEthFractionalizer": "yarn _test './**/eth/fractionalizer/**/*.*test.ts'", "testEthMarketplace": "yarn _test './**/eth/marketplace/**/*.*test.ts'", + "testEthMarket": "yarn _test './**/eth/marketplace-v2/**/*.*test.ts'", "testSub": "yarn _test './**/sub/**/*.*test.ts'", "testSubNesting": "yarn _test './**/sub/nesting/**/*.*test.ts'", "testEvent": "yarn _test ./src/check-event/*.*test.ts", --- a/tests/src/eth/marketplace-v2/Market.sol +++ b/tests/src/eth/marketplace-v2/Market.sol @@ -1,14 +1,16 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity 0.8.17; +import "@openzeppelin/contracts/security/ReentrancyGuard.sol"; import "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol"; import "@openzeppelin/contracts/token/ERC721/IERC721.sol"; +import "@openzeppelin/contracts/access/Ownable.sol"; import { UniqueNFT, CrossAddress } from "@unique-nft/solidity-interfaces/contracts/UniqueNFT.sol"; import { UniqueFungible, CrossAddress as CrossAddressF } from "@unique-nft/solidity-interfaces/contracts/UniqueFungible.sol"; import "@unique-nft/solidity-interfaces/contracts/CollectionHelpers.sol"; import "./royalty/UniqueRoyaltyHelper.sol"; -contract Market { +contract Market is Ownable, ReentrancyGuard { using ERC165Checker for address; struct Order { @@ -21,7 +23,7 @@ } uint32 public constant version = 0; - uint32 public constant buildVersion = 1; + uint32 public constant buildVersion = 3; bytes4 private constant InterfaceId_ERC721 = 0x80ac58cd; bytes4 private constant InterfaceId_ERC165 = 0x5755c3f2; CollectionHelpers private constant collectionHelpers = @@ -31,7 +33,6 @@ uint32 private idCount = 1; uint32 public marketFee; uint64 public ctime; - address selfAddress; address public ownerAddress; mapping(address => bool) public admins; @@ -57,15 +58,11 @@ error OrderNotFound(); error TooManyAmountRequested(); error NotEnoughMoneyError(); + error InvalidRoyaltiesError(uint256 totalRoyalty); error FailTransferToken(string reason); - modifier onlyOwner() { - require(msg.sender == ownerAddress, "Only owner can"); - _; - } - modifier onlyAdmin() { - require(msg.sender == ownerAddress || admins[msg.sender], "Only admin can"); + require(msg.sender == this.owner() || admins[msg.sender], "Only admin can"); _; } @@ -85,12 +82,9 @@ marketFee = fee; ctime = timestamp; - if (marketFee == 0 || marketFee >= 100) { + if (marketFee >= 100) { revert InvalidMarketFee(); } - - ownerAddress = msg.sender; - selfAddress = address(this); } function getErc721(uint32 collectionId) private view returns (IERC721) { @@ -114,34 +108,33 @@ return IERC721(collectionAddress); } - // ################################################################ - // Set new contract owner # - // ################################################################ - - function setOwner() public onlyOwner { - ownerAddress = msg.sender; - } - - // ################################################################ - // Add new admin # - // ################################################################ - + /** + * Add new admin. Only owner or an existing admin can add admins. + * + * @param admin: Address of a new admin to add + */ function addAdmin(address admin) public onlyAdmin { admins[admin] = true; } - // ################################################################ - // Remove admin # - // ################################################################ - + /** + * Remove an admin. Only owner or an existing admin can remove admins. + * + * @param admin: Address of a new admin to add + */ function removeAdmin(address admin) public onlyAdmin { delete admins[admin]; } - // ################################################################ - // Place a token for sale # - // ################################################################ - + /** + * Place an NFT or RFT token for sale. It must be pre-approved for transfers by this contract address. + * + * @param collectionId: ID of the token collection + * @param tokenId: ID of the token + * @param price: Price (with proper network currency decimals) + * @param amount: Number of token fractions to list (must always be 1 for NFT) + * @param seller: The seller cross-address (the beneficiary account to receive payment, may be different from transaction sender) + */ function put( uint32 collectionId, uint32 tokenId, @@ -166,7 +159,7 @@ revert SellerIsNotOwner(); } - if (erc721.getApproved(tokenId) != selfAddress) { + if (erc721.getApproved(tokenId) != address(this)) { revert TokenIsNotApproved(); } @@ -185,10 +178,13 @@ emit TokenIsUpForSale(version, order); } - // ################################################################ - // Get order # - // ################################################################ - + /** + * Get information about the listed token order + * + * @param collectionId: ID of the token collection + * @param tokenId: ID of the token + * @return The order information + */ function getOrder( uint32 collectionId, uint32 tokenId @@ -196,10 +192,13 @@ return orders[collectionId][tokenId]; } - // ################################################################ - // Revoke the token from the sale # - // ################################################################ - + /** + * Revoke the token from the sale. Only the original lister can use this method. + * + * @param collectionId: ID of the token collection + * @param tokenId: ID of the token + * @param amount: Number of token fractions to de-list (must always be 1 for NFT) + */ function revoke( uint32 collectionId, uint32 tokenId, @@ -241,10 +240,12 @@ emit TokenRevoke(version, order, amount); } - // ################################################################ - // Check approved # - // ################################################################ - + /** + * Test if the token is still approved to be transferred by this contract and delete the order if not. + * + * @param collectionId: ID of the token collection + * @param tokenId: ID of the token + */ function checkApproved(uint32 collectionId, uint32 tokenId) public onlyAdmin { Order memory order = orders[collectionId][tokenId]; if (order.price == 0) { @@ -253,7 +254,7 @@ IERC721 erc721 = getErc721(collectionId); - if (erc721.getApproved(tokenId) != selfAddress || erc721.ownerOf(tokenId) != getAddressFromCrossAccount(order.seller)) { + if (erc721.getApproved(tokenId) != address(this) || erc721.ownerOf(tokenId) != getAddressFromCrossAccount(order.seller)) { uint32 amount = order.amount; order.amount = 0; emit TokenRevoke(version, order, amount); @@ -272,6 +273,12 @@ } } + /** + * Revoke the token from the sale. Only the contract admin can use this method. + * + * @param collectionId: ID of the token collection + * @param tokenId: ID of the token + */ function revokeAdmin(uint32 collectionId, uint32 tokenId) public onlyAdmin { Order memory order = orders[collectionId][tokenId]; if (order.price == 0) { @@ -285,16 +292,20 @@ delete orders[collectionId][tokenId]; } - // ################################################################ - // Buy a token # - // ################################################################ - + /** + * Buy a token (partially for an RFT). + * + * @param collectionId: ID of the token collection + * @param tokenId: ID of the token + * @param amount: Number of token fractions to buy (must always be 1 for NFT) + * @param buyer: Cross-address of the buyer, eth part must be equal to the transaction signer address + */ function buy( uint32 collectionId, uint32 tokenId, uint32 amount, CrossAddress memory buyer - ) public payable validCrossAddress(buyer.eth, buyer.sub) { + ) public payable validCrossAddress(buyer.eth, buyer.sub) nonReentrant { if (msg.value == 0) { revert InvalidArgument("msg.value must not be zero"); } @@ -319,7 +330,7 @@ } IERC721 erc721 = getErc721(order.collectionId); - if (erc721.getApproved(tokenId) != selfAddress) { + if (erc721.getApproved(tokenId) != address(this)) { revert TokenIsNotApproved(); } @@ -339,13 +350,16 @@ order.tokenId ); - (uint256 totalRoyalty, RoyaltyAmount[] memory royalties) = sendRoyalties(collectionAddress, tokenId, totalValue); + (uint256 totalRoyalty, RoyaltyAmount[] memory royalties) = sendRoyalties(collectionAddress, tokenId, totalValue - feeValue); + + if (totalRoyalty >= totalValue - feeValue) { + revert InvalidRoyaltiesError(totalRoyalty); + } sendMoney(order.seller, totalValue - feeValue - totalRoyalty); if (msg.value > totalValue) { - // todo, send money to signer or buyer ? - payable(msg.sender).transfer(msg.value - totalValue); + sendMoney(buyer, msg.value - totalValue); } emit TokenIsPurchased(version, order, amount, buyer, royalties); @@ -356,7 +370,7 @@ UniqueFungible fungible = UniqueFungible(collectionAddress); - CrossAddressF memory fromF = CrossAddressF(selfAddress, 0); + CrossAddressF memory fromF = CrossAddressF(address(this), 0); CrossAddressF memory toF = CrossAddressF(to.eth, to.sub); fungible.transferFromCross(fromF, toF, money); @@ -379,7 +393,7 @@ } function withdraw(address transferTo) public onlyOwner { - uint256 balance = selfAddress.balance; + uint256 balance = address(this).balance; if (balance > 0) { payable(transferTo).transfer(balance); --- a/tests/src/eth/marketplace-v2/marketplace.test.ts +++ b/tests/src/eth/marketplace-v2/marketplace.test.ts @@ -16,7 +16,7 @@ import {IKeyringPair} from '@polkadot/types/types'; import {readFile} from 'fs/promises'; -import {EthUniqueHelper, itEth, usingEthPlaygrounds} from '../util'; +import {EthUniqueHelper, SponsoringMode, itEth, usingEthPlaygrounds} from '../util'; import {makeNames} from '../../util'; import {expect} from 'chai'; import Web3 from 'web3'; @@ -51,6 +51,18 @@ fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/introspection/IERC165.sol`, }, { + solPath: '@openzeppelin/contracts/access/Ownable.sol', + fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/access/Ownable.sol`, + }, + { + solPath: '@openzeppelin/contracts/utils/Context.sol', + fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/Context.sol`, + }, + { + solPath: '@openzeppelin/contracts/security/ReentrancyGuard.sol', + fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/security/ReentrancyGuard.sol`, + }, + { solPath: '@openzeppelin/contracts/utils/introspection/ERC165Checker.sol', fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol`, }, @@ -94,26 +106,62 @@ }); itEth('Put + Buy [eth]', async ({helper}) => { - const marketOwner = await helper.eth.createAccountWithBalance(donor, 600n); + const ONE_TOKEN = helper.balance.getOneTokenNominal(); + const PRICE = 2n * ONE_TOKEN; // 2 UNQ + const marketOwner = await helper.eth.createAccountWithBalance(donor, 60000n); const market = await deployMarket(helper, marketOwner); + const contractHelpers = helper.ethNativeContract.contractHelpers(marketOwner); + await contractHelpers.methods.selfSponsoredEnable(market.options.address).send({from: marketOwner}); + await helper.eth.transferBalanceFromSubstrate(donor, market.options.address, 10n); + // TODO: this should work too, instead of selfSponsoring! + // await contractHelpers.methods.setSponsor(market.options.address, marketOwner).send({from: marketOwner}) + // await contractHelpers.methods.confirmSponsorship(market.options.address); + + await contractHelpers.methods.setSponsoringMode(market.options.address, SponsoringMode.Generous).send({from: marketOwner}); + await contractHelpers.methods.setSponsoringRateLimit(market.options.address, 0).send({from: marketOwner}); + const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(marketOwner, 'Sponsor', 'absolutely anything', 'ROC'); - const collection = await helper.ethNativeContract.collection(collectionAddress, 'nft', marketOwner); + const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', marketOwner, true); + await collection.methods.setCollectionSponsor(marketOwner).send({from: marketOwner}); + await collection.methods.confirmCollectionSponsorship().send({from: marketOwner}); - const sellerCross = await helper.ethCrossAccount.createAccountWithBalance(donor, 600n); + const sellerCross = helper.ethCrossAccount.createAccount(); const result = await collection.methods.mintCross(sellerCross, []).send(); const tokenId = result.events.Transfer.returnValues.tokenId; await collection.methods.approve(market.options.address, tokenId).send({from: sellerCross.eth}); + + // Seller has no funds at all, his transactions are sponsored + const sellerBalance = await helper.balance.getEthereum(sellerCross.eth); + expect(sellerBalance).to.be.eq(0n); - const putResult = await market.methods.put(collectionId, tokenId, 1, 1, sellerCross).send({from: sellerCross.eth}); + const putResult = await market.methods.put(collectionId, tokenId, PRICE.toString(), 1, sellerCross).send({ + from: sellerCross.eth, gasLimit: 1_000_000 + }); expect(putResult.events.TokenIsUpForSale).is.not.undefined; + + // Seller balance are still 0 + const sellerBalanceAfter = await helper.balance.getEthereum(sellerCross.eth); + expect(sellerBalanceAfter).to.be.eq(0n); + let ownerCross = await collection.methods.ownerOfCross(tokenId).call(); expect(ownerCross.eth).to.be.eq(sellerCross.eth); expect(ownerCross.sub).to.be.eq(sellerCross.sub); - const buyerCross = await helper.ethCrossAccount.createAccountWithBalance(donor, 600n); - const buyResult = await market.methods.buy(collectionId, tokenId, 1, buyerCross).send({from: buyerCross.eth, value: 1}); + const buyerCross = await helper.ethCrossAccount.createAccountWithBalance(donor, 10n); + console.log('before buy'); + + // Buyer has only 10 UNQ + const buyerBalance = await helper.balance.getEthereum(buyerCross.eth); + expect(buyerBalance).to.be.eq(10n * ONE_TOKEN) + + const buyResult = await market.methods.buy(collectionId, tokenId, 1, buyerCross).send({from: buyerCross.eth, value: PRICE.toString(), gasLimit: 1_000_000}); expect(buyResult.events.TokenIsPurchased).is.not.undefined; + + // Buyer pays only value, transaction use sponsoring + const buyerBalanceAfter = await helper.balance.getEthereum(buyerCross.eth); + expect(buyerBalanceAfter).to.be.eq(10n * ONE_TOKEN - PRICE); + ownerCross = await collection.methods.ownerOfCross(tokenId).call(); expect(ownerCross.eth).to.be.eq(buyerCross.eth); expect(ownerCross.sub).to.be.eq(buyerCross.sub);