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

difftreelog

Sponsoring tests

str-mv2021-09-01parent: #54811ce.patch.diff
in: master

3 files changed

modifiedtests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -5,92 +5,166 @@
 
 import privateKey from '../substrate/privateKey';
 import { expect } from 'chai';
-import { createCollectionExpectSuccess, 
-  createFungibleItemExpectSuccess, 
-  transferExpectSuccess, 
-  transferFromExpectSuccess, 
-  createItemExpectSuccess, 
-  setContractSponsoringRateLimitExpectSuccess,
-  enableContractSponsoringExpectSuccess,
-  setCollectionSponsorExpectSuccess,
-  confirmSponsorshipExpectSuccess,
-  enableContractSponsoringExpectFailure} from '../util/helpers';
-import { collectionIdToAddress, 
+import {  
   contractHelpers,
   createEthAccountWithBalance,
   createEthAccount,
   transferBalanceToEth,
-  subToEth,
   deployFlipper,
   usingWeb3Http,
-  deployFungibleContract,
-  GAS_ARGS, itWeb3 } from './util/helpers';
+  itWeb3 } from './util/helpers';
 import waitNewBlocks from '../substrate/wait-new-blocks';
-import fungibleAbi from './fungibleAbi.json';
-import nonFungibleAbi from './nonFungibleAbi.json';
 
 describe.only('Sponsoring EVM contracts', () => {
-  itWeb3.skip('Sponsoring can be set by the address that has deployed the contract', async ({api, web3}) => {
+  itWeb3('Sponsoring can be set by the address that has deployed the contract', async ({api}) => {
     await usingWeb3Http(async web3Http => {
       const owner = await createEthAccountWithBalance(api, web3Http);
-      const fungible = await deployFungibleContract(web3Http, owner);
+      const flipper = await deployFlipper(web3Http, owner);
       await waitNewBlocks(api, 1);
       const helpers = contractHelpers(web3Http, owner);
       await waitNewBlocks(api, 1);
-      expect(await helpers.methods.sponsoringEnabled(fungible.options.address).call()).to.be.false;
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;
       await waitNewBlocks(api, 1);
-      await helpers.methods.toggleSponsoring(fungible.options.address, true).send({from: owner});
+      await helpers.methods.toggleSponsoring(flipper.options.address, true).send({from: owner});
       await waitNewBlocks(api, 1);
-      expect(await helpers.methods.sponsoringEnabled(fungible.options.address).call()).to.be.true;
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;
     });
   });
 
-  itWeb3.skip('Sponsoring cannot be set by the address that did not deployed the contract', async ({api, web3}) => {
+  itWeb3('Sponsoring cannot be set by the address that did not deployed the contract', async ({api}) => {
     await usingWeb3Http(async web3Http => {
       const owner = await createEthAccountWithBalance(api, web3Http);
       const notOwner = await createEthAccountWithBalance(api, web3Http);
-      const fungible = await deployFungibleContract(web3Http, owner);
+      const flipper = await deployFlipper(web3Http, owner);
       await waitNewBlocks(api, 1);
       const helpers = contractHelpers(web3Http, owner);
       await waitNewBlocks(api, 1);
-      expect(await helpers.methods.sponsoringEnabled(fungible.options.address).call()).to.be.false;
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;
       await waitNewBlocks(api, 1);
       await expect(helpers.methods.toggleSponsoring(notOwner, true).send({from: notOwner})).to.rejected;
       await waitNewBlocks(api, 1);
-      expect(await helpers.methods.sponsoringEnabled(fungible.options.address).call()).to.be.false;
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;
+    });
+  });
+
+  itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should decrease', async ({api, web3}) => {
+    await usingWeb3Http(async web3Http => {
+      const alice = privateKey('//Alice');
+
+      const owner = await createEthAccountWithBalance(api, web3Http);
+      const caller = createEthAccount(web3Http);
+      const originalCallerBalance = await web3.eth.getBalance(caller);
+      expect(originalCallerBalance).to.be.equal('0');
+
+      const flipper = await deployFlipper(web3Http, owner);
+      await waitNewBlocks(api, 1);
+      
+      const helpers = contractHelpers(web3Http, owner);
+      await helpers.methods.toggleAllowlist(flipper.options.address, true).send({ from: owner });
+      await waitNewBlocks(api, 1);
+      await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({ from: owner });
+      await waitNewBlocks(api, 1);
+
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;
+      await helpers.methods.toggleSponsoring(flipper.options.address, true).send({from: owner});
+      await waitNewBlocks(api, 1);
+      await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});
+      await waitNewBlocks(api, 1);
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;
+
+      await transferBalanceToEth(api, alice, flipper.options.address);
+      await waitNewBlocks(api, 2);
+
+      const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);
+      expect(originalFlipperBalance).to.be.not.equal('0');
+
+      await flipper.methods.flip().send({ from: caller });
+      await waitNewBlocks(api, 1);
+      expect(await flipper.methods.getValue().call()).to.be.true;
+
+      // Balance should be taken from flipper instead of caller
+      const balanceAfter = await web3.eth.getBalance(flipper.options.address);
+      expect(+balanceAfter).to.be.lessThan(+originalFlipperBalance);
     });
   });
 
-  itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works', async ({api, web3}) => {
+  itWeb3('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({api, web3}) => {
     await usingWeb3Http(async web3Http => {
       const alice = privateKey('//Alice');
-      const bob = privateKey('//Bob');
-      const collection = await createCollectionExpectSuccess({
-        mode: { type: 'Fungible', decimalPoints: 0 },
-      });
-      await createFungibleItemExpectSuccess(alice, collection, { Value: 200n }, alice.address);
+
       const owner = await createEthAccountWithBalance(api, web3Http);
-      const notOwner = await createEthAccountWithBalance(api, web3Http);
-      await transferExpectSuccess(collection, 0, alice, { ethereum: notOwner } , 200, 'Fungible');
-      const address = collectionIdToAddress(collection);
-      const fungible = await deployFungibleContract(web3Http, address);
-      await transferBalanceToEth(api, alice, fungible.options.address);
+      const caller = createEthAccount(web3Http);
+      const originalCallerBalance = await web3.eth.getBalance(caller);
+      expect(originalCallerBalance).to.be.equal('0');
+
+      const flipper = await deployFlipper(web3Http, owner);
+      await waitNewBlocks(api, 1);
+      
+      const helpers = contractHelpers(web3Http, owner);
+      await helpers.methods.toggleAllowlist(flipper.options.address, true).send({ from: owner });
       await waitNewBlocks(api, 1);
-      const balanceBefore = await web3.eth.getBalance(fungible.options.address);
+      await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({ from: owner });
+      await waitNewBlocks(api, 1);
 
-      const helpers = contractHelpers(web3Http, address);
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;
+      await helpers.methods.toggleSponsoring(flipper.options.address, true).send({from: owner});
       await waitNewBlocks(api, 1);
-      expect(await helpers.methods.sponsoringEnabled(fungible.options.address).call()).to.be.false;
+      await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});
       await waitNewBlocks(api, 1);
-      await helpers.methods.toggleSponsoring(fungible.options.address, true).send({from: owner});
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;
+
+      await transferBalanceToEth(api, alice, flipper.options.address);
+      await waitNewBlocks(api, 2);
+
+      const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);
+      expect(originalFlipperBalance).to.be.not.equal('0');
+
+      await flipper.methods.flip().send({ from: caller });
       await waitNewBlocks(api, 1);
-      expect(await helpers.methods.sponsoringEnabled(fungible.options.address).call()).to.be.true;
+      expect(await flipper.methods.getValue().call()).to.be.true;
 
-//      await fungible.methods.approve(owner, 50).send({ from: owner });
-      await fungible.methods.transferFrom(notOwner, owner, 50).send({ from: notOwner });
-      const balanceAfter = await web3.eth.getBalance(fungible.options.address);
-      expect(+balanceAfter).to.lessThan(+balanceBefore);
+      expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);
     });
   });
 
