difftreelog
added `mintCross` function for `UniqueExtensoins` interfaces
in: master
20 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6085,7 +6085,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.9] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC20UniqueExtensions` interface.
+
## [0.1.8] - 2022-11-18
### Added
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -174,6 +174,19 @@
.collect::<string>())
}
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(&mut self, caller: caller, to: EthCrossAccount, amount: uint256) -> Result<bool> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let to = to.into_sub_cross_account::<T>()?;
+ 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)
+ }
+
#[weight(<SelfWeightOf<T>>::approve())]
fn approve_cross(
&mut self,
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -152,10 +152,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple8 memory) {
+ function collectionSponsor() public view returns (Tuple9 memory) {
require(false, stub_error);
dummy;
- return Tuple8(0x0000000000000000000000000000000000000000, 0);
+ return Tuple9(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -522,7 +522,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
@@ -533,6 +533,16 @@
return "";
}
+ /// @dev EVM selector for this function is: 0x269e6158,
+ /// or in textual repr: mintCross((address,uint256),uint256)
+ function mintCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
@@ -577,7 +587,7 @@
/// @param amounts array of pairs of account address and amount
/// @dev EVM selector for this function is: 0x1acf2d55,
/// or in textual repr: mintBulk((address,uint256)[])
- function mintBulk(Tuple8[] memory amounts) public returns (bool) {
+ function mintBulk(Tuple9[] memory amounts) public returns (bool) {
require(false, stub_error);
amounts;
dummy = 0;
@@ -611,7 +621,7 @@
}
/// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
address field_0;
uint256 field_1;
}
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.1.11] - 2022-12-16
+## [0.1.12] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.1.11] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.1.10] - 2022-11-18
### Added
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -1069,6 +1069,58 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
+
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: EthCrossAccount,
+ properties: Vec<PropertyStruct>,
+ ) -> Result<uint256> {
+ let token_id = <TokensMinted<T>>::get(self.id)
+ .checked_add(1)
+ .ok_or("item id overflow")?;
+
+ let to = to.into_sub_cross_account::<T>()?;
+
+ let properties = properties
+ .into_iter()
+ .map(|PropertyStruct { key, value }| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?
+ .try_into()
+ .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+ let caller = T::CrossAccountId::from_eth(caller);
+
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ <Pallet<T>>::create_item(
+ self,
+ &caller,
+ CreateItemData::<T> {
+ properties,
+ owner: to,
+ },
+ &budget,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(token_id.into())
+ }
}
#[solidity_interface(
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -290,10 +290,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple30 memory) {
+ function collectionSponsor() public view returns (Tuple32 memory) {
require(false, stub_error);
dummy;
- return Tuple30(0x0000000000000000000000000000000000000000, 0);
+ return Tuple32(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -655,7 +655,7 @@
}
/// @dev anonymous struct
-struct Tuple30 {
+struct Tuple32 {
address field_0;
uint256 field_1;
}
@@ -804,7 +804,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -961,6 +961,7 @@
dummy;
return 0;
}
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -991,6 +992,19 @@
// return false;
// }
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
}
/// @dev anonymous struct
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.2.10] - 2022-12-16
+## [0.2.11] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.2.10] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.2.9] - 2022-11-18
### Added
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -1120,6 +1120,60 @@
Ok(true)
}
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: EthCrossAccount,
+ properties: Vec<PropertyStruct>,
+ ) -> Result<uint256> {
+ let token_id = <TokensMinted<T>>::get(self.id)
+ .checked_add(1)
+ .ok_or("item id overflow")?;
+
+ let to = to.into_sub_cross_account::<T>()?;
+
+ let properties = properties
+ .into_iter()
+ .map(|PropertyStruct { key, value }| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?
+ .try_into()
+ .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+ let caller = T::CrossAccountId::from_eth(caller);
+
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ let users = [(to, 1)]
+ .into_iter()
+ .collect::<BTreeMap<_, _>>()
+ .try_into()
+ .unwrap();
+ <Pallet<T>>::create_item(
+ self,
+ &caller,
+ CreateItemData::<T::CrossAccountId> { users, properties },
+ &budget,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(token_id.into())
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -290,10 +290,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple29 memory) {
+ function collectionSponsor() public view returns (Tuple31 memory) {
require(false, stub_error);
dummy;
- return Tuple29(0x0000000000000000000000000000000000000000, 0);
+ return Tuple31(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -655,7 +655,7 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple31 {
address field_0;
uint256 field_1;
}
@@ -802,7 +802,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -979,6 +979,20 @@
// return false;
// }
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -322,7 +322,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple8",
+ "internalType": "struct Tuple9",
"name": "",
"type": "tuple"
}
@@ -408,7 +408,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Tuple9[]",
"name": "amounts",
"type": "tuple[]"
}
@@ -419,6 +419,24 @@
"type": "function"
},
{
+ "inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -352,7 +352,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple30",
+ "internalType": "struct Tuple32",
"name": "",
"type": "tuple"
}
@@ -478,6 +478,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -334,7 +334,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple29",
+ "internalType": "struct Tuple31",
"name": "",
"type": "tuple"
}
@@ -460,6 +460,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
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 0x81172a7517interface 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) external;2526 /// Set collection properties.27 ///28 /// @param properties Vector of properties key/value pair.29 /// @dev EVM selector for this function is: 0x50b26b2a,30 /// or in textual repr: setCollectionProperties((string,bytes)[])31 function setCollectionProperties(Property[] memory properties) external;3233 // /// Delete collection property.34 // ///35 // /// @param key Property key.36 // /// @dev EVM selector for this function is: 0x7b7debce,37 // /// or in textual repr: deleteCollectionProperty(string)38 // function deleteCollectionProperty(string memory key) external;3940 /// Delete collection properties.41 ///42 /// @param keys Properties keys.43 /// @dev EVM selector for this function is: 0xee206ee3,44 /// or in textual repr: deleteCollectionProperties(string[])45 function deleteCollectionProperties(string[] memory keys) external;4647 /// Get collection property.48 ///49 /// @dev Throws error if key not found.50 ///51 /// @param key Property key.52 /// @return bytes The property corresponding to the key.53 /// @dev EVM selector for this function is: 0xcf24fd6d,54 /// or in textual repr: collectionProperty(string)55 function collectionProperty(string memory key) external view returns (bytes memory);5657 /// Get collection properties.58 ///59 /// @param keys Properties keys. Empty keys for all propertyes.60 /// @return Vector of properties key/value pairs.61 /// @dev EVM selector for this function is: 0x285fb8e6,62 /// or in textual repr: collectionProperties(string[])63 function collectionProperties(string[] memory keys) external view returns (Property[] memory);6465 // /// Set the sponsor of the collection.66 // ///67 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68 // ///69 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70 // /// @dev EVM selector for this function is: 0x7623402e,71 // /// or in textual repr: setCollectionSponsor(address)72 // function setCollectionSponsor(address sponsor) external;7374 /// Set the sponsor of the collection.75 ///76 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77 ///78 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79 /// @dev EVM selector for this function is: 0x84a1d5a8,80 /// or in textual repr: setCollectionSponsorCross((address,uint256))81 function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;8283 /// Whether there is a pending sponsor.84 /// @dev EVM selector for this function is: 0x058ac185,85 /// or in textual repr: hasCollectionPendingSponsor()86 function hasCollectionPendingSponsor() external view returns (bool);8788 /// Collection sponsorship confirmation.89 ///90 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.91 /// @dev EVM selector for this function is: 0x3c50e97a,92 /// or in textual repr: confirmCollectionSponsorship()93 function confirmCollectionSponsorship() external;9495 /// Remove collection sponsor.96 /// @dev EVM selector for this function is: 0x6e0326a3,97 /// or in textual repr: removeCollectionSponsor()98 function removeCollectionSponsor() external;99100 /// Get current sponsor.101 ///102 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103 /// @dev EVM selector for this function is: 0x6ec0a9f1,104 /// or in textual repr: collectionSponsor()105 function collectionSponsor() external view returns (Tuple8 memory);106107 /// Get current collection limits.108 ///109 /// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:110 /// "accountTokenOwnershipLimit",111 /// "sponsoredDataSize",112 /// "sponsoredDataRateLimit",113 /// "tokenLimit",114 /// "sponsorTransferTimeout",115 /// "sponsorApproveTimeout"116 /// "ownerCanTransfer",117 /// "ownerCanDestroy",118 /// "transfersEnabled"119 /// Return `false` if a limit not set.120 /// @dev EVM selector for this function is: 0xf63bc572,121 /// or in textual repr: collectionLimits()122 function collectionLimits() external view returns (Tuple19[] memory);123124 /// Set limits for the collection.125 /// @dev Throws error if limit not found.126 /// @param limit Name of the limit. Valid names:127 /// "accountTokenOwnershipLimit",128 /// "sponsoredDataSize",129 /// "sponsoredDataRateLimit",130 /// "tokenLimit",131 /// "sponsorTransferTimeout",132 /// "sponsorApproveTimeout"133 /// "ownerCanTransfer",134 /// "ownerCanDestroy",135 /// "transfersEnabled"136 /// @param status enable\disable limit. Works only with `true`.137 /// @param value Value of the limit.138 /// @dev EVM selector for this function is: 0x88150bd0,139 /// or in textual repr: setCollectionLimit(uint8,bool,uint256)140 function setCollectionLimit(141 CollectionLimits limit,142 bool status,143 uint256 value144 ) external;145146 /// Get contract address.147 /// @dev EVM selector for this function is: 0xf6b4dfb4,148 /// or in textual repr: contractAddress()149 function contractAddress() external view returns (address);150151 /// Add collection admin.152 /// @param newAdmin Cross account administrator address.153 /// @dev EVM selector for this function is: 0x859aa7d6,154 /// or in textual repr: addCollectionAdminCross((address,uint256))155 function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;156157 /// Remove collection admin.158 /// @param admin Cross account administrator address.159 /// @dev EVM selector for this function is: 0x6c0cd173,160 /// or in textual repr: removeCollectionAdminCross((address,uint256))161 function removeCollectionAdminCross(EthCrossAccount memory admin) external;162163 // /// Add collection admin.164 // /// @param newAdmin Address of the added administrator.165 // /// @dev EVM selector for this function is: 0x92e462c7,166 // /// or in textual repr: addCollectionAdmin(address)167 // function addCollectionAdmin(address newAdmin) external;168169 // /// Remove collection admin.170 // ///171 // /// @param admin Address of the removed administrator.172 // /// @dev EVM selector for this function is: 0xfafd7b42,173 // /// or in textual repr: removeCollectionAdmin(address)174 // function removeCollectionAdmin(address admin) external;175176 /// Toggle accessibility of collection nesting.177 ///178 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'179 /// @dev EVM selector for this function is: 0x112d4586,180 /// or in textual repr: setCollectionNesting(bool)181 function setCollectionNesting(bool enable) external;182183 /// Toggle accessibility of collection nesting.184 ///185 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'186 /// @param collections Addresses of collections that will be available for nesting.187 /// @dev EVM selector for this function is: 0x64872396,188 /// or in textual repr: setCollectionNesting(bool,address[])189 function setCollectionNesting(bool enable, address[] memory collections) external;190191 /// Returns nesting for a collection192 /// @dev EVM selector for this function is: 0x22d25bfe,193 /// or in textual repr: collectionNestingRestrictedCollectionIds()194 function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);195196 /// Returns permissions for a collection197 /// @dev EVM selector for this function is: 0x5b2eaf4b,198 /// or in textual repr: collectionNestingPermissions()199 function collectionNestingPermissions() external view returns (Tuple27[] memory);200201 /// Set the collection access method.202 /// @param mode Access mode203 /// 0 for Normal204 /// 1 for AllowList205 /// @dev EVM selector for this function is: 0x41835d4c,206 /// or in textual repr: setCollectionAccess(uint8)207 function setCollectionAccess(uint8 mode) external;208209 /// Checks that user allowed to operate with collection.210 ///211 /// @param user User address to check.212 /// @dev EVM selector for this function is: 0x91b6df49,213 /// or in textual repr: allowlistedCross((address,uint256))214 function allowlistedCross(EthCrossAccount memory user) external view returns (bool);215216 // /// Add the user to the allowed list.217 // ///218 // /// @param user Address of a trusted user.219 // /// @dev EVM selector for this function is: 0x67844fe6,220 // /// or in textual repr: addToCollectionAllowList(address)221 // function addToCollectionAllowList(address user) external;222223 /// Add user to allowed list.224 ///225 /// @param user User cross account address.226 /// @dev EVM selector for this function is: 0xa0184a3a,227 /// or in textual repr: addToCollectionAllowListCross((address,uint256))228 function addToCollectionAllowListCross(EthCrossAccount memory user) external;229230 // /// Remove the user from the allowed list.231 // ///232 // /// @param user Address of a removed user.233 // /// @dev EVM selector for this function is: 0x85c51acb,234 // /// or in textual repr: removeFromCollectionAllowList(address)235 // function removeFromCollectionAllowList(address user) external;236237 /// Remove user from allowed list.238 ///239 /// @param user User cross account address.240 /// @dev EVM selector for this function is: 0x09ba452a,241 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))242 function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;243244 /// Switch permission for minting.245 ///246 /// @param mode Enable if "true".247 /// @dev EVM selector for this function is: 0x00018e84,248 /// or in textual repr: setCollectionMintMode(bool)249 function setCollectionMintMode(bool mode) external;250251 // /// Check that account is the owner or admin of the collection252 // ///253 // /// @param user account to verify254 // /// @return "true" if account is the owner or admin255 // /// @dev EVM selector for this function is: 0x9811b0c7,256 // /// or in textual repr: isOwnerOrAdmin(address)257 // function isOwnerOrAdmin(address user) external view returns (bool);258259 /// Check that account is the owner or admin of the collection260 ///261 /// @param user User cross account to verify262 /// @return "true" if account is the owner or admin263 /// @dev EVM selector for this function is: 0x3e75a905,264 /// or in textual repr: isOwnerOrAdminCross((address,uint256))265 function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);266267 /// Returns collection type268 ///269 /// @return `Fungible` or `NFT` or `ReFungible`270 /// @dev EVM selector for this function is: 0xd34b55b8,271 /// or in textual repr: uniqueCollectionType()272 function uniqueCollectionType() external view returns (string memory);273274 /// Get collection owner.275 ///276 /// @return Tuble with sponsor address and his substrate mirror.277 /// If address is canonical then substrate mirror is zero and vice versa.278 /// @dev EVM selector for this function is: 0xdf727d3b,279 /// or in textual repr: collectionOwner()280 function collectionOwner() external view returns (EthCrossAccount memory);281282 // /// Changes collection owner to another account283 // ///284 // /// @dev Owner can be changed only by current owner285 // /// @param newOwner new owner account286 // /// @dev EVM selector for this function is: 0x4f53e226,287 // /// or in textual repr: changeCollectionOwner(address)288 // function changeCollectionOwner(address newOwner) external;289290 /// Get collection administrators291 ///292 /// @return Vector of tuples with admins address and his substrate mirror.293 /// If address is canonical then substrate mirror is zero and vice versa.294 /// @dev EVM selector for this function is: 0x5813216b,295 /// or in textual repr: collectionAdmins()296 function collectionAdmins() external view returns (EthCrossAccount[] memory);297298 /// Changes collection owner to another account299 ///300 /// @dev Owner can be changed only by current owner301 /// @param newOwner new owner cross account302 /// @dev EVM selector for this function is: 0x6496c497,303 /// or in textual repr: changeCollectionOwnerCross((address,uint256))304 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;305}306307/// @dev Cross account struct308struct EthCrossAccount {309 address eth;310 uint256 sub;311}312313/// @dev anonymous struct314struct Tuple27 {315 CollectionPermissions field_0;316 bool field_1;317}318319enum CollectionPermissions {320 CollectionAdmin,321 TokenOwner322}323324/// @dev anonymous struct325struct Tuple24 {326 bool field_0;327 uint256[] field_1;328}329330/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.331enum CollectionLimits {332 /// @dev How many tokens can a user have on one account.333 AccountTokenOwnership,334 /// @dev How many bytes of data are available for sponsorship.335 SponsoredDataSize,336 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]337 SponsoredDataRateLimit,338 /// @dev How many tokens can be mined into this collection.339 TokenLimit,340 /// @dev Timeouts for transfer sponsoring.341 SponsorTransferTimeout,342 /// @dev Timeout for sponsoring an approval in passed blocks.343 SponsorApproveTimeout,344 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).345 OwnerCanTransfer,346 /// @dev Can the collection owner burn other people's tokens.347 OwnerCanDestroy,348 /// @dev Is it possible to send tokens from this collection between users.349 TransferEnabled350}351352/// @dev anonymous struct353struct Tuple19 {354 CollectionLimits field_0;355 bool field_1;356 uint256 field_2;357}358359/// @dev Property struct360struct Property {361 string key;362 bytes value;363}364365/// @dev the ERC-165 identifier for this interface is 0x5b7038cf366interface ERC20UniqueExtensions is Dummy, ERC165 {367 /// @notice A description for the collection.368 /// @dev EVM selector for this function is: 0x7284e416,369 /// or in textual repr: description()370 function description() external view returns (string memory);371372 /// @dev EVM selector for this function is: 0x0ecd0ab0,373 /// or in textual repr: approveCross((address,uint256),uint256)374 function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);375376 // /// Burn tokens from account377 // /// @dev Function that burns an `amount` of the tokens of a given account,378 // /// deducting from the sender's allowance for said account.379 // /// @param from The account whose tokens will be burnt.380 // /// @param amount The amount that will be burnt.381 // /// @dev EVM selector for this function is: 0x79cc6790,382 // /// or in textual repr: burnFrom(address,uint256)383 // function burnFrom(address from, uint256 amount) external returns (bool);384385 /// Burn tokens from account386 /// @dev Function that burns an `amount` of the tokens of a given account,387 /// deducting from the sender's allowance for said account.388 /// @param from The account whose tokens will be burnt.389 /// @param amount The amount that will be burnt.390 /// @dev EVM selector for this function is: 0xbb2f5a58,391 /// or in textual repr: burnFromCross((address,uint256),uint256)392 function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);393394 /// Mint tokens for multiple accounts.395 /// @param amounts array of pairs of account address and amount396 /// @dev EVM selector for this function is: 0x1acf2d55,397 /// or in textual repr: mintBulk((address,uint256)[])398 function mintBulk(Tuple8[] memory amounts) external returns (bool);399400 /// @dev EVM selector for this function is: 0x2ada85ff,401 /// or in textual repr: transferCross((address,uint256),uint256)402 function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);403404 /// @dev EVM selector for this function is: 0xd5cf430b,405 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)406 function transferFromCross(407 EthCrossAccount memory from,408 EthCrossAccount memory to,409 uint256 amount410 ) external returns (bool);411}412413/// @dev anonymous struct414struct Tuple8 {415 address field_0;416 uint256 field_1;417}418419/// @dev the ERC-165 identifier for this interface is 0x40c10f19420interface ERC20Mintable is Dummy, ERC165 {421 /// Mint tokens for `to` account.422 /// @param to account that will receive minted tokens423 /// @param amount amount of tokens to mint424 /// @dev EVM selector for this function is: 0x40c10f19,425 /// or in textual repr: mint(address,uint256)426 function mint(address to, uint256 amount) external returns (bool);427}428429/// @dev inlined interface430interface ERC20Events {431 event Transfer(address indexed from, address indexed to, uint256 value);432 event Approval(address indexed owner, address indexed spender, uint256 value);433}434435/// @dev the ERC-165 identifier for this interface is 0x8cb847c4436interface ERC20 is Dummy, ERC165, ERC20Events {437 /// @dev EVM selector for this function is: 0x06fdde03,438 /// or in textual repr: name()439 function name() external view returns (string memory);440441 /// @dev EVM selector for this function is: 0x95d89b41,442 /// or in textual repr: symbol()443 function symbol() external view returns (string memory);444445 /// @dev EVM selector for this function is: 0x18160ddd,446 /// or in textual repr: totalSupply()447 function totalSupply() external view returns (uint256);448449 /// @dev EVM selector for this function is: 0x313ce567,450 /// or in textual repr: decimals()451 function decimals() external view returns (uint8);452453 /// @dev EVM selector for this function is: 0x70a08231,454 /// or in textual repr: balanceOf(address)455 function balanceOf(address owner) external view returns (uint256);456457 /// @dev EVM selector for this function is: 0xa9059cbb,458 /// or in textual repr: transfer(address,uint256)459 function transfer(address to, uint256 amount) external returns (bool);460461 /// @dev EVM selector for this function is: 0x23b872dd,462 /// or in textual repr: transferFrom(address,address,uint256)463 function transferFrom(464 address from,465 address to,466 uint256 amount467 ) external returns (bool);468469 /// @dev EVM selector for this function is: 0x095ea7b3,470 /// or in textual repr: approve(address,uint256)471 function approve(address spender, uint256 amount) external returns (bool);472473 /// @dev EVM selector for this function is: 0xdd62ed3e,474 /// or in textual repr: allowance(address,address)475 function allowance(address owner, address spender) external view returns (uint256);476477 /// @notice Returns collection helper contract address478 /// @dev EVM selector for this function is: 0x1896cce6,479 /// or in textual repr: collectionHelperAddress()480 function collectionHelperAddress() external view returns (address);481}482483interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}1// 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 0x81172a7517interface 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) external;2526 /// Set collection properties.27 ///28 /// @param properties Vector of properties key/value pair.29 /// @dev EVM selector for this function is: 0x50b26b2a,30 /// or in textual repr: setCollectionProperties((string,bytes)[])31 function setCollectionProperties(Property[] memory properties) external;3233 // /// Delete collection property.34 // ///35 // /// @param key Property key.36 // /// @dev EVM selector for this function is: 0x7b7debce,37 // /// or in textual repr: deleteCollectionProperty(string)38 // function deleteCollectionProperty(string memory key) external;3940 /// Delete collection properties.41 ///42 /// @param keys Properties keys.43 /// @dev EVM selector for this function is: 0xee206ee3,44 /// or in textual repr: deleteCollectionProperties(string[])45 function deleteCollectionProperties(string[] memory keys) external;4647 /// Get collection property.48 ///49 /// @dev Throws error if key not found.50 ///51 /// @param key Property key.52 /// @return bytes The property corresponding to the key.53 /// @dev EVM selector for this function is: 0xcf24fd6d,54 /// or in textual repr: collectionProperty(string)55 function collectionProperty(string memory key) external view returns (bytes memory);5657 /// Get collection properties.58 ///59 /// @param keys Properties keys. Empty keys for all propertyes.60 /// @return Vector of properties key/value pairs.61 /// @dev EVM selector for this function is: 0x285fb8e6,62 /// or in textual repr: collectionProperties(string[])63 function collectionProperties(string[] memory keys) external view returns (Property[] memory);6465 // /// Set the sponsor of the collection.66 // ///67 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68 // ///69 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70 // /// @dev EVM selector for this function is: 0x7623402e,71 // /// or in textual repr: setCollectionSponsor(address)72 // function setCollectionSponsor(address sponsor) external;7374 /// Set the sponsor of the collection.75 ///76 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77 ///78 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79 /// @dev EVM selector for this function is: 0x84a1d5a8,80 /// or in textual repr: setCollectionSponsorCross((address,uint256))81 function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;8283 /// Whether there is a pending sponsor.84 /// @dev EVM selector for this function is: 0x058ac185,85 /// or in textual repr: hasCollectionPendingSponsor()86 function hasCollectionPendingSponsor() external view returns (bool);8788 /// Collection sponsorship confirmation.89 ///90 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.91 /// @dev EVM selector for this function is: 0x3c50e97a,92 /// or in textual repr: confirmCollectionSponsorship()93 function confirmCollectionSponsorship() external;9495 /// Remove collection sponsor.96 /// @dev EVM selector for this function is: 0x6e0326a3,97 /// or in textual repr: removeCollectionSponsor()98 function removeCollectionSponsor() external;99100 /// Get current sponsor.101 ///102 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103 /// @dev EVM selector for this function is: 0x6ec0a9f1,104 /// or in textual repr: collectionSponsor()105 function collectionSponsor() external view returns (Tuple9 memory);106107 /// Get current collection limits.108 ///109 /// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:110 /// "accountTokenOwnershipLimit",111 /// "sponsoredDataSize",112 /// "sponsoredDataRateLimit",113 /// "tokenLimit",114 /// "sponsorTransferTimeout",115 /// "sponsorApproveTimeout"116 /// "ownerCanTransfer",117 /// "ownerCanDestroy",118 /// "transfersEnabled"119 /// Return `false` if a limit not set.120 /// @dev EVM selector for this function is: 0xf63bc572,121 /// or in textual repr: collectionLimits()122 function collectionLimits() external view returns (Tuple19[] memory);123124 /// Set limits for the collection.125 /// @dev Throws error if limit not found.126 /// @param limit Name of the limit. Valid names:127 /// "accountTokenOwnershipLimit",128 /// "sponsoredDataSize",129 /// "sponsoredDataRateLimit",130 /// "tokenLimit",131 /// "sponsorTransferTimeout",132 /// "sponsorApproveTimeout"133 /// "ownerCanTransfer",134 /// "ownerCanDestroy",135 /// "transfersEnabled"136 /// @param status enable\disable limit. Works only with `true`.137 /// @param value Value of the limit.138 /// @dev EVM selector for this function is: 0x88150bd0,139 /// or in textual repr: setCollectionLimit(uint8,bool,uint256)140 function setCollectionLimit(141 CollectionLimits limit,142 bool status,143 uint256 value144 ) external;145146 /// Get contract address.147 /// @dev EVM selector for this function is: 0xf6b4dfb4,148 /// or in textual repr: contractAddress()149 function contractAddress() external view returns (address);150151 /// Add collection admin.152 /// @param newAdmin Cross account administrator address.153 /// @dev EVM selector for this function is: 0x859aa7d6,154 /// or in textual repr: addCollectionAdminCross((address,uint256))155 function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;156157 /// Remove collection admin.158 /// @param admin Cross account administrator address.159 /// @dev EVM selector for this function is: 0x6c0cd173,160 /// or in textual repr: removeCollectionAdminCross((address,uint256))161 function removeCollectionAdminCross(EthCrossAccount memory admin) external;162163 // /// Add collection admin.164 // /// @param newAdmin Address of the added administrator.165 // /// @dev EVM selector for this function is: 0x92e462c7,166 // /// or in textual repr: addCollectionAdmin(address)167 // function addCollectionAdmin(address newAdmin) external;168169 // /// Remove collection admin.170 // ///171 // /// @param admin Address of the removed administrator.172 // /// @dev EVM selector for this function is: 0xfafd7b42,173 // /// or in textual repr: removeCollectionAdmin(address)174 // function removeCollectionAdmin(address admin) external;175176 /// Toggle accessibility of collection nesting.177 ///178 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'179 /// @dev EVM selector for this function is: 0x112d4586,180 /// or in textual repr: setCollectionNesting(bool)181 function setCollectionNesting(bool enable) external;182183 /// Toggle accessibility of collection nesting.184 ///185 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'186 /// @param collections Addresses of collections that will be available for nesting.187 /// @dev EVM selector for this function is: 0x64872396,188 /// or in textual repr: setCollectionNesting(bool,address[])189 function setCollectionNesting(bool enable, address[] memory collections) external;190191 /// Returns nesting for a collection192 /// @dev EVM selector for this function is: 0x22d25bfe,193 /// or in textual repr: collectionNestingRestrictedCollectionIds()194 function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);195196 /// Returns permissions for a collection197 /// @dev EVM selector for this function is: 0x5b2eaf4b,198 /// or in textual repr: collectionNestingPermissions()199 function collectionNestingPermissions() external view returns (Tuple27[] memory);200201 /// Set the collection access method.202 /// @param mode Access mode203 /// 0 for Normal204 /// 1 for AllowList205 /// @dev EVM selector for this function is: 0x41835d4c,206 /// or in textual repr: setCollectionAccess(uint8)207 function setCollectionAccess(uint8 mode) external;208209 /// Checks that user allowed to operate with collection.210 ///211 /// @param user User address to check.212 /// @dev EVM selector for this function is: 0x91b6df49,213 /// or in textual repr: allowlistedCross((address,uint256))214 function allowlistedCross(EthCrossAccount memory user) external view returns (bool);215216 // /// Add the user to the allowed list.217 // ///218 // /// @param user Address of a trusted user.219 // /// @dev EVM selector for this function is: 0x67844fe6,220 // /// or in textual repr: addToCollectionAllowList(address)221 // function addToCollectionAllowList(address user) external;222223 /// Add user to allowed list.224 ///225 /// @param user User cross account address.226 /// @dev EVM selector for this function is: 0xa0184a3a,227 /// or in textual repr: addToCollectionAllowListCross((address,uint256))228 function addToCollectionAllowListCross(EthCrossAccount memory user) external;229230 // /// Remove the user from the allowed list.231 // ///232 // /// @param user Address of a removed user.233 // /// @dev EVM selector for this function is: 0x85c51acb,234 // /// or in textual repr: removeFromCollectionAllowList(address)235 // function removeFromCollectionAllowList(address user) external;236237 /// Remove user from allowed list.238 ///239 /// @param user User cross account address.240 /// @dev EVM selector for this function is: 0x09ba452a,241 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))242 function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;243244 /// Switch permission for minting.245 ///246 /// @param mode Enable if "true".247 /// @dev EVM selector for this function is: 0x00018e84,248 /// or in textual repr: setCollectionMintMode(bool)249 function setCollectionMintMode(bool mode) external;250251 // /// Check that account is the owner or admin of the collection252 // ///253 // /// @param user account to verify254 // /// @return "true" if account is the owner or admin255 // /// @dev EVM selector for this function is: 0x9811b0c7,256 // /// or in textual repr: isOwnerOrAdmin(address)257 // function isOwnerOrAdmin(address user) external view returns (bool);258259 /// Check that account is the owner or admin of the collection260 ///261 /// @param user User cross account to verify262 /// @return "true" if account is the owner or admin263 /// @dev EVM selector for this function is: 0x3e75a905,264 /// or in textual repr: isOwnerOrAdminCross((address,uint256))265 function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);266267 /// Returns collection type268 ///269 /// @return `Fungible` or `NFT` or `ReFungible`270 /// @dev EVM selector for this function is: 0xd34b55b8,271 /// or in textual repr: uniqueCollectionType()272 function uniqueCollectionType() external view returns (string memory);273274 /// Get collection owner.275 ///276 /// @return Tuble with sponsor address and his substrate mirror.277 /// If address is canonical then substrate mirror is zero and vice versa.278 /// @dev EVM selector for this function is: 0xdf727d3b,279 /// or in textual repr: collectionOwner()280 function collectionOwner() external view returns (EthCrossAccount memory);281282 // /// Changes collection owner to another account283 // ///284 // /// @dev Owner can be changed only by current owner285 // /// @param newOwner new owner account286 // /// @dev EVM selector for this function is: 0x4f53e226,287 // /// or in textual repr: changeCollectionOwner(address)288 // function changeCollectionOwner(address newOwner) external;289290 /// Get collection administrators291 ///292 /// @return Vector of tuples with admins address and his substrate mirror.293 /// If address is canonical then substrate mirror is zero and vice versa.294 /// @dev EVM selector for this function is: 0x5813216b,295 /// or in textual repr: collectionAdmins()296 function collectionAdmins() external view returns (EthCrossAccount[] memory);297298 /// Changes collection owner to another account299 ///300 /// @dev Owner can be changed only by current owner301 /// @param newOwner new owner cross account302 /// @dev EVM selector for this function is: 0x6496c497,303 /// or in textual repr: changeCollectionOwnerCross((address,uint256))304 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;305}306307/// @dev Cross account struct308struct EthCrossAccount {309 address eth;310 uint256 sub;311}312313/// @dev anonymous struct314struct Tuple27 {315 CollectionPermissions field_0;316 bool field_1;317}318319enum CollectionPermissions {320 CollectionAdmin,321 TokenOwner322}323324/// @dev anonymous struct325struct Tuple24 {326 bool field_0;327 uint256[] field_1;328}329330/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.331enum CollectionLimits {332 /// @dev How many tokens can a user have on one account.333 AccountTokenOwnership,334 /// @dev How many bytes of data are available for sponsorship.335 SponsoredDataSize,336 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]337 SponsoredDataRateLimit,338 /// @dev How many tokens can be mined into this collection.339 TokenLimit,340 /// @dev Timeouts for transfer sponsoring.341 SponsorTransferTimeout,342 /// @dev Timeout for sponsoring an approval in passed blocks.343 SponsorApproveTimeout,344 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).345 OwnerCanTransfer,346 /// @dev Can the collection owner burn other people's tokens.347 OwnerCanDestroy,348 /// @dev Is it possible to send tokens from this collection between users.349 TransferEnabled350}351352/// @dev anonymous struct353struct Tuple19 {354 CollectionLimits field_0;355 bool field_1;356 uint256 field_2;357}358359/// @dev Property struct360struct Property {361 string key;362 bytes value;363}364365/// @dev the ERC-165 identifier for this interface is 0x7dee5997366interface ERC20UniqueExtensions is Dummy, ERC165 {367 /// @notice A description for the collection.368 /// @dev EVM selector for this function is: 0x7284e416,369 /// or in textual repr: description()370 function description() external view returns (string memory);371372 /// @dev EVM selector for this function is: 0x269e6158,373 /// or in textual repr: mintCross((address,uint256),uint256)374 function mintCross(EthCrossAccount memory to, uint256 amount) external returns (bool);375376 /// @dev EVM selector for this function is: 0x0ecd0ab0,377 /// or in textual repr: approveCross((address,uint256),uint256)378 function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);379380 // /// Burn tokens from account381 // /// @dev Function that burns an `amount` of the tokens of a given account,382 // /// deducting from the sender's allowance for said account.383 // /// @param from The account whose tokens will be burnt.384 // /// @param amount The amount that will be burnt.385 // /// @dev EVM selector for this function is: 0x79cc6790,386 // /// or in textual repr: burnFrom(address,uint256)387 // function burnFrom(address from, uint256 amount) external returns (bool);388389 /// Burn tokens from account390 /// @dev Function that burns an `amount` of the tokens of a given account,391 /// deducting from the sender's allowance for said account.392 /// @param from The account whose tokens will be burnt.393 /// @param amount The amount that will be burnt.394 /// @dev EVM selector for this function is: 0xbb2f5a58,395 /// or in textual repr: burnFromCross((address,uint256),uint256)396 function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);397398 /// Mint tokens for multiple accounts.399 /// @param amounts array of pairs of account address and amount400 /// @dev EVM selector for this function is: 0x1acf2d55,401 /// or in textual repr: mintBulk((address,uint256)[])402 function mintBulk(Tuple9[] memory amounts) external returns (bool);403404 /// @dev EVM selector for this function is: 0x2ada85ff,405 /// or in textual repr: transferCross((address,uint256),uint256)406 function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);407408 /// @dev EVM selector for this function is: 0xd5cf430b,409 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)410 function transferFromCross(411 EthCrossAccount memory from,412 EthCrossAccount memory to,413 uint256 amount414 ) external returns (bool);415}416417/// @dev anonymous struct418struct Tuple9 {419 address field_0;420 uint256 field_1;421}422423/// @dev the ERC-165 identifier for this interface is 0x40c10f19424interface ERC20Mintable is Dummy, ERC165 {425 /// Mint tokens for `to` account.426 /// @param to account that will receive minted tokens427 /// @param amount amount of tokens to mint428 /// @dev EVM selector for this function is: 0x40c10f19,429 /// or in textual repr: mint(address,uint256)430 function mint(address to, uint256 amount) external returns (bool);431}432433/// @dev inlined interface434interface ERC20Events {435 event Transfer(address indexed from, address indexed to, uint256 value);436 event Approval(address indexed owner, address indexed spender, uint256 value);437}438439/// @dev the ERC-165 identifier for this interface is 0x8cb847c4440interface ERC20 is Dummy, ERC165, ERC20Events {441 /// @dev EVM selector for this function is: 0x06fdde03,442 /// or in textual repr: name()443 function name() external view returns (string memory);444445 /// @dev EVM selector for this function is: 0x95d89b41,446 /// or in textual repr: symbol()447 function symbol() external view returns (string memory);448449 /// @dev EVM selector for this function is: 0x18160ddd,450 /// or in textual repr: totalSupply()451 function totalSupply() external view returns (uint256);452453 /// @dev EVM selector for this function is: 0x313ce567,454 /// or in textual repr: decimals()455 function decimals() external view returns (uint8);456457 /// @dev EVM selector for this function is: 0x70a08231,458 /// or in textual repr: balanceOf(address)459 function balanceOf(address owner) external view returns (uint256);460461 /// @dev EVM selector for this function is: 0xa9059cbb,462 /// or in textual repr: transfer(address,uint256)463 function transfer(address to, uint256 amount) external returns (bool);464465 /// @dev EVM selector for this function is: 0x23b872dd,466 /// or in textual repr: transferFrom(address,address,uint256)467 function transferFrom(468 address from,469 address to,470 uint256 amount471 ) external returns (bool);472473 /// @dev EVM selector for this function is: 0x095ea7b3,474 /// or in textual repr: approve(address,uint256)475 function approve(address spender, uint256 amount) external returns (bool);476477 /// @dev EVM selector for this function is: 0xdd62ed3e,478 /// or in textual repr: allowance(address,address)479 function allowance(address owner, address spender) external view returns (uint256);480481 /// @notice Returns collection helper contract address482 /// @dev EVM selector for this function is: 0x1896cce6,483 /// or in textual repr: collectionHelperAddress()484 function collectionHelperAddress() external view returns (address);485}486487interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -198,7 +198,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple27 memory);
+ function collectionSponsor() external view returns (Tuple29 memory);
/// Get current collection limits.
///
@@ -553,7 +553,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -652,6 +652,7 @@
/// @dev EVM selector for this function is: 0x75794a3c,
/// or in textual repr: nextTokenId()
function nextTokenId() external view returns (uint256);
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -670,6 +671,13 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -198,7 +198,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple26 memory);
+ function collectionSponsor() external view returns (Tuple28 memory);
/// Get current collection limits.
///
@@ -551,7 +551,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -663,6 +663,14 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -78,6 +78,25 @@
expect(event.returnValues.to).to.equal(receiver);
expect(event.returnValues.value).to.equal('100');
});
+
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(owner);
+ const ethOwner = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.ft.mintCollection(alice);
+ await collection.addAdmin(alice, {Ethereum: ethOwner});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', ethOwner);
+
+ const result = await contract.methods.mintCross(receiverCross, 100).send();
+
+ const event = result.events.Transfer;
+ expect(event.address).to.equal(collectionAddress);
+ expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.equal(helper.address.substrateToEth(owner.address));
+ expect(event.returnValues.value).to.equal('100');
+ });
itEth('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,6 +17,8 @@
import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
import {IKeyringPair} from '@polkadot/types/types';
import {Contract} from 'web3-eth-contract';
+import exp from 'constants';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
describe('NFT: Information getting', () => {
@@ -173,7 +175,45 @@
// const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
// expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
+ const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
+ const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true}}; });
+
+
+ const collection = await helper.nft.mintCollection(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ const event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
+ .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ });
+
//TODO: CORE-302 add eth methods
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -17,6 +17,7 @@
import {Pallets, requirePalletsOrSkip} from '../util';
import {expect, itEth, usingEthPlaygrounds} from './util';
import {IKeyringPair} from '@polkadot/types/types';
+import { ITokenPropertyPermission } from '../util/playgrounds/types';
describe('Refungible: Information getting', () => {
let donor: IKeyringPair;
@@ -135,6 +136,44 @@
expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
+ const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
+ const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true}}; });
+
+
+ const collection = await helper.rft.mintCollection(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ const event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ tokenId = result.events.Transfer.returnValues.tokenId;
+
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
+ .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ });
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);