git.delta.rocks / unique-network / refs/commits / ee664e3c373c

39describe('Matcher contract usage', () => {39describe('Matcher contract usage', () => {
40  itWeb3('With UNQ', async ({api, web3, privateKeyWrapper}) => {40  itWeb3('With UNQ', async ({api, web3, privateKeyWrapper}) => {
41    const alice = privateKeyWrapper('//Alice');41    const alice = privateKeyWrapper('//Alice');
42    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
42    const matcherOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);43    const matcherOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
43    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {44    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
44      from: matcherOwner,45      from: matcherOwner,
49    await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});50    await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});
50    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});51    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});
52    
51    await transferBalanceToEth(api, alice, matcher.options.address);53    await helpers.methods.setSponsor(matcher.options.address, sponsor).send({from: matcherOwner});
54    await helpers.methods.confirmSponsorship(matcher.options.address).send({from: sponsor});
5255
53    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});56    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
54    await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});57    await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});
100103
101  itWeb3('With escrow', async ({api, web3, privateKeyWrapper}) => {104  itWeb3('With escrow', async ({api, web3, privateKeyWrapper}) => {
102    const alice = privateKeyWrapper('//Alice');105    const alice = privateKeyWrapper('//Alice');
106    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
103    const matcherOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);107    const matcherOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
104    const escrow = await createEthAccountWithBalance(api, web3, privateKeyWrapper);108    const escrow = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
105    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {109    const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
112    await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});116    await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});
113    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});117    await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});
118    
114    await transferBalanceToEth(api, alice, matcher.options.address);119    await helpers.methods.setSponsor(matcher.options.address, sponsor).send({from: matcherOwner});
120    await helpers.methods.confirmSponsorship(matcher.options.address).send({from: sponsor});
115121
116    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});122    const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
117    await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});123    await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});

--- a/tests/src/eth/sponsoring.test.ts
+++ b/tests/src/eth/sponsoring.test.ts
@@ -15,13 +15,12 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {expect} from 'chai';
-import {contractHelpers, createEthAccount, createEthAccountWithBalance, deployCollector, deployFlipper, itWeb3, SponsoringMode, transferBalanceToEth} from './util/helpers';
+import {contractHelpers, createEthAccount, createEthAccountWithBalance, deployCollector, deployFlipper, itWeb3, SponsoringMode} from './util/helpers';
 
 describe('EVM sponsoring', () => {
   itWeb3('Fee is deducted from contract if sponsoring is enabled', async ({api, web3, privateKeyWrapper}) => {
-    const alice = privateKeyWrapper('//Alice');
-
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const caller = createEthAccount(web3);
     const originalCallerBalance = await web3.eth.getBalance(caller);
     expect(originalCallerBalance).to.be.equal('0');
@@ -31,28 +30,31 @@
     const helpers = contractHelpers(web3, owner);
     await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});
     await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});
+    
+    await helpers.methods.setSponsor(flipper.options.address, sponsor).send({from: owner});
+    await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});
 
     expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;
     await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});
     await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});
     expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;
-
-    await transferBalanceToEth(api, alice, flipper.options.address);
 
-    const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);
-    expect(originalFlipperBalance).to.be.not.equal('0');
+    const originalSponsorBalance = await web3.eth.getBalance(sponsor);
+    expect(originalSponsorBalance).to.be.not.equal('0');
 
     await flipper.methods.flip().send({from: caller});
     expect(await flipper.methods.getValue().call()).to.be.true;
 
     // Balance should be taken from flipper instead of caller
     expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);
-    expect(await web3.eth.getBalance(flipper.options.address)).to.be.not.equals(originalFlipperBalance);
+    expect(await web3.eth.getBalance(sponsor)).to.be.not.equals(originalSponsorBalance);
   });
+
   itWeb3('...but this doesn\'t applies to payable value', async ({api, web3, privateKeyWrapper}) => {
     const alice = privateKeyWrapper('//Alice');
 
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const originalCallerBalance = await web3.eth.getBalance(caller);
     expect(originalCallerBalance).to.be.not.equal('0');
@@ -68,16 +70,17 @@
     await helpers.methods.setSponsoringRateLimit(collector.options.address, 0).send({from: owner});
     expect(await helpers.methods.sponsoringEnabled(collector.options.address).call()).to.be.true;
 
-    await transferBalanceToEth(api, alice, collector.options.address);
+    await helpers.methods.setSponsor(collector.options.address, sponsor).send({from: owner});
+    await helpers.methods.confirmSponsorship(collector.options.address).send({from: sponsor});
 
-    const originalCollectorBalance = await web3.eth.getBalance(collector.options.address);
-    expect(originalCollectorBalance).to.be.not.equal('0');
+    const originalSponsorBalance = await web3.eth.getBalance(sponsor);
+    expect(originalSponsorBalance).to.be.not.equal('0');
 
     await collector.methods.giveMoney().send({from: caller, value: '10000'});
 
     // Balance will be taken from both caller (value) and from collector (fee)
     expect(await web3.eth.getBalance(caller)).to.be.equals((BigInt(originalCallerBalance) - 10000n).toString());
-    expect(await web3.eth.getBalance(collector.options.address)).to.be.not.equals(originalCollectorBalance);
+    expect(await web3.eth.getBalance(sponsor)).to.be.not.equals(originalSponsorBalance);
     expect(await collector.methods.getCollected().call()).to.be.equal('10000');
   });
 });