git.delta.rocks / unique-network / refs/commits / 54a796702bba

difftreelog

Remove console.log

Andy Smith2023-06-27parent: #a7c577e.patch.diff
in: master

1 file changed

modifiedtests/src/eth/marketplace-v2/marketplace.test.tsdiffbeforeafterboth
before · tests/src/eth/marketplace-v2/marketplace.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {IKeyringPair} from '@polkadot/types/types';18import {readFile} from 'fs/promises';19import {EthUniqueHelper, SponsoringMode, itEth, usingEthPlaygrounds} from '../util';20import {makeNames} from '../../util';21import {expect} from 'chai';22import Web3 from 'web3';2324const {dirname} = makeNames(import.meta.url);2526const MARKET_FEE = 1;2728describe('Market V2 Contract', () => {29  let donor: IKeyringPair;3031  before(async () => {32    await usingEthPlaygrounds(async (_helper, privateKey) => {33      donor = await privateKey({url: import.meta.url});34    });35  });3637  async function deployMarket(helper: EthUniqueHelper, marketOwner: string) {38    return await helper.ethContract.deployByCode(39      marketOwner,40      'Market',41      (await readFile(`${dirname}/Market.sol`)).toString(),42      [43        {44          solPath: '@unique-nft/solidity-interfaces/contracts/UniqueNFT.sol',45          fsPath: `${dirname}/../api/UniqueNFT.sol`,46        },47        {48          solPath: '@unique-nft/solidity-interfaces/contracts/UniqueFungible.sol',49          fsPath: `${dirname}/../api/UniqueFungible.sol`,50        },51        {52          solPath: '@openzeppelin/contracts/utils/introspection/IERC165.sol',53          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/introspection/IERC165.sol`,54        },55        {56          solPath: '@openzeppelin/contracts/access/Ownable.sol',57          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/access/Ownable.sol`,58        },59        {60          solPath: '@openzeppelin/contracts/utils/Context.sol',61          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/Context.sol`,62        },63        {64          solPath: '@openzeppelin/contracts/security/ReentrancyGuard.sol',65          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/security/ReentrancyGuard.sol`,66        },67        {68          solPath: '@openzeppelin/contracts/utils/introspection/ERC165Checker.sol',69          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol`,70        },71        {72          solPath: '@openzeppelin/contracts/token/ERC721/IERC721.sol',73          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/token/ERC721/IERC721.sol`,74        },75        {76          solPath: '@unique-nft/solidity-interfaces/contracts/CollectionHelpers.sol',77          fsPath: `${dirname}/../api/CollectionHelpers.sol`,78        },79        {80          solPath: 'royalty/UniqueRoyaltyHelper.sol',81          fsPath: `${dirname}/royalty/UniqueRoyaltyHelper.sol`,82        },83        {84          solPath: 'royalty/UniqueRoyalty.sol',85          fsPath: `${dirname}/royalty/UniqueRoyalty.sol`,86        },87        {88          solPath: 'royalty/LibPart.sol',89          fsPath: `${dirname}/royalty/LibPart.sol`,90        },91      ],92      15000000,93      [MARKET_FEE, 0],94    );95  }9697  function substrateAddressToHex(sub: Uint8Array| string, web3: Web3) {98    if(typeof sub === 'string')99      return web3.utils.padLeft(web3.utils.toHex(web3.utils.toBN(sub)), 64);100    else if(sub instanceof Uint8Array)101      return web3.utils.padLeft(web3.utils.bytesToHex(Array.from(sub)), 64);102  }103104  itEth('Deploy', async ({helper}) => {105    const marketOwner = await helper.eth.createAccountWithBalance(donor, 600n);106107    await deployMarket(helper, marketOwner);108  });109110  itEth('Put + Buy [eth]', async ({helper}) => {111    const ONE_TOKEN = helper.balance.getOneTokenNominal();112    const PRICE = 2n * ONE_TOKEN;  // 2 UNQ113    const marketOwner = await helper.eth.createAccountWithBalance(donor, 60000n);114    const market = await deployMarket(helper, marketOwner);115    const contractHelpers = helper.ethNativeContract.contractHelpers(marketOwner);116117    // Set external sponsoring118    await contractHelpers.methods.setSponsor(market.options.address, marketOwner).send({from: marketOwner});119    await contractHelpers.methods.confirmSponsorship(market.options.address).send({from: marketOwner});120121    // Configure sponsoring122    await contractHelpers.methods.setSponsoringMode(market.options.address, SponsoringMode.Generous).send({from: marketOwner});123    await contractHelpers.methods.setSponsoringRateLimit(market.options.address, 0).send({from: marketOwner});124125    const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(marketOwner, 'Sponsor', 'absolutely anything', 'ROC');126    const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', marketOwner, true);127128    // Set collection sponsoring129    await collection.methods.setCollectionSponsor(marketOwner).send({from: marketOwner});130    await collection.methods.confirmCollectionSponsorship().send({from: marketOwner});131132    const sellerCross = helper.ethCrossAccount.createAccount();133    const result = await collection.methods.mintCross(sellerCross, []).send();134    const tokenId = result.events.Transfer.returnValues.tokenId;135    await collection.methods.approve(market.options.address, tokenId).send({from: sellerCross.eth});136137    // Seller has no funds at all, his transactions are sponsored138    const sellerBalance = await helper.balance.getEthereum(sellerCross.eth);139    expect(sellerBalance).to.be.eq(0n);140141    const putResult = await market.methods.put(collectionId, tokenId, PRICE.toString(), 1, sellerCross).send({142      from: sellerCross.eth, gasLimit: 1_000_000,143    });144    expect(putResult.events.TokenIsUpForSale).is.not.undefined;145146    // Seller balance are still 0147    const sellerBalanceAfter = await helper.balance.getEthereum(sellerCross.eth);148    expect(sellerBalanceAfter).to.be.eq(0n);149150    let ownerCross = await collection.methods.ownerOfCross(tokenId).call();151    expect(ownerCross.eth).to.be.eq(sellerCross.eth);152    expect(ownerCross.sub).to.be.eq(sellerCross.sub);153154    const buyerCross = await helper.ethCrossAccount.createAccountWithBalance(donor, 10n);155    console.log('before buy');156157    // Buyer has only 10 UNQ158    const buyerBalance = await helper.balance.getEthereum(buyerCross.eth);159    expect(buyerBalance).to.be.eq(10n * ONE_TOKEN);160161    const buyResult = await market.methods.buy(collectionId, tokenId, 1, buyerCross).send({from: buyerCross.eth, value: PRICE.toString(), gasLimit: 1_000_000});162    expect(buyResult.events.TokenIsPurchased).is.not.undefined;163164    // Buyer pays only value, transaction use sponsoring165    const buyerBalanceAfter = await helper.balance.getEthereum(buyerCross.eth);166    expect(buyerBalanceAfter).to.be.eq(10n * ONE_TOKEN - PRICE);167168    ownerCross = await collection.methods.ownerOfCross(tokenId).call();169    expect(ownerCross.eth).to.be.eq(buyerCross.eth);170    expect(ownerCross.sub).to.be.eq(buyerCross.sub);171  });172173  itEth('Put + Buy [sub]', async ({helper}) => {174    const ONE_TOKEN = helper.balance.getOneTokenNominal();175    const PRICE = 2n * ONE_TOKEN;  // 2 UNQ176    const web3 = helper.getWeb3();177    const marketOwner = await helper.eth.createAccountWithBalance(donor, 600n);178    const market = await deployMarket(helper, marketOwner);179    const contractHelpers = helper.ethNativeContract.contractHelpers(marketOwner);180181    // Set self sponsoring from contract balance182    await contractHelpers.methods.selfSponsoredEnable(market.options.address).send({from: marketOwner});183    await helper.eth.transferBalanceFromSubstrate(donor, market.options.address, 10n);184185    // Configure sponsoring186    await contractHelpers.methods.setSponsoringMode(market.options.address, SponsoringMode.Generous).send({from: marketOwner});187    await contractHelpers.methods.setSponsoringRateLimit(market.options.address, 0).send({from: marketOwner});188189    const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(marketOwner, 'Sponsor', 'absolutely anything', 'ROC');190    const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', marketOwner, true);191192    // Set collection sponsoring193    await collection.methods.setCollectionSponsor(marketOwner).send({from: marketOwner});194    await collection.methods.confirmCollectionSponsorship().send({from: marketOwner});195196    const seller = helper.util.fromSeed(`//Market-seller-${(new Date()).getTime()}`);197    const sellerCross = helper.ethCrossAccount.fromKeyringPair(seller);198199    // Seller has no funds at all, his transactions are sponsored200    {201      const sellerBalance = await helper.balance.getSubstrate(seller.address);202      expect(sellerBalance).to.be.eq(0n);203    }204205    const result = await collection.methods.mintCross(sellerCross, []).send();206    const tokenId = result.events.Transfer.returnValues.tokenId;207    await helper.nft.approveToken(seller, collectionId, tokenId, {Ethereum: market.options.address});208209    await helper.eth.sendEVM(seller, market.options.address, market.methods.put(collectionId, tokenId, PRICE, 1, sellerCross).encodeABI(), '0');210    // Seller balance is still zero211    {212      const sellerBalance = await helper.balance.getSubstrate(seller.address);213      expect(sellerBalance).to.be.eq(0n);214    }215    let ownerCross = await collection.methods.ownerOfCross(tokenId).call();216    expect(ownerCross.eth).to.be.eq(sellerCross.eth);217    expect(substrateAddressToHex(ownerCross.sub, web3)).to.be.eq(substrateAddressToHex(sellerCross.sub, web3));218219    const [buyer] = await helper.arrange.createAccounts([600n], donor);220    // Buyer has only expected balance221    {222      const buyerBalance = await helper.balance.getSubstrate(buyer.address);223      expect(buyerBalance).to.be.eq(600n * ONE_TOKEN);224    }225    const buyerMirror = helper.address.substrateToEth(buyer.address);226    const buyerCross = helper.ethCrossAccount.fromKeyringPair(buyer);227    await helper.eth.transferBalanceFromSubstrate(donor, buyerMirror, PRICE, false);228229    const buyerBalanceBefore = await helper.balance.getSubstrate(buyer.address);230    await helper.eth.sendEVM(buyer, market.options.address, market.methods.buy(collectionId, tokenId, 1, buyerCross).encodeABI(), PRICE.toString());231    const buyerBalanceAfter = await helper.balance.getSubstrate(buyer.address);232    // Buyer balance not changed: transaction is sponsored233    expect(buyerBalanceBefore).to.be.eq(buyerBalanceAfter);234235    const sellerBalanceAfterBuy = BigInt(await helper.balance.getSubstrate(seller.address));236    ownerCross = await collection.methods.ownerOfCross(tokenId).call();237    expect(ownerCross.eth).to.be.eq(buyerCross.eth);238    expect(substrateAddressToHex(ownerCross.sub, web3)).to.be.eq(substrateAddressToHex(buyerCross.sub, web3));239240    // Seller got only PRICE - MARKET_FEE241    expect(sellerBalanceAfterBuy).to.be.eq(PRICE * BigInt(100 - MARKET_FEE) / 100n);242  });243});
after · tests/src/eth/marketplace-v2/marketplace.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {IKeyringPair} from '@polkadot/types/types';18import {readFile} from 'fs/promises';19import {EthUniqueHelper, SponsoringMode, itEth, usingEthPlaygrounds} from '../util';20import {makeNames} from '../../util';21import {expect} from 'chai';22import Web3 from 'web3';2324const {dirname} = makeNames(import.meta.url);2526const MARKET_FEE = 1;2728describe('Market V2 Contract', () => {29  let donor: IKeyringPair;3031  before(async () => {32    await usingEthPlaygrounds(async (_helper, privateKey) => {33      donor = await privateKey({url: import.meta.url});34    });35  });3637  async function deployMarket(helper: EthUniqueHelper, marketOwner: string) {38    return await helper.ethContract.deployByCode(39      marketOwner,40      'Market',41      (await readFile(`${dirname}/Market.sol`)).toString(),42      [43        {44          solPath: '@unique-nft/solidity-interfaces/contracts/UniqueNFT.sol',45          fsPath: `${dirname}/../api/UniqueNFT.sol`,46        },47        {48          solPath: '@unique-nft/solidity-interfaces/contracts/UniqueFungible.sol',49          fsPath: `${dirname}/../api/UniqueFungible.sol`,50        },51        {52          solPath: '@openzeppelin/contracts/utils/introspection/IERC165.sol',53          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/introspection/IERC165.sol`,54        },55        {56          solPath: '@openzeppelin/contracts/access/Ownable.sol',57          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/access/Ownable.sol`,58        },59        {60          solPath: '@openzeppelin/contracts/utils/Context.sol',61          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/Context.sol`,62        },63        {64          solPath: '@openzeppelin/contracts/security/ReentrancyGuard.sol',65          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/security/ReentrancyGuard.sol`,66        },67        {68          solPath: '@openzeppelin/contracts/utils/introspection/ERC165Checker.sol',69          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/utils/introspection/ERC165Checker.sol`,70        },71        {72          solPath: '@openzeppelin/contracts/token/ERC721/IERC721.sol',73          fsPath: `${dirname}/../../../node_modules/@openzeppelin/contracts/token/ERC721/IERC721.sol`,74        },75        {76          solPath: '@unique-nft/solidity-interfaces/contracts/CollectionHelpers.sol',77          fsPath: `${dirname}/../api/CollectionHelpers.sol`,78        },79        {80          solPath: 'royalty/UniqueRoyaltyHelper.sol',81          fsPath: `${dirname}/royalty/UniqueRoyaltyHelper.sol`,82        },83        {84          solPath: 'royalty/UniqueRoyalty.sol',85          fsPath: `${dirname}/royalty/UniqueRoyalty.sol`,86        },87        {88          solPath: 'royalty/LibPart.sol',89          fsPath: `${dirname}/royalty/LibPart.sol`,90        },91      ],92      15000000,93      [MARKET_FEE, 0],94    );95  }9697  function substrateAddressToHex(sub: Uint8Array| string, web3: Web3) {98    if(typeof sub === 'string')99      return web3.utils.padLeft(web3.utils.toHex(web3.utils.toBN(sub)), 64);100    else if(sub instanceof Uint8Array)101      return web3.utils.padLeft(web3.utils.bytesToHex(Array.from(sub)), 64);102  }103104  itEth('Deploy', async ({helper}) => {105    const marketOwner = await helper.eth.createAccountWithBalance(donor, 600n);106107    await deployMarket(helper, marketOwner);108  });109110  itEth('Put + Buy [eth]', async ({helper}) => {111    const ONE_TOKEN = helper.balance.getOneTokenNominal();112    const PRICE = 2n * ONE_TOKEN;  // 2 UNQ113    const marketOwner = await helper.eth.createAccountWithBalance(donor, 60000n);114    const market = await deployMarket(helper, marketOwner);115    const contractHelpers = helper.ethNativeContract.contractHelpers(marketOwner);116117    // Set external sponsoring118    await contractHelpers.methods.setSponsor(market.options.address, marketOwner).send({from: marketOwner});119    await contractHelpers.methods.confirmSponsorship(market.options.address).send({from: marketOwner});120121    // Configure sponsoring122    await contractHelpers.methods.setSponsoringMode(market.options.address, SponsoringMode.Generous).send({from: marketOwner});123    await contractHelpers.methods.setSponsoringRateLimit(market.options.address, 0).send({from: marketOwner});124125    const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(marketOwner, 'Sponsor', 'absolutely anything', 'ROC');126    const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', marketOwner, true);127128    // Set collection sponsoring129    await collection.methods.setCollectionSponsor(marketOwner).send({from: marketOwner});130    await collection.methods.confirmCollectionSponsorship().send({from: marketOwner});131132    const sellerCross = helper.ethCrossAccount.createAccount();133    const result = await collection.methods.mintCross(sellerCross, []).send();134    const tokenId = result.events.Transfer.returnValues.tokenId;135    await collection.methods.approve(market.options.address, tokenId).send({from: sellerCross.eth});136137    // Seller has no funds at all, his transactions are sponsored138    const sellerBalance = await helper.balance.getEthereum(sellerCross.eth);139    expect(sellerBalance).to.be.eq(0n);140141    const putResult = await market.methods.put(collectionId, tokenId, PRICE.toString(), 1, sellerCross).send({142      from: sellerCross.eth, gasLimit: 1_000_000,143    });144    expect(putResult.events.TokenIsUpForSale).is.not.undefined;145146    // Seller balance are still 0147    const sellerBalanceAfter = await helper.balance.getEthereum(sellerCross.eth);148    expect(sellerBalanceAfter).to.be.eq(0n);149150    let ownerCross = await collection.methods.ownerOfCross(tokenId).call();151    expect(ownerCross.eth).to.be.eq(sellerCross.eth);152    expect(ownerCross.sub).to.be.eq(sellerCross.sub);153154    const buyerCross = await helper.ethCrossAccount.createAccountWithBalance(donor, 10n);155156    // Buyer has only 10 UNQ157    const buyerBalance = await helper.balance.getEthereum(buyerCross.eth);158    expect(buyerBalance).to.be.eq(10n * ONE_TOKEN);159160    const buyResult = await market.methods.buy(collectionId, tokenId, 1, buyerCross).send({from: buyerCross.eth, value: PRICE.toString(), gasLimit: 1_000_000});161    expect(buyResult.events.TokenIsPurchased).is.not.undefined;162163    // Buyer pays only value, transaction use sponsoring164    const buyerBalanceAfter = await helper.balance.getEthereum(buyerCross.eth);165    expect(buyerBalanceAfter).to.be.eq(10n * ONE_TOKEN - PRICE);166167    ownerCross = await collection.methods.ownerOfCross(tokenId).call();168    expect(ownerCross.eth).to.be.eq(buyerCross.eth);169    expect(ownerCross.sub).to.be.eq(buyerCross.sub);170  });171172  itEth('Put + Buy [sub]', async ({helper}) => {173    const ONE_TOKEN = helper.balance.getOneTokenNominal();174    const PRICE = 2n * ONE_TOKEN;  // 2 UNQ175    const web3 = helper.getWeb3();176    const marketOwner = await helper.eth.createAccountWithBalance(donor, 600n);177    const market = await deployMarket(helper, marketOwner);178    const contractHelpers = helper.ethNativeContract.contractHelpers(marketOwner);179180    // Set self sponsoring from contract balance181    await contractHelpers.methods.selfSponsoredEnable(market.options.address).send({from: marketOwner});182    await helper.eth.transferBalanceFromSubstrate(donor, market.options.address, 10n);183184    // Configure sponsoring185    await contractHelpers.methods.setSponsoringMode(market.options.address, SponsoringMode.Generous).send({from: marketOwner});186    await contractHelpers.methods.setSponsoringRateLimit(market.options.address, 0).send({from: marketOwner});187188    const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(marketOwner, 'Sponsor', 'absolutely anything', 'ROC');189    const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', marketOwner, true);190191    // Set collection sponsoring192    await collection.methods.setCollectionSponsor(marketOwner).send({from: marketOwner});193    await collection.methods.confirmCollectionSponsorship().send({from: marketOwner});194195    const seller = helper.util.fromSeed(`//Market-seller-${(new Date()).getTime()}`);196    const sellerCross = helper.ethCrossAccount.fromKeyringPair(seller);197198    // Seller has no funds at all, his transactions are sponsored199    {200      const sellerBalance = await helper.balance.getSubstrate(seller.address);201      expect(sellerBalance).to.be.eq(0n);202    }203204    const result = await collection.methods.mintCross(sellerCross, []).send();205    const tokenId = result.events.Transfer.returnValues.tokenId;206    await helper.nft.approveToken(seller, collectionId, tokenId, {Ethereum: market.options.address});207208    await helper.eth.sendEVM(seller, market.options.address, market.methods.put(collectionId, tokenId, PRICE, 1, sellerCross).encodeABI(), '0');209    // Seller balance is still zero210    {211      const sellerBalance = await helper.balance.getSubstrate(seller.address);212      expect(sellerBalance).to.be.eq(0n);213    }214    let ownerCross = await collection.methods.ownerOfCross(tokenId).call();215    expect(ownerCross.eth).to.be.eq(sellerCross.eth);216    expect(substrateAddressToHex(ownerCross.sub, web3)).to.be.eq(substrateAddressToHex(sellerCross.sub, web3));217218    const [buyer] = await helper.arrange.createAccounts([600n], donor);219    // Buyer has only expected balance220    {221      const buyerBalance = await helper.balance.getSubstrate(buyer.address);222      expect(buyerBalance).to.be.eq(600n * ONE_TOKEN);223    }224    const buyerMirror = helper.address.substrateToEth(buyer.address);225    const buyerCross = helper.ethCrossAccount.fromKeyringPair(buyer);226    await helper.eth.transferBalanceFromSubstrate(donor, buyerMirror, PRICE, false);227228    const buyerBalanceBefore = await helper.balance.getSubstrate(buyer.address);229    await helper.eth.sendEVM(buyer, market.options.address, market.methods.buy(collectionId, tokenId, 1, buyerCross).encodeABI(), PRICE.toString());230    const buyerBalanceAfter = await helper.balance.getSubstrate(buyer.address);231    // Buyer balance not changed: transaction is sponsored232    expect(buyerBalanceBefore).to.be.eq(buyerBalanceAfter);233234    const sellerBalanceAfterBuy = BigInt(await helper.balance.getSubstrate(seller.address));235    ownerCross = await collection.methods.ownerOfCross(tokenId).call();236    expect(ownerCross.eth).to.be.eq(buyerCross.eth);237    expect(substrateAddressToHex(ownerCross.sub, web3)).to.be.eq(substrateAddressToHex(buyerCross.sub, web3));238239    // Seller got only PRICE - MARKET_FEE240    expect(sellerBalanceAfterBuy).to.be.eq(PRICE * BigInt(100 - MARKET_FEE) / 100n);241  });242});