git.delta.rocks / unique-network / refs/commits / 171847de27f4

difftreelog

regenerate solidity&fix test

PraetorP2022-11-15parent: #b30d78a.patch.diff
in: master

6 files changed

modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -738,14 +738,19 @@
 		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
-	
+
 	/// @notice Transfer ownership of an NFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
 	///  is the zero address. Throws if `tokenId` is not a valid NFT.
 	/// @param to The new owner
 	/// @param tokenId The NFT to transfer
 	#[weight(<SelfWeightOf<T>>::transfer())]
-	fn transfer_cross(&mut self, caller: caller, to: EthCrossAccount, token_id: uint256) -> Result<void> {
+	fn transfer_cross(
+		&mut self,
+		caller: caller,
+		to: EthCrossAccount,
+		token_id: uint256,
+	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = to.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
@@ -756,7 +761,7 @@
 		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
-	
+
 	/// @notice Transfer ownership of an NFT from cross account address to cross account address
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
 	///  is the zero address. Throws if `tokenId` is not a valid NFT.
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -756,7 +756,12 @@
 	/// @param to The new owner
 	/// @param tokenId The RFT to transfer
 	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
-	fn transfer_cross(&mut self, caller: caller, to: EthCrossAccount, token_id: uint256) -> Result<void> {
+	fn transfer_cross(
+		&mut self,
+		caller: caller,
+		to: EthCrossAccount,
+		token_id: uint256,
+	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = to.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedtests/src/eth/base.test.tsdiffbeforeafterboth
before · tests/src/eth/base.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 {EthUniqueHelper, itEth, usingEthPlaygrounds, expect} from './util';192021describe('Contract calls', () => {22  let donor: IKeyringPair;2324  before(async function () {25    await usingEthPlaygrounds(async (_helper, privateKey) => {26      donor = await privateKey({filename: __filename});27    });28  });2930  itEth('Call of simple contract fee is less than 0.2 UNQ', async ({helper}) => {31    const deployer = await helper.eth.createAccountWithBalance(donor);32    const flipper = await helper.eth.deployFlipper(deployer);3334    const cost = await helper.eth.calculateFee({Ethereum: deployer}, () => flipper.methods.flip().send({from: deployer}));35    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal()))).to.be.true;36  });3738  itEth('Balance transfer fee is less than 0.2 UNQ', async ({helper}) => {39    const userA = await helper.eth.createAccountWithBalance(donor);40    const userB = helper.eth.createAccount();41    const cost = await helper.eth.calculateFee({Ethereum: userA}, () => helper.getWeb3().eth.sendTransaction({42      from: userA,43      to: userB,44      value: '1000000',45      gas: helper.eth.DEFAULT_GAS,46    }));47    const balanceB = await helper.balance.getEthereum(userB);48    expect(cost - balanceB < BigInt(0.2 * Number(helper.balance.getOneTokenNominal()))).to.be.true;49  });5051  itEth('NFT transfer is close to 0.15 UNQ', async ({helper}) => {52    const caller = await helper.eth.createAccountWithBalance(donor);53    const receiver = helper.eth.createAccount();5455    const [alice] = await helper.arrange.createAccounts([10n], donor);56    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});57    const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});5859    const address = helper.ethAddress.fromCollectionId(collection.collectionId);60    const contract = helper.ethNativeContract.collection(address, 'nft', caller);6162    const cost = await helper.eth.calculateFee({Ethereum: caller}, () => contract.methods.transfer(receiver, tokenId).send(caller));6364    const fee = Number(cost) / Number(helper.balance.getOneTokenNominal());65    const expectedFee = 0.15;66    const tolerance = 0.001;6768    expect(Math.abs(fee - expectedFee)).to.be.lessThan(tolerance);69  });70});7172describe('ERC165 tests', () => {73  // https://eips.ethereum.org/EIPS/eip-1657475  let erc721MetadataCompatibleNftCollectionId: number;76  let simpleNftCollectionId: number;77  let minter: string;7879  const BASE_URI = 'base/';8081  async function checkInterface(helper: EthUniqueHelper, interfaceId: string, simpleResult: boolean, compatibleResult: boolean) {82    const simple = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(simpleNftCollectionId), 'nft', minter);83    const compatible = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(erc721MetadataCompatibleNftCollectionId), 'nft', minter);8485    expect(await simple.methods.supportsInterface(interfaceId).call()).to.equal(simpleResult, `empty (not ERC721Metadata compatible) NFT collection returns not ${simpleResult}`);86    expect(await compatible.methods.supportsInterface(interfaceId).call()).to.equal(compatibleResult, `ERC721Metadata compatible NFT collection returns not ${compatibleResult}`);87  }8889  before(async () => {90    await usingEthPlaygrounds(async (helper, privateKey) => {91      const donor = await privateKey({filename: __filename});92      const [alice] = await helper.arrange.createAccounts([10n], donor);93      ({collectionId: simpleNftCollectionId} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'}));94      minter = await helper.eth.createAccountWithBalance(donor);95      ({collectionId: erc721MetadataCompatibleNftCollectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(minter, 'n', 'd', 'p', BASE_URI));96    });97  });9899  itEth('nonexistent interfaceID - 0xffffffff - always false', async ({helper}) => {100    await checkInterface(helper, '0xffffffff', false, false);101  });102103  itEth('ERC721 - 0x780e9d63 - support', async ({helper}) => {104    await checkInterface(helper, '0x780e9d63', true, true);105  });106107  itEth('ERC721Metadata - 0x5b5e139f - support', async ({helper}) => {108    await checkInterface(helper, '0x5b5e139f', false, true);109  });110111  itEth('ERC721UniqueMintable - 0x476ff149 - support', async ({helper}) => {112    await checkInterface(helper, '0x476ff149', true, true);113  });114115  itEth('ERC721Enumerable - 0x780e9d63 - support', async ({helper}) => {116    await checkInterface(helper, '0x780e9d63', true, true);117  });118119  itEth('ERC721UniqueExtensions support', async ({helper}) => {120    await checkInterface(helper, '0x244543ee', true, true);121  });122123  itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => {124    await checkInterface(helper, '0x42966c68', true, true);125  });126127  itEth('ERC165 - 0x01ffc9a7 - support', async ({helper}) => {128    await checkInterface(helper, '0x01ffc9a7', true, true);129  });130});
after · tests/src/eth/base.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 {EthUniqueHelper, itEth, usingEthPlaygrounds, expect} from './util';192021describe('Contract calls', () => {22  let donor: IKeyringPair;2324  before(async function () {25    await usingEthPlaygrounds(async (_helper, privateKey) => {26      donor = await privateKey({filename: __filename});27    });28  });2930  itEth('Call of simple contract fee is less than 0.2 UNQ', async ({helper}) => {31    const deployer = await helper.eth.createAccountWithBalance(donor);32    const flipper = await helper.eth.deployFlipper(deployer);3334    const cost = await helper.eth.calculateFee({Ethereum: deployer}, () => flipper.methods.flip().send({from: deployer}));35    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal()))).to.be.true;36  });3738  itEth('Balance transfer fee is less than 0.2 UNQ', async ({helper}) => {39    const userA = await helper.eth.createAccountWithBalance(donor);40    const userB = helper.eth.createAccount();41    const cost = await helper.eth.calculateFee({Ethereum: userA}, () => helper.getWeb3().eth.sendTransaction({42      from: userA,43      to: userB,44      value: '1000000',45      gas: helper.eth.DEFAULT_GAS,46    }));47    const balanceB = await helper.balance.getEthereum(userB);48    expect(cost - balanceB < BigInt(0.2 * Number(helper.balance.getOneTokenNominal()))).to.be.true;49  });5051  itEth('NFT transfer is close to 0.15 UNQ', async ({helper}) => {52    const caller = await helper.eth.createAccountWithBalance(donor);53    const receiver = helper.eth.createAccount();5455    const [alice] = await helper.arrange.createAccounts([10n], donor);56    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});57    const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});5859    const address = helper.ethAddress.fromCollectionId(collection.collectionId);60    const contract = helper.ethNativeContract.collection(address, 'nft', caller);6162    const cost = await helper.eth.calculateFee({Ethereum: caller}, () => contract.methods.transfer(receiver, tokenId).send(caller));6364    const fee = Number(cost) / Number(helper.balance.getOneTokenNominal());65    const expectedFee = 0.15;66    const tolerance = 0.001;6768    expect(Math.abs(fee - expectedFee)).to.be.lessThan(tolerance);69  });70});7172describe('ERC165 tests', () => {73  // https://eips.ethereum.org/EIPS/eip-1657475  let erc721MetadataCompatibleNftCollectionId: number;76  let simpleNftCollectionId: number;77  let minter: string;7879  const BASE_URI = 'base/';8081  async function checkInterface(helper: EthUniqueHelper, interfaceId: string, simpleResult: boolean, compatibleResult: boolean) {82    const simple = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(simpleNftCollectionId), 'nft', minter);83    const compatible = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(erc721MetadataCompatibleNftCollectionId), 'nft', minter);8485    expect(await simple.methods.supportsInterface(interfaceId).call()).to.equal(simpleResult, `empty (not ERC721Metadata compatible) NFT collection returns not ${simpleResult}`);86    expect(await compatible.methods.supportsInterface(interfaceId).call()).to.equal(compatibleResult, `ERC721Metadata compatible NFT collection returns not ${compatibleResult}`);87  }8889  before(async () => {90    await usingEthPlaygrounds(async (helper, privateKey) => {91      const donor = await privateKey({filename: __filename});92      const [alice] = await helper.arrange.createAccounts([10n], donor);93      ({collectionId: simpleNftCollectionId} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'}));94      minter = await helper.eth.createAccountWithBalance(donor);95      ({collectionId: erc721MetadataCompatibleNftCollectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(minter, 'n', 'd', 'p', BASE_URI));96    });97  });9899  itEth('nonexistent interfaceID - 0xffffffff - always false', async ({helper}) => {100    await checkInterface(helper, '0xffffffff', false, false);101  });102103  itEth('ERC721 - 0x780e9d63 - support', async ({helper}) => {104    await checkInterface(helper, '0x780e9d63', true, true);105  });106107  itEth('ERC721Metadata - 0x5b5e139f - support', async ({helper}) => {108    await checkInterface(helper, '0x5b5e139f', false, true);109  });110111  itEth('ERC721UniqueMintable - 0x476ff149 - support', async ({helper}) => {112    await checkInterface(helper, '0x476ff149', true, true);113  });114115  itEth('ERC721Enumerable - 0x780e9d63 - support', async ({helper}) => {116    await checkInterface(helper, '0x780e9d63', true, true);117  });118119  itEth('ERC721UniqueExtensions support', async ({helper}) => {120    await checkInterface(helper, '0x0e9fc611', true, true);121  });122123  itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => {124    await checkInterface(helper, '0x42966c68', true, true);125  });126127  itEth('ERC165 - 0x01ffc9a7 - support', async ({helper}) => {128    await checkInterface(helper, '0x01ffc9a7', true, true);129  });130});