+  itWeb3('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({api, web3}) => {
+    await usingWeb3Http(async web3Http => {
+      const alice = privateKey('//Alice');
+
+      const owner = await createEthAccountWithBalance(api, web3Http);
+      const caller = await createEthAccountWithBalance(api, web3Http);
+      const originalCallerBalance = await web3.eth.getBalance(caller);
+
+      const flipper = await deployFlipper(web3Http, owner);
+      await waitNewBlocks(api, 1);
+      
+      const helpers = contractHelpers(web3Http, owner);
+      await helpers.methods.toggleAllowlist(flipper.options.address, true).send({ from: owner });
+      await waitNewBlocks(api, 1);
+      await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({ from: owner });
+      await waitNewBlocks(api, 1);
+
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;
+      await helpers.methods.toggleSponsoring(flipper.options.address, true).send({from: owner});
+      await waitNewBlocks(api, 1);
+      await helpers.methods.setSponsoringRateLimit(flipper.options.address, 10).send({from: owner});
+      await waitNewBlocks(api, 1);
+      expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;
+
+      await transferBalanceToEth(api, alice, flipper.options.address);
+      await waitNewBlocks(api, 2);
+
+      const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);
+      expect(originalFlipperBalance).to.be.not.equal('0');
+
+      await flipper.methods.flip().send({ from: caller });
+      await waitNewBlocks(api, 1);
+      expect(await flipper.methods.getValue().call()).to.be.true;
+      expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);
+
+      await flipper.methods.flip().send({ from: caller });
+      await waitNewBlocks(api, 1);
+      expect(await web3.eth.getBalance(caller)).to.be.not.equals(originalCallerBalance);
+    });
+  });
 });
