`893deebc78b4`

2 files changed

modifiedtests/src/eth/marketplace/marketplace.test.tsdiff before after both

2import {getBalanceSingle, transferBalanceExpectSuccess} from '../../substrate/get-balance';2import {getBalanceSingle, transferBalanceExpectSuccess} from '../../substrate/get-balance';
3import privateKey from '../../substrate/privateKey';3import privateKey from '../../substrate/privateKey';
4import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, createFungibleItemExpectSuccess, createItemExpectSuccess, getTokenOwner, setCollectionSponsorExpectSuccess, transferExpectSuccess, transferFromExpectSuccess} from '../../util/helpers';4import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, createFungibleItemExpectSuccess, createItemExpectSuccess, getTokenOwner, setCollectionSponsorExpectSuccess, transferExpectSuccess, transferFromExpectSuccess} from '../../util/helpers';
5import {collectionIdToAddress, contractHelpers, createEthAccountWithBalance, executeEthTxOnSub, GAS_ARGS, itWeb3, subToEth, subToEthLowercase} from '../util/helpers';5import {collectionIdToAddress, contractHelpers, createEthAccountWithBalance, executeEthTxOnSub, GAS_ARGS, itWeb3, subToEth, subToEthLowercase, transferBalanceToEth} from '../util/helpers';
6import {evmToAddress} from '@polkadot/util-crypto';6import {evmToAddress} from '@polkadot/util-crypto';
7import nonFungibleAbi from '../nonFungibleAbi.json';7import nonFungibleAbi from '../nonFungibleAbi.json';
8import fungibleAbi from '../fungibleAbi.json';8import fungibleAbi from '../fungibleAbi.json';
1212
13describe('Matcher contract usage', () => {13describe('Matcher contract usage', () => {
14  itWeb3('With UNQ', async ({api, web3}) => {14  itWeb3('With UNQ', async ({api, web3}) => {
15    const alice = privateKey('//Alice');
16    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
17    const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId));
15    const matcherOwner = await createEthAccountWithBalance(api, web3);18    const matcherOwner = await createEthAccountWithBalance(api, web3);
19    const helpers = contractHelpers(web3, matcherOwner);
20
16    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {21    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
17      from: matcherOwner,22      from: matcherOwner,
18      ...GAS_ARGS,23      ...GAS_ARGS,
19    });24    });
20    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments:[matcherOwner]}).send({from: matcherOwner});25    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments:[matcherOwner]}).send({from: matcherOwner});
21    const helpers = contractHelpers(web3, matcherOwner);26
22    await helpers.methods.toggleSponsoring(matcher.options.address, true).send({from: matcherOwner});27    await transferBalanceToEth(api, alice, matcher.options.address);
23    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});28    await helpers.methods.toggleSponsoring(matcher.options.address, true).send({from: matcherOwner});
2429
25    const alice = privateKey('//Alice');
26    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});30    await transferBalanceToEth(api, alice, subToEth(alice.address));
27    const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), {from: matcherOwner});
28    await setCollectionSponsorExpectSuccess(collectionId, alice.address);31    await setCollectionSponsorExpectSuccess(collectionId, alice.address);
29    await confirmSponsorshipExpectSuccess(collectionId);32    await confirmSponsorshipExpectSuccess(collectionId);
3033
31    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});34    const seller = privateKey('//Seller/' + Date.now());
32    await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));35    await addToAllowListExpectSuccess(alice, collectionId, {Ethereum:subToEth(seller.address)});
33
34    const seller = privateKey('//Bob');
35    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});36    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
36    await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(seller.address)));
3737
38    const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);38    const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
3939
40    // To transfer item to matcher it first needs to be transfered to EVM account of bob40    // To transfer item to matcher it first needs to be transfered to EVM account of seller
41    await transferExpectSuccess(collectionId, tokenId, seller, {Ethereum: subToEth(seller.address)});41    await transferExpectSuccess(collectionId, tokenId, seller, {Ethereum: subToEth(seller.address)});
42
43    // Token is owned by seller initially
44    expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: subToEthLowercase(seller.address)});42    expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: subToEthLowercase(seller.address)});
4543
46    // Ask44    // Ask
55    // Buy53    // Buy
56    {54    {
57      const sellerBalanceBeforePurchase = await getBalanceSingle(api, seller.address);55      const sellerBalanceBeforePurchase = await getBalanceSingle(api, seller.address);
58      // There is two functions named 'buy', so we should provide full signature
59      await executeEthTxOnSub(api, alice, matcher, m => m['buy(address,uint256)'](evmCollection.options.address, tokenId), {value: PRICE});56      await executeEthTxOnSub(api, alice, matcher, m => m.buy(evmCollection.options.address, tokenId), {value: PRICE});
60      expect(await getBalanceSingle(api, seller.address) - sellerBalanceBeforePurchase === PRICE);57      expect(await getBalanceSingle(api, seller.address) - sellerBalanceBeforePurchase === PRICE);
61    }58    }
6259
137  });133  });
138134
139  itWeb3('With escrow', async ({api, web3}) => {135  itWeb3('With escrow', async ({api, web3}) => {
136    const alice = privateKey('//Alice');
137    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
138    const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId));
140    const matcherOwner = await createEthAccountWithBalance(api, web3);139    const matcherOwner = await createEthAccountWithBalance(api, web3);
140    const helpers = contractHelpers(web3, matcherOwner);
141    const escrow = await createEthAccountWithBalance(api, web3);141    const escrow = await createEthAccountWithBalance(api, web3);
142
142    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {143    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
143      from: matcherOwner,144      from: matcherOwner,
144      ...GAS_ARGS,145      ...GAS_ARGS,
145    });146    });
146    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments: [matcherOwner]}).send({from: matcherOwner});147    const matcher = await matcherContract.deploy({data: (await readFile(`${__dirname}/MarketPlace.bin`)).toString(), arguments: [matcherOwner]}).send({from: matcherOwner});
147    await matcher.methods.setEscrow(escrow).send({from: matcherOwner});148    await matcher.methods.setEscrow(escrow).send({from: matcherOwner});
148    const helpers = contractHelpers(web3, matcherOwner);149
149    await helpers.methods.toggleSponsoring(matcher.options.address, true).send({from: matcherOwner});150    await transferBalanceToEth(api, alice, matcher.options.address);
150    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});151    await helpers.methods.toggleSponsoring(matcher.options.address, true).send({from: matcherOwner});
151152
152    const alice = privateKey('//Alice');
153    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});153    await transferBalanceToEth(api, alice, subToEth(alice.address));
154    const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), {from: matcherOwner});
155    await setCollectionSponsorExpectSuccess(collectionId, alice.address);154    await setCollectionSponsorExpectSuccess(collectionId, alice.address);
156    await confirmSponsorshipExpectSuccess(collectionId);155    await confirmSponsorshipExpectSuccess(collectionId);
157
158    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(alice.address), true).send({from: matcherOwner});
159    await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(alice.address)));
160156
161    const seller = privateKey('//Bob');157    const seller = privateKey('//Seller/' + Date.now());
162    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});158    await helpers.methods.toggleAllowed(matcher.options.address, subToEth(seller.address), true).send({from: matcherOwner});
163    await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(seller.address)));159    await addToAllowListExpectSuccess(alice, collectionId, evmToAddress(subToEth(seller.address)));
164160
165    const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);161    const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
166162
167    // To transfer item to matcher it first needs to be transfered to EVM account of bob163    // To transfer item to matcher it first needs to be transfered to EVM account of seller
168    await transferExpectSuccess(collectionId, tokenId, seller, {Ethereum: subToEth(seller.address)});164    await transferExpectSuccess(collectionId, tokenId, seller, {Ethereum: subToEth(seller.address)});
169
170    // Token is owned by seller initially
171    expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: subToEthLowercase(seller.address)});165    expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal({Ethereum: subToEthLowercase(seller.address)});
172166
173    // Ask167    // Ask

