difftreelog
refac: rename substrate methods to cross
in: master
16 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -656,7 +656,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
fn collection_owner(&self) -> Result<(address, uint256)> {
Ok(convert_cross_account_to_tuple::<T>(
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.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 you to work with collections.21/// @dev the ERC-165 identifier for this interface is 0xb3152af322contract Collection is Dummy, ERC165 {23 /// Set collection property.24 ///25 /// @param key Property key.26 /// @param value Propery value.27 /// @dev EVM selector for this function is: 0x2f073f66,28 /// or in textual repr: setCollectionProperty(string,bytes)29 function setCollectionProperty(string memory key, bytes memory value) public {30 require(false, stub_error);31 key;32 value;33 dummy = 0;34 }3536 /// Set collection properties.37 ///38 /// @param properties Vector of properties key/value pair.39 /// @dev EVM selector for this function is: 0x50b26b2a,40 /// or in textual repr: setCollectionProperties((string,bytes)[])41 function setCollectionProperties(Tuple10[] memory properties) public {42 require(false, stub_error);43 properties;44 dummy = 0;45 }4647 /// Delete collection property.48 ///49 /// @param key Property key.50 /// @dev EVM selector for this function is: 0x7b7debce,51 /// or in textual repr: deleteCollectionProperty(string)52 function deleteCollectionProperty(string memory key) public {53 require(false, stub_error);54 key;55 dummy = 0;56 }5758 /// Delete collection properties.59 ///60 /// @param keys Properties keys.61 /// @dev EVM selector for this function is: 0xee206ee3,62 /// or in textual repr: deleteCollectionProperties(string[])63 function deleteCollectionProperties(string[] memory keys) public {64 require(false, stub_error);65 keys;66 dummy = 0;67 }6869 /// Get collection property.70 ///71 /// @dev Throws error if key not found.72 ///73 /// @param key Property key.74 /// @return bytes The property corresponding to the key.75 /// @dev EVM selector for this function is: 0xcf24fd6d,76 /// or in textual repr: collectionProperty(string)77 function collectionProperty(string memory key) public view returns (bytes memory) {78 require(false, stub_error);79 key;80 dummy;81 return hex"";82 }8384 /// Get collection properties.85 ///86 /// @param keys Properties keys. Empty keys for all propertyes.87 /// @return Vector of properties key/value pairs.88 /// @dev EVM selector for this function is: 0x285fb8e6,89 /// or in textual repr: collectionProperties(string[])90 function collectionProperties(string[] memory keys) public view returns (Tuple10[] memory) {91 require(false, stub_error);92 keys;93 dummy;94 return new Tuple10[](0);95 }9697 /// Set the sponsor of the collection.98 ///99 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.100 ///101 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.102 /// @dev EVM selector for this function is: 0x7623402e,103 /// or in textual repr: setCollectionSponsor(address)104 function setCollectionSponsor(address sponsor) public {105 require(false, stub_error);106 sponsor;107 dummy = 0;108 }109110 /// Set the sponsor of the collection.111 ///112 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.113 ///114 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.115 /// @dev EVM selector for this function is: 0x84a1d5a8,116 /// or in textual repr: setCollectionSponsorCross((address,uint256))117 function setCollectionSponsorCross(Tuple6 memory sponsor) public {118 require(false, stub_error);119 sponsor;120 dummy = 0;121 }122123 /// Whether there is a pending sponsor.124 /// @dev EVM selector for this function is: 0x058ac185,125 /// or in textual repr: hasCollectionPendingSponsor()126 function hasCollectionPendingSponsor() public view returns (bool) {127 require(false, stub_error);128 dummy;129 return false;130 }131132 /// Collection sponsorship confirmation.133 ///134 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.135 /// @dev EVM selector for this function is: 0x3c50e97a,136 /// or in textual repr: confirmCollectionSponsorship()137 function confirmCollectionSponsorship() public {138 require(false, stub_error);139 dummy = 0;140 }141142 /// Remove collection sponsor.143 /// @dev EVM selector for this function is: 0x6e0326a3,144 /// or in textual repr: removeCollectionSponsor()145 function removeCollectionSponsor() public {146 require(false, stub_error);147 dummy = 0;148 }149150 /// Get current sponsor.151 ///152 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.153 /// @dev EVM selector for this function is: 0x6ec0a9f1,154 /// or in textual repr: collectionSponsor()155 function collectionSponsor() public view returns (Tuple6 memory) {156 require(false, stub_error);157 dummy;158 return Tuple6(0x0000000000000000000000000000000000000000, 0);159 }160161 /// Set limits for the collection.162 /// @dev Throws error if limit not found.163 /// @param limit Name of the limit. Valid names:164 /// "accountTokenOwnershipLimit",165 /// "sponsoredDataSize",166 /// "sponsoredDataRateLimit",167 /// "tokenLimit",168 /// "sponsorTransferTimeout",169 /// "sponsorApproveTimeout"170 /// @param value Value of the limit.171 /// @dev EVM selector for this function is: 0x6a3841db,172 /// or in textual repr: setCollectionLimit(string,uint32)173 function setCollectionLimit(string memory limit, uint32 value) public {174 require(false, stub_error);175 limit;176 value;177 dummy = 0;178 }179180 /// Set limits for the collection.181 /// @dev Throws error if limit not found.182 /// @param limit Name of the limit. Valid names:183 /// "ownerCanTransfer",184 /// "ownerCanDestroy",185 /// "transfersEnabled"186 /// @param value Value of the limit.187 /// @dev EVM selector for this function is: 0x993b7fba,188 /// or in textual repr: setCollectionLimit(string,bool)189 function setCollectionLimit(string memory limit, bool value) public {190 require(false, stub_error);191 limit;192 value;193 dummy = 0;194 }195196 /// Get contract address.197 /// @dev EVM selector for this function is: 0xf6b4dfb4,198 /// or in textual repr: contractAddress()199 function contractAddress() public view returns (address) {200 require(false, stub_error);201 dummy;202 return 0x0000000000000000000000000000000000000000;203 }204205 /// Add collection admin.206 /// @param newAdmin Cross account administrator address.207 /// @dev EVM selector for this function is: 0x859aa7d6,208 /// or in textual repr: addCollectionAdminCross((address,uint256))209 function addCollectionAdminCross(Tuple6 memory newAdmin) public {210 require(false, stub_error);211 newAdmin;212 dummy = 0;213 }214215 /// Remove collection admin.216 /// @param admin Cross account administrator address.217 /// @dev EVM selector for this function is: 0x6c0cd173,218 /// or in textual repr: removeCollectionAdminCross((address,uint256))219 function removeCollectionAdminCross(Tuple6 memory admin) public {220 require(false, stub_error);221 admin;222 dummy = 0;223 }224225 /// Add collection admin.226 /// @param newAdmin Address of the added administrator.227 /// @dev EVM selector for this function is: 0x92e462c7,228 /// or in textual repr: addCollectionAdmin(address)229 function addCollectionAdmin(address newAdmin) public {230 require(false, stub_error);231 newAdmin;232 dummy = 0;233 }234235 /// Remove collection admin.236 ///237 /// @param admin Address of the removed administrator.238 /// @dev EVM selector for this function is: 0xfafd7b42,239 /// or in textual repr: removeCollectionAdmin(address)240 function removeCollectionAdmin(address admin) public {241 require(false, stub_error);242 admin;243 dummy = 0;244 }245246 /// Toggle accessibility of collection nesting.247 ///248 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'249 /// @dev EVM selector for this function is: 0x112d4586,250 /// or in textual repr: setCollectionNesting(bool)251 function setCollectionNesting(bool enable) public {252 require(false, stub_error);253 enable;254 dummy = 0;255 }256257 /// Toggle accessibility of collection nesting.258 ///259 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'260 /// @param collections Addresses of collections that will be available for nesting.261 /// @dev EVM selector for this function is: 0x64872396,262 /// or in textual repr: setCollectionNesting(bool,address[])263 function setCollectionNesting(bool enable, address[] memory collections) public {264 require(false, stub_error);265 enable;266 collections;267 dummy = 0;268 }269270 /// Set the collection access method.271 /// @param mode Access mode272 /// 0 for Normal273 /// 1 for AllowList274 /// @dev EVM selector for this function is: 0x41835d4c,275 /// or in textual repr: setCollectionAccess(uint8)276 function setCollectionAccess(uint8 mode) public {277 require(false, stub_error);278 mode;279 dummy = 0;280 }281282 /// Checks that user allowed to operate with collection.283 ///284 /// @param user User address to check.285 /// @dev EVM selector for this function is: 0xd63a8e11,286 /// or in textual repr: allowed(address)287 function allowed(address user) public view returns (bool) {288 require(false, stub_error);289 user;290 dummy;291 return false;292 }293294 /// Add the user to the allowed list.295 ///296 /// @param user Address of a trusted user.297 /// @dev EVM selector for this function is: 0x67844fe6,298 /// or in textual repr: addToCollectionAllowList(address)299 function addToCollectionAllowList(address user) public {300 require(false, stub_error);301 user;302 dummy = 0;303 }304305 /// Add user to allowed list.306 ///307 /// @param user User cross account address.308 /// @dev EVM selector for this function is: 0xa0184a3a,309 /// or in textual repr: addToCollectionAllowListCross((address,uint256))310 function addToCollectionAllowListCross(Tuple6 memory user) public {311 require(false, stub_error);312 user;313 dummy = 0;314 }315316 /// Remove the user from the allowed list.317 ///318 /// @param user Address of a removed user.319 /// @dev EVM selector for this function is: 0x85c51acb,320 /// or in textual repr: removeFromCollectionAllowList(address)321 function removeFromCollectionAllowList(address user) public {322 require(false, stub_error);323 user;324 dummy = 0;325 }326327 /// Remove user from allowed list.328 ///329 /// @param user User cross account address.330 /// @dev EVM selector for this function is: 0x09ba452a,331 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))332 function removeFromCollectionAllowListCross(Tuple6 memory user) public {333 require(false, stub_error);334 user;335 dummy = 0;336 }337338 /// Switch permission for minting.339 ///340 /// @param mode Enable if "true".341 /// @dev EVM selector for this function is: 0x00018e84,342 /// or in textual repr: setCollectionMintMode(bool)343 function setCollectionMintMode(bool mode) public {344 require(false, stub_error);345 mode;346 dummy = 0;347 }348349 /// Check that account is the owner or admin of the collection350 ///351 /// @param user account to verify352 /// @return "true" if account is the owner or admin353 /// @dev EVM selector for this function is: 0x9811b0c7,354 /// or in textual repr: isOwnerOrAdmin(address)355 function isOwnerOrAdmin(address user) public view returns (bool) {356 require(false, stub_error);357 user;358 dummy;359 return false;360 }361362 /// Check that account is the owner or admin of the collection363 ///364 /// @param user User cross account to verify365 /// @return "true" if account is the owner or admin366 /// @dev EVM selector for this function is: 0x3e75a905,367 /// or in textual repr: isOwnerOrAdminCross((address,uint256))368 function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {369 require(false, stub_error);370 user;371 dummy;372 return false;373 }374375 /// Returns collection type376 ///377 /// @return `Fungible` or `NFT` or `ReFungible`378 /// @dev EVM selector for this function is: 0xd34b55b8,379 /// or in textual repr: uniqueCollectionType()380 function uniqueCollectionType() public view returns (string memory) {381 require(false, stub_error);382 dummy;383 return "";384 }385386 /// Get collection owner.387 ///388 /// @return Tuple with sponsor address and his substrate mirror.389 /// If address is canonical then substrate mirror is zero and vice versa.390 /// @dev EVM selector for this function is: 0xdf727d3b,391 /// or in textual repr: collectionOwner()392 function collectionOwner() public view returns (Tuple6 memory) {393 require(false, stub_error);394 dummy;395 return Tuple6(0x0000000000000000000000000000000000000000, 0);396 }397398 /// Changes collection owner to another account399 ///400 /// @dev Owner can be changed only by current owner401 /// @param newOwner new owner account402 /// @dev EVM selector for this function is: 0x4f53e226,403 /// or in textual repr: changeCollectionOwner(address)404 function changeCollectionOwner(address newOwner) public {405 require(false, stub_error);406 newOwner;407 dummy = 0;408 }409410 /// Get collection administrators411 ///412 /// @return Vector of tuples with admins address and his substrate mirror.413 /// If address is canonical then substrate mirror is zero and vice versa.414 /// @dev EVM selector for this function is: 0x5813216b,415 /// or in textual repr: collectionAdmins()416 function collectionAdmins() public view returns (Tuple6[] memory) {417 require(false, stub_error);418 dummy;419 return new Tuple6[](0);420 }421422 /// Changes collection owner to another account423 ///424 /// @dev Owner can be changed only by current owner425 /// @param newOwner new owner cross account426 /// @dev EVM selector for this function is: 0xe5c9913f,427 /// or in textual repr: setOwnerCross((address,uint256))428 function setOwnerCross(Tuple6 memory newOwner) public {429 require(false, stub_error);430 newOwner;431 dummy = 0;432 }433}434435/// @dev anonymous struct436struct Tuple10 {437 string field_0;438 bytes field_1;439}440441/// @dev the ERC-165 identifier for this interface is 0x032e5926442contract ERC20UniqueExtensions is Dummy, ERC165 {443 /// @dev EVM selector for this function is: 0x0ecd0ab0,444 /// or in textual repr: approveCross((address,uint256),uint256)445 function approveCross(Tuple6 memory spender, uint256 amount) public returns (bool) {446 require(false, stub_error);447 spender;448 amount;449 dummy = 0;450 return false;451 }452453 /// Burn tokens from account454 /// @dev Function that burns an `amount` of the tokens of a given account,455 /// deducting from the sender's allowance for said account.456 /// @param from The account whose tokens will be burnt.457 /// @param amount The amount that will be burnt.458 /// @dev EVM selector for this function is: 0x79cc6790,459 /// or in textual repr: burnFrom(address,uint256)460 function burnFrom(address from, uint256 amount) public returns (bool) {461 require(false, stub_error);462 from;463 amount;464 dummy = 0;465 return false;466 }467468 /// Burn tokens from account469 /// @dev Function that burns an `amount` of the tokens of a given account,470 /// deducting from the sender's allowance for said account.471 /// @param from The account whose tokens will be burnt.472 /// @param amount The amount that will be burnt.473 /// @dev EVM selector for this function is: 0xbb2f5a58,474 /// or in textual repr: burnFromCross((address,uint256),uint256)475 function burnFromCross(Tuple6 memory from, uint256 amount) public returns (bool) {476 require(false, stub_error);477 from;478 amount;479 dummy = 0;480 return false;481 }482483 /// Mint tokens for multiple accounts.484 /// @param amounts array of pairs of account address and amount485 /// @dev EVM selector for this function is: 0x1acf2d55,486 /// or in textual repr: mintBulk((address,uint256)[])487 function mintBulk(Tuple6[] memory amounts) public returns (bool) {488 require(false, stub_error);489 amounts;490 dummy = 0;491 return false;492 }493494 /// @dev EVM selector for this function is: 0xd5cf430b,495 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)496 function transferFromCross(497 Tuple6 memory from,498 Tuple6 memory to,499 uint256 amount500 ) public returns (bool) {501 require(false, stub_error);502 from;503 to;504 amount;505 dummy = 0;506 return false;507 }508}509510/// @dev anonymous struct511struct Tuple6 {512 address field_0;513 uint256 field_1;514}515516/// @dev the ERC-165 identifier for this interface is 0x40c10f19517contract ERC20Mintable is Dummy, ERC165 {518 /// Mint tokens for `to` account.519 /// @param to account that will receive minted tokens520 /// @param amount amount of tokens to mint521 /// @dev EVM selector for this function is: 0x40c10f19,522 /// or in textual repr: mint(address,uint256)523 function mint(address to, uint256 amount) public returns (bool) {524 require(false, stub_error);525 to;526 amount;527 dummy = 0;528 return false;529 }530}531532/// @dev inlined interface533contract ERC20Events {534 event Transfer(address indexed from, address indexed to, uint256 value);535 event Approval(address indexed owner, address indexed spender, uint256 value);536}537538/// @dev the ERC-165 identifier for this interface is 0x942e8b22539contract ERC20 is Dummy, ERC165, ERC20Events {540 /// @dev EVM selector for this function is: 0x06fdde03,541 /// or in textual repr: name()542 function name() public view returns (string memory) {543 require(false, stub_error);544 dummy;545 return "";546 }547548 /// @dev EVM selector for this function is: 0x95d89b41,549 /// or in textual repr: symbol()550 function symbol() public view returns (string memory) {551 require(false, stub_error);552 dummy;553 return "";554 }555556 /// @dev EVM selector for this function is: 0x18160ddd,557 /// or in textual repr: totalSupply()558 function totalSupply() public view returns (uint256) {559 require(false, stub_error);560 dummy;561 return 0;562 }563564 /// @dev EVM selector for this function is: 0x313ce567,565 /// or in textual repr: decimals()566 function decimals() public view returns (uint8) {567 require(false, stub_error);568 dummy;569 return 0;570 }571572 /// @dev EVM selector for this function is: 0x70a08231,573 /// or in textual repr: balanceOf(address)574 function balanceOf(address owner) public view returns (uint256) {575 require(false, stub_error);576 owner;577 dummy;578 return 0;579 }580581 /// @dev EVM selector for this function is: 0xa9059cbb,582 /// or in textual repr: transfer(address,uint256)583 function transfer(address to, uint256 amount) public returns (bool) {584 require(false, stub_error);585 to;586 amount;587 dummy = 0;588 return false;589 }590591 /// @dev EVM selector for this function is: 0x23b872dd,592 /// or in textual repr: transferFrom(address,address,uint256)593 function transferFrom(594 address from,595 address to,596 uint256 amount597 ) public returns (bool) {598 require(false, stub_error);599 from;600 to;601 amount;602 dummy = 0;603 return false;604 }605606 /// @dev EVM selector for this function is: 0x095ea7b3,607 /// or in textual repr: approve(address,uint256)608 function approve(address spender, uint256 amount) public returns (bool) {609 require(false, stub_error);610 spender;611 amount;612 dummy = 0;613 return false;614 }615616 /// @dev EVM selector for this function is: 0xdd62ed3e,617 /// or in textual repr: allowance(address,address)618 function allowance(address owner, address spender) public view returns (uint256) {619 require(false, stub_error);620 owner;621 spender;622 dummy;623 return 0;624 }625}626627contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs 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 you to work with collections.21/// @dev the ERC-165 identifier for this interface is 0xb3152af322contract Collection is Dummy, ERC165 {23 /// Set collection property.24 ///25 /// @param key Property key.26 /// @param value Propery value.27 /// @dev EVM selector for this function is: 0x2f073f66,28 /// or in textual repr: setCollectionProperty(string,bytes)29 function setCollectionProperty(string memory key, bytes memory value) public {30 require(false, stub_error);31 key;32 value;33 dummy = 0;34 }3536 /// Set collection properties.37 ///38 /// @param properties Vector of properties key/value pair.39 /// @dev EVM selector for this function is: 0x50b26b2a,40 /// or in textual repr: setCollectionProperties((string,bytes)[])41 function setCollectionProperties(Tuple10[] memory properties) public {42 require(false, stub_error);43 properties;44 dummy = 0;45 }4647 /// Delete collection property.48 ///49 /// @param key Property key.50 /// @dev EVM selector for this function is: 0x7b7debce,51 /// or in textual repr: deleteCollectionProperty(string)52 function deleteCollectionProperty(string memory key) public {53 require(false, stub_error);54 key;55 dummy = 0;56 }5758 /// Delete collection properties.59 ///60 /// @param keys Properties keys.61 /// @dev EVM selector for this function is: 0xee206ee3,62 /// or in textual repr: deleteCollectionProperties(string[])63 function deleteCollectionProperties(string[] memory keys) public {64 require(false, stub_error);65 keys;66 dummy = 0;67 }6869 /// Get collection property.70 ///71 /// @dev Throws error if key not found.72 ///73 /// @param key Property key.74 /// @return bytes The property corresponding to the key.75 /// @dev EVM selector for this function is: 0xcf24fd6d,76 /// or in textual repr: collectionProperty(string)77 function collectionProperty(string memory key) public view returns (bytes memory) {78 require(false, stub_error);79 key;80 dummy;81 return hex"";82 }8384 /// Get collection properties.85 ///86 /// @param keys Properties keys. Empty keys for all propertyes.87 /// @return Vector of properties key/value pairs.88 /// @dev EVM selector for this function is: 0x285fb8e6,89 /// or in textual repr: collectionProperties(string[])90 function collectionProperties(string[] memory keys) public view returns (Tuple10[] memory) {91 require(false, stub_error);92 keys;93 dummy;94 return new Tuple10[](0);95 }9697 /// Set the sponsor of the collection.98 ///99 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.100 ///101 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.102 /// @dev EVM selector for this function is: 0x7623402e,103 /// or in textual repr: setCollectionSponsor(address)104 function setCollectionSponsor(address sponsor) public {105 require(false, stub_error);106 sponsor;107 dummy = 0;108 }109110 /// Set the sponsor of the collection.111 ///112 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.113 ///114 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.115 /// @dev EVM selector for this function is: 0x84a1d5a8,116 /// or in textual repr: setCollectionSponsorCross((address,uint256))117 function setCollectionSponsorCross(Tuple6 memory sponsor) public {118 require(false, stub_error);119 sponsor;120 dummy = 0;121 }122123 /// Whether there is a pending sponsor.124 /// @dev EVM selector for this function is: 0x058ac185,125 /// or in textual repr: hasCollectionPendingSponsor()126 function hasCollectionPendingSponsor() public view returns (bool) {127 require(false, stub_error);128 dummy;129 return false;130 }131132 /// Collection sponsorship confirmation.133 ///134 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.135 /// @dev EVM selector for this function is: 0x3c50e97a,136 /// or in textual repr: confirmCollectionSponsorship()137 function confirmCollectionSponsorship() public {138 require(false, stub_error);139 dummy = 0;140 }141142 /// Remove collection sponsor.143 /// @dev EVM selector for this function is: 0x6e0326a3,144 /// or in textual repr: removeCollectionSponsor()145 function removeCollectionSponsor() public {146 require(false, stub_error);147 dummy = 0;148 }149150 /// Get current sponsor.151 ///152 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.153 /// @dev EVM selector for this function is: 0x6ec0a9f1,154 /// or in textual repr: collectionSponsor()155 function collectionSponsor() public view returns (Tuple6 memory) {156 require(false, stub_error);157 dummy;158 return Tuple6(0x0000000000000000000000000000000000000000, 0);159 }160161 /// Set limits for the collection.162 /// @dev Throws error if limit not found.163 /// @param limit Name of the limit. Valid names:164 /// "accountTokenOwnershipLimit",165 /// "sponsoredDataSize",166 /// "sponsoredDataRateLimit",167 /// "tokenLimit",168 /// "sponsorTransferTimeout",169 /// "sponsorApproveTimeout"170 /// @param value Value of the limit.171 /// @dev EVM selector for this function is: 0x6a3841db,172 /// or in textual repr: setCollectionLimit(string,uint32)173 function setCollectionLimit(string memory limit, uint32 value) public {174 require(false, stub_error);175 limit;176 value;177 dummy = 0;178 }179180 /// Set limits for the collection.181 /// @dev Throws error if limit not found.182 /// @param limit Name of the limit. Valid names:183 /// "ownerCanTransfer",184 /// "ownerCanDestroy",185 /// "transfersEnabled"186 /// @param value Value of the limit.187 /// @dev EVM selector for this function is: 0x993b7fba,188 /// or in textual repr: setCollectionLimit(string,bool)189 function setCollectionLimit(string memory limit, bool value) public {190 require(false, stub_error);191 limit;192 value;193 dummy = 0;194 }195196 /// Get contract address.197 /// @dev EVM selector for this function is: 0xf6b4dfb4,198 /// or in textual repr: contractAddress()199 function contractAddress() public view returns (address) {200 require(false, stub_error);201 dummy;202 return 0x0000000000000000000000000000000000000000;203 }204205 /// Add collection admin.206 /// @param newAdmin Cross account administrator address.207 /// @dev EVM selector for this function is: 0x859aa7d6,208 /// or in textual repr: addCollectionAdminCross((address,uint256))209 function addCollectionAdminCross(Tuple6 memory newAdmin) public {210 require(false, stub_error);211 newAdmin;212 dummy = 0;213 }214215 /// Remove collection admin.216 /// @param admin Cross account administrator address.217 /// @dev EVM selector for this function is: 0x6c0cd173,218 /// or in textual repr: removeCollectionAdminCross((address,uint256))219 function removeCollectionAdminCross(Tuple6 memory admin) public {220 require(false, stub_error);221 admin;222 dummy = 0;223 }224225 /// Add collection admin.226 /// @param newAdmin Address of the added administrator.227 /// @dev EVM selector for this function is: 0x92e462c7,228 /// or in textual repr: addCollectionAdmin(address)229 function addCollectionAdmin(address newAdmin) public {230 require(false, stub_error);231 newAdmin;232 dummy = 0;233 }234235 /// Remove collection admin.236 ///237 /// @param admin Address of the removed administrator.238 /// @dev EVM selector for this function is: 0xfafd7b42,239 /// or in textual repr: removeCollectionAdmin(address)240 function removeCollectionAdmin(address admin) public {241 require(false, stub_error);242 admin;243 dummy = 0;244 }245246 /// Toggle accessibility of collection nesting.247 ///248 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'249 /// @dev EVM selector for this function is: 0x112d4586,250 /// or in textual repr: setCollectionNesting(bool)251 function setCollectionNesting(bool enable) public {252 require(false, stub_error);253 enable;254 dummy = 0;255 }256257 /// Toggle accessibility of collection nesting.258 ///259 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'260 /// @param collections Addresses of collections that will be available for nesting.261 /// @dev EVM selector for this function is: 0x64872396,262 /// or in textual repr: setCollectionNesting(bool,address[])263 function setCollectionNesting(bool enable, address[] memory collections) public {264 require(false, stub_error);265 enable;266 collections;267 dummy = 0;268 }269270 /// Set the collection access method.271 /// @param mode Access mode272 /// 0 for Normal273 /// 1 for AllowList274 /// @dev EVM selector for this function is: 0x41835d4c,275 /// or in textual repr: setCollectionAccess(uint8)276 function setCollectionAccess(uint8 mode) public {277 require(false, stub_error);278 mode;279 dummy = 0;280 }281282 /// Checks that user allowed to operate with collection.283 ///284 /// @param user User address to check.285 /// @dev EVM selector for this function is: 0xd63a8e11,286 /// or in textual repr: allowed(address)287 function allowed(address user) public view returns (bool) {288 require(false, stub_error);289 user;290 dummy;291 return false;292 }293294 /// Add the user to the allowed list.295 ///296 /// @param user Address of a trusted user.297 /// @dev EVM selector for this function is: 0x67844fe6,298 /// or in textual repr: addToCollectionAllowList(address)299 function addToCollectionAllowList(address user) public {300 require(false, stub_error);301 user;302 dummy = 0;303 }304305 /// Add user to allowed list.306 ///307 /// @param user User cross account address.308 /// @dev EVM selector for this function is: 0xa0184a3a,309 /// or in textual repr: addToCollectionAllowListCross((address,uint256))310 function addToCollectionAllowListCross(Tuple6 memory user) public {311 require(false, stub_error);312 user;313 dummy = 0;314 }315316 /// Remove the user from the allowed list.317 ///318 /// @param user Address of a removed user.319 /// @dev EVM selector for this function is: 0x85c51acb,320 /// or in textual repr: removeFromCollectionAllowList(address)321 function removeFromCollectionAllowList(address user) public {322 require(false, stub_error);323 user;324 dummy = 0;325 }326327 /// Remove user from allowed list.328 ///329 /// @param user User cross account address.330 /// @dev EVM selector for this function is: 0x09ba452a,331 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))332 function removeFromCollectionAllowListCross(Tuple6 memory user) public {333 require(false, stub_error);334 user;335 dummy = 0;336 }337338 /// Switch permission for minting.339 ///340 /// @param mode Enable if "true".341 /// @dev EVM selector for this function is: 0x00018e84,342 /// or in textual repr: setCollectionMintMode(bool)343 function setCollectionMintMode(bool mode) public {344 require(false, stub_error);345 mode;346 dummy = 0;347 }348349 /// Check that account is the owner or admin of the collection350 ///351 /// @param user account to verify352 /// @return "true" if account is the owner or admin353 /// @dev EVM selector for this function is: 0x9811b0c7,354 /// or in textual repr: isOwnerOrAdmin(address)355 function isOwnerOrAdmin(address user) public view returns (bool) {356 require(false, stub_error);357 user;358 dummy;359 return false;360 }361362 /// Check that account is the owner or admin of the collection363 ///364 /// @param user User cross account to verify365 /// @return "true" if account is the owner or admin366 /// @dev EVM selector for this function is: 0x3e75a905,367 /// or in textual repr: isOwnerOrAdminCross((address,uint256))368 function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {369 require(false, stub_error);370 user;371 dummy;372 return false;373 }374375 /// Returns collection type376 ///377 /// @return `Fungible` or `NFT` or `ReFungible`378 /// @dev EVM selector for this function is: 0xd34b55b8,379 /// or in textual repr: uniqueCollectionType()380 function uniqueCollectionType() public view returns (string memory) {381 require(false, stub_error);382 dummy;383 return "";384 }385386 /// Get collection owner.387 ///388 /// @return Tuble with sponsor address and his substrate mirror.389 /// If address is canonical then substrate mirror is zero and vice versa.390 /// @dev EVM selector for this function is: 0xdf727d3b,391 /// or in textual repr: collectionOwner()392 function collectionOwner() public view returns (Tuple6 memory) {393 require(false, stub_error);394 dummy;395 return Tuple6(0x0000000000000000000000000000000000000000, 0);396 }397398 /// Changes collection owner to another account399 ///400 /// @dev Owner can be changed only by current owner401 /// @param newOwner new owner account402 /// @dev EVM selector for this function is: 0x4f53e226,403 /// or in textual repr: changeCollectionOwner(address)404 function changeCollectionOwner(address newOwner) public {405 require(false, stub_error);406 newOwner;407 dummy = 0;408 }409410 /// Get collection administrators411 ///412 /// @return Vector of tuples with admins address and his substrate mirror.413 /// If address is canonical then substrate mirror is zero and vice versa.414 /// @dev EVM selector for this function is: 0x5813216b,415 /// or in textual repr: collectionAdmins()416 function collectionAdmins() public view returns (Tuple6[] memory) {417 require(false, stub_error);418 dummy;419 return new Tuple6[](0);420 }421422 /// Changes collection owner to another account423 ///424 /// @dev Owner can be changed only by current owner425 /// @param newOwner new owner cross account426 /// @dev EVM selector for this function is: 0xe5c9913f,427 /// or in textual repr: setOwnerCross((address,uint256))428 function setOwnerCross(Tuple6 memory newOwner) public {429 require(false, stub_error);430 newOwner;431 dummy = 0;432 }433}434435/// @dev anonymous struct436struct Tuple10 {437 string field_0;438 bytes field_1;439}440441/// @dev the ERC-165 identifier for this interface is 0x032e5926442contract ERC20UniqueExtensions is Dummy, ERC165 {443 /// @dev EVM selector for this function is: 0x0ecd0ab0,444 /// or in textual repr: approveCross((address,uint256),uint256)445 function approveCross(Tuple6 memory spender, uint256 amount) public returns (bool) {446 require(false, stub_error);447 spender;448 amount;449 dummy = 0;450 return false;451 }452453 /// Burn tokens from account454 /// @dev Function that burns an `amount` of the tokens of a given account,455 /// deducting from the sender's allowance for said account.456 /// @param from The account whose tokens will be burnt.457 /// @param amount The amount that will be burnt.458 /// @dev EVM selector for this function is: 0x79cc6790,459 /// or in textual repr: burnFrom(address,uint256)460 function burnFrom(address from, uint256 amount) public returns (bool) {461 require(false, stub_error);462 from;463 amount;464 dummy = 0;465 return false;466 }467468 /// Burn tokens from account469 /// @dev Function that burns an `amount` of the tokens of a given account,470 /// deducting from the sender's allowance for said account.471 /// @param from The account whose tokens will be burnt.472 /// @param amount The amount that will be burnt.473 /// @dev EVM selector for this function is: 0xbb2f5a58,474 /// or in textual repr: burnFromCross((address,uint256),uint256)475 function burnFromCross(Tuple6 memory from, uint256 amount) public returns (bool) {476 require(false, stub_error);477 from;478 amount;479 dummy = 0;480 return false;481 }482483 /// Mint tokens for multiple accounts.484 /// @param amounts array of pairs of account address and amount485 /// @dev EVM selector for this function is: 0x1acf2d55,486 /// or in textual repr: mintBulk((address,uint256)[])487 function mintBulk(Tuple6[] memory amounts) public returns (bool) {488 require(false, stub_error);489 amounts;490 dummy = 0;491 return false;492 }493494 /// @dev EVM selector for this function is: 0xd5cf430b,495 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)496 function transferFromCross(497 Tuple6 memory from,498 Tuple6 memory to,499 uint256 amount500 ) public returns (bool) {501 require(false, stub_error);502 from;503 to;504 amount;505 dummy = 0;506 return false;507 }508}509510/// @dev anonymous struct511struct Tuple6 {512 address field_0;513 uint256 field_1;514}515516/// @dev the ERC-165 identifier for this interface is 0x40c10f19517contract ERC20Mintable is Dummy, ERC165 {518 /// Mint tokens for `to` account.519 /// @param to account that will receive minted tokens520 /// @param amount amount of tokens to mint521 /// @dev EVM selector for this function is: 0x40c10f19,522 /// or in textual repr: mint(address,uint256)523 function mint(address to, uint256 amount) public returns (bool) {524 require(false, stub_error);525 to;526 amount;527 dummy = 0;528 return false;529 }530}531532/// @dev inlined interface533contract ERC20Events {534 event Transfer(address indexed from, address indexed to, uint256 value);535 event Approval(address indexed owner, address indexed spender, uint256 value);536}537538/// @dev the ERC-165 identifier for this interface is 0x942e8b22539contract ERC20 is Dummy, ERC165, ERC20Events {540 /// @dev EVM selector for this function is: 0x06fdde03,541 /// or in textual repr: name()542 function name() public view returns (string memory) {543 require(false, stub_error);544 dummy;545 return "";546 }547548 /// @dev EVM selector for this function is: 0x95d89b41,549 /// or in textual repr: symbol()550 function symbol() public view returns (string memory) {551 require(false, stub_error);552 dummy;553 return "";554 }555556 /// @dev EVM selector for this function is: 0x18160ddd,557 /// or in textual repr: totalSupply()558 function totalSupply() public view returns (uint256) {559 require(false, stub_error);560 dummy;561 return 0;562 }563564 /// @dev EVM selector for this function is: 0x313ce567,565 /// or in textual repr: decimals()566 function decimals() public view returns (uint8) {567 require(false, stub_error);568 dummy;569 return 0;570 }571572 /// @dev EVM selector for this function is: 0x70a08231,573 /// or in textual repr: balanceOf(address)574 function balanceOf(address owner) public view returns (uint256) {575 require(false, stub_error);576 owner;577 dummy;578 return 0;579 }580581 /// @dev EVM selector for this function is: 0xa9059cbb,582 /// or in textual repr: transfer(address,uint256)583 function transfer(address to, uint256 amount) public returns (bool) {584 require(false, stub_error);585 to;586 amount;587 dummy = 0;588 return false;589 }590591 /// @dev EVM selector for this function is: 0x23b872dd,592 /// or in textual repr: transferFrom(address,address,uint256)593 function transferFrom(594 address from,595 address to,596 uint256 amount597 ) public returns (bool) {598 require(false, stub_error);599 from;600 to;601 amount;602 dummy = 0;603 return false;604 }605606 /// @dev EVM selector for this function is: 0x095ea7b3,607 /// or in textual repr: approve(address,uint256)608 function approve(address spender, uint256 amount) public returns (bool) {609 require(false, stub_error);610 spender;611 amount;612 dummy = 0;613 return false;614 }615616 /// @dev EVM selector for this function is: 0xdd62ed3e,617 /// or in textual repr: allowance(address,address)618 function allowance(address owner, address spender) public view returns (uint256) {619 require(false, stub_error);620 owner;621 spender;622 dummy;623 return 0;624 }625}626627contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -471,7 +471,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @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()
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -471,7 +471,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @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()
tests/src/eth/allowlist.test.tsdiffbeforeafterboth--- a/tests/src/eth/allowlist.test.ts
+++ b/tests/src/eth/allowlist.test.ts
@@ -89,21 +89,21 @@
expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.false;
});
- //itEth('Collection allowlist can be added and removed by [cross] address', async ({helper}) => {
- // const owner = await helper.eth.createAccountWithBalance(donor);
- // const user = donor;
- //
- // const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- // const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- // const userCross = helper.ethCrossAccount.fromKeyringPair(user);
- //
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- // await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
- //
- // await collectionEvm.methods.removeFromCollectionAllowListCross(userCross).send({from: owner});
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- //});
+ itEth('Collection allowlist can be added and removed by [cross] address', async ({helper}) => {
+ const owner = await helper.eth.createAccountWithBalance(donor);
+ const user = donor;
+
+ const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+ const userCross = helper.ethCrossAccount.fromKeyringPair(user);
+
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
+
+ await collectionEvm.methods.removeFromCollectionAllowListCross(userCross).send({from: owner});
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ });
itEth('Collection allowlist can not be add and remove [eth] address by not owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
@@ -122,22 +122,22 @@
expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.true;
});
- //itEth('Collection allowlist can not be add and remove [cross] address by not owner', async ({helper}) => {
- // const owner = await helper.eth.createAccountWithBalance(donor);
- // const notOwner = await helper.eth.createAccountWithBalance(donor);
- // const user = donor;
- //
- // const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- // const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- //
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- // const userCross = helper.ethCrossAccount.fromKeyringPair(user);
- // await expect(collectionEvm.methods.addToCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- // await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
- //
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
- // await expect(collectionEvm.methods.removeFromCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
- //});
+ itEth('Collection allowlist can not be add and remove [cross] address by not owner', async ({helper}) => {
+ const owner = await helper.eth.createAccountWithBalance(donor);
+ const notOwner = await helper.eth.createAccountWithBalance(donor);
+ const user = donor;
+
+ const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ const userCross = helper.ethCrossAccount.fromKeyringPair(user);
+ await expect(collectionEvm.methods.addToCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
+
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
+ await expect(collectionEvm.methods.removeFromCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
+ });
});
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -249,7 +249,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @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()
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -306,7 +306,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @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()
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -306,7 +306,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @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()
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -53,10 +53,10 @@
itEth('Add cross account admin by owner', async ({helper, privateKey}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- const newAdmin = await privateKey('//Bob');
+ const newAdmin = privateKey('//Bob');
const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);
await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -149,7 +149,7 @@
});
itEth('Can perform burnFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const sender = await helper.eth.createAccountWithBalance(alice, 100n);
const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);
@@ -261,7 +261,7 @@
});
itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const sender = await helper.eth.createAccountWithBalance(alice, 100n);
const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);
@@ -455,7 +455,7 @@
});
itEth('Events emitted for transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const sender = await helper.eth.createAccountWithBalance(alice, 100n);
const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -247,10 +247,10 @@
});
itEth('Can perform burnFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
const token = await collection.mintToken(alice, {Substrate: owner.address});
@@ -277,11 +277,11 @@
});
itEth('Can perform approveCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
const owner = await helper.eth.createAccountWithBalance(alice, 100n);
- const receiver = await privateKey('//Charlie');
+ const receiver = privateKey('//Charlie');
const token = await collection.mintToken(alice, {Ethereum: owner});
@@ -410,12 +410,12 @@
});
itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
- const receiver = await privateKey('//Charlie');
+ const receiver = privateKey('//Charlie');
const token = await collection.mintToken(alice, {Substrate: owner.address});
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -228,7 +228,7 @@
});
itEth('Can perform burnFrom()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
const owner = await helper.eth.createAccountWithBalance(alice, 100n);
@@ -262,10 +262,10 @@
});
itEth('Can perform burnFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
const token = await collection.mintToken(alice, 100n, {Substrate: owner.address});
@@ -295,12 +295,12 @@
});
itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
- const receiver = await privateKey('//Charlie');
+ const receiver = privateKey('//Charlie');
const token = await collection.mintToken(alice, 100n, {Substrate: owner.address});
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -381,6 +381,46 @@
}
}
+export class EthCrossAccountGroup extends EthGroupBase {
+ fromAddress(address: TEthereumAccount): TEthCrossAccount {
+ return {
+ 0: address,
+ 1: '0',
+ field_0: address,
+ field_1: '0',
+ };
+ }
+
+ fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount {
+ return {
+ 0: '0x0000000000000000000000000000000000000000',
+ 1: keyring.addressRaw,
+ field_0: '0x0000000000000000000000000000000000000000',
+ field_1: keyring.addressRaw,
+ };
+ }
+}
+
+export class EthCrossAccountGroup extends EthGroupBase {
+ fromAddress(address: TEthereumAccount): TEthCrossAccount {
+ return {
+ 0: address,
+ 1: '0',
+ field_0: address,
+ field_1: '0',
+ };
+ }
+
+ fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount {
+ return {
+ 0: '0x0000000000000000000000000000000000000000',
+ 1: keyring.addressRaw,
+ field_0: '0x0000000000000000000000000000000000000000',
+ field_1: keyring.addressRaw,
+ };
+ }
+}
+
export class EthUniqueHelper extends DevUniqueHelper {
web3: Web3 | null = null;
web3Provider: WebsocketProvider | null = null;