deletedtests/src/eth/util/ERC721.soldiffbeforeafterboth
--- a/tests/src/eth/util/ERC721.sol
+++ /dev/null
@@ -1,159 +0,0 @@
-contract ERC721 {
-    uint8 _dummy = 0;
-    address _dummy_addr = 0x0000000000000000000000000000000000000000;
-    string _dummy_string = "";
-    string stub_error =
-        "this contract does not exists, code for collections is implemented at pallet side";
-
-    event Transfer(
-        address indexed from,
-        address indexed to,
-        uint256 indexed tokenId
-    );
-
-    event Approval(
-        address indexed owner,
-        address indexed approved,
-        uint256 indexed tokenId
-    );
-
-    event ApprovalForAll(
-        address indexed owner,
-        address indexed operator,
-        bool approved
-    );
-
-	// 0x18160ddd
-    function totalSupply() external view returns (uint256) {
-        require(false, stub_error);
-        return 0;
-    }
-
-    function name() external view returns (string memory res_name) {
-        require(false, stub_error);
-        res_name = _dummy_string;
-    }
-
-    function symbol() external view returns (string memory res_symbol) {
-        require(false, stub_error);
-        res_symbol = _dummy_string;
-    }
-
-    function tokenURI(uint256 tokenId) external view returns (string memory) {
-        require(false, stub_error);
-        tokenId;
-        return _dummy_string;
-    }
-
-    function tokenByIndex(uint256 index) external view returns (uint256) {
-        require(false, stub_error);
-        index;
-		return 0;
-    }
-
-    function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256) {
-        require(false, stub_error);
-		owner;
-		index;
-		return 0;
-    }
-
-    // 0x70a08231
-    function balanceOf(address owner) external view returns (uint256) {
-        require(false, stub_error);
-        owner;
-        return 0;
-    }
-
-    // 0x6352211e
-    function ownerOf(uint256 tokenId) external view returns (address) {
-        require(false, stub_error);
-        tokenId;
-        return _dummy_addr;
-    }
-
-    // 0xb88d4fde
-    function safeTransferFrom(
-        address from,
-        address to,
-        uint256 tokenId,
-        bytes calldata data
-    ) external payable {
-        require(false, stub_error);
-        from;
-        to;
-        tokenId;
-        data;
-    }
-
-    // 0x42842e0e
-    function safeTransferFrom(
-        address from,
-        address to,
-        uint256 tokenId
-    ) external payable {
-        require(false, stub_error);
-        from;
-        to;
-        tokenId;
-    }
-
-    // 0x23b872dd
-    function transferFrom(
-        address from,
-        address to,
-        uint256 tokenId
-    ) external payable {
-        require(false, stub_error);
-        from;
-        to;
-        tokenId;
-    }
-
-    // 0x095ea7b3
-    function approve(address approved, uint256 tokenId) external payable {
-        require(false, stub_error);
-        approved;
-        tokenId;
-    }
-
-    // 0xa22cb465
-    function setApprovalForAll(address operator, bool approved) external {
-        require(false, stub_error);
-        operator;
-        approved;
-        _dummy = 0;
-    }
-
-    // 0x081812fc
-    function getApproved(uint256 tokenId) external view returns (address) {
-        require(false, stub_error);
-        tokenId;
-        return _dummy_addr;
-    }
-
-    // 0xe985e9c5
-    function isApprovedForAll(address owner, address operator)
-        external
-        view
-        returns (bool)
-    {
-        require(false, stub_error);
-        owner;
-        operator;
-        return false;
-    }
-
-    // 0x01ffc9a7
-    function supportsInterface(bytes4 interfaceID) public pure returns (bool) {
-        return
-            // ERC721
-            interfaceID == 0x80ac58cd ||
-            // ERC721Metadata
-            interfaceID == 0x5b5e139f ||
-            // ERC721Enumerable
-            interfaceID == 0x780e9d63 ||
-            // ERC165
-            interfaceID == 0x01ffc9a7;
-    }
-}
modifiedtests/src/eth/util/helpers.tsdiffbeforeafterboth
17import config from '../../config';17import config from '../../config';
18import privateKey from '../../substrate/privateKey';18import privateKey from '../../substrate/privateKey';
19import contractHelpersAbi from './contractHelpersAbi.json';19import contractHelpersAbi from './contractHelpersAbi.json';
20import fs from 'fs';
2120
22export const GAS_ARGS = { gas: 0x1000000, gasPrice: '0x01' };21export const GAS_ARGS = { gas: 0x1000000, gasPrice: '0x01' };
2322
176 };175 };
177}176}
178177
179export async function deployFungibleContract(web3: Web3 & Web3HttpMarker, deployer: string) {178// export async function deployFungibleContract(web3: Web3 & Web3HttpMarker, deployer: string) {
180179
181 const sol = fs.readFileSync(__dirname + '/ERC721.sol').toString();180// const sol = fs.readFileSync(__dirname + '/ERC721.sol').toString();
182181
183 const compiled = compileContract('ERC721', sol);182// const compiled = compileContract('ERC721', sol);
184 const ERC721 = new web3.eth.Contract(compiled.abi, undefined, {183// const ERC721 = new web3.eth.Contract(compiled.abi, undefined, {
185 data: compiled.object,184// data: compiled.object,
186 from: deployer,185// from: deployer,
187 ...GAS_ARGS,186// ...GAS_ARGS,
188 });187// });
189 const fungible = await ERC721.deploy({ data: compiled.object }).send({from: deployer});188// const fungible = await ERC721.deploy({ data: compiled.object }).send({from: deployer});
190189
191 return fungible;190// return fungible;
192}191// }
193192
194export async function deployFlipper(web3: Web3 & Web3HttpMarker, deployer: string) {193export async function deployFlipper(web3: Web3 & Web3HttpMarker, deployer: string) {
195 const compiled = compileContract('Flipper', `194 const compiled = compileContract('Flipper', `