modifiedtests/src/eth/util/helpers.tsdiff before after both

228  return new web3.eth.Contract(contractHelpersAbi as any, '0x842899ECF380553E8a4de75bF534cdf6fBF64049', {from: caller, ...GAS_ARGS});228  return new web3.eth.Contract(contractHelpersAbi as any, '0x842899ECF380553E8a4de75bF534cdf6fBF64049', {from: caller, ...GAS_ARGS});
229}229}
230230
231/**
232 * Execute ethereum method call using substrate account
233 * @param to target contract
234 * @param mkTx - closure, receiving `contract.methods`, and returning method call,
235 * to be used as following (assuming `to` = erc20 contract):
236 * `m => m.transfer(to, amount)`
237 * 
238 * # Example
239 * ```ts
240 * executeEthTxOnSub(api, alice, erc20Contract, m => m.transfer(target, amount));
241 * ```
242 */
231export async function executeEthTxOnSub(api: ApiPromise, from: IKeyringPair, to: any, mkTx: (methods: any) => any, {value = 0}: {value?: bigint | number} = { }) {243export async function executeEthTxOnSub(api: ApiPromise, from: IKeyringPair, to: any, mkTx: (methods: any) => any, {value = 0}: {value?: bigint | number} = { }) {
232  const tx = api.tx.evm.call(244  const tx = api.tx.evm.call(
233    subToEth(from.address),245    subToEth(from.address),
246  return (await getBalance(api, [evmToAddress(address)]))[0];258  return (await getBalance(api, [evmToAddress(address)]))[0];
247}259}
248260
261/**
262 * Measure how much gas given closure consumes
263 * 
264 * @param user which user balance will be checked
265 */
249export async function recordEthFee(api: ApiPromise, user: string, call: () => Promise<any>): Promise<bigint> {266export async function recordEthFee(api: ApiPromise, user: string, call: () => Promise<any>): Promise<bigint> {
250  const before = await ethBalanceViaSub(api, user);267  const before = await ethBalanceViaSub(api, user);
251268