difftreelog
refactor EthCrossAccount impl, signature some evm methods, tests and stubs
in: master
16 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -36,7 +36,7 @@
use crate::{
Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
eth::{
- EthCrossAccount, convert_cross_account_to_uint256, CollectionPermissions as EvmPermissions,
+ EthCrossAccount, CollectionPermissions as EvmPermissions,
CollectionLimits as EvmCollectionLimits,
},
weights::WeightInfo,
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -53,15 +53,6 @@
address[0..16] == ETH_COLLECTION_PREFIX
}
-/// Convert `CrossAccountId` to `uint256`.
-pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint256
-where
- T::AccountId: AsRef<[u8; 32]>,
-{
- let slice = from.as_sub().as_ref();
- uint256::from_big_endian(slice)
-}
-
/// Convert `uint256` to `CrossAccountId`.
pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
where
@@ -71,22 +62,6 @@
from.to_big_endian(&mut new_admin_arr);
let account_id = T::AccountId::from(new_admin_arr);
T::CrossAccountId::from_sub(account_id)
-}
-
-/// Convert `CrossAccountId` to `(address, uint256)`.
-pub fn convert_cross_account_to_tuple<T: Config>(
- cross_account_id: &T::CrossAccountId,
-) -> (address, uint256)
-where
- T::AccountId: AsRef<[u8; 32]>,
-{
- if cross_account_id.is_canonical_substrate() {
- let sub = convert_cross_account_to_uint256::<T>(cross_account_id);
- (Default::default(), sub)
- } else {
- let eth = *cross_account_id.as_eth();
- (eth, Default::default())
- }
}
/// Convert tuple `(address, uint256)` to `CrossAccountId`.
@@ -128,10 +103,7 @@
T::AccountId: AsRef<[u8; 32]>,
{
if cross_account_id.is_canonical_substrate() {
- Self {
- eth: Default::default(),
- sub: convert_cross_account_to_uint256::<T>(cross_account_id),
- }
+ Self::from_sub::<T>(cross_account_id.as_sub())
} else {
Self {
eth: *cross_account_id.as_eth(),
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -50,6 +50,7 @@
"pallet-evm-coder-substrate/std",
"pallet-evm/std",
"up-sponsorship/std",
+ "pallet-common/std",
]
try-runtime = ["frame-support/try-runtime"]
-stubgen = ["evm-coder/stubgen"]
+stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -175,18 +175,11 @@
///
/// @param contractAddress The contract for which a sponsor is requested.
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
- let sponsor =
- Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
- Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(
- &sponsor,
+ fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
+ Ok(EthCrossAccount::from_sub_cross_account::<T>(
+ &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
))
}
- // fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
- // Ok(EthCrossAccount::from_sub_cross_account::<T>(
- // &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
- // ))
- // }
/// Check tat contract has confirmed sponsor.
///
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,11 @@
/// @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: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) public view returns (Tuple0 memory) {
+ function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
require(false, stub_error);
contractAddress;
dummy;
- return Tuple0(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Check tat contract has confirmed sponsor.
@@ -265,8 +265,8 @@
}
}
-/// @dev anonymous struct
-struct Tuple0 {
- address field_0;
- uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
}
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -605,7 +605,7 @@
Ok(false)
}
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
@@ -618,7 +618,7 @@
Ok(token_id)
}
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @dev `tokenId` should be obtained with `nextTokenId` method,
/// unlike standard, you can't specify it manually
/// @param to The new owner
@@ -1070,7 +1070,7 @@
Ok(true)
}
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner crossAccountId
/// @param properties Properties of minted token
/// @return uint256 The id of the newly minted token
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8 uint8 dummy;9 string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13 function supportsInterface(bytes4 interfaceID) external view returns (bool) {14 require(false, stub_error);15 interfaceID;16 return true;17 }18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23 // /// @notice Set permissions for token property.24 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25 // /// @param key Property key.26 // /// @param isMutable Permission to mutate property.27 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29 // /// @dev EVM selector for this function is: 0x222d97fa,30 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32 // require(false, stub_error);33 // key;34 // isMutable;35 // collectionAdmin;36 // tokenOwner;37 // dummy = 0;38 // }3940 /// @notice Set permissions for token property.41 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.42 /// @param permissions Permissions for keys.43 /// @dev EVM selector for this function is: 0xbd92983a,44 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45 function setTokenPropertyPermissions(Tuple59[] memory permissions) public {46 require(false, stub_error);47 permissions;48 dummy = 0;49 }5051 /// @notice Get permissions for token properties.52 /// @dev EVM selector for this function is: 0xf23d7790,53 /// or in textual repr: tokenPropertyPermissions()54 function tokenPropertyPermissions() public view returns (Tuple59[] memory) {55 require(false, stub_error);56 dummy;57 return new Tuple59[](0);58 }5960 // /// @notice Set token property value.61 // /// @dev Throws error if `msg.sender` has no permission to edit the property.62 // /// @param tokenId ID of the token.63 // /// @param key Property key.64 // /// @param value Property value.65 // /// @dev EVM selector for this function is: 0x1752d67b,66 // /// or in textual repr: setProperty(uint256,string,bytes)67 // function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68 // require(false, stub_error);69 // tokenId;70 // key;71 // value;72 // dummy = 0;73 // }7475 /// @notice Set token properties value.76 /// @dev Throws error if `msg.sender` has no permission to edit the property.77 /// @param tokenId ID of the token.78 /// @param properties settable properties79 /// @dev EVM selector for this function is: 0x14ed3a6e,80 /// or in textual repr: setProperties(uint256,(string,bytes)[])81 function setProperties(uint256 tokenId, Property[] memory properties) public {82 require(false, stub_error);83 tokenId;84 properties;85 dummy = 0;86 }8788 // /// @notice Delete token property value.89 // /// @dev Throws error if `msg.sender` has no permission to edit the property.90 // /// @param tokenId ID of the token.91 // /// @param key Property key.92 // /// @dev EVM selector for this function is: 0x066111d1,93 // /// or in textual repr: deleteProperty(uint256,string)94 // function deleteProperty(uint256 tokenId, string memory key) public {95 // require(false, stub_error);96 // tokenId;97 // key;98 // dummy = 0;99 // }100101 /// @notice Delete token properties value.102 /// @dev Throws error if `msg.sender` has no permission to edit the property.103 /// @param tokenId ID of the token.104 /// @param keys Properties key.105 /// @dev EVM selector for this function is: 0xc472d371,106 /// or in textual repr: deleteProperties(uint256,string[])107 function deleteProperties(uint256 tokenId, string[] memory keys) public {108 require(false, stub_error);109 tokenId;110 keys;111 dummy = 0;112 }113114 /// @notice Get token property value.115 /// @dev Throws error if key not found116 /// @param tokenId ID of the token.117 /// @param key Property key.118 /// @return Property value bytes119 /// @dev EVM selector for this function is: 0x7228c327,120 /// or in textual repr: property(uint256,string)121 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122 require(false, stub_error);123 tokenId;124 key;125 dummy;126 return hex"";127 }128}129130/// @dev Property struct131struct Property {132 string key;133 bytes value;134}135136/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.137enum EthTokenPermissions {138 /// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]139 Mutable,140 /// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]141 TokenOwner,142 /// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]143 CollectionAdmin144}145146/// @dev anonymous struct147struct Tuple59 {148 string field_0;149 Tuple57[] field_1;150}151152/// @dev anonymous struct153struct Tuple57 {154 EthTokenPermissions field_0;155 bool field_1;156}157158/// @title A contract that allows you to work with collections.159/// @dev the ERC-165 identifier for this interface is 0x81172a75160contract Collection is Dummy, ERC165 {161 // /// Set collection property.162 // ///163 // /// @param key Property key.164 // /// @param value Propery value.165 // /// @dev EVM selector for this function is: 0x2f073f66,166 // /// or in textual repr: setCollectionProperty(string,bytes)167 // function setCollectionProperty(string memory key, bytes memory value) public {168 // require(false, stub_error);169 // key;170 // value;171 // dummy = 0;172 // }173174 /// Set collection properties.175 ///176 /// @param properties Vector of properties key/value pair.177 /// @dev EVM selector for this function is: 0x50b26b2a,178 /// or in textual repr: setCollectionProperties((string,bytes)[])179 function setCollectionProperties(Property[] memory properties) public {180 require(false, stub_error);181 properties;182 dummy = 0;183 }184185 // /// Delete collection property.186 // ///187 // /// @param key Property key.188 // /// @dev EVM selector for this function is: 0x7b7debce,189 // /// or in textual repr: deleteCollectionProperty(string)190 // function deleteCollectionProperty(string memory key) public {191 // require(false, stub_error);192 // key;193 // dummy = 0;194 // }195196 /// Delete collection properties.197 ///198 /// @param keys Properties keys.199 /// @dev EVM selector for this function is: 0xee206ee3,200 /// or in textual repr: deleteCollectionProperties(string[])201 function deleteCollectionProperties(string[] memory keys) public {202 require(false, stub_error);203 keys;204 dummy = 0;205 }206207 /// Get collection property.208 ///209 /// @dev Throws error if key not found.210 ///211 /// @param key Property key.212 /// @return bytes The property corresponding to the key.213 /// @dev EVM selector for this function is: 0xcf24fd6d,214 /// or in textual repr: collectionProperty(string)215 function collectionProperty(string memory key) public view returns (bytes memory) {216 require(false, stub_error);217 key;218 dummy;219 return hex"";220 }221222 /// Get collection properties.223 ///224 /// @param keys Properties keys. Empty keys for all propertyes.225 /// @return Vector of properties key/value pairs.226 /// @dev EVM selector for this function is: 0x285fb8e6,227 /// or in textual repr: collectionProperties(string[])228 function collectionProperties(string[] memory keys) public view returns (Property[] memory) {229 require(false, stub_error);230 keys;231 dummy;232 return new Property[](0);233 }234235 // /// Set the sponsor of the collection.236 // ///237 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.238 // ///239 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.240 // /// @dev EVM selector for this function is: 0x7623402e,241 // /// or in textual repr: setCollectionSponsor(address)242 // function setCollectionSponsor(address sponsor) public {243 // require(false, stub_error);244 // sponsor;245 // dummy = 0;246 // }247248 /// Set the sponsor of the collection.249 ///250 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.251 ///252 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.253 /// @dev EVM selector for this function is: 0x84a1d5a8,254 /// or in textual repr: setCollectionSponsorCross((address,uint256))255 function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {256 require(false, stub_error);257 sponsor;258 dummy = 0;259 }260261 /// Whether there is a pending sponsor.262 /// @dev EVM selector for this function is: 0x058ac185,263 /// or in textual repr: hasCollectionPendingSponsor()264 function hasCollectionPendingSponsor() public view returns (bool) {265 require(false, stub_error);266 dummy;267 return false;268 }269270 /// Collection sponsorship confirmation.271 ///272 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.273 /// @dev EVM selector for this function is: 0x3c50e97a,274 /// or in textual repr: confirmCollectionSponsorship()275 function confirmCollectionSponsorship() public {276 require(false, stub_error);277 dummy = 0;278 }279280 /// Remove collection sponsor.281 /// @dev EVM selector for this function is: 0x6e0326a3,282 /// or in textual repr: removeCollectionSponsor()283 function removeCollectionSponsor() public {284 require(false, stub_error);285 dummy = 0;286 }287288 /// Get current sponsor.289 ///290 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.291 /// @dev EVM selector for this function is: 0x6ec0a9f1,292 /// or in textual repr: collectionSponsor()293 function collectionSponsor() public view returns (EthCrossAccount memory) {294 require(false, stub_error);295 dummy;296 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);297 }298299 /// Get current collection limits.300 ///301 /// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:302 /// "accountTokenOwnershipLimit",303 /// "sponsoredDataSize",304 /// "sponsoredDataRateLimit",305 /// "tokenLimit",306 /// "sponsorTransferTimeout",307 /// "sponsorApproveTimeout"308 /// "ownerCanTransfer",309 /// "ownerCanDestroy",310 /// "transfersEnabled"311 /// Return `false` if a limit not set.312 /// @dev EVM selector for this function is: 0xf63bc572,313 /// or in textual repr: collectionLimits()314 function collectionLimits() public view returns (Tuple33[] memory) {315 require(false, stub_error);316 dummy;317 return new Tuple33[](0);318 }319320 /// Set limits for the collection.321 /// @dev Throws error if limit not found.322 /// @param limit Name of the limit. Valid names:323 /// "accountTokenOwnershipLimit",324 /// "sponsoredDataSize",325 /// "sponsoredDataRateLimit",326 /// "tokenLimit",327 /// "sponsorTransferTimeout",328 /// "sponsorApproveTimeout"329 /// "ownerCanTransfer",330 /// "ownerCanDestroy",331 /// "transfersEnabled"332 /// @param status enable\disable limit. Works only with `true`.333 /// @param value Value of the limit.334 /// @dev EVM selector for this function is: 0x88150bd0,335 /// or in textual repr: setCollectionLimit(uint8,bool,uint256)336 function setCollectionLimit(337 CollectionLimits limit,338 bool status,339 uint256 value340 ) public {341 require(false, stub_error);342 limit;343 status;344 value;345 dummy = 0;346 }347348 /// Get contract address.349 /// @dev EVM selector for this function is: 0xf6b4dfb4,350 /// or in textual repr: contractAddress()351 function contractAddress() public view returns (address) {352 require(false, stub_error);353 dummy;354 return 0x0000000000000000000000000000000000000000;355 }356357 /// Add collection admin.358 /// @param newAdmin Cross account administrator address.359 /// @dev EVM selector for this function is: 0x859aa7d6,360 /// or in textual repr: addCollectionAdminCross((address,uint256))361 function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {362 require(false, stub_error);363 newAdmin;364 dummy = 0;365 }366367 /// Remove collection admin.368 /// @param admin Cross account administrator address.369 /// @dev EVM selector for this function is: 0x6c0cd173,370 /// or in textual repr: removeCollectionAdminCross((address,uint256))371 function removeCollectionAdminCross(EthCrossAccount memory admin) public {372 require(false, stub_error);373 admin;374 dummy = 0;375 }376377 // /// Add collection admin.378 // /// @param newAdmin Address of the added administrator.379 // /// @dev EVM selector for this function is: 0x92e462c7,380 // /// or in textual repr: addCollectionAdmin(address)381 // function addCollectionAdmin(address newAdmin) public {382 // require(false, stub_error);383 // newAdmin;384 // dummy = 0;385 // }386387 // /// Remove collection admin.388 // ///389 // /// @param admin Address of the removed administrator.390 // /// @dev EVM selector for this function is: 0xfafd7b42,391 // /// or in textual repr: removeCollectionAdmin(address)392 // function removeCollectionAdmin(address admin) public {393 // require(false, stub_error);394 // admin;395 // dummy = 0;396 // }397398 /// Toggle accessibility of collection nesting.399 ///400 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'401 /// @dev EVM selector for this function is: 0x112d4586,402 /// or in textual repr: setCollectionNesting(bool)403 function setCollectionNesting(bool enable) public {404 require(false, stub_error);405 enable;406 dummy = 0;407 }408409 /// Toggle accessibility of collection nesting.410 ///411 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'412 /// @param collections Addresses of collections that will be available for nesting.413 /// @dev EVM selector for this function is: 0x64872396,414 /// or in textual repr: setCollectionNesting(bool,address[])415 function setCollectionNesting(bool enable, address[] memory collections) public {416 require(false, stub_error);417 enable;418 collections;419 dummy = 0;420 }421422 /// Returns nesting for a collection423 /// @dev EVM selector for this function is: 0x22d25bfe,424 /// or in textual repr: collectionNestingRestrictedCollectionIds()425 function collectionNestingRestrictedCollectionIds() public view returns (Tuple39 memory) {426 require(false, stub_error);427 dummy;428 return Tuple39(false, new uint256[](0));429 }430431 /// Returns permissions for a collection432 /// @dev EVM selector for this function is: 0x5b2eaf4b,433 /// or in textual repr: collectionNestingPermissions()434 function collectionNestingPermissions() public view returns (Tuple42[] memory) {435 require(false, stub_error);436 dummy;437 return new Tuple42[](0);438 }439440 /// Set the collection access method.441 /// @param mode Access mode442 /// 0 for Normal443 /// 1 for AllowList444 /// @dev EVM selector for this function is: 0x41835d4c,445 /// or in textual repr: setCollectionAccess(uint8)446 function setCollectionAccess(uint8 mode) public {447 require(false, stub_error);448 mode;449 dummy = 0;450 }451452 /// Checks that user allowed to operate with collection.453 ///454 /// @param user User address to check.455 /// @dev EVM selector for this function is: 0x91b6df49,456 /// or in textual repr: allowlistedCross((address,uint256))457 function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {458 require(false, stub_error);459 user;460 dummy;461 return false;462 }463464 // /// Add the user to the allowed list.465 // ///466 // /// @param user Address of a trusted user.467 // /// @dev EVM selector for this function is: 0x67844fe6,468 // /// or in textual repr: addToCollectionAllowList(address)469 // function addToCollectionAllowList(address user) public {470 // require(false, stub_error);471 // user;472 // dummy = 0;473 // }474475 /// Add user to allowed list.476 ///477 /// @param user User cross account address.478 /// @dev EVM selector for this function is: 0xa0184a3a,479 /// or in textual repr: addToCollectionAllowListCross((address,uint256))480 function addToCollectionAllowListCross(EthCrossAccount memory user) public {481 require(false, stub_error);482 user;483 dummy = 0;484 }485486 // /// Remove the user from the allowed list.487 // ///488 // /// @param user Address of a removed user.489 // /// @dev EVM selector for this function is: 0x85c51acb,490 // /// or in textual repr: removeFromCollectionAllowList(address)491 // function removeFromCollectionAllowList(address user) public {492 // require(false, stub_error);493 // user;494 // dummy = 0;495 // }496497 /// Remove user from allowed list.498 ///499 /// @param user User cross account address.500 /// @dev EVM selector for this function is: 0x09ba452a,501 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))502 function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {503 require(false, stub_error);504 user;505 dummy = 0;506 }507508 /// Switch permission for minting.509 ///510 /// @param mode Enable if "true".511 /// @dev EVM selector for this function is: 0x00018e84,512 /// or in textual repr: setCollectionMintMode(bool)513 function setCollectionMintMode(bool mode) public {514 require(false, stub_error);515 mode;516 dummy = 0;517 }518519 // /// Check that account is the owner or admin of the collection520 // ///521 // /// @param user account to verify522 // /// @return "true" if account is the owner or admin523 // /// @dev EVM selector for this function is: 0x9811b0c7,524 // /// or in textual repr: isOwnerOrAdmin(address)525 // function isOwnerOrAdmin(address user) public view returns (bool) {526 // require(false, stub_error);527 // user;528 // dummy;529 // return false;530 // }531532 /// Check that account is the owner or admin of the collection533 ///534 /// @param user User cross account to verify535 /// @return "true" if account is the owner or admin536 /// @dev EVM selector for this function is: 0x3e75a905,537 /// or in textual repr: isOwnerOrAdminCross((address,uint256))538 function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {539 require(false, stub_error);540 user;541 dummy;542 return false;543 }544545 /// Returns collection type546 ///547 /// @return `Fungible` or `NFT` or `ReFungible`548 /// @dev EVM selector for this function is: 0xd34b55b8,549 /// or in textual repr: uniqueCollectionType()550 function uniqueCollectionType() public view returns (string memory) {551 require(false, stub_error);552 dummy;553 return "";554 }555556 /// Get collection owner.557 ///558 /// @return Tuble with sponsor address and his substrate mirror.559 /// If address is canonical then substrate mirror is zero and vice versa.560 /// @dev EVM selector for this function is: 0xdf727d3b,561 /// or in textual repr: collectionOwner()562 function collectionOwner() public view returns (EthCrossAccount memory) {563 require(false, stub_error);564 dummy;565 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);566 }567568 // /// Changes collection owner to another account569 // ///570 // /// @dev Owner can be changed only by current owner571 // /// @param newOwner new owner account572 // /// @dev EVM selector for this function is: 0x4f53e226,573 // /// or in textual repr: changeCollectionOwner(address)574 // function changeCollectionOwner(address newOwner) public {575 // require(false, stub_error);576 // newOwner;577 // dummy = 0;578 // }579580 /// Get collection administrators581 ///582 /// @return Vector of tuples with admins address and his substrate mirror.583 /// If address is canonical then substrate mirror is zero and vice versa.584 /// @dev EVM selector for this function is: 0x5813216b,585 /// or in textual repr: collectionAdmins()586 function collectionAdmins() public view returns (EthCrossAccount[] memory) {587 require(false, stub_error);588 dummy;589 return new EthCrossAccount[](0);590 }591592 /// Changes collection owner to another account593 ///594 /// @dev Owner can be changed only by current owner595 /// @param newOwner new owner cross account596 /// @dev EVM selector for this function is: 0x6496c497,597 /// or in textual repr: changeCollectionOwnerCross((address,uint256))598 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {599 require(false, stub_error);600 newOwner;601 dummy = 0;602 }603}604605/// @dev Cross account struct606struct EthCrossAccount {607 address eth;608 uint256 sub;609}610611<<<<<<< HEAD612enum CollectionPermissions {613 CollectionAdmin,614 TokenOwner615}616617/// @dev anonymous struct618struct Tuple42 {619 CollectionPermissions field_0;620 bool field_1;621}622623/// @dev anonymous struct624struct Tuple39 {625 bool field_0;626 uint256[] field_1;627}628629/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.630enum CollectionLimits {631 /// @dev How many tokens can a user have on one account.632 AccountTokenOwnership,633 /// @dev How many bytes of data are available for sponsorship.634 SponsoredDataSize,635 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]636 SponsoredDataRateLimit,637 /// @dev How many tokens can be mined into this collection.638 TokenLimit,639 /// @dev Timeouts for transfer sponsoring.640 SponsorTransferTimeout,641 /// @dev Timeout for sponsoring an approval in passed blocks.642 SponsorApproveTimeout,643 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).644 OwnerCanTransfer,645 /// @dev Can the collection owner burn other people's tokens.646 OwnerCanDestroy,647 /// @dev Is it possible to send tokens from this collection between users.648 TransferEnabled649}650651/// @dev anonymous struct652struct Tuple33 {653 CollectionLimits field_0;654 bool field_1;655 uint256 field_2;656}657658/// @dev anonymous struct659struct Tuple32 {660 address field_0;661 uint256 field_1;662}663664=======665>>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet666/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension667/// @dev See https://eips.ethereum.org/EIPS/eip-721668/// @dev the ERC-165 identifier for this interface is 0x5b5e139f669contract ERC721Metadata is Dummy, ERC165 {670 // /// @notice A descriptive name for a collection of NFTs in this contract671 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`672 // /// @dev EVM selector for this function is: 0x06fdde03,673 // /// or in textual repr: name()674 // function name() public view returns (string memory) {675 // require(false, stub_error);676 // dummy;677 // return "";678 // }679680 // /// @notice An abbreviated name for NFTs in this contract681 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`682 // /// @dev EVM selector for this function is: 0x95d89b41,683 // /// or in textual repr: symbol()684 // function symbol() public view returns (string memory) {685 // require(false, stub_error);686 // dummy;687 // return "";688 // }689690 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.691 ///692 /// @dev If the token has a `url` property and it is not empty, it is returned.693 /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.694 /// If the collection property `baseURI` is empty or absent, return "" (empty string)695 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix696 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).697 ///698 /// @return token's const_metadata699 /// @dev EVM selector for this function is: 0xc87b56dd,700 /// or in textual repr: tokenURI(uint256)701 function tokenURI(uint256 tokenId) public view returns (string memory) {702 require(false, stub_error);703 tokenId;704 dummy;705 return "";706 }707}708709/// @title ERC721 Token that can be irreversibly burned (destroyed).710/// @dev the ERC-165 identifier for this interface is 0x42966c68711contract ERC721Burnable is Dummy, ERC165 {712 /// @notice Burns a specific ERC721 token.713 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized714 /// operator of the current owner.715 /// @param tokenId The NFT to approve716 /// @dev EVM selector for this function is: 0x42966c68,717 /// or in textual repr: burn(uint256)718 function burn(uint256 tokenId) public {719 require(false, stub_error);720 tokenId;721 dummy = 0;722 }723}724725/// @dev inlined interface726contract ERC721UniqueMintableEvents {727 event MintingFinished();728}729730/// @title ERC721 minting logic.731/// @dev the ERC-165 identifier for this interface is 0x476ff149732contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {733 /// @dev EVM selector for this function is: 0x05d2035b,734 /// or in textual repr: mintingFinished()735 function mintingFinished() public view returns (bool) {736 require(false, stub_error);737 dummy;738 return false;739 }740741 /// @notice Function to mint token.742 /// @param to The new owner743 /// @return uint256 The id of the newly minted token744 /// @dev EVM selector for this function is: 0x6a627842,745 /// or in textual repr: mint(address)746 function mint(address to) public returns (uint256) {747 require(false, stub_error);748 to;749 dummy = 0;750 return 0;751 }752753 // /// @notice Function to mint token.754 // /// @dev `tokenId` should be obtained with `nextTokenId` method,755 // /// unlike standard, you can't specify it manually756 // /// @param to The new owner757 // /// @param tokenId ID of the minted NFT758 // /// @dev EVM selector for this function is: 0x40c10f19,759 // /// or in textual repr: mint(address,uint256)760 // function mint(address to, uint256 tokenId) public returns (bool) {761 // require(false, stub_error);762 // to;763 // tokenId;764 // dummy = 0;765 // return false;766 // }767768 /// @notice Function to mint token with the given tokenUri.769 /// @param to The new owner770 /// @param tokenUri Token URI that would be stored in the NFT properties771 /// @return uint256 The id of the newly minted token772 /// @dev EVM selector for this function is: 0x45c17782,773 /// or in textual repr: mintWithTokenURI(address,string)774 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {775 require(false, stub_error);776 to;777 tokenUri;778 dummy = 0;779 return 0;780 }781782 // /// @notice Function to mint token with the given tokenUri.783 // /// @dev `tokenId` should be obtained with `nextTokenId` method,784 // /// unlike standard, you can't specify it manually785 // /// @param to The new owner786 // /// @param tokenId ID of the minted NFT787 // /// @param tokenUri Token URI that would be stored in the NFT properties788 // /// @dev EVM selector for this function is: 0x50bb4e7f,789 // /// or in textual repr: mintWithTokenURI(address,uint256,string)790 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {791 // require(false, stub_error);792 // to;793 // tokenId;794 // tokenUri;795 // dummy = 0;796 // return false;797 // }798799 /// @dev Not implemented800 /// @dev EVM selector for this function is: 0x7d64bcb4,801 /// or in textual repr: finishMinting()802 function finishMinting() public returns (bool) {803 require(false, stub_error);804 dummy = 0;805 return false;806 }807}808809/// @title Unique extensions for ERC721.810/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4811contract ERC721UniqueExtensions is Dummy, ERC165 {812 /// @notice A descriptive name for a collection of NFTs in this contract813 /// @dev EVM selector for this function is: 0x06fdde03,814 /// or in textual repr: name()815 function name() public view returns (string memory) {816 require(false, stub_error);817 dummy;818 return "";819 }820821 /// @notice An abbreviated name for NFTs in this contract822 /// @dev EVM selector for this function is: 0x95d89b41,823 /// or in textual repr: symbol()824 function symbol() public view returns (string memory) {825 require(false, stub_error);826 dummy;827 return "";828 }829830 /// @notice A description for the collection.831 /// @dev EVM selector for this function is: 0x7284e416,832 /// or in textual repr: description()833 function description() public view returns (string memory) {834 require(false, stub_error);835 dummy;836 return "";837 }838839 /// Returns the owner (in cross format) of the token.840 ///841 /// @param tokenId Id for the token.842 /// @dev EVM selector for this function is: 0x2b29dace,843 /// or in textual repr: crossOwnerOf(uint256)844 function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {845 require(false, stub_error);846 tokenId;847 dummy;848 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);849 }850851 /// Returns the token properties.852 ///853 /// @param tokenId Id for the token.854 /// @param keys Properties keys. Empty keys for all propertyes.855 /// @return Vector of properties key/value pairs.856 /// @dev EVM selector for this function is: 0xe07ede7e,857 /// or in textual repr: properties(uint256,string[])858 function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {859 require(false, stub_error);860 tokenId;861 keys;862 dummy;863 return new Property[](0);864 }865866 /// @notice Set or reaffirm the approved address for an NFT867 /// @dev The zero address indicates there is no approved address.868 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized869 /// operator of the current owner.870 /// @param approved The new substrate address approved NFT controller871 /// @param tokenId The NFT to approve872 /// @dev EVM selector for this function is: 0x0ecd0ab0,873 /// or in textual repr: approveCross((address,uint256),uint256)874 function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {875 require(false, stub_error);876 approved;877 tokenId;878 dummy = 0;879 }880881 /// @notice Transfer ownership of an NFT882 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`883 /// is the zero address. Throws if `tokenId` is not a valid NFT.884 /// @param to The new owner885 /// @param tokenId The NFT to transfer886 /// @dev EVM selector for this function is: 0xa9059cbb,887 /// or in textual repr: transfer(address,uint256)888 function transfer(address to, uint256 tokenId) public {889 require(false, stub_error);890 to;891 tokenId;892 dummy = 0;893 }894895 /// @notice Transfer ownership of an NFT896 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`897 /// is the zero address. Throws if `tokenId` is not a valid NFT.898 /// @param to The new owner899 /// @param tokenId The NFT to transfer900 /// @dev EVM selector for this function is: 0x2ada85ff,901 /// or in textual repr: transferCross((address,uint256),uint256)902 function transferCross(EthCrossAccount memory to, uint256 tokenId) public {903 require(false, stub_error);904 to;905 tokenId;906 dummy = 0;907 }908909 /// @notice Transfer ownership of an NFT from cross account address to cross account address910 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`911 /// is the zero address. Throws if `tokenId` is not a valid NFT.912 /// @param from Cross acccount address of current owner913 /// @param to Cross acccount address of new owner914 /// @param tokenId The NFT to transfer915 /// @dev EVM selector for this function is: 0xd5cf430b,916 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)917 function transferFromCross(918 EthCrossAccount memory from,919 EthCrossAccount memory to,920 uint256 tokenId921 ) public {922 require(false, stub_error);923 from;924 to;925 tokenId;926 dummy = 0;927 }928929 // /// @notice Burns a specific ERC721 token.930 // /// @dev Throws unless `msg.sender` is the current owner or an authorized931 // /// operator for this NFT. Throws if `from` is not the current owner. Throws932 // /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.933 // /// @param from The current owner of the NFT934 // /// @param tokenId The NFT to transfer935 // /// @dev EVM selector for this function is: 0x79cc6790,936 // /// or in textual repr: burnFrom(address,uint256)937 // function burnFrom(address from, uint256 tokenId) public {938 // require(false, stub_error);939 // from;940 // tokenId;941 // dummy = 0;942 // }943944 /// @notice Burns a specific ERC721 token.945 /// @dev Throws unless `msg.sender` is the current owner or an authorized946 /// operator for this NFT. Throws if `from` is not the current owner. Throws947 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.948 /// @param from The current owner of the NFT949 /// @param tokenId The NFT to transfer950 /// @dev EVM selector for this function is: 0xbb2f5a58,951 /// or in textual repr: burnFromCross((address,uint256),uint256)952 function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {953 require(false, stub_error);954 from;955 tokenId;956 dummy = 0;957 }958959 /// @notice Returns next free NFT ID.960 /// @dev EVM selector for this function is: 0x75794a3c,961 /// or in textual repr: nextTokenId()962 function nextTokenId() public view returns (uint256) {963 require(false, stub_error);964 dummy;965 return 0;966 }967968 // /// @notice Function to mint multiple tokens.969 // /// @dev `tokenIds` should be an array of consecutive numbers and first number970 // /// should be obtained with `nextTokenId` method971 // /// @param to The new owner972 // /// @param tokenIds IDs of the minted NFTs973 // /// @dev EVM selector for this function is: 0x44a9945e,974 // /// or in textual repr: mintBulk(address,uint256[])975 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {976 // require(false, stub_error);977 // to;978 // tokenIds;979 // dummy = 0;980 // return false;981 // }982983 // /// @notice Function to mint multiple tokens with the given tokenUris.984 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive985 // /// numbers and first number should be obtained with `nextTokenId` method986 // /// @param to The new owner987 // /// @param tokens array of pairs of token ID and token URI for minted tokens988 // /// @dev EVM selector for this function is: 0x36543006,989 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])990 // function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {991 // require(false, stub_error);992 // to;993 // tokens;994 // dummy = 0;995 // return false;996 // }997998 /// @notice Function to mint token.999 /// @param to The new owner crossAccountId1000 /// @param properties Properties of minted token1001 /// @return uint256 The id of the newly minted token1002 /// @dev EVM selector for this function is: 0xb904db03,1003 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])1004 function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {1005 require(false, stub_error);1006 to;1007 properties;1008 dummy = 0;1009 return 0;1010 }1011}10121013/// @dev anonymous struct1014struct Tuple15 {1015 uint256 field_0;1016 string field_1;1017}10181019/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension1020/// @dev See https://eips.ethereum.org/EIPS/eip-7211021/// @dev the ERC-165 identifier for this interface is 0x780e9d631022contract ERC721Enumerable is Dummy, ERC165 {1023 /// @notice Enumerate valid NFTs1024 /// @param index A counter less than `totalSupply()`1025 /// @return The token identifier for the `index`th NFT,1026 /// (sort order not specified)1027 /// @dev EVM selector for this function is: 0x4f6ccce7,1028 /// or in textual repr: tokenByIndex(uint256)1029 function tokenByIndex(uint256 index) public view returns (uint256) {1030 require(false, stub_error);1031 index;1032 dummy;1033 return 0;1034 }10351036 /// @dev Not implemented1037 /// @dev EVM selector for this function is: 0x2f745c59,1038 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)1039 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1040 require(false, stub_error);1041 owner;1042 index;1043 dummy;1044 return 0;1045 }10461047 /// @notice Count NFTs tracked by this contract1048 /// @return A count of valid NFTs tracked by this contract, where each one of1049 /// them has an assigned and queryable owner not equal to the zero address1050 /// @dev EVM selector for this function is: 0x18160ddd,1051 /// or in textual repr: totalSupply()1052 function totalSupply() public view returns (uint256) {1053 require(false, stub_error);1054 dummy;1055 return 0;1056 }1057}10581059/// @dev inlined interface1060contract ERC721Events {1061 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1062 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1063 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1064}10651066/// @title ERC-721 Non-Fungible Token Standard1067/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1068/// @dev the ERC-165 identifier for this interface is 0x983a942b1069contract ERC721 is Dummy, ERC165, ERC721Events {1070 /// @notice Count all NFTs assigned to an owner1071 /// @dev NFTs assigned to the zero address are considered invalid, and this1072 /// function throws for queries about the zero address.1073 /// @param owner An address for whom to query the balance1074 /// @return The number of NFTs owned by `owner`, possibly zero1075 /// @dev EVM selector for this function is: 0x70a08231,1076 /// or in textual repr: balanceOf(address)1077 function balanceOf(address owner) public view returns (uint256) {1078 require(false, stub_error);1079 owner;1080 dummy;1081 return 0;1082 }10831084 /// @notice Find the owner of an NFT1085 /// @dev NFTs assigned to zero address are considered invalid, and queries1086 /// about them do throw.1087 /// @param tokenId The identifier for an NFT1088 /// @return The address of the owner of the NFT1089 /// @dev EVM selector for this function is: 0x6352211e,1090 /// or in textual repr: ownerOf(uint256)1091 function ownerOf(uint256 tokenId) public view returns (address) {1092 require(false, stub_error);1093 tokenId;1094 dummy;1095 return 0x0000000000000000000000000000000000000000;1096 }10971098 /// @dev Not implemented1099 /// @dev EVM selector for this function is: 0xb88d4fde,1100 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)1101 function safeTransferFrom(1102 address from,1103 address to,1104 uint256 tokenId,1105 bytes memory data1106 ) public {1107 require(false, stub_error);1108 from;1109 to;1110 tokenId;1111 data;1112 dummy = 0;1113 }11141115 /// @dev Not implemented1116 /// @dev EVM selector for this function is: 0x42842e0e,1117 /// or in textual repr: safeTransferFrom(address,address,uint256)1118 function safeTransferFrom(1119 address from,1120 address to,1121 uint256 tokenId1122 ) public {1123 require(false, stub_error);1124 from;1125 to;1126 tokenId;1127 dummy = 0;1128 }11291130 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1131 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1132 /// THEY MAY BE PERMANENTLY LOST1133 /// @dev Throws unless `msg.sender` is the current owner or an authorized1134 /// operator for this NFT. Throws if `from` is not the current owner. Throws1135 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1136 /// @param from The current owner of the NFT1137 /// @param to The new owner1138 /// @param tokenId The NFT to transfer1139 /// @dev EVM selector for this function is: 0x23b872dd,1140 /// or in textual repr: transferFrom(address,address,uint256)1141 function transferFrom(1142 address from,1143 address to,1144 uint256 tokenId1145 ) public {1146 require(false, stub_error);1147 from;1148 to;1149 tokenId;1150 dummy = 0;1151 }11521153 /// @notice Set or reaffirm the approved address for an NFT1154 /// @dev The zero address indicates there is no approved address.1155 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1156 /// operator of the current owner.1157 /// @param approved The new approved NFT controller1158 /// @param tokenId The NFT to approve1159 /// @dev EVM selector for this function is: 0x095ea7b3,1160 /// or in textual repr: approve(address,uint256)1161 function approve(address approved, uint256 tokenId) public {1162 require(false, stub_error);1163 approved;1164 tokenId;1165 dummy = 0;1166 }11671168 /// @notice Sets or unsets the approval of a given operator.1169 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1170 /// @param operator Operator1171 /// @param approved Should operator status be granted or revoked?1172 /// @dev EVM selector for this function is: 0xa22cb465,1173 /// or in textual repr: setApprovalForAll(address,bool)1174 function setApprovalForAll(address operator, bool approved) public {1175 require(false, stub_error);1176 operator;1177 approved;1178 dummy = 0;1179 }11801181 /// @dev Not implemented1182 /// @dev EVM selector for this function is: 0x081812fc,1183 /// or in textual repr: getApproved(uint256)1184 function getApproved(uint256 tokenId) public view returns (address) {1185 require(false, stub_error);1186 tokenId;1187 dummy;1188 return 0x0000000000000000000000000000000000000000;1189 }11901191 /// @notice Tells whether the given `owner` approves the `operator`.1192 /// @dev EVM selector for this function is: 0xe985e9c5,1193 /// or in textual repr: isApprovedForAll(address,address)1194 function isApprovedForAll(address owner, address operator) public view returns (bool) {1195 require(false, stub_error);1196 owner;1197 operator;1198 dummy;1199 return false;1200 }12011202 /// @notice Returns collection helper contract address1203 /// @dev EVM selector for this function is: 0x1896cce6,1204 /// or in textual repr: collectionHelperAddress()1205 function collectionHelperAddress() public view returns (address) {1206 require(false, stub_error);1207 dummy;1208 return 0x0000000000000000000000000000000000000000;1209 }1210}12111212contract UniqueNFT is1213 Dummy,1214 ERC165,1215 ERC721,1216 ERC721Enumerable,1217 ERC721UniqueExtensions,1218 ERC721UniqueMintable,1219 ERC721Burnable,1220 ERC721Metadata,1221 Collection,1222 TokenProperties1223{}pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -637,7 +637,7 @@
Ok(false)
}
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
@@ -650,7 +650,7 @@
Ok(token_id)
}
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @dev `tokenId` should be obtained with `nextTokenId` method,
/// unlike standard, you can't specify it manually
/// @param to The new owner
@@ -1120,7 +1120,7 @@
Ok(true)
}
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner crossAccountId
/// @param properties Properties of minted token
/// @return uint256 The id of the newly minted token
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -733,7 +733,7 @@
return false;
}
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
@@ -745,7 +745,7 @@
return 0;
}
- // /// @notice Function to mint token.
+ // /// @notice Function to a mint token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -979,7 +979,7 @@
// return false;
// }
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner crossAccountId
/// @param properties Properties of minted token
/// @return uint256 The id of the newly minted token
tests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple0",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) external view returns (Tuple0 memory);
+ function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
/// Check tat contract has confirmed sponsor.
///
@@ -171,8 +171,8 @@
function toggleAllowlist(address contractAddress, bool enabled) external;
}
-/// @dev anonymous struct
-struct Tuple0 {
- address field_0;
- uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -515,14 +515,14 @@
/// or in textual repr: mintingFinished()
function mintingFinished() external view returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
/// or in textual repr: mint(address)
function mint(address to) external returns (uint256);
- // /// @notice Function to mint token.
+ // /// @notice Function to a mint token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -674,7 +674,7 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner crossAccountId
/// @param properties Properties of minted token
/// @return uint256 The id of the newly minted token
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -513,14 +513,14 @@
/// or in textual repr: mintingFinished()
function mintingFinished() external view returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
/// or in textual repr: mint(address)
function mint(address to) external returns (uint256);
- // /// @notice Function to mint token.
+ // /// @notice Function to a mint token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -666,7 +666,7 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to a mint token.
/// @param to The new owner crossAccountId
/// @param properties Properties of minted token
/// @return uint256 The id of the newly minted token
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,7 +17,6 @@
import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
import {IKeyringPair} from '@polkadot/types/types';
import {Contract} from 'web3-eth-contract';
-import exp from 'constants';
import {ITokenPropertyPermission} from '../util/playgrounds/types';
@@ -180,9 +179,16 @@
const caller = await helper.eth.createAccountWithBalance(donor);
const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
- const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
- collectionAdmin: true,
- mutable: true}}; });
+ const permissions: ITokenPropertyPermission[] = properties
+ .map(p => {
+ return {
+ key: p.key, permission: {
+ tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true,
+ },
+ };
+ });
const collection = await helper.nft.mintCollection(minter, {
@@ -198,7 +204,7 @@
let tokenId = result.events.Transfer.returnValues.tokenId;
expect(tokenId).to.be.equal(expectedTokenId);
- const event = result.events.Transfer;
+ let event = result.events.Transfer;
expect(event.address).to.be.equal(collectionAddress);
expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
@@ -206,10 +212,16 @@
expectedTokenId = await contract.methods.nextTokenId().call();
result = await contract.methods.mintCross(receiverCross, properties).send();
+ event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
tokenId = result.events.Transfer.returnValues.tokenId;
-
+
expect(tokenId).to.be.equal(expectedTokenId);
-
+
expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
.map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
});
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -17,7 +17,7 @@
import {Pallets, requirePalletsOrSkip} from '../util';
import {expect, itEth, usingEthPlaygrounds} from './util';
import {IKeyringPair} from '@polkadot/types/types';
-import { ITokenPropertyPermission } from '../util/playgrounds/types';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
describe('Refungible: Information getting', () => {
let donor: IKeyringPair;
@@ -159,7 +159,7 @@
let tokenId = result.events.Transfer.returnValues.tokenId;
expect(tokenId).to.be.equal(expectedTokenId);
- const event = result.events.Transfer;
+ let event = result.events.Transfer;
expect(event.address).to.be.equal(collectionAddress);
expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
@@ -167,6 +167,12 @@
expectedTokenId = await contract.methods.nextTokenId().call();
result = await contract.methods.mintCross(receiverCross, properties).send();
+ event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
tokenId = result.events.Transfer.returnValues.tokenId;
expect(tokenId).to.be.equal(expectedTokenId);