difftreelog
refactor eth::Property
in: master
13 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -33,9 +33,7 @@
use alloc::format;
use crate::{
- Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
- eth::{CollectionLimitField as EvmCollectionLimits, self},
- weights::WeightInfo,
+ Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,
};
/// Events for ethereum collection helper.
@@ -125,7 +123,8 @@
let properties = properties
.into_iter()
- .map(|eth::Property { key, value }| {
+ .map(|property| {
+ let (key, value) = property.take_key_value();
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
@@ -215,7 +214,7 @@
let key =
string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok(eth::Property { key, value })
+ Ok(eth::Property::new(key, value))
})
.collect::<Result<Vec<_>>>()?;
Ok(properties)
@@ -302,11 +301,11 @@
Ok(vec![
eth::CollectionLimit::from_opt_int(
- EvmCollectionLimits::AccountTokenOwnership,
+ eth::CollectionLimitField::AccountTokenOwnership,
limits.account_token_ownership_limit,
),
eth::CollectionLimit::from_opt_int(
- EvmCollectionLimits::SponsoredDataSize,
+ eth::CollectionLimitField::SponsoredDataSize,
limits.sponsored_data_size,
),
limits
@@ -314,7 +313,7 @@
.and_then(|limit| {
if let SponsoringRateLimit::Blocks(blocks) = limit {
Some(eth::CollectionLimit::from_int(
- EvmCollectionLimits::SponsoredDataRateLimit,
+ eth::CollectionLimitField::SponsoredDataRateLimit,
blocks,
))
} else {
@@ -322,28 +321,31 @@
}
})
.unwrap_or(eth::CollectionLimit::from_int(
- EvmCollectionLimits::SponsoredDataRateLimit,
+ eth::CollectionLimitField::SponsoredDataRateLimit,
Default::default(),
)),
- eth::CollectionLimit::from_opt_int(EvmCollectionLimits::TokenLimit, limits.token_limit),
eth::CollectionLimit::from_opt_int(
- EvmCollectionLimits::SponsorTransferTimeout,
+ eth::CollectionLimitField::TokenLimit,
+ limits.token_limit,
+ ),
+ eth::CollectionLimit::from_opt_int(
+ eth::CollectionLimitField::SponsorTransferTimeout,
limits.sponsor_transfer_timeout,
),
eth::CollectionLimit::from_opt_int(
- EvmCollectionLimits::SponsorApproveTimeout,
+ eth::CollectionLimitField::SponsorApproveTimeout,
limits.sponsor_approve_timeout,
),
eth::CollectionLimit::from_opt_bool(
- EvmCollectionLimits::OwnerCanTransfer,
+ eth::CollectionLimitField::OwnerCanTransfer,
limits.owner_can_transfer,
),
eth::CollectionLimit::from_opt_bool(
- EvmCollectionLimits::OwnerCanDestroy,
+ eth::CollectionLimitField::OwnerCanDestroy,
limits.owner_can_destroy,
),
eth::CollectionLimit::from_opt_bool(
- EvmCollectionLimits::TransferEnabled,
+ eth::CollectionLimitField::TransferEnabled,
limits.transfers_enabled,
),
])
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -171,10 +171,18 @@
/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
#[derive(Debug, Default, AbiCoder)]
pub struct Property {
- /// Property key.
- pub key: evm_coder::types::string,
- /// Property value.
- pub value: evm_coder::types::bytes,
+ key: evm_coder::types::string,
+ value: evm_coder::types::bytes,
+}
+
+impl Property {
+ pub fn new(key: evm_coder::types::string, value: evm_coder::types::bytes) -> Self {
+ Self { key, value }
+ }
+
+ pub fn take_key_value(self) -> (evm_coder::types::string, evm_coder::types::bytes) {
+ (self.key, self.value)
+ }
}
/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -499,9 +499,7 @@
/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
- /// @dev Property key.
string key;
- /// @dev Property value.
bytes value;
}
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -170,7 +170,8 @@
let properties = properties
.into_iter()
- .map(|pallet_common::eth::Property { key, value }| {
+ .map(|property| {
+ let (key, value) = property.take_key_value();
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
@@ -796,7 +797,7 @@
let key = string::from_utf8(p.key.to_vec())
.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok(pallet_common::eth::Property { key, value })
+ Ok(pallet_common::eth::Property::new(key, value))
})
.collect::<Result<Vec<_>>>()
}
@@ -1054,7 +1055,8 @@
let properties = properties
.into_iter()
- .map(|pallet_common::eth::Property { key, value }| {
+ .map(|property| {
+ let (key, value) = property.take_key_value();
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -129,9 +129,7 @@
/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
- /// @dev Property key.
string key;
- /// @dev Property value.
bytes value;
}
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -173,7 +173,8 @@
let properties = properties
.into_iter()
- .map(|pallet_common::eth::Property { key, value }| {
+ .map(|property| {
+ let (key, value) = property.take_key_value();
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
@@ -831,7 +832,7 @@
let key = string::from_utf8(p.key.to_vec())
.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok(pallet_common::eth::Property { key, value })
+ Ok(pallet_common::eth::Property::new(key, value))
})
.collect::<Result<Vec<_>>>()
}
@@ -1100,7 +1101,8 @@
let properties = properties
.into_iter()
- .map(|pallet_common::eth::Property { key, value }| {
+ .map(|property| {
+ let (key, value) = property.take_key_value();
let key = <Vec<u8>>::from(key)
.try_into()
.map_err(|_| "key too large")?;
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -129,9 +129,7 @@
/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
- /// @dev Property key.
string key;
- /// @dev Property value.
bytes value;
}
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 0x2a14cfd117interface 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(CrossAccount 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 (CrossAccount memory);106107 /// Get current collection limits.108 ///109 /// @return Array of collection limits110 /// @dev EVM selector for this function is: 0xf63bc572,111 /// or in textual repr: collectionLimits()112 function collectionLimits() external view returns (CollectionLimit[] memory);113114 /// Set limits for the collection.115 /// @dev Throws error if limit not found.116 /// @param limit Some limit.117 /// @dev EVM selector for this function is: 0x2316ee74,118 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))119 function setCollectionLimit(CollectionLimit memory limit) external;120121 /// Get contract address.122 /// @dev EVM selector for this function is: 0xf6b4dfb4,123 /// or in textual repr: contractAddress()124 function contractAddress() external view returns (address);125126 /// Add collection admin.127 /// @param newAdmin Cross account administrator address.128 /// @dev EVM selector for this function is: 0x859aa7d6,129 /// or in textual repr: addCollectionAdminCross((address,uint256))130 function addCollectionAdminCross(CrossAccount memory newAdmin) external;131132 /// Remove collection admin.133 /// @param admin Cross account administrator address.134 /// @dev EVM selector for this function is: 0x6c0cd173,135 /// or in textual repr: removeCollectionAdminCross((address,uint256))136 function removeCollectionAdminCross(CrossAccount memory admin) external;137138 // /// Add collection admin.139 // /// @param newAdmin Address of the added administrator.140 // /// @dev EVM selector for this function is: 0x92e462c7,141 // /// or in textual repr: addCollectionAdmin(address)142 // function addCollectionAdmin(address newAdmin) external;143144 // /// Remove collection admin.145 // ///146 // /// @param admin Address of the removed administrator.147 // /// @dev EVM selector for this function is: 0xfafd7b42,148 // /// or in textual repr: removeCollectionAdmin(address)149 // function removeCollectionAdmin(address admin) external;150151 /// Toggle accessibility of collection nesting.152 ///153 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'154 /// @dev EVM selector for this function is: 0x112d4586,155 /// or in textual repr: setCollectionNesting(bool)156 function setCollectionNesting(bool enable) external;157158 /// Toggle accessibility of collection nesting.159 ///160 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'161 /// @param collections Addresses of collections that will be available for nesting.162 /// @dev EVM selector for this function is: 0x64872396,163 /// or in textual repr: setCollectionNesting(bool,address[])164 function setCollectionNesting(bool enable, address[] memory collections) external;165166 /// Returns nesting for a collection167 /// @dev EVM selector for this function is: 0x22d25bfe,168 /// or in textual repr: collectionNestingRestrictedCollectionIds()169 function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);170171 /// Returns permissions for a collection172 /// @dev EVM selector for this function is: 0x5b2eaf4b,173 /// or in textual repr: collectionNestingPermissions()174 function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);175176 /// Set the collection access method.177 /// @param mode Access mode178 /// 0 for Normal179 /// 1 for AllowList180 /// @dev EVM selector for this function is: 0x41835d4c,181 /// or in textual repr: setCollectionAccess(uint8)182 function setCollectionAccess(uint8 mode) external;183184 /// Checks that user allowed to operate with collection.185 ///186 /// @param user User address to check.187 /// @dev EVM selector for this function is: 0x91b6df49,188 /// or in textual repr: allowlistedCross((address,uint256))189 function allowlistedCross(CrossAccount memory user) external view returns (bool);190191 // /// Add the user to the allowed list.192 // ///193 // /// @param user Address of a trusted user.194 // /// @dev EVM selector for this function is: 0x67844fe6,195 // /// or in textual repr: addToCollectionAllowList(address)196 // function addToCollectionAllowList(address user) external;197198 /// Add user to allowed list.199 ///200 /// @param user User cross account address.201 /// @dev EVM selector for this function is: 0xa0184a3a,202 /// or in textual repr: addToCollectionAllowListCross((address,uint256))203 function addToCollectionAllowListCross(CrossAccount memory user) external;204205 // /// Remove the user from the allowed list.206 // ///207 // /// @param user Address of a removed user.208 // /// @dev EVM selector for this function is: 0x85c51acb,209 // /// or in textual repr: removeFromCollectionAllowList(address)210 // function removeFromCollectionAllowList(address user) external;211212 /// Remove user from allowed list.213 ///214 /// @param user User cross account address.215 /// @dev EVM selector for this function is: 0x09ba452a,216 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))217 function removeFromCollectionAllowListCross(CrossAccount memory user) external;218219 /// Switch permission for minting.220 ///221 /// @param mode Enable if "true".222 /// @dev EVM selector for this function is: 0x00018e84,223 /// or in textual repr: setCollectionMintMode(bool)224 function setCollectionMintMode(bool mode) external;225226 // /// Check that account is the owner or admin of the collection227 // ///228 // /// @param user account to verify229 // /// @return "true" if account is the owner or admin230 // /// @dev EVM selector for this function is: 0x9811b0c7,231 // /// or in textual repr: isOwnerOrAdmin(address)232 // function isOwnerOrAdmin(address user) external view returns (bool);233234 /// Check that account is the owner or admin of the collection235 ///236 /// @param user User cross account to verify237 /// @return "true" if account is the owner or admin238 /// @dev EVM selector for this function is: 0x3e75a905,239 /// or in textual repr: isOwnerOrAdminCross((address,uint256))240 function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);241242 /// Returns collection type243 ///244 /// @return `Fungible` or `NFT` or `ReFungible`245 /// @dev EVM selector for this function is: 0xd34b55b8,246 /// or in textual repr: uniqueCollectionType()247 function uniqueCollectionType() external view returns (string memory);248249 /// Get collection owner.250 ///251 /// @return Tuble with sponsor address and his substrate mirror.252 /// If address is canonical then substrate mirror is zero and vice versa.253 /// @dev EVM selector for this function is: 0xdf727d3b,254 /// or in textual repr: collectionOwner()255 function collectionOwner() external view returns (CrossAccount memory);256257 // /// Changes collection owner to another account258 // ///259 // /// @dev Owner can be changed only by current owner260 // /// @param newOwner new owner account261 // /// @dev EVM selector for this function is: 0x4f53e226,262 // /// or in textual repr: changeCollectionOwner(address)263 // function changeCollectionOwner(address newOwner) external;264265 /// Get collection administrators266 ///267 /// @return Vector of tuples with admins address and his substrate mirror.268 /// If address is canonical then substrate mirror is zero and vice versa.269 /// @dev EVM selector for this function is: 0x5813216b,270 /// or in textual repr: collectionAdmins()271 function collectionAdmins() external view returns (CrossAccount[] memory);272273 /// Changes collection owner to another account274 ///275 /// @dev Owner can be changed only by current owner276 /// @param newOwner new owner cross account277 /// @dev EVM selector for this function is: 0x6496c497,278 /// or in textual repr: changeCollectionOwnerCross((address,uint256))279 function changeCollectionOwnerCross(CrossAccount memory newOwner) external;280}281282/// @dev Cross account struct283struct CrossAccount {284 address eth;285 uint256 sub;286}287288/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.289struct CollectionNestingPermission {290 CollectionPermissionField field;291 bool value;292}293294/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.295enum CollectionPermissionField {296 /// @dev Owner of token can nest tokens under it.297 TokenOwner,298 /// @dev Admin of token collection can nest tokens under token.299 CollectionAdmin300}301302/// @dev Nested collections.303struct CollectionNesting {304 bool token_owner;305 uint256[] ids;306}307308/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.309struct CollectionLimit {310 CollectionLimitField field;311 OptionUint value;312}313314/// @dev Ethereum representation of Optional value with uint256.315struct OptionUint {316 bool status;317 uint256 value;318}319320/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.321enum CollectionLimitField {322 /// @dev How many tokens can a user have on one account.323 AccountTokenOwnership,324 /// @dev How many bytes of data are available for sponsorship.325 SponsoredDataSize,326 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]327 SponsoredDataRateLimit,328 /// @dev How many tokens can be mined into this collection.329 TokenLimit,330 /// @dev Timeouts for transfer sponsoring.331 SponsorTransferTimeout,332 /// @dev Timeout for sponsoring an approval in passed blocks.333 SponsorApproveTimeout,334 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).335 OwnerCanTransfer,336 /// @dev Can the collection owner burn other people's tokens.337 OwnerCanDestroy,338 /// @dev Is it possible to send tokens from this collection between users.339 TransferEnabled340}341342/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).343struct Property {344 /// @dev Property key.345 string key;346 /// @dev Property value.347 bytes value;348}349350/// @dev the ERC-165 identifier for this interface is 0x7dee5997351interface ERC20UniqueExtensions is Dummy, ERC165 {352 /// @notice A description for the collection.353 /// @dev EVM selector for this function is: 0x7284e416,354 /// or in textual repr: description()355 function description() external view returns (string memory);356357 /// @dev EVM selector for this function is: 0x269e6158,358 /// or in textual repr: mintCross((address,uint256),uint256)359 function mintCross(CrossAccount memory to, uint256 amount) external returns (bool);360361 /// @dev EVM selector for this function is: 0x0ecd0ab0,362 /// or in textual repr: approveCross((address,uint256),uint256)363 function approveCross(CrossAccount memory spender, uint256 amount) external returns (bool);364365 // /// Burn tokens from account366 // /// @dev Function that burns an `amount` of the tokens of a given account,367 // /// deducting from the sender's allowance for said account.368 // /// @param from The account whose tokens will be burnt.369 // /// @param amount The amount that will be burnt.370 // /// @dev EVM selector for this function is: 0x79cc6790,371 // /// or in textual repr: burnFrom(address,uint256)372 // function burnFrom(address from, uint256 amount) external returns (bool);373374 /// Burn tokens from account375 /// @dev Function that burns an `amount` of the tokens of a given account,376 /// deducting from the sender's allowance for said account.377 /// @param from The account whose tokens will be burnt.378 /// @param amount The amount that will be burnt.379 /// @dev EVM selector for this function is: 0xbb2f5a58,380 /// or in textual repr: burnFromCross((address,uint256),uint256)381 function burnFromCross(CrossAccount memory from, uint256 amount) external returns (bool);382383 /// Mint tokens for multiple accounts.384 /// @param amounts array of pairs of account address and amount385 /// @dev EVM selector for this function is: 0x1acf2d55,386 /// or in textual repr: mintBulk((address,uint256)[])387 function mintBulk(Tuple9[] memory amounts) external returns (bool);388389 /// @dev EVM selector for this function is: 0x2ada85ff,390 /// or in textual repr: transferCross((address,uint256),uint256)391 function transferCross(CrossAccount memory to, uint256 amount) external returns (bool);392393 /// @dev EVM selector for this function is: 0xd5cf430b,394 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)395 function transferFromCross(396 CrossAccount memory from,397 CrossAccount memory to,398 uint256 amount399 ) external returns (bool);400}401402/// @dev anonymous struct403struct Tuple9 {404 address field_0;405 uint256 field_1;406}407408/// @dev the ERC-165 identifier for this interface is 0x40c10f19409interface ERC20Mintable is Dummy, ERC165 {410 /// Mint tokens for `to` account.411 /// @param to account that will receive minted tokens412 /// @param amount amount of tokens to mint413 /// @dev EVM selector for this function is: 0x40c10f19,414 /// or in textual repr: mint(address,uint256)415 function mint(address to, uint256 amount) external returns (bool);416}417418/// @dev inlined interface419interface ERC20Events {420 event Transfer(address indexed from, address indexed to, uint256 value);421 event Approval(address indexed owner, address indexed spender, uint256 value);422}423424/// @dev the ERC-165 identifier for this interface is 0x8cb847c4425interface ERC20 is Dummy, ERC165, ERC20Events {426 /// @dev EVM selector for this function is: 0x06fdde03,427 /// or in textual repr: name()428 function name() external view returns (string memory);429430 /// @dev EVM selector for this function is: 0x95d89b41,431 /// or in textual repr: symbol()432 function symbol() external view returns (string memory);433434 /// @dev EVM selector for this function is: 0x18160ddd,435 /// or in textual repr: totalSupply()436 function totalSupply() external view returns (uint256);437438 /// @dev EVM selector for this function is: 0x313ce567,439 /// or in textual repr: decimals()440 function decimals() external view returns (uint8);441442 /// @dev EVM selector for this function is: 0x70a08231,443 /// or in textual repr: balanceOf(address)444 function balanceOf(address owner) external view returns (uint256);445446 /// @dev EVM selector for this function is: 0xa9059cbb,447 /// or in textual repr: transfer(address,uint256)448 function transfer(address to, uint256 amount) external returns (bool);449450 /// @dev EVM selector for this function is: 0x23b872dd,451 /// or in textual repr: transferFrom(address,address,uint256)452 function transferFrom(453 address from,454 address to,455 uint256 amount456 ) external returns (bool);457458 /// @dev EVM selector for this function is: 0x095ea7b3,459 /// or in textual repr: approve(address,uint256)460 function approve(address spender, uint256 amount) external returns (bool);461462 /// @dev EVM selector for this function is: 0xdd62ed3e,463 /// or in textual repr: allowance(address,address)464 function allowance(address owner, address spender) external view returns (uint256);465466 /// @notice Returns collection helper contract address467 /// @dev EVM selector for this function is: 0x1896cce6,468 /// or in textual repr: collectionHelperAddress()469 function collectionHelperAddress() external view returns (address);470}471472interface 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 0x2a14cfd117interface 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(CrossAccount 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 (CrossAccount memory);106107 /// Get current collection limits.108 ///109 /// @return Array of collection limits110 /// @dev EVM selector for this function is: 0xf63bc572,111 /// or in textual repr: collectionLimits()112 function collectionLimits() external view returns (CollectionLimit[] memory);113114 /// Set limits for the collection.115 /// @dev Throws error if limit not found.116 /// @param limit Some limit.117 /// @dev EVM selector for this function is: 0x2316ee74,118 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))119 function setCollectionLimit(CollectionLimit memory limit) external;120121 /// Get contract address.122 /// @dev EVM selector for this function is: 0xf6b4dfb4,123 /// or in textual repr: contractAddress()124 function contractAddress() external view returns (address);125126 /// Add collection admin.127 /// @param newAdmin Cross account administrator address.128 /// @dev EVM selector for this function is: 0x859aa7d6,129 /// or in textual repr: addCollectionAdminCross((address,uint256))130 function addCollectionAdminCross(CrossAccount memory newAdmin) external;131132 /// Remove collection admin.133 /// @param admin Cross account administrator address.134 /// @dev EVM selector for this function is: 0x6c0cd173,135 /// or in textual repr: removeCollectionAdminCross((address,uint256))136 function removeCollectionAdminCross(CrossAccount memory admin) external;137138 // /// Add collection admin.139 // /// @param newAdmin Address of the added administrator.140 // /// @dev EVM selector for this function is: 0x92e462c7,141 // /// or in textual repr: addCollectionAdmin(address)142 // function addCollectionAdmin(address newAdmin) external;143144 // /// Remove collection admin.145 // ///146 // /// @param admin Address of the removed administrator.147 // /// @dev EVM selector for this function is: 0xfafd7b42,148 // /// or in textual repr: removeCollectionAdmin(address)149 // function removeCollectionAdmin(address admin) external;150151 /// Toggle accessibility of collection nesting.152 ///153 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'154 /// @dev EVM selector for this function is: 0x112d4586,155 /// or in textual repr: setCollectionNesting(bool)156 function setCollectionNesting(bool enable) external;157158 /// Toggle accessibility of collection nesting.159 ///160 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'161 /// @param collections Addresses of collections that will be available for nesting.162 /// @dev EVM selector for this function is: 0x64872396,163 /// or in textual repr: setCollectionNesting(bool,address[])164 function setCollectionNesting(bool enable, address[] memory collections) external;165166 /// Returns nesting for a collection167 /// @dev EVM selector for this function is: 0x22d25bfe,168 /// or in textual repr: collectionNestingRestrictedCollectionIds()169 function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);170171 /// Returns permissions for a collection172 /// @dev EVM selector for this function is: 0x5b2eaf4b,173 /// or in textual repr: collectionNestingPermissions()174 function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);175176 /// Set the collection access method.177 /// @param mode Access mode178 /// 0 for Normal179 /// 1 for AllowList180 /// @dev EVM selector for this function is: 0x41835d4c,181 /// or in textual repr: setCollectionAccess(uint8)182 function setCollectionAccess(uint8 mode) external;183184 /// Checks that user allowed to operate with collection.185 ///186 /// @param user User address to check.187 /// @dev EVM selector for this function is: 0x91b6df49,188 /// or in textual repr: allowlistedCross((address,uint256))189 function allowlistedCross(CrossAccount memory user) external view returns (bool);190191 // /// Add the user to the allowed list.192 // ///193 // /// @param user Address of a trusted user.194 // /// @dev EVM selector for this function is: 0x67844fe6,195 // /// or in textual repr: addToCollectionAllowList(address)196 // function addToCollectionAllowList(address user) external;197198 /// Add user to allowed list.199 ///200 /// @param user User cross account address.201 /// @dev EVM selector for this function is: 0xa0184a3a,202 /// or in textual repr: addToCollectionAllowListCross((address,uint256))203 function addToCollectionAllowListCross(CrossAccount memory user) external;204205 // /// Remove the user from the allowed list.206 // ///207 // /// @param user Address of a removed user.208 // /// @dev EVM selector for this function is: 0x85c51acb,209 // /// or in textual repr: removeFromCollectionAllowList(address)210 // function removeFromCollectionAllowList(address user) external;211212 /// Remove user from allowed list.213 ///214 /// @param user User cross account address.215 /// @dev EVM selector for this function is: 0x09ba452a,216 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))217 function removeFromCollectionAllowListCross(CrossAccount memory user) external;218219 /// Switch permission for minting.220 ///221 /// @param mode Enable if "true".222 /// @dev EVM selector for this function is: 0x00018e84,223 /// or in textual repr: setCollectionMintMode(bool)224 function setCollectionMintMode(bool mode) external;225226 // /// Check that account is the owner or admin of the collection227 // ///228 // /// @param user account to verify229 // /// @return "true" if account is the owner or admin230 // /// @dev EVM selector for this function is: 0x9811b0c7,231 // /// or in textual repr: isOwnerOrAdmin(address)232 // function isOwnerOrAdmin(address user) external view returns (bool);233234 /// Check that account is the owner or admin of the collection235 ///236 /// @param user User cross account to verify237 /// @return "true" if account is the owner or admin238 /// @dev EVM selector for this function is: 0x3e75a905,239 /// or in textual repr: isOwnerOrAdminCross((address,uint256))240 function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);241242 /// Returns collection type243 ///244 /// @return `Fungible` or `NFT` or `ReFungible`245 /// @dev EVM selector for this function is: 0xd34b55b8,246 /// or in textual repr: uniqueCollectionType()247 function uniqueCollectionType() external view returns (string memory);248249 /// Get collection owner.250 ///251 /// @return Tuble with sponsor address and his substrate mirror.252 /// If address is canonical then substrate mirror is zero and vice versa.253 /// @dev EVM selector for this function is: 0xdf727d3b,254 /// or in textual repr: collectionOwner()255 function collectionOwner() external view returns (CrossAccount memory);256257 // /// Changes collection owner to another account258 // ///259 // /// @dev Owner can be changed only by current owner260 // /// @param newOwner new owner account261 // /// @dev EVM selector for this function is: 0x4f53e226,262 // /// or in textual repr: changeCollectionOwner(address)263 // function changeCollectionOwner(address newOwner) external;264265 /// Get collection administrators266 ///267 /// @return Vector of tuples with admins address and his substrate mirror.268 /// If address is canonical then substrate mirror is zero and vice versa.269 /// @dev EVM selector for this function is: 0x5813216b,270 /// or in textual repr: collectionAdmins()271 function collectionAdmins() external view returns (CrossAccount[] memory);272273 /// Changes collection owner to another account274 ///275 /// @dev Owner can be changed only by current owner276 /// @param newOwner new owner cross account277 /// @dev EVM selector for this function is: 0x6496c497,278 /// or in textual repr: changeCollectionOwnerCross((address,uint256))279 function changeCollectionOwnerCross(CrossAccount memory newOwner) external;280}281282/// @dev Cross account struct283struct CrossAccount {284 address eth;285 uint256 sub;286}287288/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.289struct CollectionNestingPermission {290 CollectionPermissionField field;291 bool value;292}293294/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.295enum CollectionPermissionField {296 /// @dev Owner of token can nest tokens under it.297 TokenOwner,298 /// @dev Admin of token collection can nest tokens under token.299 CollectionAdmin300}301302/// @dev Nested collections.303struct CollectionNesting {304 bool token_owner;305 uint256[] ids;306}307308/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.309struct CollectionLimit {310 CollectionLimitField field;311 OptionUint value;312}313314/// @dev Ethereum representation of Optional value with uint256.315struct OptionUint {316 bool status;317 uint256 value;318}319320/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.321enum CollectionLimitField {322 /// @dev How many tokens can a user have on one account.323 AccountTokenOwnership,324 /// @dev How many bytes of data are available for sponsorship.325 SponsoredDataSize,326 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]327 SponsoredDataRateLimit,328 /// @dev How many tokens can be mined into this collection.329 TokenLimit,330 /// @dev Timeouts for transfer sponsoring.331 SponsorTransferTimeout,332 /// @dev Timeout for sponsoring an approval in passed blocks.333 SponsorApproveTimeout,334 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).335 OwnerCanTransfer,336 /// @dev Can the collection owner burn other people's tokens.337 OwnerCanDestroy,338 /// @dev Is it possible to send tokens from this collection between users.339 TransferEnabled340}341342/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).343struct Property {344 string key;345 bytes value;346}347348/// @dev the ERC-165 identifier for this interface is 0x7dee5997349interface ERC20UniqueExtensions is Dummy, ERC165 {350 /// @notice A description for the collection.351 /// @dev EVM selector for this function is: 0x7284e416,352 /// or in textual repr: description()353 function description() external view returns (string memory);354355 /// @dev EVM selector for this function is: 0x269e6158,356 /// or in textual repr: mintCross((address,uint256),uint256)357 function mintCross(CrossAccount memory to, uint256 amount) external returns (bool);358359 /// @dev EVM selector for this function is: 0x0ecd0ab0,360 /// or in textual repr: approveCross((address,uint256),uint256)361 function approveCross(CrossAccount memory spender, uint256 amount) external returns (bool);362363 // /// Burn tokens from account364 // /// @dev Function that burns an `amount` of the tokens of a given account,365 // /// deducting from the sender's allowance for said account.366 // /// @param from The account whose tokens will be burnt.367 // /// @param amount The amount that will be burnt.368 // /// @dev EVM selector for this function is: 0x79cc6790,369 // /// or in textual repr: burnFrom(address,uint256)370 // function burnFrom(address from, uint256 amount) external returns (bool);371372 /// Burn tokens from account373 /// @dev Function that burns an `amount` of the tokens of a given account,374 /// deducting from the sender's allowance for said account.375 /// @param from The account whose tokens will be burnt.376 /// @param amount The amount that will be burnt.377 /// @dev EVM selector for this function is: 0xbb2f5a58,378 /// or in textual repr: burnFromCross((address,uint256),uint256)379 function burnFromCross(CrossAccount memory from, uint256 amount) external returns (bool);380381 /// Mint tokens for multiple accounts.382 /// @param amounts array of pairs of account address and amount383 /// @dev EVM selector for this function is: 0x1acf2d55,384 /// or in textual repr: mintBulk((address,uint256)[])385 function mintBulk(Tuple9[] memory amounts) external returns (bool);386387 /// @dev EVM selector for this function is: 0x2ada85ff,388 /// or in textual repr: transferCross((address,uint256),uint256)389 function transferCross(CrossAccount memory to, uint256 amount) external returns (bool);390391 /// @dev EVM selector for this function is: 0xd5cf430b,392 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)393 function transferFromCross(394 CrossAccount memory from,395 CrossAccount memory to,396 uint256 amount397 ) external returns (bool);398}399400/// @dev anonymous struct401struct Tuple9 {402 address field_0;403 uint256 field_1;404}405406/// @dev the ERC-165 identifier for this interface is 0x40c10f19407interface ERC20Mintable is Dummy, ERC165 {408 /// Mint tokens for `to` account.409 /// @param to account that will receive minted tokens410 /// @param amount amount of tokens to mint411 /// @dev EVM selector for this function is: 0x40c10f19,412 /// or in textual repr: mint(address,uint256)413 function mint(address to, uint256 amount) external returns (bool);414}415416/// @dev inlined interface417interface ERC20Events {418 event Transfer(address indexed from, address indexed to, uint256 value);419 event Approval(address indexed owner, address indexed spender, uint256 value);420}421422/// @dev the ERC-165 identifier for this interface is 0x8cb847c4423interface ERC20 is Dummy, ERC165, ERC20Events {424 /// @dev EVM selector for this function is: 0x06fdde03,425 /// or in textual repr: name()426 function name() external view returns (string memory);427428 /// @dev EVM selector for this function is: 0x95d89b41,429 /// or in textual repr: symbol()430 function symbol() external view returns (string memory);431432 /// @dev EVM selector for this function is: 0x18160ddd,433 /// or in textual repr: totalSupply()434 function totalSupply() external view returns (uint256);435436 /// @dev EVM selector for this function is: 0x313ce567,437 /// or in textual repr: decimals()438 function decimals() external view returns (uint8);439440 /// @dev EVM selector for this function is: 0x70a08231,441 /// or in textual repr: balanceOf(address)442 function balanceOf(address owner) external view returns (uint256);443444 /// @dev EVM selector for this function is: 0xa9059cbb,445 /// or in textual repr: transfer(address,uint256)446 function transfer(address to, uint256 amount) external returns (bool);447448 /// @dev EVM selector for this function is: 0x23b872dd,449 /// or in textual repr: transferFrom(address,address,uint256)450 function transferFrom(451 address from,452 address to,453 uint256 amount454 ) external returns (bool);455456 /// @dev EVM selector for this function is: 0x095ea7b3,457 /// or in textual repr: approve(address,uint256)458 function approve(address spender, uint256 amount) external returns (bool);459460 /// @dev EVM selector for this function is: 0xdd62ed3e,461 /// or in textual repr: allowance(address,address)462 function allowance(address owner, address spender) external view returns (uint256);463464 /// @notice Returns collection helper contract address465 /// @dev EVM selector for this function is: 0x1896cce6,466 /// or in textual repr: collectionHelperAddress()467 function collectionHelperAddress() external view returns (address);468}469470interface 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
@@ -82,9 +82,7 @@
/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
- /// @dev Property key.
string key;
- /// @dev Property value.
bytes value;
}
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -82,9 +82,7 @@
/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
struct Property {
- /// @dev Property key.
string key;
- /// @dev Property value.
bytes value;
}