difftreelog
fix after rebase
in: master
5 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -86,7 +86,6 @@
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-use crate::erc::CollectionHelpersEvents;
#[cfg(feature = "runtime-benchmarks")]
pub mod benchmarking;
pub mod dispatch;
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -1,751 +0,0 @@
-// SPDX-License-Identifier: OTHER
-// This code is automatically generated
-
-pragma solidity >=0.8.0 <0.9.0;
-
-/// @dev common stubs holder
-contract Dummy {
- uint8 dummy;
- string stub_error = "this contract is implemented in native";
-}
-
-contract ERC165 is Dummy {
- function supportsInterface(bytes4 interfaceID) external view returns (bool) {
- require(false, stub_error);
- interfaceID;
- return true;
- }
-}
-
-/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1
-contract Collection is Dummy, ERC165 {
- // /// Set collection property.
- // ///
- // /// @param key Property key.
- // /// @param value Propery value.
- // /// @dev EVM selector for this function is: 0x2f073f66,
- // /// or in textual repr: setCollectionProperty(string,bytes)
- // function setCollectionProperty(string memory key, bytes memory value) public {
- // require(false, stub_error);
- // key;
- // value;
- // dummy = 0;
- // }
-
- /// Set collection properties.
- ///
- /// @param properties Vector of properties key/value pair.
- /// @dev EVM selector for this function is: 0x50b26b2a,
- /// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Property[] memory properties) public {
- require(false, stub_error);
- properties;
- dummy = 0;
- }
-
- // /// Delete collection property.
- // ///
- // /// @param key Property key.
- // /// @dev EVM selector for this function is: 0x7b7debce,
- // /// or in textual repr: deleteCollectionProperty(string)
- // function deleteCollectionProperty(string memory key) public {
- // require(false, stub_error);
- // key;
- // dummy = 0;
- // }
-
- /// Delete collection properties.
- ///
- /// @param keys Properties keys.
- /// @dev EVM selector for this function is: 0xee206ee3,
- /// or in textual repr: deleteCollectionProperties(string[])
- function deleteCollectionProperties(string[] memory keys) public {
- require(false, stub_error);
- keys;
- dummy = 0;
- }
-
- /// Get collection property.
- ///
- /// @dev Throws error if key not found.
- ///
- /// @param key Property key.
- /// @return bytes The property corresponding to the key.
- /// @dev EVM selector for this function is: 0xcf24fd6d,
- /// or in textual repr: collectionProperty(string)
- function collectionProperty(string memory key) public view returns (bytes memory) {
- require(false, stub_error);
- key;
- dummy;
- return hex"";
- }
-
- /// Get collection properties.
- ///
- /// @param keys Properties keys. Empty keys for all propertyes.
- /// @return Vector of properties key/value pairs.
- /// @dev EVM selector for this function is: 0x285fb8e6,
- /// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Property[] memory) {
- require(false, stub_error);
- keys;
- dummy;
- return new Property[](0);
- }
-
- // /// Set the sponsor of the collection.
- // ///
- // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
- // ///
- // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
- // /// @dev EVM selector for this function is: 0x7623402e,
- // /// or in textual repr: setCollectionSponsor(address)
- // function setCollectionSponsor(address sponsor) public {
- // require(false, stub_error);
- // sponsor;
- // dummy = 0;
- // }
-
- /// Set the sponsor of the collection.
- ///
- /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
- ///
- /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
- /// @dev EVM selector for this function is: 0x84a1d5a8,
- /// or in textual repr: setCollectionSponsorCross((address,uint256))
- function setCollectionSponsorCross(CrossAddress memory sponsor) public {
- require(false, stub_error);
- sponsor;
- dummy = 0;
- }
-
- /// Whether there is a pending sponsor.
- /// @dev EVM selector for this function is: 0x058ac185,
- /// or in textual repr: hasCollectionPendingSponsor()
- function hasCollectionPendingSponsor() public view returns (bool) {
- require(false, stub_error);
- dummy;
- return false;
- }
-
- /// Collection sponsorship confirmation.
- ///
- /// @dev After setting the sponsor for the collection, it must be confirmed with this function.
- /// @dev EVM selector for this function is: 0x3c50e97a,
- /// or in textual repr: confirmCollectionSponsorship()
- function confirmCollectionSponsorship() public {
- require(false, stub_error);
- dummy = 0;
- }
-
- /// Remove collection sponsor.
- /// @dev EVM selector for this function is: 0x6e0326a3,
- /// or in textual repr: removeCollectionSponsor()
- function removeCollectionSponsor() public {
- require(false, stub_error);
- dummy = 0;
- }
-
- /// Get current sponsor.
- ///
- /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- /// @dev EVM selector for this function is: 0x6ec0a9f1,
- /// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (CrossAddress memory) {
- require(false, stub_error);
- dummy;
- return CrossAddress(0x0000000000000000000000000000000000000000, 0);
- }
-
- /// Get current collection limits.
- ///
- /// @return Array of collection limits
- /// @dev EVM selector for this function is: 0xf63bc572,
- /// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (CollectionLimit[] memory) {
- require(false, stub_error);
- dummy;
- return new CollectionLimit[](0);
- }
-
- /// Set limits for the collection.
- /// @dev Throws error if limit not found.
- /// @param limit Some limit.
- /// @dev EVM selector for this function is: 0x2316ee74,
- /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))
- function setCollectionLimit(CollectionLimit memory limit) public {
- require(false, stub_error);
- limit;
- dummy = 0;
- }
-
- /// Get contract address.
- /// @dev EVM selector for this function is: 0xf6b4dfb4,
- /// or in textual repr: contractAddress()
- function contractAddress() public view returns (address) {
- require(false, stub_error);
- dummy;
- return 0x0000000000000000000000000000000000000000;
- }
-
- /// Add collection admin.
- /// @param newAdmin Cross account administrator address.
- /// @dev EVM selector for this function is: 0x859aa7d6,
- /// or in textual repr: addCollectionAdminCross((address,uint256))
- function addCollectionAdminCross(CrossAddress memory newAdmin) public {
- require(false, stub_error);
- newAdmin;
- dummy = 0;
- }
-
- /// Remove collection admin.
- /// @param admin Cross account administrator address.
- /// @dev EVM selector for this function is: 0x6c0cd173,
- /// or in textual repr: removeCollectionAdminCross((address,uint256))
- function removeCollectionAdminCross(CrossAddress memory admin) public {
- require(false, stub_error);
- admin;
- dummy = 0;
- }
-
- // /// Add collection admin.
- // /// @param newAdmin Address of the added administrator.
- // /// @dev EVM selector for this function is: 0x92e462c7,
- // /// or in textual repr: addCollectionAdmin(address)
- // function addCollectionAdmin(address newAdmin) public {
- // require(false, stub_error);
- // newAdmin;
- // dummy = 0;
- // }
-
- // /// Remove collection admin.
- // ///
- // /// @param admin Address of the removed administrator.
- // /// @dev EVM selector for this function is: 0xfafd7b42,
- // /// or in textual repr: removeCollectionAdmin(address)
- // function removeCollectionAdmin(address admin) public {
- // require(false, stub_error);
- // admin;
- // dummy = 0;
- // }
-
- /// Toggle accessibility of collection nesting.
- ///
- /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'
- /// @dev EVM selector for this function is: 0x112d4586,
- /// or in textual repr: setCollectionNesting(bool)
- function setCollectionNesting(bool enable) public {
- require(false, stub_error);
- enable;
- dummy = 0;
- }
-
- /// Toggle accessibility of collection nesting.
- ///
- /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'
- /// @param collections Addresses of collections that will be available for nesting.
- /// @dev EVM selector for this function is: 0x64872396,
- /// or in textual repr: setCollectionNesting(bool,address[])
- function setCollectionNesting(bool enable, address[] memory collections) public {
- require(false, stub_error);
- enable;
- collections;
- dummy = 0;
- }
-
- /// Returns nesting for a collection
- /// @dev EVM selector for this function is: 0x22d25bfe,
- /// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {
- require(false, stub_error);
- dummy;
- return CollectionNesting(false, new uint256[](0));
- }
-
- /// Returns permissions for a collection
- /// @dev EVM selector for this function is: 0x5b2eaf4b,
- /// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {
- require(false, stub_error);
- dummy;
- return new CollectionNestingPermission[](0);
- }
-
- /// Set the collection access method.
- /// @param mode Access mode
- /// @dev EVM selector for this function is: 0x41835d4c,
- /// or in textual repr: setCollectionAccess(uint8)
- function setCollectionAccess(AccessMode mode) public {
- require(false, stub_error);
- mode;
- dummy = 0;
- }
-
- /// Checks that user allowed to operate with collection.
- ///
- /// @param user User address to check.
- /// @dev EVM selector for this function is: 0x91b6df49,
- /// or in textual repr: allowlistedCross((address,uint256))
- function allowlistedCross(CrossAddress memory user) public view returns (bool) {
- require(false, stub_error);
- user;
- dummy;
- return false;
- }
-
- // /// Add the user to the allowed list.
- // ///
- // /// @param user Address of a trusted user.
- // /// @dev EVM selector for this function is: 0x67844fe6,
- // /// or in textual repr: addToCollectionAllowList(address)
- // function addToCollectionAllowList(address user) public {
- // require(false, stub_error);
- // user;
- // dummy = 0;
- // }
-
- /// Add user to allowed list.
- ///
- /// @param user User cross account address.
- /// @dev EVM selector for this function is: 0xa0184a3a,
- /// or in textual repr: addToCollectionAllowListCross((address,uint256))
- function addToCollectionAllowListCross(CrossAddress memory user) public {
- require(false, stub_error);
- user;
- dummy = 0;
- }
-
- // /// Remove the user from the allowed list.
- // ///
- // /// @param user Address of a removed user.
- // /// @dev EVM selector for this function is: 0x85c51acb,
- // /// or in textual repr: removeFromCollectionAllowList(address)
- // function removeFromCollectionAllowList(address user) public {
- // require(false, stub_error);
- // user;
- // dummy = 0;
- // }
-
- /// Remove user from allowed list.
- ///
- /// @param user User cross account address.
- /// @dev EVM selector for this function is: 0x09ba452a,
- /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))
- function removeFromCollectionAllowListCross(CrossAddress memory user) public {
- require(false, stub_error);
- user;
- dummy = 0;
- }
-
- /// Switch permission for minting.
- ///
- /// @param mode Enable if "true".
- /// @dev EVM selector for this function is: 0x00018e84,
- /// or in textual repr: setCollectionMintMode(bool)
- function setCollectionMintMode(bool mode) public {
- require(false, stub_error);
- mode;
- dummy = 0;
- }
-
- // /// Check that account is the owner or admin of the collection
- // ///
- // /// @param user account to verify
- // /// @return "true" if account is the owner or admin
- // /// @dev EVM selector for this function is: 0x9811b0c7,
- // /// or in textual repr: isOwnerOrAdmin(address)
- // function isOwnerOrAdmin(address user) public view returns (bool) {
- // require(false, stub_error);
- // user;
- // dummy;
- // return false;
- // }
-
- /// Check that account is the owner or admin of the collection
- ///
- /// @param user User cross account to verify
- /// @return "true" if account is the owner or admin
- /// @dev EVM selector for this function is: 0x3e75a905,
- /// or in textual repr: isOwnerOrAdminCross((address,uint256))
- function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {
- require(false, stub_error);
- user;
- dummy;
- return false;
- }
-
- /// Returns collection type
- ///
- /// @return `Fungible` or `NFT` or `ReFungible`
- /// @dev EVM selector for this function is: 0xd34b55b8,
- /// or in textual repr: uniqueCollectionType()
- function uniqueCollectionType() public view returns (string memory) {
- require(false, stub_error);
- dummy;
- return "";
- }
-
- /// Get collection owner.
- ///
- /// @return Tuble with sponsor address and his substrate mirror.
- /// If address is canonical then substrate mirror is zero and vice versa.
- /// @dev EVM selector for this function is: 0xdf727d3b,
- /// or in textual repr: collectionOwner()
- function collectionOwner() public view returns (CrossAddress memory) {
- require(false, stub_error);
- dummy;
- return CrossAddress(0x0000000000000000000000000000000000000000, 0);
- }
-
- // /// Changes collection owner to another account
- // ///
- // /// @dev Owner can be changed only by current owner
- // /// @param newOwner new owner account
- // /// @dev EVM selector for this function is: 0x4f53e226,
- // /// or in textual repr: changeCollectionOwner(address)
- // function changeCollectionOwner(address newOwner) public {
- // require(false, stub_error);
- // newOwner;
- // dummy = 0;
- // }
-
- /// Get collection administrators
- ///
- /// @return Vector of tuples with admins address and his substrate mirror.
- /// If address is canonical then substrate mirror is zero and vice versa.
- /// @dev EVM selector for this function is: 0x5813216b,
- /// or in textual repr: collectionAdmins()
- function collectionAdmins() public view returns (CrossAddress[] memory) {
- require(false, stub_error);
- dummy;
- return new CrossAddress[](0);
- }
-
- /// Changes collection owner to another account
- ///
- /// @dev Owner can be changed only by current owner
- /// @param newOwner new owner cross account
- /// @dev EVM selector for this function is: 0x6496c497,
- /// or in textual repr: changeCollectionOwnerCross((address,uint256))
- function changeCollectionOwnerCross(CrossAddress memory newOwner) public {
- require(false, stub_error);
- newOwner;
- dummy = 0;
- }
-}
-
-/// Cross account struct
-struct CrossAddress {
- address eth;
- 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;
- bool value;
-}
-
-/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissionField {
- /// Owner of token can nest tokens under it.
- TokenOwner,
- /// Admin of token collection can nest tokens under token.
- CollectionAdmin
-}
-
-/// Nested collections.
-struct CollectionNesting {
- bool token_owner;
- uint256[] ids;
-}
-
-/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
-struct CollectionLimit {
- CollectionLimitField field;
- OptionUint256 value;
-}
-
-/// Optional value
-struct OptionUint256 {
- /// Shows the status of accessibility of value
- bool status;
- /// Actual value if `status` is true
- uint256 value;
-}
-
-/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
-enum CollectionLimitField {
- /// How many tokens can a user have on one account.
- AccountTokenOwnership,
- /// How many bytes of data are available for sponsorship.
- SponsoredDataSize,
- /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]
- SponsoredDataRateLimit,
- /// How many tokens can be mined into this collection.
- TokenLimit,
- /// Timeouts for transfer sponsoring.
- SponsorTransferTimeout,
- /// Timeout for sponsoring an approval in passed blocks.
- SponsorApproveTimeout,
- /// Whether the collection owner of the collection can send tokens (which belong to other users).
- OwnerCanTransfer,
- /// Can the collection owner burn other people's tokens.
- OwnerCanDestroy,
- /// Is it possible to send tokens from this collection between users.
- TransferEnabled
-}
-
-/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
-struct Property {
- string key;
- bytes value;
-}
-
-/// @dev the ERC-165 identifier for this interface is 0x85d7dea6
-contract ERC20UniqueExtensions is Dummy, ERC165 {
- /// @dev Function to check the amount of tokens that an owner allowed to a spender.
- /// @param owner crossAddress The address which owns the funds.
- /// @param spender crossAddress The address which will spend the funds.
- /// @return A uint256 specifying the amount of tokens still available for the spender.
- /// @dev EVM selector for this function is: 0xe0af4bd7,
- /// or in textual repr: allowanceCross((address,uint256),(address,uint256))
- function allowanceCross(CrossAddress memory owner, CrossAddress memory spender) public view returns (uint256) {
- require(false, stub_error);
- owner;
- spender;
- dummy;
- return 0;
- }
-
- /// @notice A description for the collection.
- /// @dev EVM selector for this function is: 0x7284e416,
- /// or in textual repr: description()
- function description() public view returns (string memory) {
- require(false, stub_error);
- dummy;
- return "";
- }
-
- /// @dev EVM selector for this function is: 0x269e6158,
- /// or in textual repr: mintCross((address,uint256),uint256)
- function mintCross(CrossAddress memory to, uint256 amount) public returns (bool) {
- require(false, stub_error);
- to;
- amount;
- dummy = 0;
- return false;
- }
-
- /// @dev EVM selector for this function is: 0x0ecd0ab0,
- /// or in textual repr: approveCross((address,uint256),uint256)
- function approveCross(CrossAddress memory spender, uint256 amount) public returns (bool) {
- require(false, stub_error);
- spender;
- amount;
- dummy = 0;
- return false;
- }
-
- // /// Burn tokens from account
- // /// @dev Function that burns an `amount` of the tokens of a given account,
- // /// deducting from the sender's allowance for said account.
- // /// @param from The account whose tokens will be burnt.
- // /// @param amount The amount that will be burnt.
- // /// @dev EVM selector for this function is: 0x79cc6790,
- // /// or in textual repr: burnFrom(address,uint256)
- // function burnFrom(address from, uint256 amount) public returns (bool) {
- // require(false, stub_error);
- // from;
- // amount;
- // dummy = 0;
- // return false;
- // }
-
- /// Burn tokens from account
- /// @dev Function that burns an `amount` of the tokens of a given account,
- /// deducting from the sender's allowance for said account.
- /// @param from The account whose tokens will be burnt.
- /// @param amount The amount that will be burnt.
- /// @dev EVM selector for this function is: 0xbb2f5a58,
- /// or in textual repr: burnFromCross((address,uint256),uint256)
- function burnFromCross(CrossAddress memory from, uint256 amount) public returns (bool) {
- require(false, stub_error);
- from;
- amount;
- dummy = 0;
- return false;
- }
-
- /// Mint tokens for multiple accounts.
- /// @param amounts array of pairs of account address and amount
- /// @dev EVM selector for this function is: 0x1acf2d55,
- /// or in textual repr: mintBulk((address,uint256)[])
- function mintBulk(AmountForAddress[] memory amounts) public returns (bool) {
- require(false, stub_error);
- amounts;
- dummy = 0;
- return false;
- }
-
- /// @dev EVM selector for this function is: 0x2ada85ff,
- /// or in textual repr: transferCross((address,uint256),uint256)
- function transferCross(CrossAddress memory to, uint256 amount) public returns (bool) {
- require(false, stub_error);
- to;
- amount;
- dummy = 0;
- return false;
- }
-
- /// @dev EVM selector for this function is: 0xd5cf430b,
- /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
- function transferFromCross(
- CrossAddress memory from,
- CrossAddress memory to,
- uint256 amount
- ) public returns (bool) {
- require(false, stub_error);
- from;
- to;
- amount;
- dummy = 0;
- return false;
- }
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() public view returns (address) {
- require(false, stub_error);
- dummy;
- return 0x0000000000000000000000000000000000000000;
- }
-}
-
-struct AmountForAddress {
- address to;
- uint256 amount;
-}
-
-/// @dev the ERC-165 identifier for this interface is 0x40c10f19
-contract ERC20Mintable is Dummy, ERC165 {
- /// Mint tokens for `to` account.
- /// @param to account that will receive minted tokens
- /// @param amount amount of tokens to mint
- /// @dev EVM selector for this function is: 0x40c10f19,
- /// or in textual repr: mint(address,uint256)
- function mint(address to, uint256 amount) public returns (bool) {
- require(false, stub_error);
- to;
- amount;
- dummy = 0;
- return false;
- }
-}
-
-/// @dev inlined interface
-contract ERC20Events {
- event Transfer(address indexed from, address indexed to, uint256 value);
- event Approval(address indexed owner, address indexed spender, uint256 value);
-}
-
-/// @dev the ERC-165 identifier for this interface is 0x942e8b22
-contract ERC20 is Dummy, ERC165, ERC20Events {
- /// @dev EVM selector for this function is: 0x06fdde03,
- /// or in textual repr: name()
- function name() public view returns (string memory) {
- require(false, stub_error);
- dummy;
- return "";
- }
-
- /// @dev EVM selector for this function is: 0x95d89b41,
- /// or in textual repr: symbol()
- function symbol() public view returns (string memory) {
- require(false, stub_error);
- dummy;
- return "";
- }
-
- /// @dev EVM selector for this function is: 0x18160ddd,
- /// or in textual repr: totalSupply()
- function totalSupply() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- /// @dev EVM selector for this function is: 0x313ce567,
- /// or in textual repr: decimals()
- function decimals() public view returns (uint8) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- /// @dev EVM selector for this function is: 0x70a08231,
- /// or in textual repr: balanceOf(address)
- function balanceOf(address owner) public view returns (uint256) {
- require(false, stub_error);
- owner;
- dummy;
- return 0;
- }
-
- /// @dev EVM selector for this function is: 0xa9059cbb,
- /// or in textual repr: transfer(address,uint256)
- function transfer(address to, uint256 amount) public returns (bool) {
- require(false, stub_error);
- to;
- amount;
- dummy = 0;
- return false;
- }
-
- /// @dev EVM selector for this function is: 0x23b872dd,
- /// or in textual repr: transferFrom(address,address,uint256)
- function transferFrom(
- address from,
- address to,
- uint256 amount
- ) public returns (bool) {
- require(false, stub_error);
- from;
- to;
- amount;
- dummy = 0;
- return false;
- }
-
- /// @dev EVM selector for this function is: 0x095ea7b3,
- /// or in textual repr: approve(address,uint256)
- function approve(address spender, uint256 amount) public returns (bool) {
- require(false, stub_error);
- spender;
- amount;
- dummy = 0;
- return false;
- }
-
- /// @dev EVM selector for this function is: 0xdd62ed3e,
- /// or in textual repr: allowance(address,address)
- function allowance(address owner, address spender) public view returns (uint256) {
- require(false, stub_error);
- owner;
- spender;
- dummy;
- return 0;
- }
-}
-
-contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -623,7 +623,6 @@
is_token_owner,
|properties| <TokenProperties<T>>::set((collection.id, token_id), properties),
erc::ERC721TokenEvent::TokenChanged {
- collection_id: collection_id_to_address(collection.id),
token_id: token_id.into(),
}
.to_log(T::ContractAddress::get()),
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -572,7 +572,6 @@
is_token_owner,
|properties| <TokenProperties<T>>::set((collection.id, token_id), properties),
erc::ERC721TokenEvent::TokenChanged {
- collection_id: collection_id_to_address(collection.id),
token_id: token_id.into(),
}
.to_log(T::ContractAddress::get()),
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 /// @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 0x85d7dea6357interface ERC20UniqueExtensions is Dummy, ERC165 {358 /// @dev Function to check the amount of tokens that an owner allowed to a spender.359 /// @param owner crossAddress The address which owns the funds.360 /// @param spender crossAddress The address which will spend the funds.361 /// @return A uint256 specifying the amount of tokens still available for the spender.362 /// @dev EVM selector for this function is: 0xe0af4bd7,363 /// or in textual repr: allowanceCross((address,uint256),(address,uint256))364 function allowanceCross(CrossAddress memory owner, CrossAddress memory spender) external view returns (uint256);365366 /// @notice A description for the collection.367 /// @dev EVM selector for this function is: 0x7284e416,368 /// or in textual repr: description()369 function description() external view returns (string memory);370371 /// @dev EVM selector for this function is: 0x269e6158,372 /// or in textual repr: mintCross((address,uint256),uint256)373 function mintCross(CrossAddress memory to, uint256 amount) external returns (bool);374375 /// @dev EVM selector for this function is: 0x0ecd0ab0,376 /// or in textual repr: approveCross((address,uint256),uint256)377 function approveCross(CrossAddress memory spender, uint256 amount) external returns (bool);378379 // /// Burn tokens from account380 // /// @dev Function that burns an `amount` of the tokens of a given account,381 // /// deducting from the sender's allowance for said account.382 // /// @param from The account whose tokens will be burnt.383 // /// @param amount The amount that will be burnt.384 // /// @dev EVM selector for this function is: 0x79cc6790,385 // /// or in textual repr: burnFrom(address,uint256)386 // function burnFrom(address from, uint256 amount) external returns (bool);387388 /// Burn tokens from account389 /// @dev Function that burns an `amount` of the tokens of a given account,390 /// deducting from the sender's allowance for said account.391 /// @param from The account whose tokens will be burnt.392 /// @param amount The amount that will be burnt.393 /// @dev EVM selector for this function is: 0xbb2f5a58,394 /// or in textual repr: burnFromCross((address,uint256),uint256)395 function burnFromCross(CrossAddress memory from, uint256 amount) external returns (bool);396397 /// Mint tokens for multiple accounts.398 /// @param amounts array of pairs of account address and amount399 /// @dev EVM selector for this function is: 0x1acf2d55,400 /// or in textual repr: mintBulk((address,uint256)[])401 function mintBulk(AmountForAddress[] memory amounts) external returns (bool);402403 /// @dev EVM selector for this function is: 0x2ada85ff,404 /// or in textual repr: transferCross((address,uint256),uint256)405 function transferCross(CrossAddress memory to, uint256 amount) external returns (bool);406407 /// @dev EVM selector for this function is: 0xd5cf430b,408 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)409 function transferFromCross(410 CrossAddress memory from,411 CrossAddress memory to,412 uint256 amount413 ) external returns (bool);414415 /// @notice Returns collection helper contract address416 /// @dev EVM selector for this function is: 0x1896cce6,417 /// or in textual repr: collectionHelperAddress()418 function collectionHelperAddress() external view returns (address);419}420421struct AmountForAddress {422 address to;423 uint256 amount;424}425426/// @dev the ERC-165 identifier for this interface is 0x40c10f19427interface ERC20Mintable is Dummy, ERC165 {428 /// Mint tokens for `to` account.429 /// @param to account that will receive minted tokens430 /// @param amount amount of tokens to mint431 /// @dev EVM selector for this function is: 0x40c10f19,432 /// or in textual repr: mint(address,uint256)433 function mint(address to, uint256 amount) external returns (bool);434}435436/// @dev inlined interface437interface ERC20Events {438 event Transfer(address indexed from, address indexed to, uint256 value);439 event Approval(address indexed owner, address indexed spender, uint256 value);440}441442/// @dev the ERC-165 identifier for this interface is 0x942e8b22443interface ERC20 is Dummy, ERC165, ERC20Events {444 /// @dev EVM selector for this function is: 0x06fdde03,445 /// or in textual repr: name()446 function name() external view returns (string memory);447448 /// @dev EVM selector for this function is: 0x95d89b41,449 /// or in textual repr: symbol()450 function symbol() external view returns (string memory);451452 /// @dev EVM selector for this function is: 0x18160ddd,453 /// or in textual repr: totalSupply()454 function totalSupply() external view returns (uint256);455456 /// @dev EVM selector for this function is: 0x313ce567,457 /// or in textual repr: decimals()458 function decimals() external view returns (uint8);459460 /// @dev EVM selector for this function is: 0x70a08231,461 /// or in textual repr: balanceOf(address)462 function balanceOf(address owner) external view returns (uint256);463464 /// @dev EVM selector for this function is: 0xa9059cbb,465 /// or in textual repr: transfer(address,uint256)466 function transfer(address to, uint256 amount) external returns (bool);467468 /// @dev EVM selector for this function is: 0x23b872dd,469 /// or in textual repr: transferFrom(address,address,uint256)470 function transferFrom(471 address from,472 address to,473 uint256 amount474 ) external returns (bool);475476 /// @dev EVM selector for this function is: 0x095ea7b3,477 /// or in textual repr: approve(address,uint256)478 function approve(address spender, uint256 amount) external returns (bool);479480 /// @dev EVM selector for this function is: 0xdd62ed3e,481 /// or in textual repr: allowance(address,address)482 function allowance(address owner, address spender) external view returns (uint256);483}484485interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}