difftreelog
CORE-386 Fix PR
in: master
7 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -261,13 +261,13 @@
Ok(())
}
- fn set_collection_access(&mut self, caller: caller, mode: string) -> Result<void> {
+ fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {
let caller = T::CrossAccountId::from_eth(caller);
self.check_is_owner_or_admin(&caller)
.map_err(dispatch_to_evm::<T>)?;
- self.collection.permissions.access = Some(match mode.as_str() {
- "Normal" => AccessMode::Normal,
- "AllowList" => AccessMode::AllowList,
+ self.collection.permissions.access = Some(match mode {
+ 0 => AccessMode::Normal,
+ 1 => AccessMode::AllowList,
_ => return Err("Not supported access mode".into()),
});
save(self);
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -543,6 +543,7 @@
token_owner,
..
} => {
+ //TODO: исследовать угрозы при публичном минтинге.
if is_token_create && (collection_admin || token_owner) {
return Ok(());
}
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: 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,64 +42,6 @@
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
@@ -232,6 +174,64 @@
function finishMinting() external returns (bool);
}
+// Selector: 6aea9834
+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(uint8) 41835d4c
+ function setCollectionAccess(uint8 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: 780e9d63
interface ERC721Enumerable is Dummy, ERC165 {
// Selector: tokenByIndex(uint256) 4f6ccce7
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -247,7 +247,8 @@
expect(oldPermissions.mintMode).to.be.false;
expect(oldPermissions.access).to.be.equal('Normal');
- await collectionEvm.methods.setCollectionAccess('AllowList').send({from: owner});
+ //TODO: change value, when enum generated
+ await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});
await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -341,7 +341,7 @@
"type": "function"
},
{
- "inputs": [{ "internalType": "string", "name": "mode", "type": "string" }],
+ "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],
"name": "setCollectionAccess",
"outputs": [],
"stateMutability": "nonpayable",