difftreelog
feature/mint-for-fungible-token
in: master
5 files changed
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -129,7 +129,23 @@
}
}
-#[solidity_interface(name = ERC20UniqueExtensions)]
+#[solidity_interface(name = "ERC20Mintable")]
+impl<T: Config> FungibleHandle<T> {
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let to = T::CrossAccountId::from_eth(to);
+ let amount = amount.try_into().map_err(|_| "amount overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+ <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)
+ .map_err(dispatch_to_evm::<T>)?;
+ Ok(true)
+ }
+}
+
+#[solidity_interface(name = "ERC20UniqueExtensions")]
impl<T: Config> FungibleHandle<T> {
#[weight(<SelfWeightOf<T>>::burn_from())]
fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
@@ -144,12 +160,29 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
+
+ #[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]
+ fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+ let amounts = amounts
+ .into_iter()
+ .map(|(to, amount)| Ok((T::CrossAccountId::from_eth(to), amount.try_into().map_err(|_| "amount overflow")?)))
+ .collect::<Result<_>>()?;
+
+ <Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)
+ .map_err(dispatch_to_evm::<T>)?;
+ Ok(true)
+ }
}
#[solidity_interface(
name = UniqueFungible,
is(
ERC20,
+ ERC20Mintable,
ERC20UniqueExtensions,
Collection(common_mut, CollectionHandle<T>),
)
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -3,7 +3,13 @@
pragma solidity >=0.8.0 <0.9.0;
-/// @dev common stubs holder
+// Anonymous struct
+struct Tuple0 {
+ address field_0;
+ uint256 field_1;
+}
+
+// Common stubs holder
contract Dummy {
uint8 dummy;
string stub_error = "this contract is implemented in native";
@@ -21,8 +27,49 @@
}
}
-/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xe54be640
+// Inline
+contract ERC20Events {
+ event Transfer(address indexed from, address indexed to, uint256 value);
+ event Approval(
+ address indexed owner,
+ address indexed spender,
+ uint256 value
+ );
+}
+
+// Selector: 40c10f19
+contract ERC20Mintable is Dummy, ERC165 {
+ // Selector: mint(address,uint256) 40c10f19
+ function mint(address to, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+}
+
+// Selector: 63034ac5
+contract ERC20UniqueExtensions is Dummy, ERC165 {
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ from;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: mintBulk((address,uint256)[]) 1acf2d55
+ function mintBulk(Tuple0[] memory amounts) public returns (bool) {
+ require(false, stub_error);
+ amounts;
+ dummy = 0;
+ return false;
+ }
+}
+
+// Selector: 6cf113cd
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -476,6 +523,7 @@
Dummy,
ERC165,
ERC20,
+ ERC20Mintable,
ERC20UniqueExtensions,
Collection
{}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0xe54be64017interface Collection is Dummy, ERC165 {18 /// Set collection property.19 ///20 /// @param key Property key.21 /// @param value Propery value.22 /// @dev EVM selector for this function is: 0x2f073f66,23 /// or in textual repr: setCollectionProperty(string,bytes)24 function setCollectionProperty(string memory key, bytes memory value)25 external;2627 /// Delete collection property.28 ///29 /// @param key Property key.30 /// @dev EVM selector for this function is: 0x7b7debce,31 /// or in textual repr: deleteCollectionProperty(string)32 function deleteCollectionProperty(string memory key) external;3334 /// Get collection property.35 ///36 /// @dev Throws error if key not found.37 ///38 /// @param key Property key.39 /// @return bytes The property corresponding to the key.40 /// @dev EVM selector for this function is: 0xcf24fd6d,41 /// or in textual repr: collectionProperty(string)42 function collectionProperty(string memory key)43 external44 view45 returns (bytes memory);4647 /// Set the sponsor of the collection.48 ///49 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.50 ///51 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.52 /// @dev EVM selector for this function is: 0x7623402e,53 /// or in textual repr: setCollectionSponsor(address)54 function setCollectionSponsor(address sponsor) external;5556 /// Set the substrate sponsor of the collection.57 ///58 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.59 ///60 /// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.61 /// @dev EVM selector for this function is: 0xc74d6751,62 /// or in textual repr: setCollectionSponsorSubstrate(uint256)63 function setCollectionSponsorSubstrate(uint256 sponsor) external;6465 /// @dev EVM selector for this function is: 0x058ac185,66 /// or in textual repr: hasCollectionPendingSponsor()67 function hasCollectionPendingSponsor() external view returns (bool);6869 /// Collection sponsorship confirmation.70 ///71 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.72 /// @dev EVM selector for this function is: 0x3c50e97a,73 /// or in textual repr: confirmCollectionSponsorship()74 function confirmCollectionSponsorship() external;7576 /// Remove collection sponsor.77 /// @dev EVM selector for this function is: 0x6e0326a3,78 /// or in textual repr: removeCollectionSponsor()79 function removeCollectionSponsor() external;8081 /// Get current sponsor.82 ///83 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.84 /// @dev EVM selector for this function is: 0xb66bbc14,85 /// or in textual repr: getCollectionSponsor()86 function getCollectionSponsor() external view returns (Tuple6 memory);8788 /// Set limits for the collection.89 /// @dev Throws error if limit not found.90 /// @param limit Name of the limit. Valid names:91 /// "accountTokenOwnershipLimit",92 /// "sponsoredDataSize",93 /// "sponsoredDataRateLimit",94 /// "tokenLimit",95 /// "sponsorTransferTimeout",96 /// "sponsorApproveTimeout"97 /// @param value Value of the limit.98 /// @dev EVM selector for this function is: 0x6a3841db,99 /// or in textual repr: setCollectionLimit(string,uint32)100 function setCollectionLimit(string memory limit, uint32 value) external;101102 /// Set limits for the collection.103 /// @dev Throws error if limit not found.104 /// @param limit Name of the limit. Valid names:105 /// "ownerCanTransfer",106 /// "ownerCanDestroy",107 /// "transfersEnabled"108 /// @param value Value of the limit.109 /// @dev EVM selector for this function is: 0x993b7fba,110 /// or in textual repr: setCollectionLimit(string,bool)111 function setCollectionLimit(string memory limit, bool value) external;112113 /// Get contract address.114 /// @dev EVM selector for this function is: 0xf6b4dfb4,115 /// or in textual repr: contractAddress()116 function contractAddress() external view returns (address);117118 /// Add collection admin by substrate address.119 /// @param newAdmin Substrate administrator address.120 /// @dev EVM selector for this function is: 0x5730062b,121 /// or in textual repr: addCollectionAdminSubstrate(uint256)122 function addCollectionAdminSubstrate(uint256 newAdmin) external;123124 /// Remove collection admin by substrate address.125 /// @param admin Substrate administrator address.126 /// @dev EVM selector for this function is: 0x4048fcf9,127 /// or in textual repr: removeCollectionAdminSubstrate(uint256)128 function removeCollectionAdminSubstrate(uint256 admin) external;129130 /// Add collection admin.131 /// @param newAdmin Address of the added administrator.132 /// @dev EVM selector for this function is: 0x92e462c7,133 /// or in textual repr: addCollectionAdmin(address)134 function addCollectionAdmin(address newAdmin) external;135136 /// Remove collection admin.137 ///138 /// @param admin Address of the removed administrator.139 /// @dev EVM selector for this function is: 0xfafd7b42,140 /// or in textual repr: removeCollectionAdmin(address)141 function removeCollectionAdmin(address admin) external;142143 /// Toggle accessibility of collection nesting.144 ///145 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'146 /// @dev EVM selector for this function is: 0x112d4586,147 /// or in textual repr: setCollectionNesting(bool)148 function setCollectionNesting(bool enable) external;149150 /// Toggle accessibility of collection nesting.151 ///152 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'153 /// @param collections Addresses of collections that will be available for nesting.154 /// @dev EVM selector for this function is: 0x64872396,155 /// or in textual repr: setCollectionNesting(bool,address[])156 function setCollectionNesting(bool enable, address[] memory collections)157 external;158159 /// Set the collection access method.160 /// @param mode Access mode161 /// 0 for Normal162 /// 1 for AllowList163 /// @dev EVM selector for this function is: 0x41835d4c,164 /// or in textual repr: setCollectionAccess(uint8)165 function setCollectionAccess(uint8 mode) external;166167 /// Add the user to the allowed list.168 ///169 /// @param user Address of a trusted user.170 /// @dev EVM selector for this function is: 0x67844fe6,171 /// or in textual repr: addToCollectionAllowList(address)172 function addToCollectionAllowList(address user) external;173174 /// Remove the user from the allowed list.175 ///176 /// @param user Address of a removed user.177 /// @dev EVM selector for this function is: 0x85c51acb,178 /// or in textual repr: removeFromCollectionAllowList(address)179 function removeFromCollectionAllowList(address user) external;180181 /// Switch permission for minting.182 ///183 /// @param mode Enable if "true".184 /// @dev EVM selector for this function is: 0x00018e84,185 /// or in textual repr: setCollectionMintMode(bool)186 function setCollectionMintMode(bool mode) external;187188 /// Check that account is the owner or admin of the collection189 ///190 /// @param user account to verify191 /// @return "true" if account is the owner or admin192 /// @dev EVM selector for this function is: 0x9811b0c7,193 /// or in textual repr: isOwnerOrAdmin(address)194 function isOwnerOrAdmin(address user) external view returns (bool);195196 /// Check that substrate account is the owner or admin of the collection197 ///198 /// @param user account to verify199 /// @return "true" if account is the owner or admin200 /// @dev EVM selector for this function is: 0x68910e00,201 /// or in textual repr: isOwnerOrAdminSubstrate(uint256)202 function isOwnerOrAdminSubstrate(uint256 user) external view returns (bool);203204 /// Returns collection type205 ///206 /// @return `Fungible` or `NFT` or `ReFungible`207 /// @dev EVM selector for this function is: 0xd34b55b8,208 /// or in textual repr: uniqueCollectionType()209 function uniqueCollectionType() external returns (string memory);210211 /// Changes collection owner to another account212 ///213 /// @dev Owner can be changed only by current owner214 /// @param newOwner new owner account215 /// @dev EVM selector for this function is: 0x13af4035,216 /// or in textual repr: setOwner(address)217 function setOwner(address newOwner) external;218219 /// Changes collection owner to another substrate account220 ///221 /// @dev Owner can be changed only by current owner222 /// @param newOwner new owner substrate account223 /// @dev EVM selector for this function is: 0xb212138f,224 /// or in textual repr: setOwnerSubstrate(uint256)225 function setOwnerSubstrate(uint256 newOwner) external;226}227228/// @dev anonymous struct229struct Tuple6 {230 address field_0;231 uint256 field_1;232}233234/// @dev the ERC-165 identifier for this interface is 0x79cc6790235interface ERC20UniqueExtensions is Dummy, ERC165 {236 /// @dev EVM selector for this function is: 0x79cc6790,237 /// or in textual repr: burnFrom(address,uint256)238 function burnFrom(address from, uint256 amount) external returns (bool);239}240241/// @dev inlined interface242interface ERC20Events {243 event Transfer(address indexed from, address indexed to, uint256 value);244 event Approval(245 address indexed owner,246 address indexed spender,247 uint256 value248 );249}250251/// @dev the ERC-165 identifier for this interface is 0x942e8b22252interface ERC20 is Dummy, ERC165, ERC20Events {253 /// @dev EVM selector for this function is: 0x06fdde03,254 /// or in textual repr: name()255 function name() external view returns (string memory);256257 /// @dev EVM selector for this function is: 0x95d89b41,258 /// or in textual repr: symbol()259 function symbol() external view returns (string memory);260261 /// @dev EVM selector for this function is: 0x18160ddd,262 /// or in textual repr: totalSupply()263 function totalSupply() external view returns (uint256);264265 /// @dev EVM selector for this function is: 0x313ce567,266 /// or in textual repr: decimals()267 function decimals() external view returns (uint8);268269 /// @dev EVM selector for this function is: 0x70a08231,270 /// or in textual repr: balanceOf(address)271 function balanceOf(address owner) external view returns (uint256);272273 /// @dev EVM selector for this function is: 0xa9059cbb,274 /// or in textual repr: transfer(address,uint256)275 function transfer(address to, uint256 amount) external returns (bool);276277 /// @dev EVM selector for this function is: 0x23b872dd,278 /// or in textual repr: transferFrom(address,address,uint256)279 function transferFrom(280 address from,281 address to,282 uint256 amount283 ) external returns (bool);284285 /// @dev EVM selector for this function is: 0x095ea7b3,286 /// or in textual repr: approve(address,uint256)287 function approve(address spender, uint256 amount) external returns (bool);288289 /// @dev EVM selector for this function is: 0xdd62ed3e,290 /// or in textual repr: allowance(address,address)291 function allowance(address owner, address spender)292 external293 view294 returns (uint256);295}296297interface UniqueFungible is298 Dummy,299 ERC165,300 ERC20,301 ERC20UniqueExtensions,302 Collection303{}tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-import {approveExpectSuccess, createCollectionExpectSuccess, createFungibleItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE} from '../util/helpers';
-import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';
+import {approveExpectSuccess, createCollection, createCollectionExpectSuccess, createFungibleItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE} from '../util/helpers';
+import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, evmCollection, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';
import fungibleAbi from './fungibleAbi.json';
import {expect} from 'chai';
+import {submitTransactionAsync} from '../substrate/substrate-api';
describe('Fungible: Information getting', () => {
itWeb3('totalSupply', async ({api, web3, privateKeyWrapper}) => {
@@ -58,6 +59,129 @@
});
describe('Fungible: Plain calls', () => {
+ itWeb3('Can perform mint()', async ({web3, api, privateKeyWrapper}) => {
+ const alice = privateKeyWrapper('//Alice');
+ const collection = await createCollection(api, alice, {
+ name: 'token name',
+ mode: {type: 'Fungible', decimalPoints: 0},
+ });
+
+ const receiver = createEthAccount(web3);
+
+ const collectionIdAddress = collectionIdToAddress(collection.collectionId);
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const changeAdminTx = api.tx.unique.addCollectionAdmin(collection.collectionId, {Ethereum: owner});
+ await submitTransactionAsync(alice, changeAdminTx);
+
+ const collectionContract = evmCollection(web3, owner, collectionIdAddress, {type: 'Fungible', decimalPoints: 0});
+ const result = await collectionContract.methods.mint(receiver, 100).send();
+ const events = normalizeEvents(result.events);
+
+ expect(events).to.be.deep.equal([
+ {
+ address: collectionIdAddress,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver,
+ value: '100',
+ },
+ },
+ ]);
+ });
+
+ itWeb3('Can perform mintBulk()', async ({web3, api, privateKeyWrapper}) => {
+ const alice = privateKeyWrapper('//Alice');
+ const collection = await createCollection(api, alice, {
+ name: 'token name',
+ mode: {type: 'Fungible', decimalPoints: 0},
+ });
+
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const receiver1 = createEthAccount(web3);
+ const receiver2 = createEthAccount(web3);
+ const receiver3 = createEthAccount(web3);
+
+ const collectionIdAddress = collectionIdToAddress(collection.collectionId);
+ const changeAdminTx = api.tx.unique.addCollectionAdmin(collection.collectionId, {Ethereum: owner});
+ await submitTransactionAsync(alice, changeAdminTx);
+
+ const collectionContract = evmCollection(web3, owner, collectionIdAddress, {type: 'Fungible', decimalPoints: 0});
+ const result = await collectionContract.methods.mintBulk([
+ [receiver1, 10],
+ [receiver2, 20],
+ [receiver3, 30],
+ ]).call();
+ console.log(result);
+ const events = normalizeEvents(result.events);
+
+ expect(events).to.be.deep.equal([
+ {
+ address:collectionIdAddress,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver1,
+ value: '10',
+ },
+ },
+ {
+ address:collectionIdAddress,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver2,
+ value: '20',
+ },
+ },
+ {
+ address:collectionIdAddress,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver3,
+ value: '30',
+ },
+ },
+ ]);
+ });
+
+ itWeb3('Can perform burn()', async ({web3, api, privateKeyWrapper}) => {
+ const alice = privateKeyWrapper('//Alice');
+ const collection = await createCollection(api, alice, {
+ name: 'token name',
+ mode: {type: 'Fungible', decimalPoints: 0},
+ });
+
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+ const changeAdminTx = api.tx.unique.addCollectionAdmin(collection.collectionId, {Ethereum: owner});
+ await submitTransactionAsync(alice, changeAdminTx);
+ const receiver = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+
+ const collectionIdAddress = collectionIdToAddress(collection.collectionId);
+ const collectionContract = evmCollection(web3, owner, collectionIdAddress, {type: 'Fungible', decimalPoints: 0});
+ await collectionContract.methods.mint(receiver, 100).send();
+
+ const result = await collectionContract.methods.burnFrom(receiver, 49).send({from: receiver});
+
+ const events = normalizeEvents(result.events);
+
+ expect(events).to.be.deep.equal([
+ {
+ address: collectionIdAddress,
+ event: 'Transfer',
+ args: {
+ from: receiver,
+ to: '0x0000000000000000000000000000000000000000',
+ value: '49',
+ },
+ },
+ ]);
+
+ const balance = await collectionContract.methods.balanceOf(receiver).call();
+ expect(balance).to.equal('51');
+ });
+
itWeb3('Can perform approve()', async ({web3, api, privateKeyWrapper}) => {
const collection = await createCollectionExpectSuccess({
name: 'token name',
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -151,6 +151,33 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "address", "name": "to", "type": "address" },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "mint",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "field_0", "type": "address" },
+ { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ ],
+ "internalType": "struct Tuple0[]",
+ "name": "amounts",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintBulk",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "getCollectionSponsor",
"outputs": [