difftreelog
feat add enum for AccessMode
in: master
12 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -503,18 +503,12 @@
}
/// Set the collection access method.
/// @param mode Access mode
- /// 0 for Normal
- /// 1 for AllowList
- fn set_collection_access(&mut self, caller: caller, mode: u8) -> Result<()> {
+ fn set_collection_access(&mut self, caller: caller, mode: eth::AccessMode) -> Result<()> {
self.consume_store_reads_and_writes(1, 1)?;
let caller = T::CrossAccountId::from_eth(caller);
let permissions = CollectionPermissions {
- access: Some(match mode {
- 0 => AccessMode::Normal,
- 1 => AccessMode::AllowList,
- _ => return Err("not supported access mode".into()),
- }),
+ access: Some(mode.into()),
..Default::default()
};
<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -413,3 +413,32 @@
Self { field, value }
}
}
+
+/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).
+#[derive(AbiCoder, Copy, Clone, Default, Debug)]
+#[repr(u8)]
+pub enum AccessMode {
+ /// Access grant for owner and admins. Used as default.
+ #[default]
+ Normal,
+ /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.
+ AllowList,
+}
+
+impl From<up_data_structs::AccessMode> for AccessMode {
+ fn from(value: up_data_structs::AccessMode) -> Self {
+ match value {
+ up_data_structs::AccessMode::Normal => AccessMode::Normal,
+ up_data_structs::AccessMode::AllowList => AccessMode::AllowList,
+ }
+ }
+}
+
+impl Into<up_data_structs::AccessMode> for AccessMode {
+ fn into(self) -> up_data_structs::AccessMode {
+ match self {
+ AccessMode::Normal => up_data_structs::AccessMode::Normal,
+ AccessMode::AllowList => up_data_structs::AccessMode::AllowList,
+ }
+ }
+}
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
@@ -274,11 +274,9 @@
/// Set the collection access method.
/// @param mode Access mode
- /// 0 for Normal
- /// 1 for AllowList
/// @dev EVM selector for this function is: 0x41835d4c,
/// or in textual repr: setCollectionAccess(uint8)
- function setCollectionAccess(uint8 mode) public {
+ function setCollectionAccess(AccessMode mode) public {
require(false, stub_error);
mode;
dummy = 0;
@@ -443,6 +441,14 @@
uint256 sub;
}
+/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).
+enum AccessMode {
+ /// Access grant for owner and admins. Used as default.
+ Normal,
+ /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.
+ AllowList
+}
+
/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
struct CollectionNestingPermission {
CollectionPermissionField field;
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -416,11 +416,9 @@
/// Set the collection access method.
/// @param mode Access mode
- /// 0 for Normal
- /// 1 for AllowList
/// @dev EVM selector for this function is: 0x41835d4c,
/// or in textual repr: setCollectionAccess(uint8)
- function setCollectionAccess(uint8 mode) public {
+ function setCollectionAccess(AccessMode mode) public {
require(false, stub_error);
mode;
dummy = 0;
@@ -585,6 +583,14 @@
uint256 sub;
}
+/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).
+enum AccessMode {
+ /// Access grant for owner and admins. Used as default.
+ Normal,
+ /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.
+ AllowList
+}
+
/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
struct CollectionNestingPermission {
CollectionPermissionField field;
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -416,11 +416,9 @@
/// Set the collection access method.
/// @param mode Access mode
- /// 0 for Normal
- /// 1 for AllowList
/// @dev EVM selector for this function is: 0x41835d4c,
/// or in textual repr: setCollectionAccess(uint8)
- function setCollectionAccess(uint8 mode) public {
+ function setCollectionAccess(AccessMode mode) public {
require(false, stub_error);
mode;
dummy = 0;
@@ -585,6 +583,14 @@
uint256 sub;
}
+/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).
+enum AccessMode {
+ /// Access grant for owner and admins. Used as default.
+ Normal,
+ /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.
+ AllowList
+}
+
/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
struct CollectionNestingPermission {
CollectionPermissionField field;
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -488,7 +488,9 @@
"type": "function"
},
{
- "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],
+ "inputs": [
+ { "internalType": "enum AccessMode", "name": "mode", "type": "uint8" }
+ ],
"name": "setCollectionAccess",
"outputs": [],
"stateMutability": "nonpayable",
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -650,7 +650,9 @@
"type": "function"
},
{
- "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],
+ "inputs": [
+ { "internalType": "enum AccessMode", "name": "mode", "type": "uint8" }
+ ],
"name": "setCollectionAccess",
"outputs": [],
"stateMutability": "nonpayable",
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -632,7 +632,9 @@
"type": "function"
},
{
- "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],
+ "inputs": [
+ { "internalType": "enum AccessMode", "name": "mode", "type": "uint8" }
+ ],
"name": "setCollectionAccess",
"outputs": [],
"stateMutability": "nonpayable",
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(CrossAddress 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 (CrossAddress 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(CrossAddress 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(CrossAddress 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(CrossAddress 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(CrossAddress 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(CrossAddress 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(CrossAddress 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 (CrossAddress 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 (CrossAddress[] 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(CrossAddress memory newOwner) external;280}281282/// Cross account struct283struct CrossAddress {284 address eth;285 uint256 sub;286}287288/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.289struct CollectionNestingPermission {290 CollectionPermissionField field;291 bool value;292}293294/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.295enum CollectionPermissionField {296 /// Owner of token can nest tokens under it.297 TokenOwner,298 /// Admin of token collection can nest tokens under token.299 CollectionAdmin300}301302/// Nested collections.303struct CollectionNesting {304 bool token_owner;305 uint256[] ids;306}307308/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.309struct CollectionLimit {310 CollectionLimitField field;311 OptionUint256 value;312}313314/// Optional value315struct OptionUint256 {316 /// Shows the status of accessibility of value317 bool status;318 /// Actual value if `status` is true319 uint256 value;320}321322/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.323enum CollectionLimitField {324 /// How many tokens can a user have on one account.325 AccountTokenOwnership,326 /// How many bytes of data are available for sponsorship.327 SponsoredDataSize,328 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]329 SponsoredDataRateLimit,330 /// How many tokens can be mined into this collection.331 TokenLimit,332 /// Timeouts for transfer sponsoring.333 SponsorTransferTimeout,334 /// Timeout for sponsoring an approval in passed blocks.335 SponsorApproveTimeout,336 /// Whether the collection owner of the collection can send tokens (which belong to other users).337 OwnerCanTransfer,338 /// Can the collection owner burn other people's tokens.339 OwnerCanDestroy,340 /// Is it possible to send tokens from this collection between users.341 TransferEnabled342}343344/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).345struct Property {346 string key;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(CrossAddress 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(CrossAddress 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(CrossAddress 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(CrossAddress 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 CrossAddress memory from,397 CrossAddress 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(CrossAddress 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 (CrossAddress 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(CrossAddress 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(CrossAddress 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 /// @dev EVM selector for this function is: 0x41835d4c,179 /// or in textual repr: setCollectionAccess(uint8)180 function setCollectionAccess(AccessMode mode) external;181182 /// Checks that user allowed to operate with collection.183 ///184 /// @param user User address to check.185 /// @dev EVM selector for this function is: 0x91b6df49,186 /// or in textual repr: allowlistedCross((address,uint256))187 function allowlistedCross(CrossAddress memory user) external view returns (bool);188189 // /// Add the user to the allowed list.190 // ///191 // /// @param user Address of a trusted user.192 // /// @dev EVM selector for this function is: 0x67844fe6,193 // /// or in textual repr: addToCollectionAllowList(address)194 // function addToCollectionAllowList(address user) external;195196 /// Add user to allowed list.197 ///198 /// @param user User cross account address.199 /// @dev EVM selector for this function is: 0xa0184a3a,200 /// or in textual repr: addToCollectionAllowListCross((address,uint256))201 function addToCollectionAllowListCross(CrossAddress memory user) external;202203 // /// Remove the user from the allowed list.204 // ///205 // /// @param user Address of a removed user.206 // /// @dev EVM selector for this function is: 0x85c51acb,207 // /// or in textual repr: removeFromCollectionAllowList(address)208 // function removeFromCollectionAllowList(address user) external;209210 /// Remove user from allowed list.211 ///212 /// @param user User cross account address.213 /// @dev EVM selector for this function is: 0x09ba452a,214 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))215 function removeFromCollectionAllowListCross(CrossAddress memory user) external;216217 /// Switch permission for minting.218 ///219 /// @param mode Enable if "true".220 /// @dev EVM selector for this function is: 0x00018e84,221 /// or in textual repr: setCollectionMintMode(bool)222 function setCollectionMintMode(bool mode) external;223224 // /// Check that account is the owner or admin of the collection225 // ///226 // /// @param user account to verify227 // /// @return "true" if account is the owner or admin228 // /// @dev EVM selector for this function is: 0x9811b0c7,229 // /// or in textual repr: isOwnerOrAdmin(address)230 // function isOwnerOrAdmin(address user) external view returns (bool);231232 /// Check that account is the owner or admin of the collection233 ///234 /// @param user User cross account to verify235 /// @return "true" if account is the owner or admin236 /// @dev EVM selector for this function is: 0x3e75a905,237 /// or in textual repr: isOwnerOrAdminCross((address,uint256))238 function isOwnerOrAdminCross(CrossAddress memory user) external view returns (bool);239240 /// Returns collection type241 ///242 /// @return `Fungible` or `NFT` or `ReFungible`243 /// @dev EVM selector for this function is: 0xd34b55b8,244 /// or in textual repr: uniqueCollectionType()245 function uniqueCollectionType() external view returns (string memory);246247 /// Get collection owner.248 ///249 /// @return Tuble with sponsor address and his substrate mirror.250 /// If address is canonical then substrate mirror is zero and vice versa.251 /// @dev EVM selector for this function is: 0xdf727d3b,252 /// or in textual repr: collectionOwner()253 function collectionOwner() external view returns (CrossAddress memory);254255 // /// Changes collection owner to another account256 // ///257 // /// @dev Owner can be changed only by current owner258 // /// @param newOwner new owner account259 // /// @dev EVM selector for this function is: 0x4f53e226,260 // /// or in textual repr: changeCollectionOwner(address)261 // function changeCollectionOwner(address newOwner) external;262263 /// Get collection administrators264 ///265 /// @return Vector of tuples with admins address and his substrate mirror.266 /// If address is canonical then substrate mirror is zero and vice versa.267 /// @dev EVM selector for this function is: 0x5813216b,268 /// or in textual repr: collectionAdmins()269 function collectionAdmins() external view returns (CrossAddress[] memory);270271 /// Changes collection owner to another account272 ///273 /// @dev Owner can be changed only by current owner274 /// @param newOwner new owner cross account275 /// @dev EVM selector for this function is: 0x6496c497,276 /// or in textual repr: changeCollectionOwnerCross((address,uint256))277 function changeCollectionOwnerCross(CrossAddress memory newOwner) external;278}279280/// Cross account struct281struct CrossAddress {282 address eth;283 uint256 sub;284}285286/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).287enum AccessMode {288 /// Access grant for owner and admins. Used as default.289 Normal,290 /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.291 AllowList292}293294/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.295struct CollectionNestingPermission {296 CollectionPermissionField field;297 bool value;298}299300/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.301enum CollectionPermissionField {302 /// Owner of token can nest tokens under it.303 TokenOwner,304 /// Admin of token collection can nest tokens under token.305 CollectionAdmin306}307308/// Nested collections.309struct CollectionNesting {310 bool token_owner;311 uint256[] ids;312}313314/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.315struct CollectionLimit {316 CollectionLimitField field;317 OptionUint256 value;318}319320/// Optional value321struct OptionUint256 {322 /// Shows the status of accessibility of value323 bool status;324 /// Actual value if `status` is true325 uint256 value;326}327328/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.329enum CollectionLimitField {330 /// How many tokens can a user have on one account.331 AccountTokenOwnership,332 /// How many bytes of data are available for sponsorship.333 SponsoredDataSize,334 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]335 SponsoredDataRateLimit,336 /// How many tokens can be mined into this collection.337 TokenLimit,338 /// Timeouts for transfer sponsoring.339 SponsorTransferTimeout,340 /// Timeout for sponsoring an approval in passed blocks.341 SponsorApproveTimeout,342 /// Whether the collection owner of the collection can send tokens (which belong to other users).343 OwnerCanTransfer,344 /// Can the collection owner burn other people's tokens.345 OwnerCanDestroy,346 /// Is it possible to send tokens from this collection between users.347 TransferEnabled348}349350/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).351struct Property {352 string key;353 bytes value;354}355356/// @dev the ERC-165 identifier for this interface is 0x7dee5997357interface ERC20UniqueExtensions is Dummy, ERC165 {358 /// @notice A description for the collection.359 /// @dev EVM selector for this function is: 0x7284e416,360 /// or in textual repr: description()361 function description() external view returns (string memory);362363 /// @dev EVM selector for this function is: 0x269e6158,364 /// or in textual repr: mintCross((address,uint256),uint256)365 function mintCross(CrossAddress memory to, uint256 amount) external returns (bool);366367 /// @dev EVM selector for this function is: 0x0ecd0ab0,368 /// or in textual repr: approveCross((address,uint256),uint256)369 function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);370371 // /// Burn tokens from account372 // /// @dev Function that burns an `amount` of the tokens of a given account,373 // /// deducting from the sender's allowance for said account.374 // /// @param from The account whose tokens will be burnt.375 // /// @param amount The amount that will be burnt.376 // /// @dev EVM selector for this function is: 0x79cc6790,377 // /// or in textual repr: burnFrom(address,uint256)378 // function burnFrom(address from, 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: 0xbb2f5a58,386 /// or in textual repr: burnFromCross((address,uint256),uint256)387 function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);388389 /// Mint tokens for multiple accounts.390 /// @param amounts array of pairs of account address and amount391 /// @dev EVM selector for this function is: 0x1acf2d55,392 /// or in textual repr: mintBulk((address,uint256)[])393 function mintBulk(Tuple9[] memory amounts) external returns (bool);394395 /// @dev EVM selector for this function is: 0x2ada85ff,396 /// or in textual repr: transferCross((address,uint256),uint256)397 function transferCross(CrossAddress memory to, uint256 amount) external returns (bool);398399 /// @dev EVM selector for this function is: 0xd5cf430b,400 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)401 function transferFromCross(402 CrossAddress memory from,403 CrossAddress memory to,404 uint256 amount405 ) external returns (bool);406}407408/// @dev anonymous struct409struct Tuple9 {410 address field_0;411 uint256 field_1;412}413414/// @dev the ERC-165 identifier for this interface is 0x40c10f19415interface ERC20Mintable is Dummy, ERC165 {416 /// Mint tokens for `to` account.417 /// @param to account that will receive minted tokens418 /// @param amount amount of tokens to mint419 /// @dev EVM selector for this function is: 0x40c10f19,420 /// or in textual repr: mint(address,uint256)421 function mint(address to, uint256 amount) external returns (bool);422}423424/// @dev inlined interface425interface ERC20Events {426 event Transfer(address indexed from, address indexed to, uint256 value);427 event Approval(address indexed owner, address indexed spender, uint256 value);428}429430/// @dev the ERC-165 identifier for this interface is 0x8cb847c4431interface ERC20 is Dummy, ERC165, ERC20Events {432 /// @dev EVM selector for this function is: 0x06fdde03,433 /// or in textual repr: name()434 function name() external view returns (string memory);435436 /// @dev EVM selector for this function is: 0x95d89b41,437 /// or in textual repr: symbol()438 function symbol() external view returns (string memory);439440 /// @dev EVM selector for this function is: 0x18160ddd,441 /// or in textual repr: totalSupply()442 function totalSupply() external view returns (uint256);443444 /// @dev EVM selector for this function is: 0x313ce567,445 /// or in textual repr: decimals()446 function decimals() external view returns (uint8);447448 /// @dev EVM selector for this function is: 0x70a08231,449 /// or in textual repr: balanceOf(address)450 function balanceOf(address owner) external view returns (uint256);451452 /// @dev EVM selector for this function is: 0xa9059cbb,453 /// or in textual repr: transfer(address,uint256)454 function transfer(address to, uint256 amount) external returns (bool);455456 /// @dev EVM selector for this function is: 0x23b872dd,457 /// or in textual repr: transferFrom(address,address,uint256)458 function transferFrom(459 address from,460 address to,461 uint256 amount462 ) external returns (bool);463464 /// @dev EVM selector for this function is: 0x095ea7b3,465 /// or in textual repr: approve(address,uint256)466 function approve(address spender, uint256 amount) external returns (bool);467468 /// @dev EVM selector for this function is: 0xdd62ed3e,469 /// or in textual repr: allowance(address,address)470 function allowance(address owner, address spender) external view returns (uint256);471472 /// @notice Returns collection helper contract address473 /// @dev EVM selector for this function is: 0x1896cce6,474 /// or in textual repr: collectionHelperAddress()475 function collectionHelperAddress() external view returns (address);476}477478interface 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
@@ -275,11 +275,9 @@
/// Set the collection access method.
/// @param mode Access mode
- /// 0 for Normal
- /// 1 for AllowList
/// @dev EVM selector for this function is: 0x41835d4c,
/// or in textual repr: setCollectionAccess(uint8)
- function setCollectionAccess(uint8 mode) external;
+ function setCollectionAccess(AccessMode mode) external;
/// Checks that user allowed to operate with collection.
///
@@ -385,6 +383,14 @@
uint256 sub;
}
+/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).
+enum AccessMode {
+ /// Access grant for owner and admins. Used as default.
+ Normal,
+ /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.
+ AllowList
+}
+
/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
struct CollectionNestingPermission {
CollectionPermissionField field;
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -275,11 +275,9 @@
/// Set the collection access method.
/// @param mode Access mode
- /// 0 for Normal
- /// 1 for AllowList
/// @dev EVM selector for this function is: 0x41835d4c,
/// or in textual repr: setCollectionAccess(uint8)
- function setCollectionAccess(uint8 mode) external;
+ function setCollectionAccess(AccessMode mode) external;
/// Checks that user allowed to operate with collection.
///
@@ -385,6 +383,14 @@
uint256 sub;
}
+/// Ethereum representation of `AccessMode` (see [`up_data_structs::AccessMode`]).
+enum AccessMode {
+ /// Access grant for owner and admins. Used as default.
+ Normal,
+ /// Like a [`Normal`](AccessMode::Normal) but also users in allow list.
+ AllowList
+}
+
/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
struct CollectionNestingPermission {
CollectionPermissionField field;