difftreelog
feature: Added `transfer_cross` in eth functions.
in: master
22 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6121,7 +6121,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.6"
+version = "0.1.7"
dependencies = [
"ethereum",
"evm-coder",
@@ -6376,7 +6376,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.8"
+version = "0.1.9"
dependencies = [
"ethereum",
"evm-coder",
@@ -6498,7 +6498,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.7"
+version = "0.2.8"
dependencies = [
"derivative",
"ethereum",
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -2,22 +2,32 @@
All notable changes to this project will be documented in this file.
+<!-- bureaucrate goes here -->
+
+## [0.1.7] - 2022-11-14
+
+### Changed
+
+- Added `transfer_cross` in eth functions.
+
## [0.1.6] - 2022-11-02
+
### Changed
- - Use named structure `EthCrossAccount` in eth functions.
+- Use named structure `EthCrossAccount` in eth functions.
+
## [0.1.5] - 2022-08-29
### Added
- - Implementation of `mint` and `mint_bulk` methods for ERC20 API.
+- Implementation of `mint` and `mint_bulk` methods for ERC20 API.
## [v0.1.4] - 2022-08-24
### Change
- - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
-<!-- bureaucrate goes here -->
+- Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
+
## [v0.1.3] 2022-08-16
### Other changes
@@ -41,11 +51,11 @@
### Fixed
- - Issue with ItemCreated event containing total supply of tokens instead minted amount
+- Issue with ItemCreated event containing total supply of tokens instead minted amount
## [0.1.1] - 2022-07-14
### Added
- - Implementation of RPC method `token_owners` returning 10 owners in no particular order.
- This was an internal request to improve the web interface and support fractionalization event.
+- Implementation of RPC method `token_owners` returning 10 owners in no particular order.
+ This was an internal request to improve the web interface and support fractionalization event.
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.6"
+version = "0.1.7"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -93,6 +93,7 @@
<Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;
Ok(true)
}
+
#[weight(<SelfWeightOf<T>>::transfer_from())]
fn transfer_from(
&mut self,
@@ -238,6 +239,24 @@
Ok(true)
}
+ #[weight(<SelfWeightOf<T>>::transfer())]
+ fn transfer_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>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;
+ Ok(true)
+ }
+
#[weight(<SelfWeightOf<T>>::transfer_from())]
fn transfer_from_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 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(Tuple14[] 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 (Tuple14[] memory) {91 require(false, stub_error);92 keys;93 dummy;94 return new Tuple14[](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 /// 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount 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 (EthCrossAccount memory) {393 require(false, stub_error);394 dummy;395 return EthCrossAccount(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 (EthCrossAccount[] memory) {417 require(false, stub_error);418 dummy;419 return new EthCrossAccount[](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(EthCrossAccount memory newOwner) public {429 require(false, stub_error);430 newOwner;431 dummy = 0;432 }433}434435/// @dev Cross account struct436struct EthCrossAccount {437 address eth;438 uint256 sub;439}440441/// @dev anonymous struct442struct Tuple14 {443 string field_0;444 bytes field_1;445}446447/// @dev the ERC-165 identifier for this interface is 0x032e5926448contract ERC20UniqueExtensions is Dummy, ERC165 {449 /// @dev EVM selector for this function is: 0x0ecd0ab0,450 /// or in textual repr: approveCross((address,uint256),uint256)451 function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {452 require(false, stub_error);453 spender;454 amount;455 dummy = 0;456 return false;457 }458459 /// Burn tokens from account460 /// @dev Function that burns an `amount` of the tokens of a given account,461 /// deducting from the sender's allowance for said account.462 /// @param from The account whose tokens will be burnt.463 /// @param amount The amount that will be burnt.464 /// @dev EVM selector for this function is: 0x79cc6790,465 /// or in textual repr: burnFrom(address,uint256)466 function burnFrom(address from, uint256 amount) public returns (bool) {467 require(false, stub_error);468 from;469 amount;470 dummy = 0;471 return false;472 }473474 /// Burn tokens from account475 /// @dev Function that burns an `amount` of the tokens of a given account,476 /// deducting from the sender's allowance for said account.477 /// @param from The account whose tokens will be burnt.478 /// @param amount The amount that will be burnt.479 /// @dev EVM selector for this function is: 0xbb2f5a58,480 /// or in textual repr: burnFromCross((address,uint256),uint256)481 function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {482 require(false, stub_error);483 from;484 amount;485 dummy = 0;486 return false;487 }488489 /// Mint tokens for multiple accounts.490 /// @param amounts array of pairs of account address and amount491 /// @dev EVM selector for this function is: 0x1acf2d55,492 /// or in textual repr: mintBulk((address,uint256)[])493 function mintBulk(Tuple8[] memory amounts) public returns (bool) {494 require(false, stub_error);495 amounts;496 dummy = 0;497 return false;498 }499500 /// @dev EVM selector for this function is: 0xd5cf430b,501 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)502 function transferFromCross(503 EthCrossAccount memory from,504 EthCrossAccount memory to,505 uint256 amount506 ) public returns (bool) {507 require(false, stub_error);508 from;509 to;510 amount;511 dummy = 0;512 return false;513 }514}515516/// @dev anonymous struct517struct Tuple8 {518 address field_0;519 uint256 field_1;520}521522/// @dev the ERC-165 identifier for this interface is 0x40c10f19523contract ERC20Mintable is Dummy, ERC165 {524 /// Mint tokens for `to` account.525 /// @param to account that will receive minted tokens526 /// @param amount amount of tokens to mint527 /// @dev EVM selector for this function is: 0x40c10f19,528 /// or in textual repr: mint(address,uint256)529 function mint(address to, uint256 amount) public returns (bool) {530 require(false, stub_error);531 to;532 amount;533 dummy = 0;534 return false;535 }536}537538/// @dev inlined interface539contract ERC20Events {540 event Transfer(address indexed from, address indexed to, uint256 value);541 event Approval(address indexed owner, address indexed spender, uint256 value);542}543544/// @dev the ERC-165 identifier for this interface is 0x942e8b22545contract ERC20 is Dummy, ERC165, ERC20Events {546 /// @dev EVM selector for this function is: 0x06fdde03,547 /// or in textual repr: name()548 function name() public view returns (string memory) {549 require(false, stub_error);550 dummy;551 return "";552 }553554 /// @dev EVM selector for this function is: 0x95d89b41,555 /// or in textual repr: symbol()556 function symbol() public view returns (string memory) {557 require(false, stub_error);558 dummy;559 return "";560 }561562 /// @dev EVM selector for this function is: 0x18160ddd,563 /// or in textual repr: totalSupply()564 function totalSupply() public view returns (uint256) {565 require(false, stub_error);566 dummy;567 return 0;568 }569570 /// @dev EVM selector for this function is: 0x313ce567,571 /// or in textual repr: decimals()572 function decimals() public view returns (uint8) {573 require(false, stub_error);574 dummy;575 return 0;576 }577578 /// @dev EVM selector for this function is: 0x70a08231,579 /// or in textual repr: balanceOf(address)580 function balanceOf(address owner) public view returns (uint256) {581 require(false, stub_error);582 owner;583 dummy;584 return 0;585 }586587 /// @dev EVM selector for this function is: 0xa9059cbb,588 /// or in textual repr: transfer(address,uint256)589 function transfer(address 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: 0x23b872dd,598 /// or in textual repr: transferFrom(address,address,uint256)599 function transferFrom(600 address from,601 address 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 }611612 /// @dev EVM selector for this function is: 0x095ea7b3,613 /// or in textual repr: approve(address,uint256)614 function approve(address spender, uint256 amount) public returns (bool) {615 require(false, stub_error);616 spender;617 amount;618 dummy = 0;619 return false;620 }621622 /// @dev EVM selector for this function is: 0xdd62ed3e,623 /// or in textual repr: allowance(address,address)624 function allowance(address owner, address spender) public view returns (uint256) {625 require(false, stub_error);626 owner;627 spender;628 dummy;629 return 0;630 }631}632633contract 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(Tuple15[] 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 (Tuple15[] memory) {91 require(false, stub_error);92 keys;93 dummy;94 return new Tuple15[](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 /// 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount 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(EthCrossAccount 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 (EthCrossAccount memory) {393 require(false, stub_error);394 dummy;395 return EthCrossAccount(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 (EthCrossAccount[] memory) {417 require(false, stub_error);418 dummy;419 return new EthCrossAccount[](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(EthCrossAccount memory newOwner) public {429 require(false, stub_error);430 newOwner;431 dummy = 0;432 }433}434435/// @dev Cross account struct436struct EthCrossAccount {437 address eth;438 uint256 sub;439}440441/// @dev anonymous struct442struct Tuple15 {443 string field_0;444 bytes field_1;445}446447/// @dev the ERC-165 identifier for this interface is 0x29f4dcd9448contract ERC20UniqueExtensions is Dummy, ERC165 {449 /// @dev EVM selector for this function is: 0x0ecd0ab0,450 /// or in textual repr: approveCross((address,uint256),uint256)451 function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {452 require(false, stub_error);453 spender;454 amount;455 dummy = 0;456 return false;457 }458459 /// Burn tokens from account460 /// @dev Function that burns an `amount` of the tokens of a given account,461 /// deducting from the sender's allowance for said account.462 /// @param from The account whose tokens will be burnt.463 /// @param amount The amount that will be burnt.464 /// @dev EVM selector for this function is: 0x79cc6790,465 /// or in textual repr: burnFrom(address,uint256)466 function burnFrom(address from, uint256 amount) public returns (bool) {467 require(false, stub_error);468 from;469 amount;470 dummy = 0;471 return false;472 }473474 /// Burn tokens from account475 /// @dev Function that burns an `amount` of the tokens of a given account,476 /// deducting from the sender's allowance for said account.477 /// @param from The account whose tokens will be burnt.478 /// @param amount The amount that will be burnt.479 /// @dev EVM selector for this function is: 0xbb2f5a58,480 /// or in textual repr: burnFromCross((address,uint256),uint256)481 function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {482 require(false, stub_error);483 from;484 amount;485 dummy = 0;486 return false;487 }488489 /// Mint tokens for multiple accounts.490 /// @param amounts array of pairs of account address and amount491 /// @dev EVM selector for this function is: 0x1acf2d55,492 /// or in textual repr: mintBulk((address,uint256)[])493 function mintBulk(Tuple8[] memory amounts) public returns (bool) {494 require(false, stub_error);495 amounts;496 dummy = 0;497 return false;498 }499500 /// @dev EVM selector for this function is: 0x2ada85ff,501 /// or in textual repr: transferCross((address,uint256),uint256)502 function transferCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {503 require(false, stub_error);504 to;505 amount;506 dummy = 0;507 return false;508 }509510 /// @dev EVM selector for this function is: 0xd5cf430b,511 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)512 function transferFromCross(513 EthCrossAccount memory from,514 EthCrossAccount memory to,515 uint256 amount516 ) public returns (bool) {517 require(false, stub_error);518 from;519 to;520 amount;521 dummy = 0;522 return false;523 }524}525526/// @dev anonymous struct527struct Tuple8 {528 address field_0;529 uint256 field_1;530}531532/// @dev the ERC-165 identifier for this interface is 0x40c10f19533contract ERC20Mintable is Dummy, ERC165 {534 /// Mint tokens for `to` account.535 /// @param to account that will receive minted tokens536 /// @param amount amount of tokens to mint537 /// @dev EVM selector for this function is: 0x40c10f19,538 /// or in textual repr: mint(address,uint256)539 function mint(address to, uint256 amount) public returns (bool) {540 require(false, stub_error);541 to;542 amount;543 dummy = 0;544 return false;545 }546}547548/// @dev inlined interface549contract ERC20Events {550 event Transfer(address indexed from, address indexed to, uint256 value);551 event Approval(address indexed owner, address indexed spender, uint256 value);552}553554/// @dev the ERC-165 identifier for this interface is 0x942e8b22555contract ERC20 is Dummy, ERC165, ERC20Events {556 /// @dev EVM selector for this function is: 0x06fdde03,557 /// or in textual repr: name()558 function name() public view returns (string memory) {559 require(false, stub_error);560 dummy;561 return "";562 }563564 /// @dev EVM selector for this function is: 0x95d89b41,565 /// or in textual repr: symbol()566 function symbol() public view returns (string memory) {567 require(false, stub_error);568 dummy;569 return "";570 }571572 /// @dev EVM selector for this function is: 0x18160ddd,573 /// or in textual repr: totalSupply()574 function totalSupply() public view returns (uint256) {575 require(false, stub_error);576 dummy;577 return 0;578 }579580 /// @dev EVM selector for this function is: 0x313ce567,581 /// or in textual repr: decimals()582 function decimals() public view returns (uint8) {583 require(false, stub_error);584 dummy;585 return 0;586 }587588 /// @dev EVM selector for this function is: 0x70a08231,589 /// or in textual repr: balanceOf(address)590 function balanceOf(address owner) public view returns (uint256) {591 require(false, stub_error);592 owner;593 dummy;594 return 0;595 }596597 /// @dev EVM selector for this function is: 0xa9059cbb,598 /// or in textual repr: transfer(address,uint256)599 function transfer(address to, uint256 amount) public returns (bool) {600 require(false, stub_error);601 to;602 amount;603 dummy = 0;604 return false;605 }606607 /// @dev EVM selector for this function is: 0x23b872dd,608 /// or in textual repr: transferFrom(address,address,uint256)609 function transferFrom(610 address from,611 address to,612 uint256 amount613 ) public returns (bool) {614 require(false, stub_error);615 from;616 to;617 amount;618 dummy = 0;619 return false;620 }621622 /// @dev EVM selector for this function is: 0x095ea7b3,623 /// or in textual repr: approve(address,uint256)624 function approve(address spender, uint256 amount) public returns (bool) {625 require(false, stub_error);626 spender;627 amount;628 dummy = 0;629 return false;630 }631632 /// @dev EVM selector for this function is: 0xdd62ed3e,633 /// or in textual repr: allowance(address,address)634 function allowance(address owner, address spender) public view returns (uint256) {635 require(false, stub_error);636 owner;637 spender;638 dummy;639 return 0;640 }641}642643contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.9] - 2022-11-14
+
+### Changed
+
+- Added `transfer_cross` in eth functions.
+
## [v0.1.8] - 2022-11-11
### Changed
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.8"
+version = "0.1.9"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -738,7 +738,25 @@
<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;
Ok(())
}
+
+ /// @notice Transfer ownership of an NFT
+ /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ /// is the zero address. Throws if `tokenId` is not a valid NFT.
+ /// @param to The new owner
+ /// @param tokenId The NFT to transfer
+ #[weight(<SelfWeightOf<T>>::transfer())]
+ fn transfer_cross(&mut self, caller: caller, to: EthCrossAccount, token_id: uint256) -> Result<void> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let to = to.into_sub_cross_account::<T>()?;
+ let token = token_id.try_into()?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+ <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;
+ Ok(())
+ }
+
/// @notice Transfer ownership of an NFT from cross account address to cross account address
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid NFT.
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -67,7 +67,7 @@
/// @param properties settable properties
/// @dev EVM selector for this function is: 0x14ed3a6e,
/// or in textual repr: setProperties(uint256,(string,bytes)[])
- function setProperties(uint256 tokenId, Tuple21[] memory properties) public {
+ function setProperties(uint256 tokenId, Tuple22[] memory properties) public {
require(false, stub_error);
tokenId;
properties;
@@ -137,7 +137,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple21[] memory properties) public {
+ function setCollectionProperties(Tuple22[] memory properties) public {
require(false, stub_error);
properties;
dummy = 0;
@@ -186,11 +186,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple21[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Tuple22[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple21[](0);
+ return new Tuple22[](0);
}
/// Set the sponsor of the collection.
@@ -251,10 +251,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 (Tuple24 memory) {
+ function collectionSponsor() public view returns (Tuple25 memory) {
require(false, stub_error);
dummy;
- return Tuple24(0x0000000000000000000000000000000000000000, 0);
+ return Tuple25(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -538,13 +538,13 @@
}
/// @dev anonymous struct
-struct Tuple24 {
+struct Tuple25 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple21 {
+struct Tuple22 {
string field_0;
bytes field_1;
}
@@ -693,7 +693,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x244543ee
+/// @dev the ERC-165 identifier for this interface is 0x0e9fc611
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,
@@ -742,6 +742,20 @@
dummy = 0;
}
+ /// @notice Transfer ownership of an NFT
+ /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ /// is the zero address. Throws if `tokenId` is not a valid NFT.
+ /// @param to The new owner
+ /// @param tokenId The NFT to transfer
+ /// @dev EVM selector for this function is: 0x2ada85ff,
+ /// or in textual repr: transferCross((address,uint256),uint256)
+ function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+ require(false, stub_error);
+ to;
+ tokenId;
+ dummy = 0;
+ }
+
/// @notice Transfer ownership of an NFT from cross account address to cross account address
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid NFT.
@@ -822,7 +836,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -833,7 +847,7 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple11 {
uint256 field_0;
string field_1;
}
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.2.8] - 2022-11-14
+
+### Changed
+
+- Added `transfer_cross` in eth functions.
+
## [v0.2.7] - 2022-11-11
### Changed
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-refungible"
-version = "0.2.7"
+version = "0.2.8"
license = "GPLv3"
edition = "2021"
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -756,6 +756,29 @@
/// @param to The new owner
/// @param tokenId The RFT to transfer
#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
+ fn transfer_cross(&mut self, caller: caller, to: EthCrossAccount, token_id: uint256) -> Result<void> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let to = to.into_sub_cross_account::<T>()?;
+ let token = token_id.try_into()?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ let balance = balance(self, token, &caller)?;
+ ensure_single_owner(self, token, balance)?;
+
+ <Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)
+ .map_err(dispatch_to_evm::<T>)?;
+ Ok(())
+ }
+
+ /// @notice Transfer ownership of an RFT
+ /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ /// is the zero address. Throws if `tokenId` is not a valid RFT.
+ /// Throws if RFT pieces have multiple owners.
+ /// @param to The new owner
+ /// @param tokenId The RFT to transfer
+ #[weight(<SelfWeightOf<T>>::transfer_creating_removing())]
fn transfer_from_cross(
&mut self,
caller: caller,
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -67,7 +67,7 @@
/// @param properties settable properties
/// @dev EVM selector for this function is: 0x14ed3a6e,
/// or in textual repr: setProperties(uint256,(string,bytes)[])
- function setProperties(uint256 tokenId, Tuple20[] memory properties) public {
+ function setProperties(uint256 tokenId, Tuple21[] memory properties) public {
require(false, stub_error);
tokenId;
properties;
@@ -137,7 +137,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple20[] memory properties) public {
+ function setCollectionProperties(Tuple21[] memory properties) public {
require(false, stub_error);
properties;
dummy = 0;
@@ -186,11 +186,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple20[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Tuple21[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple20[](0);
+ return new Tuple21[](0);
}
/// Set the sponsor of the collection.
@@ -251,10 +251,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 (Tuple23 memory) {
+ function collectionSponsor() public view returns (Tuple24 memory) {
require(false, stub_error);
dummy;
- return Tuple23(0x0000000000000000000000000000000000000000, 0);
+ return Tuple24(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -538,13 +538,13 @@
}
/// @dev anonymous struct
-struct Tuple23 {
+struct Tuple24 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple20 {
+struct Tuple21 {
string field_0;
bytes field_1;
}
@@ -691,7 +691,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x81feb398
+/// @dev the ERC-165 identifier for this interface is 0xab243667
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,
@@ -732,6 +732,21 @@
/// Throws if RFT pieces have multiple owners.
/// @param to The new owner
/// @param tokenId The RFT to transfer
+ /// @dev EVM selector for this function is: 0x2ada85ff,
+ /// or in textual repr: transferCross((address,uint256),uint256)
+ function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+ require(false, stub_error);
+ to;
+ tokenId;
+ dummy = 0;
+ }
+
+ /// @notice Transfer ownership of an RFT
+ /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ /// is the zero address. Throws if `tokenId` is not a valid RFT.
+ /// Throws if RFT pieces have multiple owners.
+ /// @param to The new owner
+ /// @param tokenId The RFT to transfer
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
@@ -809,7 +824,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple9[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -831,7 +846,7 @@
}
/// @dev anonymous struct
-struct Tuple9 {
+struct Tuple10 {
uint256 field_0;
string field_1;
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -28,7 +28,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple14[] memory properties) external;
+ function setCollectionProperties(Tuple15[] memory properties) external;
/// Delete collection property.
///
@@ -60,7 +60,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple14[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple15[] memory);
/// Set the sponsor of the collection.
///
@@ -287,12 +287,12 @@
}
/// @dev anonymous struct
-struct Tuple14 {
+struct Tuple15 {
string field_0;
bytes field_1;
}
-/// @dev the ERC-165 identifier for this interface is 0x032e5926
+/// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
@@ -322,6 +322,10 @@
/// or in textual repr: mintBulk((address,uint256)[])
function mintBulk(Tuple8[] memory amounts) external returns (bool);
+ /// @dev EVM selector for this function is: 0x2ada85ff,
+ /// or in textual repr: transferCross((address,uint256),uint256)
+ function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -49,7 +49,7 @@
/// @param properties settable properties
/// @dev EVM selector for this function is: 0x14ed3a6e,
/// or in textual repr: setProperties(uint256,(string,bytes)[])
- function setProperties(uint256 tokenId, Tuple21[] memory properties) external;
+ function setProperties(uint256 tokenId, Tuple22[] memory properties) external;
// /// @notice Delete token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -93,7 +93,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple21[] memory properties) external;
+ function setCollectionProperties(Tuple22[] memory properties) external;
/// Delete collection property.
///
@@ -125,7 +125,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple22[] memory);
/// Set the sponsor of the collection.
///
@@ -167,7 +167,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 (Tuple24 memory);
+ function collectionSponsor() external view returns (Tuple25 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -352,13 +352,13 @@
}
/// @dev anonymous struct
-struct Tuple24 {
+struct Tuple25 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple21 {
+struct Tuple22 {
string field_0;
bytes field_1;
}
@@ -458,7 +458,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x244543ee
+/// @dev the ERC-165 identifier for this interface is 0x0e9fc611
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,
@@ -489,6 +489,15 @@
/// or in textual repr: transfer(address,uint256)
function transfer(address to, uint256 tokenId) external;
+ /// @notice Transfer ownership of an NFT
+ /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ /// is the zero address. Throws if `tokenId` is not a valid NFT.
+ /// @param to The new owner
+ /// @param tokenId The NFT to transfer
+ /// @dev EVM selector for this function is: 0x2ada85ff,
+ /// or in textual repr: transferCross((address,uint256),uint256)
+ function transferCross(EthCrossAccount memory to, uint256 tokenId) external;
+
/// @notice Transfer ownership of an NFT from cross account address to cross account address
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid NFT.
@@ -543,12 +552,12 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) external returns (bool);
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple11 {
uint256 field_0;
string field_1;
}
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -49,7 +49,7 @@
/// @param properties settable properties
/// @dev EVM selector for this function is: 0x14ed3a6e,
/// or in textual repr: setProperties(uint256,(string,bytes)[])
- function setProperties(uint256 tokenId, Tuple20[] memory properties) external;
+ function setProperties(uint256 tokenId, Tuple21[] memory properties) external;
// /// @notice Delete token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -93,7 +93,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple20[] memory properties) external;
+ function setCollectionProperties(Tuple21[] memory properties) external;
/// Delete collection property.
///
@@ -125,7 +125,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple20[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
/// Set the sponsor of the collection.
///
@@ -167,7 +167,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 (Tuple23 memory);
+ function collectionSponsor() external view returns (Tuple24 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -352,13 +352,13 @@
}
/// @dev anonymous struct
-struct Tuple23 {
+struct Tuple24 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple20 {
+struct Tuple21 {
string field_0;
bytes field_1;
}
@@ -456,7 +456,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x81feb398
+/// @dev the ERC-165 identifier for this interface is 0xab243667
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,
@@ -484,6 +484,16 @@
/// Throws if RFT pieces have multiple owners.
/// @param to The new owner
/// @param tokenId The RFT to transfer
+ /// @dev EVM selector for this function is: 0x2ada85ff,
+ /// or in textual repr: transferCross((address,uint256),uint256)
+ function transferCross(EthCrossAccount memory to, uint256 tokenId) external;
+
+ /// @notice Transfer ownership of an RFT
+ /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ /// is the zero address. Throws if `tokenId` is not a valid RFT.
+ /// Throws if RFT pieces have multiple owners.
+ /// @param to The new owner
+ /// @param tokenId The RFT to transfer
/// @dev EVM selector for this function is: 0xd5cf430b,
/// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
function transferFromCross(
@@ -535,7 +545,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple9[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool);
/// Returns EVM address for refungible token
///
@@ -546,7 +556,7 @@
}
/// @dev anonymous struct
-struct Tuple9 {
+struct Tuple10 {
uint256 field_0;
string field_1;
}
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -230,6 +230,37 @@
}
});
+ itEth('Can perform transferCross()', async ({helper}) => {
+ const owner = await helper.eth.createAccountWithBalance(donor);
+ const receiver = await helper.eth.createAccountWithBalance(donor);
+ const to = helper.ethCrossAccount.fromAddress(receiver);
+ const collection = await helper.ft.mintCollection(alice);
+ await collection.mint(alice, 200n, {Ethereum: owner});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);
+
+ {
+ const result = await contract.methods.transferCross(to, 50).send({from: owner});
+
+ const event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal(owner);
+ expect(event.returnValues.to).to.be.equal(receiver);
+ expect(event.returnValues.value).to.be.equal('50');
+ }
+
+ {
+ const balance = await contract.methods.balanceOf(owner).call();
+ expect(+balance).to.equal(150);
+ }
+
+ {
+ const balance = await contract.methods.balanceOf(receiver).call();
+ expect(+balance).to.equal(50);
+ }
+ });
+
itEth('Can perform transfer()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -239,7 +239,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple14[]",
+ "internalType": "struct Tuple15[]",
"name": "",
"type": "tuple[]"
}
@@ -496,7 +496,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple14[]",
+ "internalType": "struct Tuple15[]",
"name": "properties",
"type": "tuple[]"
}
@@ -594,6 +594,24 @@
},
{
"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": "transferCross",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "from", "type": "address" },
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "uint256", "name": "amount", "type": "uint256" }
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -402,6 +402,37 @@
expect(+balance).to.equal(1);
}
});
+
+ itEth('Can perform transferCross()', async ({helper}) => {
+ const collection = await helper.nft.mintCollection(minter, {});
+ const owner = await helper.eth.createAccountWithBalance(donor);
+ const receiver = helper.eth.createAccount();
+ const to = helper.ethCrossAccount.fromAddress(receiver);
+ const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+
+ {
+ const result = await contract.methods.transferCross(to, tokenId).send({from: owner});
+
+ const event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal(owner);
+ expect(event.returnValues.to).to.be.equal(receiver);
+ expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);
+ }
+
+ {
+ const balance = await contract.methods.balanceOf(owner).call();
+ expect(+balance).to.equal(0);
+ }
+
+ {
+ const balance = await contract.methods.balanceOf(receiver).call();
+ expect(+balance).to.equal(1);
+ }
+ });
});
describe('NFT: Fees', () => {
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -269,7 +269,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple21[]",
+ "internalType": "struct Tuple22[]",
"name": "",
"type": "tuple[]"
}
@@ -293,7 +293,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple24",
+ "internalType": "struct Tuple25",
"name": "",
"type": "tuple"
}
@@ -611,7 +611,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple21[]",
+ "internalType": "struct Tuple22[]",
"name": "properties",
"type": "tuple[]"
}
@@ -682,7 +682,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple21[]",
+ "internalType": "struct Tuple22[]",
"name": "properties",
"type": "tuple[]"
}
@@ -778,6 +778,24 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+ ],
+ "name": "transferCross",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "from", "type": "address" },
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -359,6 +359,37 @@
expect(+balance).to.equal(1);
}
});
+
+ itEth('Can perform transferCross()', async ({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const receiver = helper.eth.createAccount();
+ const to = helper.ethCrossAccount.fromAddress(receiver);
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry', '6', '6');
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
+
+ const result = await contract.methods.mint(caller).send();
+ const tokenId = result.events.Transfer.returnValues.tokenId;
+
+ {
+ const result = await contract.methods.transferCross(to, tokenId).send({from: caller});
+
+ const event = result.events.Transfer;
+ expect(event.address).to.equal(collectionAddress);
+ expect(event.returnValues.from).to.equal(caller);
+ expect(event.returnValues.to).to.equal(receiver);
+ expect(event.returnValues.tokenId).to.equal(tokenId.toString());
+ }
+
+ {
+ const balance = await contract.methods.balanceOf(caller).call();
+ expect(+balance).to.equal(0);
+ }
+
+ {
+ const balance = await contract.methods.balanceOf(receiver).call();
+ expect(+balance).to.equal(1);
+ }
+ });
itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -251,7 +251,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple20[]",
+ "internalType": "struct Tuple21[]",
"name": "",
"type": "tuple[]"
}
@@ -275,7 +275,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple23",
+ "internalType": "struct Tuple24",
"name": "",
"type": "tuple"
}
@@ -593,7 +593,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple20[]",
+ "internalType": "struct Tuple21[]",
"name": "properties",
"type": "tuple[]"
}
@@ -664,7 +664,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple20[]",
+ "internalType": "struct Tuple21[]",
"name": "properties",
"type": "tuple[]"
}
@@ -769,6 +769,24 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+ ],
+ "name": "transferCross",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "from", "type": "address" },
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }