difftreelog
CORE-386 Rename eth methods
in: master
8 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -83,7 +83,7 @@
Ok(prop.to_vec())
}
- fn eth_set_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {
+ fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {
check_is_owner(caller, self)?;
let sponsor = T::CrossAccountId::from_eth(sponsor);
@@ -92,7 +92,7 @@
Ok(())
}
- fn eth_confirm_sponsorship(&mut self, caller: caller) -> Result<void> {
+ fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
if !self.confirm_sponsorship(caller.as_sub()) {
return Err(Error::Revert("Caller is not set as sponsor".into()));
@@ -101,7 +101,7 @@
Ok(())
}
- #[solidity(rename_selector = "setLimit")]
+ #[solidity(rename_selector = "setCollectionLimit")]
fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {
check_is_owner(caller, self)?;
let mut limits = self.limits.clone();
@@ -138,7 +138,7 @@
Ok(())
}
- #[solidity(rename_selector = "setLimit")]
+ #[solidity(rename_selector = "setCollectionLimit")]
fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {
check_is_owner(caller, self)?;
let mut limits = self.limits.clone();
@@ -192,7 +192,7 @@
// Ok(())
// }
- fn add_admin(&self, caller: caller, new_admin: address) -> Result<void> {
+ fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
self.check_is_owner_or_admin(&caller)
.map_err(dispatch_to_evm::<T>)?;
@@ -202,7 +202,7 @@
Ok(())
}
- fn remove_admin(&self, caller: caller, admin: address) -> Result<void> {
+ fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
self.check_is_owner_or_admin(&caller)
.map_err(dispatch_to_evm::<T>)?;
@@ -212,7 +212,7 @@
Ok(())
}
- #[solidity(rename_selector = "setNesting")]
+ #[solidity(rename_selector = "setCollectionNesting")]
fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
self.check_is_owner_or_admin(&caller)
@@ -225,7 +225,7 @@
Ok(())
}
- #[solidity(rename_selector = "setNesting")]
+ #[solidity(rename_selector = "setCollectionNesting")]
fn set_nesting(&mut self, caller: caller, enable: bool, collections: Vec<address>) -> Result<void> {
if collections.is_empty() {
return Err("No addresses provided".into());
@@ -253,7 +253,7 @@
Ok(())
}
- fn set_access(&mut self, caller: caller, mode: string) -> Result<void> {
+ fn set_collection_access(&mut self, caller: caller, mode: string) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
self.check_is_owner_or_admin(&caller)
.map_err(dispatch_to_evm::<T>)?;
@@ -266,7 +266,7 @@
Ok(())
}
- fn add_to_allow_list(&self, caller: caller, user: address) -> Result<void> {
+ fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {
let caller = check_is_owner_or_admin(caller, self)?;
let user = T::CrossAccountId::from_eth(user);
<Pallet<T>>::toggle_allowlist(self, &caller, &user, true)
@@ -274,7 +274,7 @@
Ok(())
}
- fn remove_from_allow_list(&self, caller: caller, user: address) -> Result<void> {
+ fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {
let caller = check_is_owner_or_admin(caller, self)?;
let user = T::CrossAccountId::from_eth(user);
<Pallet<T>>::toggle_allowlist(self, &caller, &user, false)
@@ -282,7 +282,7 @@
Ok(())
}
- fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {
+ fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {
check_is_owner_or_admin(caller, self)?;
self.collection.permissions.mint_mode = Some(mode);
save(self);
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56// Anonymous struct7struct Tuple0 {8 uint256 field_0;9 string field_1;10}1112// Common stubs holder13contract Dummy {14 uint8 dummy;15 string stub_error = "this contract is implemented in native";16}1718contract ERC165 is Dummy {19 function supportsInterface(bytes4 interfaceID)20 external21 view22 returns (bool)23 {24 require(false, stub_error);25 interfaceID;26 return true;27 }28}2930// Inline31contract ERC721Events {32 event Transfer(33 address indexed from,34 address indexed to,35 uint256 indexed tokenId36 );37 event Approval(38 address indexed owner,39 address indexed approved,40 uint256 indexed tokenId41 );42 event ApprovalForAll(43 address indexed owner,44 address indexed operator,45 bool approved46 );47}4849// Inline50contract ERC721MintableEvents {51 event MintingFinished();52}5354// Selector: 4136937755contract TokenProperties is Dummy, ERC165 {56 // Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa57 function setTokenPropertyPermission(58 string memory key,59 bool isMutable,60 bool collectionAdmin,61 bool tokenOwner62 ) public {63 require(false, stub_error);64 key;65 isMutable;66 collectionAdmin;67 tokenOwner;68 dummy = 0;69 }7071 // Selector: setProperty(uint256,string,bytes) 1752d67b72 function setProperty(73 uint256 tokenId,74 string memory key,75 bytes memory value76 ) public {77 require(false, stub_error);78 tokenId;79 key;80 value;81 dummy = 0;82 }8384 // Selector: deleteProperty(uint256,string) 066111d185 function deleteProperty(uint256 tokenId, string memory key) public {86 require(false, stub_error);87 tokenId;88 key;89 dummy = 0;90 }9192 // Throws error if key not found93 //94 // Selector: property(uint256,string) 7228c32795 function property(uint256 tokenId, string memory key)96 public97 view98 returns (bytes memory)99 {100 require(false, stub_error);101 tokenId;102 key;103 dummy;104 return hex"";105 }106}107108// Selector: 42966c68109contract ERC721Burnable is Dummy, ERC165 {110 // Selector: burn(uint256) 42966c68111 function burn(uint256 tokenId) public {112 require(false, stub_error);113 tokenId;114 dummy = 0;115 }116}117118// Selector: 58800161119contract ERC721 is Dummy, ERC165, ERC721Events {120 // Selector: balanceOf(address) 70a08231121 function balanceOf(address owner) public view returns (uint256) {122 require(false, stub_error);123 owner;124 dummy;125 return 0;126 }127128 // Selector: ownerOf(uint256) 6352211e129 function ownerOf(uint256 tokenId) public view returns (address) {130 require(false, stub_error);131 tokenId;132 dummy;133 return 0x0000000000000000000000000000000000000000;134 }135136 // Not implemented137 //138 // Selector: safeTransferFromWithData(address,address,uint256,bytes) 60a11672139 function safeTransferFromWithData(140 address from,141 address to,142 uint256 tokenId,143 bytes memory data144 ) public {145 require(false, stub_error);146 from;147 to;148 tokenId;149 data;150 dummy = 0;151 }152153 // Not implemented154 //155 // Selector: safeTransferFrom(address,address,uint256) 42842e0e156 function safeTransferFrom(157 address from,158 address to,159 uint256 tokenId160 ) public {161 require(false, stub_error);162 from;163 to;164 tokenId;165 dummy = 0;166 }167168 // Selector: transferFrom(address,address,uint256) 23b872dd169 function transferFrom(170 address from,171 address to,172 uint256 tokenId173 ) public {174 require(false, stub_error);175 from;176 to;177 tokenId;178 dummy = 0;179 }180181 // Selector: approve(address,uint256) 095ea7b3182 function approve(address approved, uint256 tokenId) public {183 require(false, stub_error);184 approved;185 tokenId;186 dummy = 0;187 }188189 // Not implemented190 //191 // Selector: setApprovalForAll(address,bool) a22cb465192 function setApprovalForAll(address operator, bool approved) public {193 require(false, stub_error);194 operator;195 approved;196 dummy = 0;197 }198199 // Not implemented200 //201 // Selector: getApproved(uint256) 081812fc202 function getApproved(uint256 tokenId) public view returns (address) {203 require(false, stub_error);204 tokenId;205 dummy;206 return 0x0000000000000000000000000000000000000000;207 }208209 // Not implemented210 //211 // Selector: isApprovedForAll(address,address) e985e9c5212 function isApprovedForAll(address owner, address operator)213 public214 view215 returns (address)216 {217 require(false, stub_error);218 owner;219 operator;220 dummy;221 return 0x0000000000000000000000000000000000000000;222 }223}224225// Selector: 5b5e139f226contract ERC721Metadata is Dummy, ERC165 {227 // Selector: name() 06fdde03228 function name() public view returns (string memory) {229 require(false, stub_error);230 dummy;231 return "";232 }233234 // Selector: symbol() 95d89b41235 function symbol() public view returns (string memory) {236 require(false, stub_error);237 dummy;238 return "";239 }240241 // Returns token's const_metadata242 //243 // Selector: tokenURI(uint256) c87b56dd244 function tokenURI(uint256 tokenId) public view returns (string memory) {245 require(false, stub_error);246 tokenId;247 dummy;248 return "";249 }250}251252// Selector: 68ccfe89253contract ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {254 // Selector: mintingFinished() 05d2035b255 function mintingFinished() public view returns (bool) {256 require(false, stub_error);257 dummy;258 return false;259 }260261 // `token_id` should be obtained with `next_token_id` method,262 // unlike standard, you can't specify it manually263 //264 // Selector: mint(address,uint256) 40c10f19265 function mint(address to, uint256 tokenId) public returns (bool) {266 require(false, stub_error);267 to;268 tokenId;269 dummy = 0;270 return false;271 }272273 // `token_id` should be obtained with `next_token_id` method,274 // unlike standard, you can't specify it manually275 //276 // Selector: mintWithTokenURI(address,uint256,string) 50bb4e7f277 function mintWithTokenURI(278 address to,279 uint256 tokenId,280 string memory tokenUri281 ) public returns (bool) {282 require(false, stub_error);283 to;284 tokenId;285 tokenUri;286 dummy = 0;287 return false;288 }289290 // Not implemented291 //292 // Selector: finishMinting() 7d64bcb4293 function finishMinting() public returns (bool) {294 require(false, stub_error);295 dummy = 0;296 return false;297 }298}299300// Selector: 780e9d63301contract ERC721Enumerable is Dummy, ERC165 {302 // Selector: tokenByIndex(uint256) 4f6ccce7303 function tokenByIndex(uint256 index) public view returns (uint256) {304 require(false, stub_error);305 index;306 dummy;307 return 0;308 }309310 // Not implemented311 //312 // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59313 function tokenOfOwnerByIndex(address owner, uint256 index)314 public315 view316 returns (uint256)317 {318 require(false, stub_error);319 owner;320 index;321 dummy;322 return 0;323 }324325 // Selector: totalSupply() 18160ddd326 function totalSupply() public view returns (uint256) {327 require(false, stub_error);328 dummy;329 return 0;330 }331}332333// Selector: d74d154f334contract ERC721UniqueExtensions is Dummy, ERC165 {335 // Selector: transfer(address,uint256) a9059cbb336 function transfer(address to, uint256 tokenId) public {337 require(false, stub_error);338 to;339 tokenId;340 dummy = 0;341 }342343 // Selector: burnFrom(address,uint256) 79cc6790344 function burnFrom(address from, uint256 tokenId) public {345 require(false, stub_error);346 from;347 tokenId;348 dummy = 0;349 }350351 // Selector: nextTokenId() 75794a3c352 function nextTokenId() public view returns (uint256) {353 require(false, stub_error);354 dummy;355 return 0;356 }357358 // Selector: mintBulk(address,uint256[]) 44a9945e359 function mintBulk(address to, uint256[] memory tokenIds)360 public361 returns (bool)362 {363 require(false, stub_error);364 to;365 tokenIds;366 dummy = 0;367 return false;368 }369370 // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006371 function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)372 public373 returns (bool)374 {375 require(false, stub_error);376 to;377 tokens;378 dummy = 0;379 return false;380 }381}382383// Selector: f56cd7fa384contract Collection is Dummy, ERC165 {385 // Selector: setCollectionProperty(string,bytes) 2f073f66386 function setCollectionProperty(string memory key, bytes memory value)387 public388 {389 require(false, stub_error);390 key;391 value;392 dummy = 0;393 }394395 // Selector: deleteCollectionProperty(string) 7b7debce396 function deleteCollectionProperty(string memory key) public {397 require(false, stub_error);398 key;399 dummy = 0;400 }401402 // Throws error if key not found403 //404 // Selector: collectionProperty(string) cf24fd6d405 function collectionProperty(string memory key)406 public407 view408 returns (bytes memory)409 {410 require(false, stub_error);411 key;412 dummy;413 return hex"";414 }415416 // Selector: ethSetSponsor(address) 8f9af356417 function ethSetSponsor(address sponsor) public {418 require(false, stub_error);419 sponsor;420 dummy = 0;421 }422423 // Selector: ethConfirmSponsorship() a8580d1a424 function ethConfirmSponsorship() public {425 require(false, stub_error);426 dummy = 0;427 }428429 // Selector: setLimit(string,uint32) 68db30ca430 function setLimit(string memory limit, uint32 value) public {431 require(false, stub_error);432 limit;433 value;434 dummy = 0;435 }436437 // Selector: setLimit(string,bool) ea67e4c2438 function setLimit(string memory limit, bool value) public {439 require(false, stub_error);440 limit;441 value;442 dummy = 0;443 }444445 // Selector: contractAddress() f6b4dfb4446 function contractAddress() public view returns (address) {447 require(false, stub_error);448 dummy;449 return 0x0000000000000000000000000000000000000000;450 }451452 // Selector: addAdmin(address) 70480275453 function addAdmin(address newAdmin) public view {454 require(false, stub_error);455 newAdmin;456 dummy;457 }458459 // Selector: removeAdmin(address) 1785f53c460 function removeAdmin(address admin) public view {461 require(false, stub_error);462 admin;463 dummy;464 }465466 // Selector: setNesting(bool) e8fc50dd467 function setNesting(bool enable) public {468 require(false, stub_error);469 enable;470 dummy = 0;471 }472473 // Selector: setNesting(bool,address[]) 7df12a9a474 function setNesting(bool enable, address[] memory collections) public {475 require(false, stub_error);476 enable;477 collections;478 dummy = 0;479 }480481 // Selector: setAccess(string) 488f56aa482 function setAccess(string memory mode) public {483 require(false, stub_error);484 mode;485 dummy = 0;486 }487488 // Selector: addToAllowList(address) 31f59102489 function addToAllowList(address user) public view {490 require(false, stub_error);491 user;492 dummy;493 }494495 // Selector: removeFromAllowList(address) eba8dabc496 function removeFromAllowList(address user) public view {497 require(false, stub_error);498 user;499 dummy;500 }501502 // Selector: setMintMode(bool) 5dea9bd5503 function setMintMode(bool mode) public {504 require(false, stub_error);505 mode;506 dummy = 0;507 }508}509510contract UniqueNFT is511 Dummy,512 ERC165,513 ERC721,514 ERC721Metadata,515 ERC721Enumerable,516 ERC721UniqueExtensions,517 ERC721Mintable,518 ERC721Burnable,519 Collection,520 TokenProperties521{}1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56// Anonymous struct7struct Tuple0 {8 uint256 field_0;9 string field_1;10}1112// Common stubs holder13contract Dummy {14 uint8 dummy;15 string stub_error = "this contract is implemented in native";16}1718contract ERC165 is Dummy {19 function supportsInterface(bytes4 interfaceID)20 external21 view22 returns (bool)23 {24 require(false, stub_error);25 interfaceID;26 return true;27 }28}2930// Inline31contract ERC721Events {32 event Transfer(33 address indexed from,34 address indexed to,35 uint256 indexed tokenId36 );37 event Approval(38 address indexed owner,39 address indexed approved,40 uint256 indexed tokenId41 );42 event ApprovalForAll(43 address indexed owner,44 address indexed operator,45 bool approved46 );47}4849// Inline50contract ERC721MintableEvents {51 event MintingFinished();52}5354// Selector: 1248b7d155contract Collection is Dummy, ERC165 {56 // Selector: setCollectionProperty(string,bytes) 2f073f6657 function setCollectionProperty(string memory key, bytes memory value)58 public59 {60 require(false, stub_error);61 key;62 value;63 dummy = 0;64 }6566 // Selector: deleteCollectionProperty(string) 7b7debce67 function deleteCollectionProperty(string memory key) public {68 require(false, stub_error);69 key;70 dummy = 0;71 }7273 // Throws error if key not found74 //75 // Selector: collectionProperty(string) cf24fd6d76 function collectionProperty(string memory key)77 public78 view79 returns (bytes memory)80 {81 require(false, stub_error);82 key;83 dummy;84 return hex"";85 }8687 // Selector: setCollectionSponsor(address) 7623402e88 function setCollectionSponsor(address sponsor) public {89 require(false, stub_error);90 sponsor;91 dummy = 0;92 }9394 // Selector: confirmCollectionSponsorship() 3c50e97a95 function confirmCollectionSponsorship() public {96 require(false, stub_error);97 dummy = 0;98 }99100 // Selector: setCollectionLimit(string,uint32) 6a3841db101 function setCollectionLimit(string memory limit, uint32 value) public {102 require(false, stub_error);103 limit;104 value;105 dummy = 0;106 }107108 // Selector: setCollectionLimit(string,bool) 993b7fba109 function setCollectionLimit(string memory limit, bool value) public {110 require(false, stub_error);111 limit;112 value;113 dummy = 0;114 }115116 // Selector: contractAddress() f6b4dfb4117 function contractAddress() public view returns (address) {118 require(false, stub_error);119 dummy;120 return 0x0000000000000000000000000000000000000000;121 }122123 // Selector: addCollectionAdmin(address) 92e462c7124 function addCollectionAdmin(address newAdmin) public view {125 require(false, stub_error);126 newAdmin;127 dummy;128 }129130 // Selector: removeCollectionAdmin(address) fafd7b42131 function removeCollectionAdmin(address admin) public view {132 require(false, stub_error);133 admin;134 dummy;135 }136137 // Selector: setCollectionNesting(bool) 112d4586138 function setCollectionNesting(bool enable) public {139 require(false, stub_error);140 enable;141 dummy = 0;142 }143144 // Selector: setCollectionNesting(bool,address[]) 64872396145 function setCollectionNesting(bool enable, address[] memory collections)146 public147 {148 require(false, stub_error);149 enable;150 collections;151 dummy = 0;152 }153154 // Selector: setCollectionAccess(string) 392172a9155 function setCollectionAccess(string memory mode) public {156 require(false, stub_error);157 mode;158 dummy = 0;159 }160161 // Selector: addToCollectionAllowList(address) 67844fe6162 function addToCollectionAllowList(address user) public view {163 require(false, stub_error);164 user;165 dummy;166 }167168 // Selector: removeFromCollectionAllowList(address) 85c51acb169 function removeFromCollectionAllowList(address user) public view {170 require(false, stub_error);171 user;172 dummy;173 }174175 // Selector: setCollectionMintMode(bool) 00018e84176 function setCollectionMintMode(bool mode) public {177 require(false, stub_error);178 mode;179 dummy = 0;180 }181}182183// Selector: 41369377184contract TokenProperties is Dummy, ERC165 {185 // Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa186 function setTokenPropertyPermission(187 string memory key,188 bool isMutable,189 bool collectionAdmin,190 bool tokenOwner191 ) public {192 require(false, stub_error);193 key;194 isMutable;195 collectionAdmin;196 tokenOwner;197 dummy = 0;198 }199200 // Selector: setProperty(uint256,string,bytes) 1752d67b201 function setProperty(202 uint256 tokenId,203 string memory key,204 bytes memory value205 ) public {206 require(false, stub_error);207 tokenId;208 key;209 value;210 dummy = 0;211 }212213 // Selector: deleteProperty(uint256,string) 066111d1214 function deleteProperty(uint256 tokenId, string memory key) public {215 require(false, stub_error);216 tokenId;217 key;218 dummy = 0;219 }220221 // Throws error if key not found222 //223 // Selector: property(uint256,string) 7228c327224 function property(uint256 tokenId, string memory key)225 public226 view227 returns (bytes memory)228 {229 require(false, stub_error);230 tokenId;231 key;232 dummy;233 return hex"";234 }235}236237// Selector: 42966c68238contract ERC721Burnable is Dummy, ERC165 {239 // Selector: burn(uint256) 42966c68240 function burn(uint256 tokenId) public {241 require(false, stub_error);242 tokenId;243 dummy = 0;244 }245}246247// Selector: 58800161248contract ERC721 is Dummy, ERC165, ERC721Events {249 // Selector: balanceOf(address) 70a08231250 function balanceOf(address owner) public view returns (uint256) {251 require(false, stub_error);252 owner;253 dummy;254 return 0;255 }256257 // Selector: ownerOf(uint256) 6352211e258 function ownerOf(uint256 tokenId) public view returns (address) {259 require(false, stub_error);260 tokenId;261 dummy;262 return 0x0000000000000000000000000000000000000000;263 }264265 // Not implemented266 //267 // Selector: safeTransferFromWithData(address,address,uint256,bytes) 60a11672268 function safeTransferFromWithData(269 address from,270 address to,271 uint256 tokenId,272 bytes memory data273 ) public {274 require(false, stub_error);275 from;276 to;277 tokenId;278 data;279 dummy = 0;280 }281282 // Not implemented283 //284 // Selector: safeTransferFrom(address,address,uint256) 42842e0e285 function safeTransferFrom(286 address from,287 address to,288 uint256 tokenId289 ) public {290 require(false, stub_error);291 from;292 to;293 tokenId;294 dummy = 0;295 }296297 // Selector: transferFrom(address,address,uint256) 23b872dd298 function transferFrom(299 address from,300 address to,301 uint256 tokenId302 ) public {303 require(false, stub_error);304 from;305 to;306 tokenId;307 dummy = 0;308 }309310 // Selector: approve(address,uint256) 095ea7b3311 function approve(address approved, uint256 tokenId) public {312 require(false, stub_error);313 approved;314 tokenId;315 dummy = 0;316 }317318 // Not implemented319 //320 // Selector: setApprovalForAll(address,bool) a22cb465321 function setApprovalForAll(address operator, bool approved) public {322 require(false, stub_error);323 operator;324 approved;325 dummy = 0;326 }327328 // Not implemented329 //330 // Selector: getApproved(uint256) 081812fc331 function getApproved(uint256 tokenId) public view returns (address) {332 require(false, stub_error);333 tokenId;334 dummy;335 return 0x0000000000000000000000000000000000000000;336 }337338 // Not implemented339 //340 // Selector: isApprovedForAll(address,address) e985e9c5341 function isApprovedForAll(address owner, address operator)342 public343 view344 returns (address)345 {346 require(false, stub_error);347 owner;348 operator;349 dummy;350 return 0x0000000000000000000000000000000000000000;351 }352}353354// Selector: 5b5e139f355contract ERC721Metadata is Dummy, ERC165 {356 // Selector: name() 06fdde03357 function name() public view returns (string memory) {358 require(false, stub_error);359 dummy;360 return "";361 }362363 // Selector: symbol() 95d89b41364 function symbol() public view returns (string memory) {365 require(false, stub_error);366 dummy;367 return "";368 }369370 // Returns token's const_metadata371 //372 // Selector: tokenURI(uint256) c87b56dd373 function tokenURI(uint256 tokenId) public view returns (string memory) {374 require(false, stub_error);375 tokenId;376 dummy;377 return "";378 }379}380381// Selector: 68ccfe89382contract ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {383 // Selector: mintingFinished() 05d2035b384 function mintingFinished() public view returns (bool) {385 require(false, stub_error);386 dummy;387 return false;388 }389390 // `token_id` should be obtained with `next_token_id` method,391 // unlike standard, you can't specify it manually392 //393 // Selector: mint(address,uint256) 40c10f19394 function mint(address to, uint256 tokenId) public returns (bool) {395 require(false, stub_error);396 to;397 tokenId;398 dummy = 0;399 return false;400 }401402 // `token_id` should be obtained with `next_token_id` method,403 // unlike standard, you can't specify it manually404 //405 // Selector: mintWithTokenURI(address,uint256,string) 50bb4e7f406 function mintWithTokenURI(407 address to,408 uint256 tokenId,409 string memory tokenUri410 ) public returns (bool) {411 require(false, stub_error);412 to;413 tokenId;414 tokenUri;415 dummy = 0;416 return false;417 }418419 // Not implemented420 //421 // Selector: finishMinting() 7d64bcb4422 function finishMinting() public returns (bool) {423 require(false, stub_error);424 dummy = 0;425 return false;426 }427}428429// Selector: 780e9d63430contract ERC721Enumerable is Dummy, ERC165 {431 // Selector: tokenByIndex(uint256) 4f6ccce7432 function tokenByIndex(uint256 index) public view returns (uint256) {433 require(false, stub_error);434 index;435 dummy;436 return 0;437 }438439 // Not implemented440 //441 // Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59442 function tokenOfOwnerByIndex(address owner, uint256 index)443 public444 view445 returns (uint256)446 {447 require(false, stub_error);448 owner;449 index;450 dummy;451 return 0;452 }453454 // Selector: totalSupply() 18160ddd455 function totalSupply() public view returns (uint256) {456 require(false, stub_error);457 dummy;458 return 0;459 }460}461462// Selector: d74d154f463contract ERC721UniqueExtensions is Dummy, ERC165 {464 // Selector: transfer(address,uint256) a9059cbb465 function transfer(address to, uint256 tokenId) public {466 require(false, stub_error);467 to;468 tokenId;469 dummy = 0;470 }471472 // Selector: burnFrom(address,uint256) 79cc6790473 function burnFrom(address from, uint256 tokenId) public {474 require(false, stub_error);475 from;476 tokenId;477 dummy = 0;478 }479480 // Selector: nextTokenId() 75794a3c481 function nextTokenId() public view returns (uint256) {482 require(false, stub_error);483 dummy;484 return 0;485 }486487 // Selector: mintBulk(address,uint256[]) 44a9945e488 function mintBulk(address to, uint256[] memory tokenIds)489 public490 returns (bool)491 {492 require(false, stub_error);493 to;494 tokenIds;495 dummy = 0;496 return false;497 }498499 // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006500 function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)501 public502 returns (bool)503 {504 require(false, stub_error);505 to;506 tokens;507 dummy = 0;508 return false;509 }510}511512contract UniqueNFT is513 Dummy,514 ERC165,515 ERC721,516 ERC721Metadata,517 ERC721Enumerable,518 ERC721UniqueExtensions,519 ERC721Mintable,520 ERC721Burnable,521 Collection,522 TokenProperties523{}tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -42,6 +42,64 @@
event MintingFinished();
}
+// Selector: 1248b7d1
+interface Collection is Dummy, ERC165 {
+ // Selector: setCollectionProperty(string,bytes) 2f073f66
+ function setCollectionProperty(string memory key, bytes memory value)
+ external;
+
+ // Selector: deleteCollectionProperty(string) 7b7debce
+ function deleteCollectionProperty(string memory key) external;
+
+ // Throws error if key not found
+ //
+ // Selector: collectionProperty(string) cf24fd6d
+ function collectionProperty(string memory key)
+ external
+ view
+ returns (bytes memory);
+
+ // Selector: setCollectionSponsor(address) 7623402e
+ function setCollectionSponsor(address sponsor) external;
+
+ // Selector: confirmCollectionSponsorship() 3c50e97a
+ function confirmCollectionSponsorship() external;
+
+ // Selector: setCollectionLimit(string,uint32) 6a3841db
+ function setCollectionLimit(string memory limit, uint32 value) external;
+
+ // Selector: setCollectionLimit(string,bool) 993b7fba
+ function setCollectionLimit(string memory limit, bool value) external;
+
+ // Selector: contractAddress() f6b4dfb4
+ function contractAddress() external view returns (address);
+
+ // Selector: addCollectionAdmin(address) 92e462c7
+ function addCollectionAdmin(address newAdmin) external view;
+
+ // Selector: removeCollectionAdmin(address) fafd7b42
+ function removeCollectionAdmin(address admin) external view;
+
+ // Selector: setCollectionNesting(bool) 112d4586
+ function setCollectionNesting(bool enable) external;
+
+ // Selector: setCollectionNesting(bool,address[]) 64872396
+ function setCollectionNesting(bool enable, address[] memory collections)
+ external;
+
+ // Selector: setCollectionAccess(string) 392172a9
+ function setCollectionAccess(string memory mode) external;
+
+ // Selector: addToCollectionAllowList(address) 67844fe6
+ function addToCollectionAllowList(address user) external view;
+
+ // Selector: removeFromCollectionAllowList(address) 85c51acb
+ function removeFromCollectionAllowList(address user) external view;
+
+ // Selector: setCollectionMintMode(bool) 00018e84
+ function setCollectionMintMode(bool mode) external;
+}
+
// Selector: 41369377
interface TokenProperties is Dummy, ERC165 {
// Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa
@@ -211,63 +269,6 @@
function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
external
returns (bool);
-}
-
-// Selector: f56cd7fa
-interface Collection is Dummy, ERC165 {
- // Selector: setCollectionProperty(string,bytes) 2f073f66
- function setCollectionProperty(string memory key, bytes memory value)
- external;
-
- // Selector: deleteCollectionProperty(string) 7b7debce
- function deleteCollectionProperty(string memory key) external;
-
- // Throws error if key not found
- //
- // Selector: collectionProperty(string) cf24fd6d
- function collectionProperty(string memory key)
- external
- view
- returns (bytes memory);
-
- // Selector: ethSetSponsor(address) 8f9af356
- function ethSetSponsor(address sponsor) external;
-
- // Selector: ethConfirmSponsorship() a8580d1a
- function ethConfirmSponsorship() external;
-
- // Selector: setLimit(string,uint32) 68db30ca
- function setLimit(string memory limit, uint32 value) external;
-
- // Selector: setLimit(string,bool) ea67e4c2
- function setLimit(string memory limit, bool value) external;
-
- // Selector: contractAddress() f6b4dfb4
- function contractAddress() external view returns (address);
-
- // Selector: addAdmin(address) 70480275
- function addAdmin(address newAdmin) external view;
-
- // Selector: removeAdmin(address) 1785f53c
- function removeAdmin(address admin) external view;
-
- // Selector: setNesting(bool) e8fc50dd
- function setNesting(bool enable) external;
-
- // Selector: setNesting(bool,address[]) 7df12a9a
- function setNesting(bool enable, address[] memory collections) external;
-
- // Selector: setAccess(string) 488f56aa
- function setAccess(string memory mode) external;
-
- // Selector: addToAllowList(address) 31f59102
- function addToAllowList(address user) external view;
-
- // Selector: removeFromAllowList(address) eba8dabc
- function removeFromAllowList(address user) external view;
-
- // Selector: setMintMode(bool) 5dea9bd5
- function setMintMode(bool mode) external;
}
interface UniqueNFT is
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -222,7 +222,7 @@
});
//TODO: CORE-302 add eth methods
- itWeb3('Sponsoring collection from evm address via access list', async ({api, web3}) => {
+ itWeb3.skip('Sponsoring collection from evm address via access list', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const collectionHelpers = evmCollectionHelpers(web3, owner);
let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
@@ -292,19 +292,19 @@
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const sponsor = await createEthAccountWithBalance(api, web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- result = await collectionEvm.methods.ethSetSponsor(sponsor).send();
+ result = await collectionEvm.methods.setCollectionSponsor(sponsor).send();
let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
- await expect(collectionEvm.methods.ethConfirmSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
+ await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
- await sponsorCollection.methods.ethConfirmSponsorship().send();
+ await sponsorCollection.methods.confirmCollectionSponsorship().send();
collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isConfirmed).to.be.true;
expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
const user = createEthAccount(web3);
- await collectionEvm.methods.addAdmin(user).send();
+ await collectionEvm.methods.addCollectionAdmin(user).send();
const ownerBalanceBefore = await ethBalanceViaSub(api, owner);
const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);
tests/src/eth/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createCollection.test.ts
+++ b/tests/src/eth/createCollection.test.ts
@@ -75,13 +75,13 @@
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const sponsor = await createEthAccountWithBalance(api, web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- result = await collectionEvm.methods.ethSetSponsor(sponsor).send();
+ result = await collectionEvm.methods.setCollectionSponsor(sponsor).send();
let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
- await expect(collectionEvm.methods.ethConfirmSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
+ await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
- await sponsorCollection.methods.ethConfirmSponsorship().send();
+ await sponsorCollection.methods.confirmCollectionSponsorship().send();
collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.sponsorship.isConfirmed).to.be.true;
expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
@@ -105,15 +105,15 @@
};
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- await collectionEvm.methods['setLimit(string,uint32)']('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
- await collectionEvm.methods['setLimit(string,uint32)']('sponsoredDataSize', limits.sponsoredDataSize).send();
- await collectionEvm.methods['setLimit(string,uint32)']('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
- await collectionEvm.methods['setLimit(string,uint32)']('tokenLimit', limits.tokenLimit).send();
- await collectionEvm.methods['setLimit(string,uint32)']('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
- await collectionEvm.methods['setLimit(string,uint32)']('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
- await collectionEvm.methods['setLimit(string,bool)']('ownerCanTransfer', limits.ownerCanTransfer).send();
- await collectionEvm.methods['setLimit(string,bool)']('ownerCanDestroy', limits.ownerCanDestroy).send();
- await collectionEvm.methods['setLimit(string,bool)']('transfersEnabled', limits.transfersEnabled).send();
+ await collectionEvm.methods['setCollectionLimit(string,uint32)']('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
+ await collectionEvm.methods['setCollectionLimit(string,uint32)']('sponsoredDataSize', limits.sponsoredDataSize).send();
+ await collectionEvm.methods['setCollectionLimit(string,uint32)']('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
+ await collectionEvm.methods['setCollectionLimit(string,uint32)']('tokenLimit', limits.tokenLimit).send();
+ await collectionEvm.methods['setCollectionLimit(string,uint32)']('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
+ await collectionEvm.methods['setCollectionLimit(string,uint32)']('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
+ await collectionEvm.methods['setCollectionLimit(string,bool)']('ownerCanTransfer', limits.ownerCanTransfer).send();
+ await collectionEvm.methods['setCollectionLimit(string,bool)']('ownerCanDestroy', limits.ownerCanDestroy).send();
+ await collectionEvm.methods['setCollectionLimit(string,bool)']('transfersEnabled', limits.transfersEnabled).send();
const collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.be.eq(limits.accountTokenOwnershipLimit);
@@ -201,17 +201,17 @@
{
const sponsor = await createEthAccountWithBalance(api, web3);
await expect(contractEvmFromNotOwner.methods
- .ethSetSponsor(sponsor)
+ .setCollectionSponsor(sponsor)
.call()).to.be.rejectedWith(EXPECTED_ERROR);
const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
await expect(sponsorCollection.methods
- .ethConfirmSponsorship()
+ .confirmCollectionSponsorship()
.call()).to.be.rejectedWith('Caller is not set as sponsor');
}
{
await expect(contractEvmFromNotOwner.methods
- .setLimit('account_token_ownership_limit', '1000')
+ .setCollectionLimit('account_token_ownership_limit', '1000')
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
});
@@ -223,7 +223,7 @@
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
await expect(collectionEvm.methods
- .setLimit('badLimit', 'true')
+ .setCollectionLimit('badLimit', 'true')
.call()).to.be.rejectedWith('Unknown boolean limit "badLimit"');
});
});
\ No newline at end of file
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -84,7 +84,7 @@
"inputs": [
{ "internalType": "address", "name": "newAdmin", "type": "address" }
],
- "name": "addAdmin",
+ "name": "addCollectionAdmin",
"outputs": [],
"stateMutability": "view",
"type": "function"
@@ -93,7 +93,7 @@
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
- "name": "addToAllowList",
+ "name": "addToCollectionAllowList",
"outputs": [],
"stateMutability": "view",
"type": "function"
@@ -145,6 +145,13 @@
},
{
"inputs": [],
+ "name": "confirmCollectionSponsorship",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "contractAddress",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "view",
@@ -163,22 +170,6 @@
{ "internalType": "string", "name": "key", "type": "string" }
],
"name": "deleteProperty",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "ethConfirmSponsorship",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "sponsor", "type": "address" }
- ],
- "name": "ethSetSponsor",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -302,7 +293,7 @@
"inputs": [
{ "internalType": "address", "name": "admin", "type": "address" }
],
- "name": "removeAdmin",
+ "name": "removeCollectionAdmin",
"outputs": [],
"stateMutability": "view",
"type": "function"
@@ -311,7 +302,7 @@
"inputs": [
{ "internalType": "address", "name": "user", "type": "address" }
],
- "name": "removeFromAllowList",
+ "name": "removeFromCollectionAllowList",
"outputs": [],
"stateMutability": "view",
"type": "function"
@@ -335,13 +326,6 @@
{ "internalType": "bytes", "name": "data", "type": "bytes" }
],
"name": "safeTransferFromWithData",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [{ "internalType": "string", "name": "mode", "type": "string" }],
- "name": "setAccess",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -357,11 +341,8 @@
"type": "function"
},
{
- "inputs": [
- { "internalType": "string", "name": "key", "type": "string" },
- { "internalType": "bytes", "name": "value", "type": "bytes" }
- ],
- "name": "setCollectionProperty",
+ "inputs": [{ "internalType": "string", "name": "mode", "type": "string" }],
+ "name": "setCollectionAccess",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -371,7 +352,7 @@
{ "internalType": "string", "name": "limit", "type": "string" },
{ "internalType": "uint32", "name": "value", "type": "uint32" }
],
- "name": "setLimit",
+ "name": "setCollectionLimit",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -381,14 +362,21 @@
{ "internalType": "string", "name": "limit", "type": "string" },
{ "internalType": "bool", "name": "value", "type": "bool" }
],
- "name": "setLimit",
+ "name": "setCollectionLimit",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],
- "name": "setMintMode",
+ "name": "setCollectionMintMode",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],
+ "name": "setCollectionNesting",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -402,14 +390,26 @@
"type": "address[]"
}
],
- "name": "setNesting",
+ "name": "setCollectionNesting",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
- "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],
- "name": "setNesting",
+ "inputs": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "name": "setCollectionProperty",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "address", "name": "sponsor", "type": "address" }
+ ],
+ "name": "setCollectionSponsor",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -99,7 +99,7 @@
const collectionEvmOwned = evmCollection(web3, owner, collectionIdAddress);
const collectionEvm = evmCollection(web3, caller, collectionIdAddress);
const contract = await proxyWrap(api, web3, collectionEvm);
- await collectionEvmOwned.methods.addAdmin(contract.options.address).send();
+ await collectionEvmOwned.methods.addCollectionAdmin(contract.options.address).send();
{
const nextTokenId = await contract.methods.nextTokenId().call();