difftreelog
Merge pull request #654 from UniqueNetwork/feature/solidity_methods_renaming
in: master
Feature/solidity methods renaming
21 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -592,6 +592,7 @@
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner account
+ #[solidity(rename_selector = "changeCollectionOwner")]
fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {
self.consume_store_writes(1)?;
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8 uint8 dummy;9 string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13 function supportsInterface(bytes4 interfaceID) external view returns (bool) {14 require(false, stub_error);15 interfaceID;16 return true;17 }18}1920/// @title A contract that allows you to work with collections.21/// @dev the ERC-165 identifier for this interface is 0x3e1e808322contract 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 /// Delete collection property.37 ///38 /// @param key Property key.39 /// @dev EVM selector for this function is: 0x7b7debce,40 /// or in textual repr: deleteCollectionProperty(string)41 function deleteCollectionProperty(string memory key) public {42 require(false, stub_error);43 key;44 dummy = 0;45 }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) public view returns (bytes memory) {56 require(false, stub_error);57 key;58 dummy;59 return hex"";60 }6162 /// Set the sponsor of the collection.63 ///64 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.65 ///66 /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.67 /// @dev EVM selector for this function is: 0x7623402e,68 /// or in textual repr: setCollectionSponsor(address)69 function setCollectionSponsor(address sponsor) public {70 require(false, stub_error);71 sponsor;72 dummy = 0;73 }7475 /// Whether there is a pending sponsor.76 /// @dev EVM selector for this function is: 0x058ac185,77 /// or in textual repr: hasCollectionPendingSponsor()78 function hasCollectionPendingSponsor() public view returns (bool) {79 require(false, stub_error);80 dummy;81 return false;82 }8384 /// Collection sponsorship confirmation.85 ///86 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.87 /// @dev EVM selector for this function is: 0x3c50e97a,88 /// or in textual repr: confirmCollectionSponsorship()89 function confirmCollectionSponsorship() public {90 require(false, stub_error);91 dummy = 0;92 }9394 /// Remove collection sponsor.95 /// @dev EVM selector for this function is: 0x6e0326a3,96 /// or in textual repr: removeCollectionSponsor()97 function removeCollectionSponsor() public {98 require(false, stub_error);99 dummy = 0;100 }101102 /// Get current sponsor.103 ///104 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.105 /// @dev EVM selector for this function is: 0x6ec0a9f1,106 /// or in textual repr: collectionSponsor()107 function collectionSponsor() public view returns (Tuple6 memory) {108 require(false, stub_error);109 dummy;110 return Tuple6(0x0000000000000000000000000000000000000000, 0);111 }112113 /// Set limits for the collection.114 /// @dev Throws error if limit not found.115 /// @param limit Name of the limit. Valid names:116 /// "accountTokenOwnershipLimit",117 /// "sponsoredDataSize",118 /// "sponsoredDataRateLimit",119 /// "tokenLimit",120 /// "sponsorTransferTimeout",121 /// "sponsorApproveTimeout"122 /// @param value Value of the limit.123 /// @dev EVM selector for this function is: 0x6a3841db,124 /// or in textual repr: setCollectionLimit(string,uint32)125 function setCollectionLimit(string memory limit, uint32 value) public {126 require(false, stub_error);127 limit;128 value;129 dummy = 0;130 }131132 /// Set limits for the collection.133 /// @dev Throws error if limit not found.134 /// @param limit Name of the limit. Valid names:135 /// "ownerCanTransfer",136 /// "ownerCanDestroy",137 /// "transfersEnabled"138 /// @param value Value of the limit.139 /// @dev EVM selector for this function is: 0x993b7fba,140 /// or in textual repr: setCollectionLimit(string,bool)141 function setCollectionLimit(string memory limit, bool value) public {142 require(false, stub_error);143 limit;144 value;145 dummy = 0;146 }147148 /// Get contract address.149 /// @dev EVM selector for this function is: 0xf6b4dfb4,150 /// or in textual repr: contractAddress()151 function contractAddress() public view returns (address) {152 require(false, stub_error);153 dummy;154 return 0x0000000000000000000000000000000000000000;155 }156157 /// Add collection admin.158 /// @param newAdmin Address of the added administrator.159 /// @dev EVM selector for this function is: 0x92e462c7,160 /// or in textual repr: addCollectionAdmin(address)161 function addCollectionAdmin(address newAdmin) public {162 require(false, stub_error);163 newAdmin;164 dummy = 0;165 }166167 /// Remove collection admin.168 ///169 /// @param admin Address of the removed administrator.170 /// @dev EVM selector for this function is: 0xfafd7b42,171 /// or in textual repr: removeCollectionAdmin(address)172 function removeCollectionAdmin(address admin) public {173 require(false, stub_error);174 admin;175 dummy = 0;176 }177178 /// Toggle accessibility of collection nesting.179 ///180 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'181 /// @dev EVM selector for this function is: 0x112d4586,182 /// or in textual repr: setCollectionNesting(bool)183 function setCollectionNesting(bool enable) public {184 require(false, stub_error);185 enable;186 dummy = 0;187 }188189 /// Toggle accessibility of collection nesting.190 ///191 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'192 /// @param collections Addresses of collections that will be available for nesting.193 /// @dev EVM selector for this function is: 0x64872396,194 /// or in textual repr: setCollectionNesting(bool,address[])195 function setCollectionNesting(bool enable, address[] memory collections) public {196 require(false, stub_error);197 enable;198 collections;199 dummy = 0;200 }201202 /// Set the collection access method.203 /// @param mode Access mode204 /// 0 for Normal205 /// 1 for AllowList206 /// @dev EVM selector for this function is: 0x41835d4c,207 /// or in textual repr: setCollectionAccess(uint8)208 function setCollectionAccess(uint8 mode) public {209 require(false, stub_error);210 mode;211 dummy = 0;212 }213214 /// Checks that user allowed to operate with collection.215 ///216 /// @param user User address to check.217 /// @dev EVM selector for this function is: 0xd63a8e11,218 /// or in textual repr: allowed(address)219 function allowed(address user) public view returns (bool) {220 require(false, stub_error);221 user;222 dummy;223 return false;224 }225226 /// Add the user to the allowed list.227 ///228 /// @param user Address of a trusted user.229 /// @dev EVM selector for this function is: 0x67844fe6,230 /// or in textual repr: addToCollectionAllowList(address)231 function addToCollectionAllowList(address user) public {232 require(false, stub_error);233 user;234 dummy = 0;235 }236237 /// Remove the user from the allowed list.238 ///239 /// @param user Address of a removed user.240 /// @dev EVM selector for this function is: 0x85c51acb,241 /// or in textual repr: removeFromCollectionAllowList(address)242 function removeFromCollectionAllowList(address user) public {243 require(false, stub_error);244 user;245 dummy = 0;246 }247248 /// Switch permission for minting.249 ///250 /// @param mode Enable if "true".251 /// @dev EVM selector for this function is: 0x00018e84,252 /// or in textual repr: setCollectionMintMode(bool)253 function setCollectionMintMode(bool mode) public {254 require(false, stub_error);255 mode;256 dummy = 0;257 }258259 /// Check that account is the owner or admin of the collection260 ///261 /// @param user account to verify262 /// @return "true" if account is the owner or admin263 /// @dev EVM selector for this function is: 0x9811b0c7,264 /// or in textual repr: isOwnerOrAdmin(address)265 function isOwnerOrAdmin(address user) public view returns (bool) {266 require(false, stub_error);267 user;268 dummy;269 return false;270 }271272 /// Returns collection type273 ///274 /// @return `Fungible` or `NFT` or `ReFungible`275 /// @dev EVM selector for this function is: 0xd34b55b8,276 /// or in textual repr: uniqueCollectionType()277 function uniqueCollectionType() public view returns (string memory) {278 require(false, stub_error);279 dummy;280 return "";281 }282283 /// Get collection owner.284 ///285 /// @return Tuble with sponsor address and his substrate mirror.286 /// If address is canonical then substrate mirror is zero and vice versa.287 /// @dev EVM selector for this function is: 0xdf727d3b,288 /// or in textual repr: collectionOwner()289 function collectionOwner() public view returns (Tuple6 memory) {290 require(false, stub_error);291 dummy;292 return Tuple6(0x0000000000000000000000000000000000000000, 0);293 }294295 /// Changes collection owner to another account296 ///297 /// @dev Owner can be changed only by current owner298 /// @param newOwner new owner account299 /// @dev EVM selector for this function is: 0x13af4035,300 /// or in textual repr: setOwner(address)301 function setOwner(address newOwner) public {302 require(false, stub_error);303 newOwner;304 dummy = 0;305 }306}307308/// @dev the ERC-165 identifier for this interface is 0x63034ac5309contract ERC20UniqueExtensions is Dummy, ERC165 {310 /// Burn tokens from account311 /// @dev Function that burns an `amount` of the tokens of a given account,312 /// deducting from the sender's allowance for said account.313 /// @param from The account whose tokens will be burnt.314 /// @param amount The amount that will be burnt.315 /// @dev EVM selector for this function is: 0x79cc6790,316 /// or in textual repr: burnFrom(address,uint256)317 function burnFrom(address from, uint256 amount) public returns (bool) {318 require(false, stub_error);319 from;320 amount;321 dummy = 0;322 return false;323 }324325 /// Mint tokens for multiple accounts.326 /// @param amounts array of pairs of account address and amount327 /// @dev EVM selector for this function is: 0x1acf2d55,328 /// or in textual repr: mintBulk((address,uint256)[])329 function mintBulk(Tuple6[] memory amounts) public returns (bool) {330 require(false, stub_error);331 amounts;332 dummy = 0;333 return false;334 }335}336337/// @dev anonymous struct338struct Tuple6 {339 address field_0;340 uint256 field_1;341}342343/// @dev the ERC-165 identifier for this interface is 0x40c10f19344contract ERC20Mintable is Dummy, ERC165 {345 /// Mint tokens for `to` account.346 /// @param to account that will receive minted tokens347 /// @param amount amount of tokens to mint348 /// @dev EVM selector for this function is: 0x40c10f19,349 /// or in textual repr: mint(address,uint256)350 function mint(address to, uint256 amount) public returns (bool) {351 require(false, stub_error);352 to;353 amount;354 dummy = 0;355 return false;356 }357}358359/// @dev inlined interface360contract ERC20Events {361 event Transfer(address indexed from, address indexed to, uint256 value);362 event Approval(address indexed owner, address indexed spender, uint256 value);363}364365/// @dev the ERC-165 identifier for this interface is 0x942e8b22366contract ERC20 is Dummy, ERC165, ERC20Events {367 /// @dev EVM selector for this function is: 0x06fdde03,368 /// or in textual repr: name()369 function name() public view returns (string memory) {370 require(false, stub_error);371 dummy;372 return "";373 }374375 /// @dev EVM selector for this function is: 0x95d89b41,376 /// or in textual repr: symbol()377 function symbol() public view returns (string memory) {378 require(false, stub_error);379 dummy;380 return "";381 }382383 /// @dev EVM selector for this function is: 0x18160ddd,384 /// or in textual repr: totalSupply()385 function totalSupply() public view returns (uint256) {386 require(false, stub_error);387 dummy;388 return 0;389 }390391 /// @dev EVM selector for this function is: 0x313ce567,392 /// or in textual repr: decimals()393 function decimals() public view returns (uint8) {394 require(false, stub_error);395 dummy;396 return 0;397 }398399 /// @dev EVM selector for this function is: 0x70a08231,400 /// or in textual repr: balanceOf(address)401 function balanceOf(address owner) public view returns (uint256) {402 require(false, stub_error);403 owner;404 dummy;405 return 0;406 }407408 /// @dev EVM selector for this function is: 0xa9059cbb,409 /// or in textual repr: transfer(address,uint256)410 function transfer(address to, uint256 amount) public returns (bool) {411 require(false, stub_error);412 to;413 amount;414 dummy = 0;415 return false;416 }417418 /// @dev EVM selector for this function is: 0x23b872dd,419 /// or in textual repr: transferFrom(address,address,uint256)420 function transferFrom(421 address from,422 address to,423 uint256 amount424 ) public returns (bool) {425 require(false, stub_error);426 from;427 to;428 amount;429 dummy = 0;430 return false;431 }432433 /// @dev EVM selector for this function is: 0x095ea7b3,434 /// or in textual repr: approve(address,uint256)435 function approve(address spender, uint256 amount) public returns (bool) {436 require(false, stub_error);437 spender;438 amount;439 dummy = 0;440 return false;441 }442443 /// @dev EVM selector for this function is: 0xdd62ed3e,444 /// or in textual repr: allowance(address,address)445 function allowance(address owner, address spender) public view returns (uint256) {446 require(false, stub_error);447 owner;448 spender;449 dummy;450 return 0;451 }452}453454contract UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -91,7 +91,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x3e1e8083
+/// @dev the ERC-165 identifier for this interface is 0x62e22290
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -369,9 +369,9 @@
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner account
- /// @dev EVM selector for this function is: 0x13af4035,
- /// or in textual repr: setOwner(address)
- function setOwner(address newOwner) public {
+ /// @dev EVM selector for this function is: 0x4f53e226,
+ /// or in textual repr: changeCollectionOwner(address)
+ function changeCollectionOwner(address newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
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
@@ -91,7 +91,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x3e1e8083
+/// @dev the ERC-165 identifier for this interface is 0x62e22290
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -369,9 +369,9 @@
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner account
- /// @dev EVM selector for this function is: 0x13af4035,
- /// or in textual repr: setOwner(address)
- function setOwner(address newOwner) public {
+ /// @dev EVM selector for this function is: 0x4f53e226,
+ /// or in textual repr: changeCollectionOwner(address)
+ function changeCollectionOwner(address newOwner) public {
require(false, stub_error);
newOwner;
dummy = 0;
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -184,6 +184,7 @@
/// @return address Address of the newly created collection
#[weight(<SelfWeightOf<T>>::create_collection())]
#[deprecated(note = "mathod was renamed to `create_nft_collection`, prefer it instead")]
+ #[solidity(hide)]
fn create_nonfungible_collection(
&mut self,
caller: caller,
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -45,25 +45,21 @@
return 0x0000000000000000000000000000000000000000;
}
- /// Create an NFT collection
- /// @param name Name of the collection
- /// @param description Informative description of the collection
- /// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
- /// @return address Address of the newly created collection
- /// @dev EVM selector for this function is: 0xe34a6844,
- /// or in textual repr: createNonfungibleCollection(string,string,string)
- function createNonfungibleCollection(
- string memory name,
- string memory description,
- string memory tokenPrefix
- ) public payable returns (address) {
- require(false, stub_error);
- name;
- description;
- tokenPrefix;
- dummy = 0;
- return 0x0000000000000000000000000000000000000000;
- }
+ // /// Create an NFT collection
+ // /// @param name Name of the collection
+ // /// @param description Informative description of the collection
+ // /// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
+ // /// @return address Address of the newly created collection
+ // /// @dev EVM selector for this function is: 0xe34a6844,
+ // /// or in textual repr: createNonfungibleCollection(string,string,string)
+ // function createNonfungibleCollection(string memory name, string memory description, string memory tokenPrefix) public payable returns (address) {
+ // require(false, stub_error);
+ // name;
+ // description;
+ // tokenPrefix;
+ // dummy = 0;
+ // return 0x0000000000000000000000000000000000000000;
+ // }
/// @dev EVM selector for this function is: 0xab173450,
/// or in textual repr: createRFTCollection(string,string,string)
tests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/CollectionHelpers.sol
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -33,18 +33,14 @@
string memory tokenPrefix
) external payable returns (address);
- /// Create an NFT collection
- /// @param name Name of the collection
- /// @param description Informative description of the collection
- /// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
- /// @return address Address of the newly created collection
- /// @dev EVM selector for this function is: 0xe34a6844,
- /// or in textual repr: createNonfungibleCollection(string,string,string)
- function createNonfungibleCollection(
- string memory name,
- string memory description,
- string memory tokenPrefix
- ) external payable returns (address);
+ // /// Create an NFT collection
+ // /// @param name Name of the collection
+ // /// @param description Informative description of the collection
+ // /// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
+ // /// @return address Address of the newly created collection
+ // /// @dev EVM selector for this function is: 0xe34a6844,
+ // /// or in textual repr: createNonfungibleCollection(string,string,string)
+ // function createNonfungibleCollection(string memory name, string memory description, string memory tokenPrefix) external payable returns (address);
/// @dev EVM selector for this function is: 0xab173450,
/// or in textual repr: createRFTCollection(string,string,string)
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,7 +13,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x3e1e8083
+/// @dev the ERC-165 identifier for this interface is 0x62e22290
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -194,9 +194,9 @@
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner account
- /// @dev EVM selector for this function is: 0x13af4035,
- /// or in textual repr: setOwner(address)
- function setOwner(address newOwner) external;
+ /// @dev EVM selector for this function is: 0x4f53e226,
+ /// or in textual repr: changeCollectionOwner(address)
+ function changeCollectionOwner(address newOwner) external;
}
/// @dev the ERC-165 identifier for this interface is 0x63034ac5
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -62,7 +62,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x3e1e8083
+/// @dev the ERC-165 identifier for this interface is 0x62e22290
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -243,9 +243,9 @@
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner account
- /// @dev EVM selector for this function is: 0x13af4035,
- /// or in textual repr: setOwner(address)
- function setOwner(address newOwner) external;
+ /// @dev EVM selector for this function is: 0x4f53e226,
+ /// or in textual repr: changeCollectionOwner(address)
+ function changeCollectionOwner(address newOwner) external;
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -62,7 +62,7 @@
}
/// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x3e1e8083
+/// @dev the ERC-165 identifier for this interface is 0x62e22290
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
@@ -243,9 +243,9 @@
///
/// @dev Owner can be changed only by current owner
/// @param newOwner new owner account
- /// @dev EVM selector for this function is: 0x13af4035,
- /// or in textual repr: setOwner(address)
- function setOwner(address newOwner) external;
+ /// @dev EVM selector for this function is: 0x4f53e226,
+ /// or in textual repr: changeCollectionOwner(address)
+ function changeCollectionOwner(address newOwner) external;
}
/// @dev anonymous struct
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -282,7 +282,7 @@
const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- await collectionEvm.methods.setOwner(newOwner).send();
+ await collectionEvm.methods.changeCollectionOwner(newOwner).send();
expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;
expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.true;
@@ -293,7 +293,7 @@
const newOwner = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.setOwner(newOwner).send());
+ const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.changeCollectionOwner(newOwner).send());
expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));
expect(cost > 0);
});
@@ -304,7 +304,7 @@
const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- await expect(collectionEvm.methods.setOwner(newOwner).send({from: newOwner})).to.be.rejected;
+ await expect(collectionEvm.methods.changeCollectionOwner(newOwner).send({from: newOwner})).to.be.rejected;
expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.false;
});
});
tests/src/eth/collectionHelpersAbi.jsondiffbeforeafterboth--- a/tests/src/eth/collectionHelpersAbi.json
+++ b/tests/src/eth/collectionHelpersAbi.json
@@ -42,17 +42,6 @@
{ "internalType": "string", "name": "description", "type": "string" },
{ "internalType": "string", "name": "tokenPrefix", "type": "string" }
],
- "name": "createNonfungibleCollection",
- "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
- "stateMutability": "payable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "string", "name": "name", "type": "string" },
- { "internalType": "string", "name": "description", "type": "string" },
- { "internalType": "string", "name": "tokenPrefix", "type": "string" }
- ],
"name": "createRFTCollection",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "payable",
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -116,6 +116,15 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+ ],
+ "name": "changeCollectionOwner",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "collectionOwner",
"outputs": [
@@ -329,15 +338,6 @@
{ "internalType": "address", "name": "sponsor", "type": "address" }
],
"name": "setCollectionSponsor",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "newOwner", "type": "address" }
- ],
- "name": "setOwner",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -146,6 +146,15 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+ ],
+ "name": "changeCollectionOwner",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "collectionOwner",
"outputs": [
@@ -472,15 +481,6 @@
{ "internalType": "address", "name": "sponsor", "type": "address" }
],
"name": "setCollectionSponsor",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "newOwner", "type": "address" }
- ],
- "name": "setOwner",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -146,6 +146,15 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "address", "name": "newOwner", "type": "address" }
+ ],
+ "name": "changeCollectionOwner",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "collectionOwner",
"outputs": [
@@ -472,15 +481,6 @@
{ "internalType": "address", "name": "sponsor", "type": "address" }
],
"name": "setCollectionSponsor",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "newOwner", "type": "address" }
- ],
- "name": "setOwner",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"