difftreelog
refac: rename substrate methods to cross
in: master
16 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -656,7 +656,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
fn collection_owner(&self) -> Result<(address, uint256)> {
Ok(convert_cross_account_to_tuple::<T>(
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -385,7 +385,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -471,7 +471,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -471,7 +471,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
tests/src/eth/allowlist.test.tsdiffbeforeafterboth--- a/tests/src/eth/allowlist.test.ts
+++ b/tests/src/eth/allowlist.test.ts
@@ -89,21 +89,21 @@
expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.false;
});
- //itEth('Collection allowlist can be added and removed by [cross] address', async ({helper}) => {
- // const owner = await helper.eth.createAccountWithBalance(donor);
- // const user = donor;
- //
- // const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- // const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- // const userCross = helper.ethCrossAccount.fromKeyringPair(user);
- //
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- // await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
- //
- // await collectionEvm.methods.removeFromCollectionAllowListCross(userCross).send({from: owner});
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- //});
+ itEth('Collection allowlist can be added and removed by [cross] address', async ({helper}) => {
+ const owner = await helper.eth.createAccountWithBalance(donor);
+ const user = donor;
+
+ const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+ const userCross = helper.ethCrossAccount.fromKeyringPair(user);
+
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
+
+ await collectionEvm.methods.removeFromCollectionAllowListCross(userCross).send({from: owner});
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ });
itEth('Collection allowlist can not be add and remove [eth] address by not owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
@@ -122,22 +122,22 @@
expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.true;
});
- //itEth('Collection allowlist can not be add and remove [cross] address by not owner', async ({helper}) => {
- // const owner = await helper.eth.createAccountWithBalance(donor);
- // const notOwner = await helper.eth.createAccountWithBalance(donor);
- // const user = donor;
- //
- // const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- // const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- //
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- // const userCross = helper.ethCrossAccount.fromKeyringPair(user);
- // await expect(collectionEvm.methods.addToCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- // await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
- //
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
- // await expect(collectionEvm.methods.removeFromCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
- // expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
- //});
+ itEth('Collection allowlist can not be add and remove [cross] address by not owner', async ({helper}) => {
+ const owner = await helper.eth.createAccountWithBalance(donor);
+ const notOwner = await helper.eth.createAccountWithBalance(donor);
+ const user = donor;
+
+ const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ const userCross = helper.ethCrossAccount.fromKeyringPair(user);
+ await expect(collectionEvm.methods.addToCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
+ await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
+
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
+ await expect(collectionEvm.methods.removeFromCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');
+ expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
+ });
});
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0xb3152af317interface Collection is Dummy, ERC165 {18 /// Set collection property.19 ///20 /// @param key Property key.21 /// @param value Propery value.22 /// @dev EVM selector for this function is: 0x2f073f66,23 /// or in textual repr: setCollectionProperty(string,bytes)24 function setCollectionProperty(string memory key, bytes memory value) external;2526 /// Set collection properties.27 ///28 /// @param properties Vector of properties key/value pair.29 /// @dev EVM selector for this function is: 0x50b26b2a,30 /// or in textual repr: setCollectionProperties((string,bytes)[])31 function setCollectionProperties(Tuple10[] memory properties) external;3233 /// Delete collection property.34 ///35 /// @param key Property key.36 /// @dev EVM selector for this function is: 0x7b7debce,37 /// or in textual repr: deleteCollectionProperty(string)38 function deleteCollectionProperty(string memory key) external;3940 /// Delete collection properties.41 ///42 /// @param keys Properties keys.43 /// @dev EVM selector for this function is: 0xee206ee3,44 /// or in textual repr: deleteCollectionProperties(string[])45 function deleteCollectionProperties(string[] memory keys) external;4647 /// Get collection property.48 ///49 /// @dev Throws error if key not found.50 ///51 /// @param key Property key.52 /// @return bytes The property corresponding to the key.53 /// @dev EVM selector for this function is: 0xcf24fd6d,54 /// or in textual repr: collectionProperty(string)55 function collectionProperty(string memory key) external view returns (bytes memory);5657 /// Get collection properties.58 ///59 /// @param keys Properties keys. Empty keys for all propertyes.60 /// @return Vector of properties key/value pairs.61 /// @dev EVM selector for this function is: 0x285fb8e6,62 /// or in textual repr: collectionProperties(string[])63 function collectionProperties(string[] memory keys) external view returns (Tuple10[] memory);6465 /// Set the sponsor of the collection.66 ///67 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68 ///69 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70 /// @dev EVM selector for this function is: 0x7623402e,71 /// or in textual repr: setCollectionSponsor(address)72 function setCollectionSponsor(address sponsor) external;7374 /// Set the sponsor of the collection.75 ///76 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77 ///78 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79 /// @dev EVM selector for this function is: 0x84a1d5a8,80 /// or in textual repr: setCollectionSponsorCross((address,uint256))81 function setCollectionSponsorCross(Tuple6 memory sponsor) external;8283 /// Whether there is a pending sponsor.84 /// @dev EVM selector for this function is: 0x058ac185,85 /// or in textual repr: hasCollectionPendingSponsor()86 function hasCollectionPendingSponsor() external view returns (bool);8788 /// Collection sponsorship confirmation.89 ///90 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.91 /// @dev EVM selector for this function is: 0x3c50e97a,92 /// or in textual repr: confirmCollectionSponsorship()93 function confirmCollectionSponsorship() external;9495 /// Remove collection sponsor.96 /// @dev EVM selector for this function is: 0x6e0326a3,97 /// or in textual repr: removeCollectionSponsor()98 function removeCollectionSponsor() external;99100 /// Get current sponsor.101 ///102 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103 /// @dev EVM selector for this function is: 0x6ec0a9f1,104 /// or in textual repr: collectionSponsor()105 function collectionSponsor() external view returns (Tuple6 memory);106107 /// Set limits for the collection.108 /// @dev Throws error if limit not found.109 /// @param limit Name of the limit. Valid names:110 /// "accountTokenOwnershipLimit",111 /// "sponsoredDataSize",112 /// "sponsoredDataRateLimit",113 /// "tokenLimit",114 /// "sponsorTransferTimeout",115 /// "sponsorApproveTimeout"116 /// @param value Value of the limit.117 /// @dev EVM selector for this function is: 0x6a3841db,118 /// or in textual repr: setCollectionLimit(string,uint32)119 function setCollectionLimit(string memory limit, uint32 value) external;120121 /// Set limits for the collection.122 /// @dev Throws error if limit not found.123 /// @param limit Name of the limit. Valid names:124 /// "ownerCanTransfer",125 /// "ownerCanDestroy",126 /// "transfersEnabled"127 /// @param value Value of the limit.128 /// @dev EVM selector for this function is: 0x993b7fba,129 /// or in textual repr: setCollectionLimit(string,bool)130 function setCollectionLimit(string memory limit, bool value) external;131132 /// Get contract address.133 /// @dev EVM selector for this function is: 0xf6b4dfb4,134 /// or in textual repr: contractAddress()135 function contractAddress() external view returns (address);136137 /// Add collection admin.138 /// @param newAdmin Cross account administrator address.139 /// @dev EVM selector for this function is: 0x859aa7d6,140 /// or in textual repr: addCollectionAdminCross((address,uint256))141 function addCollectionAdminCross(Tuple6 memory newAdmin) external;142143 /// Remove collection admin.144 /// @param admin Cross account administrator address.145 /// @dev EVM selector for this function is: 0x6c0cd173,146 /// or in textual repr: removeCollectionAdminCross((address,uint256))147 function removeCollectionAdminCross(Tuple6 memory admin) external;148149 /// Add collection admin.150 /// @param newAdmin Address of the added administrator.151 /// @dev EVM selector for this function is: 0x92e462c7,152 /// or in textual repr: addCollectionAdmin(address)153 function addCollectionAdmin(address newAdmin) external;154155 /// Remove collection admin.156 ///157 /// @param admin Address of the removed administrator.158 /// @dev EVM selector for this function is: 0xfafd7b42,159 /// or in textual repr: removeCollectionAdmin(address)160 function removeCollectionAdmin(address admin) external;161162 /// Toggle accessibility of collection nesting.163 ///164 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'165 /// @dev EVM selector for this function is: 0x112d4586,166 /// or in textual repr: setCollectionNesting(bool)167 function setCollectionNesting(bool enable) external;168169 /// Toggle accessibility of collection nesting.170 ///171 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'172 /// @param collections Addresses of collections that will be available for nesting.173 /// @dev EVM selector for this function is: 0x64872396,174 /// or in textual repr: setCollectionNesting(bool,address[])175 function setCollectionNesting(bool enable, address[] memory collections) external;176177 /// Set the collection access method.178 /// @param mode Access mode179 /// 0 for Normal180 /// 1 for AllowList181 /// @dev EVM selector for this function is: 0x41835d4c,182 /// or in textual repr: setCollectionAccess(uint8)183 function setCollectionAccess(uint8 mode) external;184185 /// Checks that user allowed to operate with collection.186 ///187 /// @param user User address to check.188 /// @dev EVM selector for this function is: 0xd63a8e11,189 /// or in textual repr: allowed(address)190 function allowed(address user) external view returns (bool);191192 /// Add the user to the allowed list.193 ///194 /// @param user Address of a trusted user.195 /// @dev EVM selector for this function is: 0x67844fe6,196 /// or in textual repr: addToCollectionAllowList(address)197 function addToCollectionAllowList(address user) external;198199 /// Add user to allowed list.200 ///201 /// @param user User cross account address.202 /// @dev EVM selector for this function is: 0xa0184a3a,203 /// or in textual repr: addToCollectionAllowListCross((address,uint256))204 function addToCollectionAllowListCross(Tuple6 memory user) external;205206 /// Remove the user from the allowed list.207 ///208 /// @param user Address of a removed user.209 /// @dev EVM selector for this function is: 0x85c51acb,210 /// or in textual repr: removeFromCollectionAllowList(address)211 function removeFromCollectionAllowList(address user) external;212213 /// Remove user from allowed list.214 ///215 /// @param user User cross account address.216 /// @dev EVM selector for this function is: 0x09ba452a,217 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))218 function removeFromCollectionAllowListCross(Tuple6 memory user) external;219220 /// Switch permission for minting.221 ///222 /// @param mode Enable if "true".223 /// @dev EVM selector for this function is: 0x00018e84,224 /// or in textual repr: setCollectionMintMode(bool)225 function setCollectionMintMode(bool mode) external;226227 /// Check that account is the owner or admin of the collection228 ///229 /// @param user account to verify230 /// @return "true" if account is the owner or admin231 /// @dev EVM selector for this function is: 0x9811b0c7,232 /// or in textual repr: isOwnerOrAdmin(address)233 function isOwnerOrAdmin(address user) external view returns (bool);234235 /// Check that account is the owner or admin of the collection236 ///237 /// @param user User cross account to verify238 /// @return "true" if account is the owner or admin239 /// @dev EVM selector for this function is: 0x3e75a905,240 /// or in textual repr: isOwnerOrAdminCross((address,uint256))241 function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);242243 /// Returns collection type244 ///245 /// @return `Fungible` or `NFT` or `ReFungible`246 /// @dev EVM selector for this function is: 0xd34b55b8,247 /// or in textual repr: uniqueCollectionType()248 function uniqueCollectionType() external view returns (string memory);249250 /// Get collection owner.251 ///252 /// @return Tuple with sponsor address and his substrate mirror.253 /// If address is canonical then substrate mirror is zero and vice versa.254 /// @dev EVM selector for this function is: 0xdf727d3b,255 /// or in textual repr: collectionOwner()256 function collectionOwner() external view returns (Tuple6 memory);257258 /// Changes collection owner to another account259 ///260 /// @dev Owner can be changed only by current owner261 /// @param newOwner new owner account262 /// @dev EVM selector for this function is: 0x4f53e226,263 /// or in textual repr: changeCollectionOwner(address)264 function changeCollectionOwner(address newOwner) external;265266 /// Get collection administrators267 ///268 /// @return Vector of tuples with admins address and his substrate mirror.269 /// If address is canonical then substrate mirror is zero and vice versa.270 /// @dev EVM selector for this function is: 0x5813216b,271 /// or in textual repr: collectionAdmins()272 function collectionAdmins() external view returns (Tuple6[] memory);273274 /// Changes collection owner to another account275 ///276 /// @dev Owner can be changed only by current owner277 /// @param newOwner new owner cross account278 /// @dev EVM selector for this function is: 0xe5c9913f,279 /// or in textual repr: setOwnerCross((address,uint256))280 function setOwnerCross(Tuple6 memory newOwner) external;281}282283/// @dev anonymous struct284struct Tuple10 {285 string field_0;286 bytes field_1;287}288289/// @dev the ERC-165 identifier for this interface is 0x032e5926290interface ERC20UniqueExtensions is Dummy, ERC165 {291 /// @dev EVM selector for this function is: 0x0ecd0ab0,292 /// or in textual repr: approveCross((address,uint256),uint256)293 function approveCross(Tuple6 memory spender, uint256 amount) external returns (bool);294295 /// Burn tokens from account296 /// @dev Function that burns an `amount` of the tokens of a given account,297 /// deducting from the sender's allowance for said account.298 /// @param from The account whose tokens will be burnt.299 /// @param amount The amount that will be burnt.300 /// @dev EVM selector for this function is: 0x79cc6790,301 /// or in textual repr: burnFrom(address,uint256)302 function burnFrom(address from, uint256 amount) external returns (bool);303304 /// Burn tokens from account305 /// @dev Function that burns an `amount` of the tokens of a given account,306 /// deducting from the sender's allowance for said account.307 /// @param from The account whose tokens will be burnt.308 /// @param amount The amount that will be burnt.309 /// @dev EVM selector for this function is: 0xbb2f5a58,310 /// or in textual repr: burnFromCross((address,uint256),uint256)311 function burnFromCross(Tuple6 memory from, uint256 amount) external returns (bool);312313 /// Mint tokens for multiple accounts.314 /// @param amounts array of pairs of account address and amount315 /// @dev EVM selector for this function is: 0x1acf2d55,316 /// or in textual repr: mintBulk((address,uint256)[])317 function mintBulk(Tuple6[] memory amounts) external returns (bool);318319 /// @dev EVM selector for this function is: 0xd5cf430b,320 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)321 function transferFromCross(322 Tuple6 memory from,323 Tuple6 memory to,324 uint256 amount325 ) external returns (bool);326}327328/// @dev anonymous struct329struct Tuple6 {330 address field_0;331 uint256 field_1;332}333334/// @dev the ERC-165 identifier for this interface is 0x40c10f19335interface ERC20Mintable is Dummy, ERC165 {336 /// Mint tokens for `to` account.337 /// @param to account that will receive minted tokens338 /// @param amount amount of tokens to mint339 /// @dev EVM selector for this function is: 0x40c10f19,340 /// or in textual repr: mint(address,uint256)341 function mint(address to, uint256 amount) external returns (bool);342}343344/// @dev inlined interface345interface ERC20Events {346 event Transfer(address indexed from, address indexed to, uint256 value);347 event Approval(address indexed owner, address indexed spender, uint256 value);348}349350/// @dev the ERC-165 identifier for this interface is 0x942e8b22351interface ERC20 is Dummy, ERC165, ERC20Events {352 /// @dev EVM selector for this function is: 0x06fdde03,353 /// or in textual repr: name()354 function name() external view returns (string memory);355356 /// @dev EVM selector for this function is: 0x95d89b41,357 /// or in textual repr: symbol()358 function symbol() external view returns (string memory);359360 /// @dev EVM selector for this function is: 0x18160ddd,361 /// or in textual repr: totalSupply()362 function totalSupply() external view returns (uint256);363364 /// @dev EVM selector for this function is: 0x313ce567,365 /// or in textual repr: decimals()366 function decimals() external view returns (uint8);367368 /// @dev EVM selector for this function is: 0x70a08231,369 /// or in textual repr: balanceOf(address)370 function balanceOf(address owner) external view returns (uint256);371372 /// @dev EVM selector for this function is: 0xa9059cbb,373 /// or in textual repr: transfer(address,uint256)374 function transfer(address to, uint256 amount) external returns (bool);375376 /// @dev EVM selector for this function is: 0x23b872dd,377 /// or in textual repr: transferFrom(address,address,uint256)378 function transferFrom(379 address from,380 address to,381 uint256 amount382 ) external returns (bool);383384 /// @dev EVM selector for this function is: 0x095ea7b3,385 /// or in textual repr: approve(address,uint256)386 function approve(address spender, uint256 amount) external returns (bool);387388 /// @dev EVM selector for this function is: 0xdd62ed3e,389 /// or in textual repr: allowance(address,address)390 function allowance(address owner, address spender) external view returns (uint256);391}392393interface 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 holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0xb3152af317interface Collection is Dummy, ERC165 {18 /// Set collection property.19 ///20 /// @param key Property key.21 /// @param value Propery value.22 /// @dev EVM selector for this function is: 0x2f073f66,23 /// or in textual repr: setCollectionProperty(string,bytes)24 function setCollectionProperty(string memory key, bytes memory value) external;2526 /// Set collection properties.27 ///28 /// @param properties Vector of properties key/value pair.29 /// @dev EVM selector for this function is: 0x50b26b2a,30 /// or in textual repr: setCollectionProperties((string,bytes)[])31 function setCollectionProperties(Tuple10[] memory properties) external;3233 /// Delete collection property.34 ///35 /// @param key Property key.36 /// @dev EVM selector for this function is: 0x7b7debce,37 /// or in textual repr: deleteCollectionProperty(string)38 function deleteCollectionProperty(string memory key) external;3940 /// Delete collection properties.41 ///42 /// @param keys Properties keys.43 /// @dev EVM selector for this function is: 0xee206ee3,44 /// or in textual repr: deleteCollectionProperties(string[])45 function deleteCollectionProperties(string[] memory keys) external;4647 /// Get collection property.48 ///49 /// @dev Throws error if key not found.50 ///51 /// @param key Property key.52 /// @return bytes The property corresponding to the key.53 /// @dev EVM selector for this function is: 0xcf24fd6d,54 /// or in textual repr: collectionProperty(string)55 function collectionProperty(string memory key) external view returns (bytes memory);5657 /// Get collection properties.58 ///59 /// @param keys Properties keys. Empty keys for all propertyes.60 /// @return Vector of properties key/value pairs.61 /// @dev EVM selector for this function is: 0x285fb8e6,62 /// or in textual repr: collectionProperties(string[])63 function collectionProperties(string[] memory keys) external view returns (Tuple10[] memory);6465 /// Set the sponsor of the collection.66 ///67 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68 ///69 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70 /// @dev EVM selector for this function is: 0x7623402e,71 /// or in textual repr: setCollectionSponsor(address)72 function setCollectionSponsor(address sponsor) external;7374 /// Set the sponsor of the collection.75 ///76 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77 ///78 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79 /// @dev EVM selector for this function is: 0x84a1d5a8,80 /// or in textual repr: setCollectionSponsorCross((address,uint256))81 function setCollectionSponsorCross(Tuple6 memory sponsor) external;8283 /// Whether there is a pending sponsor.84 /// @dev EVM selector for this function is: 0x058ac185,85 /// or in textual repr: hasCollectionPendingSponsor()86 function hasCollectionPendingSponsor() external view returns (bool);8788 /// Collection sponsorship confirmation.89 ///90 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.91 /// @dev EVM selector for this function is: 0x3c50e97a,92 /// or in textual repr: confirmCollectionSponsorship()93 function confirmCollectionSponsorship() external;9495 /// Remove collection sponsor.96 /// @dev EVM selector for this function is: 0x6e0326a3,97 /// or in textual repr: removeCollectionSponsor()98 function removeCollectionSponsor() external;99100 /// Get current sponsor.101 ///102 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103 /// @dev EVM selector for this function is: 0x6ec0a9f1,104 /// or in textual repr: collectionSponsor()105 function collectionSponsor() external view returns (Tuple6 memory);106107 /// Set limits for the collection.108 /// @dev Throws error if limit not found.109 /// @param limit Name of the limit. Valid names:110 /// "accountTokenOwnershipLimit",111 /// "sponsoredDataSize",112 /// "sponsoredDataRateLimit",113 /// "tokenLimit",114 /// "sponsorTransferTimeout",115 /// "sponsorApproveTimeout"116 /// @param value Value of the limit.117 /// @dev EVM selector for this function is: 0x6a3841db,118 /// or in textual repr: setCollectionLimit(string,uint32)119 function setCollectionLimit(string memory limit, uint32 value) external;120121 /// Set limits for the collection.122 /// @dev Throws error if limit not found.123 /// @param limit Name of the limit. Valid names:124 /// "ownerCanTransfer",125 /// "ownerCanDestroy",126 /// "transfersEnabled"127 /// @param value Value of the limit.128 /// @dev EVM selector for this function is: 0x993b7fba,129 /// or in textual repr: setCollectionLimit(string,bool)130 function setCollectionLimit(string memory limit, bool value) external;131132 /// Get contract address.133 /// @dev EVM selector for this function is: 0xf6b4dfb4,134 /// or in textual repr: contractAddress()135 function contractAddress() external view returns (address);136137 /// Add collection admin.138 /// @param newAdmin Cross account administrator address.139 /// @dev EVM selector for this function is: 0x859aa7d6,140 /// or in textual repr: addCollectionAdminCross((address,uint256))141 function addCollectionAdminCross(Tuple6 memory newAdmin) external;142143 /// Remove collection admin.144 /// @param admin Cross account administrator address.145 /// @dev EVM selector for this function is: 0x6c0cd173,146 /// or in textual repr: removeCollectionAdminCross((address,uint256))147 function removeCollectionAdminCross(Tuple6 memory admin) external;148149 /// Add collection admin.150 /// @param newAdmin Address of the added administrator.151 /// @dev EVM selector for this function is: 0x92e462c7,152 /// or in textual repr: addCollectionAdmin(address)153 function addCollectionAdmin(address newAdmin) external;154155 /// Remove collection admin.156 ///157 /// @param admin Address of the removed administrator.158 /// @dev EVM selector for this function is: 0xfafd7b42,159 /// or in textual repr: removeCollectionAdmin(address)160 function removeCollectionAdmin(address admin) external;161162 /// Toggle accessibility of collection nesting.163 ///164 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'165 /// @dev EVM selector for this function is: 0x112d4586,166 /// or in textual repr: setCollectionNesting(bool)167 function setCollectionNesting(bool enable) external;168169 /// Toggle accessibility of collection nesting.170 ///171 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'172 /// @param collections Addresses of collections that will be available for nesting.173 /// @dev EVM selector for this function is: 0x64872396,174 /// or in textual repr: setCollectionNesting(bool,address[])175 function setCollectionNesting(bool enable, address[] memory collections) external;176177 /// Set the collection access method.178 /// @param mode Access mode179 /// 0 for Normal180 /// 1 for AllowList181 /// @dev EVM selector for this function is: 0x41835d4c,182 /// or in textual repr: setCollectionAccess(uint8)183 function setCollectionAccess(uint8 mode) external;184185 /// Checks that user allowed to operate with collection.186 ///187 /// @param user User address to check.188 /// @dev EVM selector for this function is: 0xd63a8e11,189 /// or in textual repr: allowed(address)190 function allowed(address user) external view returns (bool);191192 /// Add the user to the allowed list.193 ///194 /// @param user Address of a trusted user.195 /// @dev EVM selector for this function is: 0x67844fe6,196 /// or in textual repr: addToCollectionAllowList(address)197 function addToCollectionAllowList(address user) external;198199 /// Add user to allowed list.200 ///201 /// @param user User cross account address.202 /// @dev EVM selector for this function is: 0xa0184a3a,203 /// or in textual repr: addToCollectionAllowListCross((address,uint256))204 function addToCollectionAllowListCross(Tuple6 memory user) external;205206 /// Remove the user from the allowed list.207 ///208 /// @param user Address of a removed user.209 /// @dev EVM selector for this function is: 0x85c51acb,210 /// or in textual repr: removeFromCollectionAllowList(address)211 function removeFromCollectionAllowList(address user) external;212213 /// Remove user from allowed list.214 ///215 /// @param user User cross account address.216 /// @dev EVM selector for this function is: 0x09ba452a,217 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))218 function removeFromCollectionAllowListCross(Tuple6 memory user) external;219220 /// Switch permission for minting.221 ///222 /// @param mode Enable if "true".223 /// @dev EVM selector for this function is: 0x00018e84,224 /// or in textual repr: setCollectionMintMode(bool)225 function setCollectionMintMode(bool mode) external;226227 /// Check that account is the owner or admin of the collection228 ///229 /// @param user account to verify230 /// @return "true" if account is the owner or admin231 /// @dev EVM selector for this function is: 0x9811b0c7,232 /// or in textual repr: isOwnerOrAdmin(address)233 function isOwnerOrAdmin(address user) external view returns (bool);234235 /// Check that account is the owner or admin of the collection236 ///237 /// @param user User cross account to verify238 /// @return "true" if account is the owner or admin239 /// @dev EVM selector for this function is: 0x3e75a905,240 /// or in textual repr: isOwnerOrAdminCross((address,uint256))241 function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);242243 /// Returns collection type244 ///245 /// @return `Fungible` or `NFT` or `ReFungible`246 /// @dev EVM selector for this function is: 0xd34b55b8,247 /// or in textual repr: uniqueCollectionType()248 function uniqueCollectionType() external view returns (string memory);249250 /// Get collection owner.251 ///252 /// @return Tuble with sponsor address and his substrate mirror.253 /// If address is canonical then substrate mirror is zero and vice versa.254 /// @dev EVM selector for this function is: 0xdf727d3b,255 /// or in textual repr: collectionOwner()256 function collectionOwner() external view returns (Tuple6 memory);257258 /// Changes collection owner to another account259 ///260 /// @dev Owner can be changed only by current owner261 /// @param newOwner new owner account262 /// @dev EVM selector for this function is: 0x4f53e226,263 /// or in textual repr: changeCollectionOwner(address)264 function changeCollectionOwner(address newOwner) external;265266 /// Get collection administrators267 ///268 /// @return Vector of tuples with admins address and his substrate mirror.269 /// If address is canonical then substrate mirror is zero and vice versa.270 /// @dev EVM selector for this function is: 0x5813216b,271 /// or in textual repr: collectionAdmins()272 function collectionAdmins() external view returns (Tuple6[] memory);273274 /// Changes collection owner to another account275 ///276 /// @dev Owner can be changed only by current owner277 /// @param newOwner new owner cross account278 /// @dev EVM selector for this function is: 0xe5c9913f,279 /// or in textual repr: setOwnerCross((address,uint256))280 function setOwnerCross(Tuple6 memory newOwner) external;281}282283/// @dev anonymous struct284struct Tuple10 {285 string field_0;286 bytes field_1;287}288289/// @dev the ERC-165 identifier for this interface is 0x032e5926290interface ERC20UniqueExtensions is Dummy, ERC165 {291 /// @dev EVM selector for this function is: 0x0ecd0ab0,292 /// or in textual repr: approveCross((address,uint256),uint256)293 function approveCross(Tuple6 memory spender, uint256 amount) external returns (bool);294295 /// Burn tokens from account296 /// @dev Function that burns an `amount` of the tokens of a given account,297 /// deducting from the sender's allowance for said account.298 /// @param from The account whose tokens will be burnt.299 /// @param amount The amount that will be burnt.300 /// @dev EVM selector for this function is: 0x79cc6790,301 /// or in textual repr: burnFrom(address,uint256)302 function burnFrom(address from, uint256 amount) external returns (bool);303304 /// Burn tokens from account305 /// @dev Function that burns an `amount` of the tokens of a given account,306 /// deducting from the sender's allowance for said account.307 /// @param from The account whose tokens will be burnt.308 /// @param amount The amount that will be burnt.309 /// @dev EVM selector for this function is: 0xbb2f5a58,310 /// or in textual repr: burnFromCross((address,uint256),uint256)311 function burnFromCross(Tuple6 memory from, uint256 amount) external returns (bool);312313 /// Mint tokens for multiple accounts.314 /// @param amounts array of pairs of account address and amount315 /// @dev EVM selector for this function is: 0x1acf2d55,316 /// or in textual repr: mintBulk((address,uint256)[])317 function mintBulk(Tuple6[] memory amounts) external returns (bool);318319 /// @dev EVM selector for this function is: 0xd5cf430b,320 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)321 function transferFromCross(322 Tuple6 memory from,323 Tuple6 memory to,324 uint256 amount325 ) external returns (bool);326}327328/// @dev anonymous struct329struct Tuple6 {330 address field_0;331 uint256 field_1;332}333334/// @dev the ERC-165 identifier for this interface is 0x40c10f19335interface ERC20Mintable is Dummy, ERC165 {336 /// Mint tokens for `to` account.337 /// @param to account that will receive minted tokens338 /// @param amount amount of tokens to mint339 /// @dev EVM selector for this function is: 0x40c10f19,340 /// or in textual repr: mint(address,uint256)341 function mint(address to, uint256 amount) external returns (bool);342}343344/// @dev inlined interface345interface ERC20Events {346 event Transfer(address indexed from, address indexed to, uint256 value);347 event Approval(address indexed owner, address indexed spender, uint256 value);348}349350/// @dev the ERC-165 identifier for this interface is 0x942e8b22351interface ERC20 is Dummy, ERC165, ERC20Events {352 /// @dev EVM selector for this function is: 0x06fdde03,353 /// or in textual repr: name()354 function name() external view returns (string memory);355356 /// @dev EVM selector for this function is: 0x95d89b41,357 /// or in textual repr: symbol()358 function symbol() external view returns (string memory);359360 /// @dev EVM selector for this function is: 0x18160ddd,361 /// or in textual repr: totalSupply()362 function totalSupply() external view returns (uint256);363364 /// @dev EVM selector for this function is: 0x313ce567,365 /// or in textual repr: decimals()366 function decimals() external view returns (uint8);367368 /// @dev EVM selector for this function is: 0x70a08231,369 /// or in textual repr: balanceOf(address)370 function balanceOf(address owner) external view returns (uint256);371372 /// @dev EVM selector for this function is: 0xa9059cbb,373 /// or in textual repr: transfer(address,uint256)374 function transfer(address to, uint256 amount) external returns (bool);375376 /// @dev EVM selector for this function is: 0x23b872dd,377 /// or in textual repr: transferFrom(address,address,uint256)378 function transferFrom(379 address from,380 address to,381 uint256 amount382 ) external returns (bool);383384 /// @dev EVM selector for this function is: 0x095ea7b3,385 /// or in textual repr: approve(address,uint256)386 function approve(address spender, uint256 amount) external returns (bool);387388 /// @dev EVM selector for this function is: 0xdd62ed3e,389 /// or in textual repr: allowance(address,address)390 function allowance(address owner, address spender) external view returns (uint256);391}392393interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -306,7 +306,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -306,7 +306,7 @@
/// Get collection owner.
///
- /// @return Tuple with sponsor address and his substrate mirror.
+ /// @return Tuble with sponsor address and his substrate mirror.
/// If address is canonical then substrate mirror is zero and vice versa.
/// @dev EVM selector for this function is: 0xdf727d3b,
/// or in textual repr: collectionOwner()
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -53,10 +53,10 @@
itEth('Add cross account admin by owner', async ({helper, privateKey}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- const newAdmin = await privateKey('//Bob');
+ const newAdmin = privateKey('//Bob');
const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);
await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -149,7 +149,7 @@
});
itEth('Can perform burnFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const sender = await helper.eth.createAccountWithBalance(alice, 100n);
const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);
@@ -261,7 +261,7 @@
});
itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const sender = await helper.eth.createAccountWithBalance(alice, 100n);
const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);
@@ -455,7 +455,7 @@
});
itEth('Events emitted for transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const sender = await helper.eth.createAccountWithBalance(alice, 100n);
const collection = await helper.ft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -247,10 +247,10 @@
});
itEth('Can perform burnFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
const token = await collection.mintToken(alice, {Substrate: owner.address});
@@ -277,11 +277,11 @@
});
itEth('Can perform approveCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
const owner = await helper.eth.createAccountWithBalance(alice, 100n);
- const receiver = await privateKey('//Charlie');
+ const receiver = privateKey('//Charlie');
const token = await collection.mintToken(alice, {Ethereum: owner});
@@ -410,12 +410,12 @@
});
itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
- const receiver = await privateKey('//Charlie');
+ const receiver = privateKey('//Charlie');
const token = await collection.mintToken(alice, {Substrate: owner.address});
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -228,7 +228,7 @@
});
itEth('Can perform burnFrom()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
const owner = await helper.eth.createAccountWithBalance(alice, 100n);
@@ -262,10 +262,10 @@
});
itEth('Can perform burnFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
const token = await collection.mintToken(alice, 100n, {Substrate: owner.address});
@@ -295,12 +295,12 @@
});
itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
- const alice = await privateKey('//Alice');
+ const alice = privateKey('//Alice');
const collection = await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const owner = privateKey('//Bob');
const spender = await helper.eth.createAccountWithBalance(alice, 100n);
- const receiver = await privateKey('//Charlie');
+ const receiver = privateKey('//Charlie');
const token = await collection.mintToken(alice, 100n, {Substrate: owner.address});
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -381,6 +381,46 @@
}
}
+export class EthCrossAccountGroup extends EthGroupBase {
+ fromAddress(address: TEthereumAccount): TEthCrossAccount {
+ return {
+ 0: address,
+ 1: '0',
+ field_0: address,
+ field_1: '0',
+ };
+ }
+
+ fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount {
+ return {
+ 0: '0x0000000000000000000000000000000000000000',
+ 1: keyring.addressRaw,
+ field_0: '0x0000000000000000000000000000000000000000',
+ field_1: keyring.addressRaw,
+ };
+ }
+}
+
+export class EthCrossAccountGroup extends EthGroupBase {
+ fromAddress(address: TEthereumAccount): TEthCrossAccount {
+ return {
+ 0: address,
+ 1: '0',
+ field_0: address,
+ field_1: '0',
+ };
+ }
+
+ fromKeyringPair(keyring: IKeyringPair): TEthCrossAccount {
+ return {
+ 0: '0x0000000000000000000000000000000000000000',
+ 1: keyring.addressRaw,
+ field_0: '0x0000000000000000000000000000000000000000',
+ field_1: keyring.addressRaw,
+ };
+ }
+}
+
export class EthUniqueHelper extends DevUniqueHelper {
web3: Web3 | null = null;
web3Provider: WebsocketProvider | null = null;