git.delta.rocks / unique-network / refs/commits / 9cba02dd9f43

difftreelog

fix nonfungible erc721 selector

Yaroslav Bolyukin2023-01-12parent: #b81a3fd.patch.diff
in: master

7 files changed

modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
525 Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))525 Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
526 }526 }
527
528 /// @notice Returns collection helper contract address
529 fn collection_helper_address(&self) -> Result<address> {
530 Ok(T::ContractAddress::get())
531 }
532}527}
533528
534/// @title ERC721 Token that can be irreversibly burned (destroyed).529/// @title ERC721 Token that can be irreversibly burned (destroyed).
1059 Ok(token_id.into())1054 Ok(token_id.into())
1060 }1055 }
1056
1057 /// @notice Returns collection helper contract address
1058 fn collection_helper_address(&self) -> Result<address> {
1059 Ok(T::ContractAddress::get())
1060 }
1061}1061}
10621062
1063#[solidity_interface(1063#[solidity_interface(
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
785}785}
786786
787/// @title Unique extensions for ERC721.787/// @title Unique extensions for ERC721.
788/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4788/// @dev the ERC-165 identifier for this interface is 0x16de3152
789contract ERC721UniqueExtensions is Dummy, ERC165 {789contract ERC721UniqueExtensions is Dummy, ERC165 {
790 /// @notice A descriptive name for a collection of NFTs in this contract790 /// @notice A descriptive name for a collection of NFTs in this contract
791 /// @dev EVM selector for this function is: 0x06fdde03,791 /// @dev EVM selector for this function is: 0x06fdde03,
987 return 0;987 return 0;
988 }988 }
989
990 /// @notice Returns collection helper contract address
991 /// @dev EVM selector for this function is: 0x1896cce6,
992 /// or in textual repr: collectionHelperAddress()
993 function collectionHelperAddress() public view returns (address) {
994 require(false, stub_error);
995 dummy;
996 return 0x0000000000000000000000000000000000000000;
997 }
989}998}
990999
991/// @dev anonymous struct1000/// @dev anonymous struct
10431052
1044/// @title ERC-721 Non-Fungible Token Standard1053/// @title ERC-721 Non-Fungible Token Standard
1045/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1054/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
1046/// @dev the ERC-165 identifier for this interface is 0x983a942b1055/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
1047contract ERC721 is Dummy, ERC165, ERC721Events {1056contract ERC721 is Dummy, ERC165, ERC721Events {
1048 /// @notice Count all NFTs assigned to an owner1057 /// @notice Count all NFTs assigned to an owner
1049 /// @dev NFTs assigned to the zero address are considered invalid, and this1058 /// @dev NFTs assigned to the zero address are considered invalid, and this
1177 return false;1186 return false;
1178 }1187 }
1179
1180 /// @notice Returns collection helper contract address
1181 /// @dev EVM selector for this function is: 0x1896cce6,
1182 /// or in textual repr: collectionHelperAddress()
1183 function collectionHelperAddress() public view returns (address) {
1184 require(false, stub_error);
1185 dummy;
1186 return 0x0000000000000000000000000000000000000000;
1187 }
1188}1188}
11891189
1190contract UniqueNFT is1190contract UniqueNFT is
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
49 "name": "ApprovalForAll",49 "name": "ApprovalForAll",
50 "type": "event"50 "type": "event"
51 },51 },
52 {
53 "anonymous": false,
54 "inputs": [],
55 "name": "MintingFinished",
56 "type": "event"
57 },
52 {58 {
53 "anonymous": false,59 "anonymous": false,
54 "inputs": [60 "inputs": [
416 "stateMutability": "view",422 "stateMutability": "view",
417 "type": "function"423 "type": "function"
418 },424 },
425 {
426 "inputs": [],
427 "name": "finishMinting",
428 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
429 "stateMutability": "nonpayable",
430 "type": "function"
431 },
419 {432 {
420 "inputs": [433 "inputs": [
421 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }434 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
502 "stateMutability": "nonpayable",515 "stateMutability": "nonpayable",
503 "type": "function"516 "type": "function"
504 },517 },
518 {
519 "inputs": [],
520 "name": "mintingFinished",
521 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
522 "stateMutability": "view",
523 "type": "function"
524 },
505 {525 {
506 "inputs": [],526 "inputs": [],
507 "name": "name",527 "name": "name",
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
49 "name": "ApprovalForAll",49 "name": "ApprovalForAll",
50 "type": "event"50 "type": "event"
51 },51 },
52 {
53 "anonymous": false,
54 "inputs": [],
55 "name": "MintingFinished",
56 "type": "event"
57 },
52 {58 {
53 "anonymous": false,59 "anonymous": false,
54 "inputs": [60 "inputs": [
398 "stateMutability": "view",404 "stateMutability": "view",
399 "type": "function"405 "type": "function"
400 },406 },
407 {
408 "inputs": [],
409 "name": "finishMinting",
410 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
411 "stateMutability": "nonpayable",
412 "type": "function"
413 },
401 {414 {
402 "inputs": [415 "inputs": [
403 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }416 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
484 "stateMutability": "nonpayable",497 "stateMutability": "nonpayable",
485 "type": "function"498 "type": "function"
486 },499 },
500 {
501 "inputs": [],
502 "name": "mintingFinished",
503 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
504 "stateMutability": "view",
505 "type": "function"
506 },
487 {507 {
488 "inputs": [],508 "inputs": [],
489 "name": "name",509 "name": "name",
modifiedtests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth
96 "stateMutability": "view",96 "stateMutability": "view",
97 "type": "function"97 "type": "function"
98 },98 },
99 {
100 "inputs": [
101 { "internalType": "address", "name": "from", "type": "address" },
102 { "internalType": "uint256", "name": "amount", "type": "uint256" }
103 ],
104 "name": "burnFrom",
105 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
106 "stateMutability": "nonpayable",
107 "type": "function"
108 },
99 {109 {
100 "inputs": [110 "inputs": [
101 {111 {
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
536}536}
537537
538/// @title Unique extensions for ERC721.538/// @title Unique extensions for ERC721.
539/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4539/// @dev the ERC-165 identifier for this interface is 0x16de3152
540interface ERC721UniqueExtensions is Dummy, ERC165 {540interface ERC721UniqueExtensions is Dummy, ERC165 {
541 /// @notice A descriptive name for a collection of NFTs in this contract541 /// @notice A descriptive name for a collection of NFTs in this contract
542 /// @dev EVM selector for this function is: 0x06fdde03,542 /// @dev EVM selector for this function is: 0x06fdde03,
662 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])662 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
663 function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);663 function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);
664
665 /// @notice Returns collection helper contract address
666 /// @dev EVM selector for this function is: 0x1896cce6,
667 /// or in textual repr: collectionHelperAddress()
668 function collectionHelperAddress() external view returns (address);
664}669}
665670
666/// @dev anonymous struct671/// @dev anonymous struct
703708
704/// @title ERC-721 Non-Fungible Token Standard709/// @title ERC-721 Non-Fungible Token Standard
705/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md710/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
706/// @dev the ERC-165 identifier for this interface is 0x983a942b711/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
707interface ERC721 is Dummy, ERC165, ERC721Events {712interface ERC721 is Dummy, ERC165, ERC721Events {
708 /// @notice Count all NFTs assigned to an owner713 /// @notice Count all NFTs assigned to an owner
709 /// @dev NFTs assigned to the zero address are considered invalid, and this714 /// @dev NFTs assigned to the zero address are considered invalid, and this
787 /// or in textual repr: isApprovedForAll(address,address)792 /// or in textual repr: isApprovedForAll(address,address)
788 function isApprovedForAll(address owner, address operator) external view returns (bool);793 function isApprovedForAll(address owner, address operator) external view returns (bool);
789
790 /// @notice Returns collection helper contract address
791 /// @dev EVM selector for this function is: 0x1896cce6,
792 /// or in textual repr: collectionHelperAddress()
793 function collectionHelperAddress() external view returns (address);
794}794}
795795
796interface UniqueNFT is796interface UniqueNFT is