difftreelog
added `mintCross` function for `UniqueExtensoins` interfaces
in: master
20 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6085,7 +6085,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.9] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC20UniqueExtensions` interface.
+
## [0.1.8] - 2022-11-18
### Added
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -174,6 +174,19 @@
.collect::<string>())
}
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(&mut self, caller: caller, to: EthCrossAccount, amount: uint256) -> Result<bool> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let to = to.into_sub_cross_account::<T>()?;
+ let amount = amount.try_into().map_err(|_| "amount overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+ <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)
+ .map_err(dispatch_to_evm::<T>)?;
+ Ok(true)
+ }
+
#[weight(<SelfWeightOf<T>>::approve())]
fn approve_cross(
&mut self,
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 0x81172a7522contract 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(Property[] 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 (Property[] memory) {91 require(false, stub_error);92 keys;93 dummy;94 return new Property[](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(EthCrossAccount 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 (Tuple8 memory) {156 require(false, stub_error);157 dummy;158 return Tuple8(0x0000000000000000000000000000000000000000, 0);159 }160161 /// Get current collection limits.162 ///163 /// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:164 /// "accountTokenOwnershipLimit",165 /// "sponsoredDataSize",166 /// "sponsoredDataRateLimit",167 /// "tokenLimit",168 /// "sponsorTransferTimeout",169 /// "sponsorApproveTimeout"170 /// "ownerCanTransfer",171 /// "ownerCanDestroy",172 /// "transfersEnabled"173 /// Return `false` if a limit not set.174 /// @dev EVM selector for this function is: 0xf63bc572,175 /// or in textual repr: collectionLimits()176 function collectionLimits() public view returns (Tuple20[] memory) {177 require(false, stub_error);178 dummy;179 return new Tuple20[](0);180 }181182 /// Set limits for the collection.183 /// @dev Throws error if limit not found.184 /// @param limit Name of the limit. Valid names:185 /// "accountTokenOwnershipLimit",186 /// "sponsoredDataSize",187 /// "sponsoredDataRateLimit",188 /// "tokenLimit",189 /// "sponsorTransferTimeout",190 /// "sponsorApproveTimeout"191 /// "ownerCanTransfer",192 /// "ownerCanDestroy",193 /// "transfersEnabled"194 /// @param status enable\disable limit. Works only with `true`.195 /// @param value Value of the limit.196 /// @dev EVM selector for this function is: 0x88150bd0,197 /// or in textual repr: setCollectionLimit(uint8,bool,uint256)198 function setCollectionLimit(199 CollectionLimits limit,200 bool status,201 uint256 value202 ) public {203 require(false, stub_error);204 limit;205 status;206 value;207 dummy = 0;208 }209210 /// Get contract address.211 /// @dev EVM selector for this function is: 0xf6b4dfb4,212 /// or in textual repr: contractAddress()213 function contractAddress() public view returns (address) {214 require(false, stub_error);215 dummy;216 return 0x0000000000000000000000000000000000000000;217 }218219 /// Add collection admin.220 /// @param newAdmin Cross account administrator address.221 /// @dev EVM selector for this function is: 0x859aa7d6,222 /// or in textual repr: addCollectionAdminCross((address,uint256))223 function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {224 require(false, stub_error);225 newAdmin;226 dummy = 0;227 }228229 /// Remove collection admin.230 /// @param admin Cross account administrator address.231 /// @dev EVM selector for this function is: 0x6c0cd173,232 /// or in textual repr: removeCollectionAdminCross((address,uint256))233 function removeCollectionAdminCross(EthCrossAccount memory admin) public {234 require(false, stub_error);235 admin;236 dummy = 0;237 }238239 // /// Add collection admin.240 // /// @param newAdmin Address of the added administrator.241 // /// @dev EVM selector for this function is: 0x92e462c7,242 // /// or in textual repr: addCollectionAdmin(address)243 // function addCollectionAdmin(address newAdmin) public {244 // require(false, stub_error);245 // newAdmin;246 // dummy = 0;247 // }248249 // /// Remove collection admin.250 // ///251 // /// @param admin Address of the removed administrator.252 // /// @dev EVM selector for this function is: 0xfafd7b42,253 // /// or in textual repr: removeCollectionAdmin(address)254 // function removeCollectionAdmin(address admin) public {255 // require(false, stub_error);256 // admin;257 // dummy = 0;258 // }259260 /// Toggle accessibility of collection nesting.261 ///262 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'263 /// @dev EVM selector for this function is: 0x112d4586,264 /// or in textual repr: setCollectionNesting(bool)265 function setCollectionNesting(bool enable) public {266 require(false, stub_error);267 enable;268 dummy = 0;269 }270271 /// Toggle accessibility of collection nesting.272 ///273 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'274 /// @param collections Addresses of collections that will be available for nesting.275 /// @dev EVM selector for this function is: 0x64872396,276 /// or in textual repr: setCollectionNesting(bool,address[])277 function setCollectionNesting(bool enable, address[] memory collections) public {278 require(false, stub_error);279 enable;280 collections;281 dummy = 0;282 }283284 /// Returns nesting for a collection285 /// @dev EVM selector for this function is: 0x22d25bfe,286 /// or in textual repr: collectionNestingRestrictedCollectionIds()287 function collectionNestingRestrictedCollectionIds() public view returns (Tuple26 memory) {288 require(false, stub_error);289 dummy;290 return Tuple26(false, new uint256[](0));291 }292293 /// Returns permissions for a collection294 /// @dev EVM selector for this function is: 0x5b2eaf4b,295 /// or in textual repr: collectionNestingPermissions()296 function collectionNestingPermissions() public view returns (Tuple29[] memory) {297 require(false, stub_error);298 dummy;299 return new Tuple29[](0);300 }301302 /// Set the collection access method.303 /// @param mode Access mode304 /// 0 for Normal305 /// 1 for AllowList306 /// @dev EVM selector for this function is: 0x41835d4c,307 /// or in textual repr: setCollectionAccess(uint8)308 function setCollectionAccess(uint8 mode) public {309 require(false, stub_error);310 mode;311 dummy = 0;312 }313314 /// Checks that user allowed to operate with collection.315 ///316 /// @param user User address to check.317 /// @dev EVM selector for this function is: 0x91b6df49,318 /// or in textual repr: allowlistedCross((address,uint256))319 function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {320 require(false, stub_error);321 user;322 dummy;323 return false;324 }325326 // /// Add the user to the allowed list.327 // ///328 // /// @param user Address of a trusted user.329 // /// @dev EVM selector for this function is: 0x67844fe6,330 // /// or in textual repr: addToCollectionAllowList(address)331 // function addToCollectionAllowList(address user) public {332 // require(false, stub_error);333 // user;334 // dummy = 0;335 // }336337 /// Add user to allowed list.338 ///339 /// @param user User cross account address.340 /// @dev EVM selector for this function is: 0xa0184a3a,341 /// or in textual repr: addToCollectionAllowListCross((address,uint256))342 function addToCollectionAllowListCross(EthCrossAccount memory user) public {343 require(false, stub_error);344 user;345 dummy = 0;346 }347348 // /// Remove the user from the allowed list.349 // ///350 // /// @param user Address of a removed user.351 // /// @dev EVM selector for this function is: 0x85c51acb,352 // /// or in textual repr: removeFromCollectionAllowList(address)353 // function removeFromCollectionAllowList(address user) public {354 // require(false, stub_error);355 // user;356 // dummy = 0;357 // }358359 /// Remove user from allowed list.360 ///361 /// @param user User cross account address.362 /// @dev EVM selector for this function is: 0x09ba452a,363 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))364 function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {365 require(false, stub_error);366 user;367 dummy = 0;368 }369370 /// Switch permission for minting.371 ///372 /// @param mode Enable if "true".373 /// @dev EVM selector for this function is: 0x00018e84,374 /// or in textual repr: setCollectionMintMode(bool)375 function setCollectionMintMode(bool mode) public {376 require(false, stub_error);377 mode;378 dummy = 0;379 }380381 // /// Check that account is the owner or admin of the collection382 // ///383 // /// @param user account to verify384 // /// @return "true" if account is the owner or admin385 // /// @dev EVM selector for this function is: 0x9811b0c7,386 // /// or in textual repr: isOwnerOrAdmin(address)387 // function isOwnerOrAdmin(address user) public view returns (bool) {388 // require(false, stub_error);389 // user;390 // dummy;391 // return false;392 // }393394 /// Check that account is the owner or admin of the collection395 ///396 /// @param user User cross account to verify397 /// @return "true" if account is the owner or admin398 /// @dev EVM selector for this function is: 0x3e75a905,399 /// or in textual repr: isOwnerOrAdminCross((address,uint256))400 function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {401 require(false, stub_error);402 user;403 dummy;404 return false;405 }406407 /// Returns collection type408 ///409 /// @return `Fungible` or `NFT` or `ReFungible`410 /// @dev EVM selector for this function is: 0xd34b55b8,411 /// or in textual repr: uniqueCollectionType()412 function uniqueCollectionType() public view returns (string memory) {413 require(false, stub_error);414 dummy;415 return "";416 }417418 /// Get collection owner.419 ///420 /// @return Tuble with sponsor address and his substrate mirror.421 /// If address is canonical then substrate mirror is zero and vice versa.422 /// @dev EVM selector for this function is: 0xdf727d3b,423 /// or in textual repr: collectionOwner()424 function collectionOwner() public view returns (EthCrossAccount memory) {425 require(false, stub_error);426 dummy;427 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);428 }429430 // /// Changes collection owner to another account431 // ///432 // /// @dev Owner can be changed only by current owner433 // /// @param newOwner new owner account434 // /// @dev EVM selector for this function is: 0x4f53e226,435 // /// or in textual repr: changeCollectionOwner(address)436 // function changeCollectionOwner(address newOwner) public {437 // require(false, stub_error);438 // newOwner;439 // dummy = 0;440 // }441442 /// Get collection administrators443 ///444 /// @return Vector of tuples with admins address and his substrate mirror.445 /// If address is canonical then substrate mirror is zero and vice versa.446 /// @dev EVM selector for this function is: 0x5813216b,447 /// or in textual repr: collectionAdmins()448 function collectionAdmins() public view returns (EthCrossAccount[] memory) {449 require(false, stub_error);450 dummy;451 return new EthCrossAccount[](0);452 }453454 /// Changes collection owner to another account455 ///456 /// @dev Owner can be changed only by current owner457 /// @param newOwner new owner cross account458 /// @dev EVM selector for this function is: 0x6496c497,459 /// or in textual repr: changeCollectionOwnerCross((address,uint256))460 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {461 require(false, stub_error);462 newOwner;463 dummy = 0;464 }465}466467/// @dev Cross account struct468struct EthCrossAccount {469 address eth;470 uint256 sub;471}472473enum CollectionPermissions {474 CollectionAdmin,475 TokenOwner476}477478/// @dev anonymous struct479struct Tuple29 {480 CollectionPermissions field_0;481 bool field_1;482}483484/// @dev anonymous struct485struct Tuple26 {486 bool field_0;487 uint256[] field_1;488}489490/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.491enum CollectionLimits {492 /// @dev How many tokens can a user have on one account.493 AccountTokenOwnership,494 /// @dev How many bytes of data are available for sponsorship.495 SponsoredDataSize,496 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]497 SponsoredDataRateLimit,498 /// @dev How many tokens can be mined into this collection.499 TokenLimit,500 /// @dev Timeouts for transfer sponsoring.501 SponsorTransferTimeout,502 /// @dev Timeout for sponsoring an approval in passed blocks.503 SponsorApproveTimeout,504 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).505 OwnerCanTransfer,506 /// @dev Can the collection owner burn other people's tokens.507 OwnerCanDestroy,508 /// @dev Is it possible to send tokens from this collection between users.509 TransferEnabled510}511512/// @dev anonymous struct513struct Tuple20 {514 CollectionLimits field_0;515 bool field_1;516 uint256 field_2;517}518519/// @dev Property struct520struct Property {521 string key;522 bytes value;523}524525/// @dev the ERC-165 identifier for this interface is 0x5b7038cf526contract ERC20UniqueExtensions is Dummy, ERC165 {527 /// @notice A description for the collection.528 /// @dev EVM selector for this function is: 0x7284e416,529 /// or in textual repr: description()530 function description() public view returns (string memory) {531 require(false, stub_error);532 dummy;533 return "";534 }535536 /// @dev EVM selector for this function is: 0x0ecd0ab0,537 /// or in textual repr: approveCross((address,uint256),uint256)538 function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {539 require(false, stub_error);540 spender;541 amount;542 dummy = 0;543 return false;544 }545546 // /// Burn tokens from account547 // /// @dev Function that burns an `amount` of the tokens of a given account,548 // /// deducting from the sender's allowance for said account.549 // /// @param from The account whose tokens will be burnt.550 // /// @param amount The amount that will be burnt.551 // /// @dev EVM selector for this function is: 0x79cc6790,552 // /// or in textual repr: burnFrom(address,uint256)553 // function burnFrom(address from, uint256 amount) public returns (bool) {554 // require(false, stub_error);555 // from;556 // amount;557 // dummy = 0;558 // return false;559 // }560561 /// Burn tokens from account562 /// @dev Function that burns an `amount` of the tokens of a given account,563 /// deducting from the sender's allowance for said account.564 /// @param from The account whose tokens will be burnt.565 /// @param amount The amount that will be burnt.566 /// @dev EVM selector for this function is: 0xbb2f5a58,567 /// or in textual repr: burnFromCross((address,uint256),uint256)568 function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {569 require(false, stub_error);570 from;571 amount;572 dummy = 0;573 return false;574 }575576 /// Mint tokens for multiple accounts.577 /// @param amounts array of pairs of account address and amount578 /// @dev EVM selector for this function is: 0x1acf2d55,579 /// or in textual repr: mintBulk((address,uint256)[])580 function mintBulk(Tuple8[] memory amounts) public returns (bool) {581 require(false, stub_error);582 amounts;583 dummy = 0;584 return false;585 }586587 /// @dev EVM selector for this function is: 0x2ada85ff,588 /// or in textual repr: transferCross((address,uint256),uint256)589 function transferCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {590 require(false, stub_error);591 to;592 amount;593 dummy = 0;594 return false;595 }596597 /// @dev EVM selector for this function is: 0xd5cf430b,598 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)599 function transferFromCross(600 EthCrossAccount memory from,601 EthCrossAccount memory to,602 uint256 amount603 ) public returns (bool) {604 require(false, stub_error);605 from;606 to;607 amount;608 dummy = 0;609 return false;610 }611}612613/// @dev anonymous struct614struct Tuple8 {615 address field_0;616 uint256 field_1;617}618619/// @dev the ERC-165 identifier for this interface is 0x40c10f19620contract ERC20Mintable is Dummy, ERC165 {621 /// Mint tokens for `to` account.622 /// @param to account that will receive minted tokens623 /// @param amount amount of tokens to mint624 /// @dev EVM selector for this function is: 0x40c10f19,625 /// or in textual repr: mint(address,uint256)626 function mint(address to, uint256 amount) public returns (bool) {627 require(false, stub_error);628 to;629 amount;630 dummy = 0;631 return false;632 }633}634635/// @dev inlined interface636contract ERC20Events {637 event Transfer(address indexed from, address indexed to, uint256 value);638 event Approval(address indexed owner, address indexed spender, uint256 value);639}640641/// @dev the ERC-165 identifier for this interface is 0x8cb847c4642contract ERC20 is Dummy, ERC165, ERC20Events {643 /// @dev EVM selector for this function is: 0x06fdde03,644 /// or in textual repr: name()645 function name() public view returns (string memory) {646 require(false, stub_error);647 dummy;648 return "";649 }650651 /// @dev EVM selector for this function is: 0x95d89b41,652 /// or in textual repr: symbol()653 function symbol() public view returns (string memory) {654 require(false, stub_error);655 dummy;656 return "";657 }658659 /// @dev EVM selector for this function is: 0x18160ddd,660 /// or in textual repr: totalSupply()661 function totalSupply() public view returns (uint256) {662 require(false, stub_error);663 dummy;664 return 0;665 }666667 /// @dev EVM selector for this function is: 0x313ce567,668 /// or in textual repr: decimals()669 function decimals() public view returns (uint8) {670 require(false, stub_error);671 dummy;672 return 0;673 }674675 /// @dev EVM selector for this function is: 0x70a08231,676 /// or in textual repr: balanceOf(address)677 function balanceOf(address owner) public view returns (uint256) {678 require(false, stub_error);679 owner;680 dummy;681 return 0;682 }683684 /// @dev EVM selector for this function is: 0xa9059cbb,685 /// or in textual repr: transfer(address,uint256)686 function transfer(address to, uint256 amount) public returns (bool) {687 require(false, stub_error);688 to;689 amount;690 dummy = 0;691 return false;692 }693694 /// @dev EVM selector for this function is: 0x23b872dd,695 /// or in textual repr: transferFrom(address,address,uint256)696 function transferFrom(697 address from,698 address to,699 uint256 amount700 ) public returns (bool) {701 require(false, stub_error);702 from;703 to;704 amount;705 dummy = 0;706 return false;707 }708709 /// @dev EVM selector for this function is: 0x095ea7b3,710 /// or in textual repr: approve(address,uint256)711 function approve(address spender, uint256 amount) public returns (bool) {712 require(false, stub_error);713 spender;714 amount;715 dummy = 0;716 return false;717 }718719 /// @dev EVM selector for this function is: 0xdd62ed3e,720 /// or in textual repr: allowance(address,address)721 function allowance(address owner, address spender) public view returns (uint256) {722 require(false, stub_error);723 owner;724 spender;725 dummy;726 return 0;727 }728729 /// @notice Returns collection helper contract address730 /// @dev EVM selector for this function is: 0x1896cce6,731 /// or in textual repr: collectionHelperAddress()732 function collectionHelperAddress() public view returns (address) {733 require(false, stub_error);734 dummy;735 return 0x0000000000000000000000000000000000000000;736 }737}738739contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.1.11] - 2022-12-16
+## [0.1.12] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.1.11] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.1.10] - 2022-11-18
### Added
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -1069,6 +1069,58 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
+
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: EthCrossAccount,
+ properties: Vec<PropertyStruct>,
+ ) -> Result<uint256> {
+ let token_id = <TokensMinted<T>>::get(self.id)
+ .checked_add(1)
+ .ok_or("item id overflow")?;
+
+ let to = to.into_sub_cross_account::<T>()?;
+
+ let properties = properties
+ .into_iter()
+ .map(|PropertyStruct { key, value }| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?
+ .try_into()
+ .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+ let caller = T::CrossAccountId::from_eth(caller);
+
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ <Pallet<T>>::create_item(
+ self,
+ &caller,
+ CreateItemData::<T> {
+ properties,
+ owner: to,
+ },
+ &budget,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(token_id.into())
+ }
}
#[solidity_interface(
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -290,10 +290,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple30 memory) {
+ function collectionSponsor() public view returns (Tuple32 memory) {
require(false, stub_error);
dummy;
- return Tuple30(0x0000000000000000000000000000000000000000, 0);
+ return Tuple32(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -655,7 +655,7 @@
}
/// @dev anonymous struct
-struct Tuple30 {
+struct Tuple32 {
address field_0;
uint256 field_1;
}
@@ -804,7 +804,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -961,6 +961,7 @@
dummy;
return 0;
}
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -991,6 +992,19 @@
// return false;
// }
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
}
/// @dev anonymous struct
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.2.10] - 2022-12-16
+## [0.2.11] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.2.10] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.2.9] - 2022-11-18
### Added
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -1120,6 +1120,60 @@
Ok(true)
}
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: EthCrossAccount,
+ properties: Vec<PropertyStruct>,
+ ) -> Result<uint256> {
+ let token_id = <TokensMinted<T>>::get(self.id)
+ .checked_add(1)
+ .ok_or("item id overflow")?;
+
+ let to = to.into_sub_cross_account::<T>()?;
+
+ let properties = properties
+ .into_iter()
+ .map(|PropertyStruct { key, value }| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?
+ .try_into()
+ .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+ let caller = T::CrossAccountId::from_eth(caller);
+
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ let users = [(to, 1)]
+ .into_iter()
+ .collect::<BTreeMap<_, _>>()
+ .try_into()
+ .unwrap();
+ <Pallet<T>>::create_item(
+ self,
+ &caller,
+ CreateItemData::<T::CrossAccountId> { users, properties },
+ &budget,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(token_id.into())
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -290,10 +290,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple29 memory) {
+ function collectionSponsor() public view returns (Tuple31 memory) {
require(false, stub_error);
dummy;
- return Tuple29(0x0000000000000000000000000000000000000000, 0);
+ return Tuple31(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -655,7 +655,7 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple31 {
address field_0;
uint256 field_1;
}
@@ -802,7 +802,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -979,6 +979,20 @@
// return false;
// }
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -322,7 +322,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple8",
+ "internalType": "struct Tuple9",
"name": "",
"type": "tuple"
}
@@ -408,7 +408,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Tuple9[]",
"name": "amounts",
"type": "tuple[]"
}
@@ -419,6 +419,24 @@
"type": "function"
},
{
+ "inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -352,7 +352,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple30",
+ "internalType": "struct Tuple32",
"name": "",
"type": "tuple"
}
@@ -478,6 +478,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -334,7 +334,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple29",
+ "internalType": "struct Tuple31",
"name": "",
"type": "tuple"
}
@@ -460,6 +460,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -102,7 +102,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: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple8 memory);
+ function collectionSponsor() external view returns (Tuple9 memory);
/// Get current collection limits.
///
@@ -362,13 +362,17 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
/// or in textual repr: description()
function description() external view returns (string memory);
+ /// @dev EVM selector for this function is: 0x269e6158,
+ /// or in textual repr: mintCross((address,uint256),uint256)
+ function mintCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
@@ -395,7 +399,7 @@
/// @param amounts array of pairs of account address and amount
/// @dev EVM selector for this function is: 0x1acf2d55,
/// or in textual repr: mintBulk((address,uint256)[])
- function mintBulk(Tuple8[] memory amounts) external returns (bool);
+ function mintBulk(Tuple9[] memory amounts) external returns (bool);
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
@@ -411,7 +415,7 @@
}
/// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
address field_0;
uint256 field_1;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -198,7 +198,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: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple27 memory);
+ function collectionSponsor() external view returns (Tuple29 memory);
/// Get current collection limits.
///
@@ -553,7 +553,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -652,6 +652,7 @@
/// @dev EVM selector for this function is: 0x75794a3c,
/// or in textual repr: nextTokenId()
function nextTokenId() external view returns (uint256);
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -670,6 +671,13 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -198,7 +198,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: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple26 memory);
+ function collectionSponsor() external view returns (Tuple28 memory);
/// Get current collection limits.
///
@@ -551,7 +551,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -663,6 +663,14 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
+ /// @notice Function to mint token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -78,6 +78,25 @@
expect(event.returnValues.to).to.equal(receiver);
expect(event.returnValues.value).to.equal('100');
});
+
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(owner);
+ const ethOwner = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.ft.mintCollection(alice);
+ await collection.addAdmin(alice, {Ethereum: ethOwner});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', ethOwner);
+
+ const result = await contract.methods.mintCross(receiverCross, 100).send();
+
+ const event = result.events.Transfer;
+ expect(event.address).to.equal(collectionAddress);
+ expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.equal(helper.address.substrateToEth(owner.address));
+ expect(event.returnValues.value).to.equal('100');
+ });
itEth('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,6 +17,8 @@
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';
describe('NFT: Information getting', () => {
@@ -173,7 +175,45 @@
// const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
// expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ 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 collection = await helper.nft.mintCollection(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ const 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([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ 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()); }));
+ });
+
//TODO: CORE-302 add eth methods
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -17,6 +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';
describe('Refungible: Information getting', () => {
let donor: IKeyringPair;
@@ -135,6 +136,44 @@
expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ 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 collection = await helper.rft.mintCollection(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ const 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([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ 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()); }));
+ });
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);