difftreelog
Merge pull request #827 from UniqueNetwork/fix/frontier-get-code
in: master
Fix eth_getCode
15 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2467,7 +2467,7 @@
[[package]]
name = "fc-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"async-trait",
"fc-db",
@@ -2486,7 +2486,7 @@
[[package]]
name = "fc-db"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fp-storage",
"kvdb-rocksdb",
@@ -2505,7 +2505,7 @@
[[package]]
name = "fc-mapping-sync"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fc-db",
"fp-consensus",
@@ -2522,7 +2522,7 @@
[[package]]
name = "fc-rpc"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2565,7 +2565,7 @@
[[package]]
name = "fc-rpc-core"
version = "1.1.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2730,7 +2730,7 @@
[[package]]
name = "fp-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"parity-scale-codec 3.2.1",
@@ -2742,7 +2742,7 @@
[[package]]
name = "fp-ethereum"
version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2757,7 +2757,7 @@
[[package]]
name = "fp-evm"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"evm",
"frame-support",
@@ -2771,7 +2771,7 @@
[[package]]
name = "fp-evm-mapping"
version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"frame-support",
"sp-core",
@@ -2780,7 +2780,7 @@
[[package]]
name = "fp-rpc"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -2797,7 +2797,7 @@
[[package]]
name = "fp-self-contained"
version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"frame-support",
@@ -2810,7 +2810,7 @@
[[package]]
name = "fp-storage"
version = "2.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"parity-scale-codec 3.2.1",
"serde",
@@ -5687,7 +5687,7 @@
[[package]]
name = "pallet-base-fee"
version = "1.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fp-evm",
"frame-support",
@@ -5952,7 +5952,7 @@
[[package]]
name = "pallet-ethereum"
version = "4.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"ethereum 0.14.0",
"ethereum-types 0.14.1",
@@ -5980,7 +5980,7 @@
[[package]]
name = "pallet-evm"
version = "6.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"environmental",
"evm",
@@ -6066,7 +6066,7 @@
[[package]]
name = "pallet-evm-precompile-simple"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#cf1894629c7df1c4dafe58aa773627a3d940da14"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.36#ef8d2809ed05da0664e9b43cb87436451295b634"
dependencies = [
"fp-evm",
"ripemd",
crates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -811,6 +811,13 @@
let list = generics_list(gen);
quote! { <#list> }
}
+fn generics_stub(gen: &Generics) -> proc_macro2::TokenStream {
+ if gen.params.is_empty() {
+ return quote! {};
+ }
+ let params = (0..gen.params.len()).map(|_| quote! {()});
+ quote! {<#(#params,)*>}
+}
fn generics_data(gen: &Generics) -> proc_macro2::TokenStream {
let list = generics_list(gen);
if gen.params.len() == 1 {
@@ -866,6 +873,7 @@
let generics = self.generics;
let gen_ref = generics_reference(&generics);
let gen_data = generics_data(&generics);
+ let gen_stub = generics_stub(&generics);
let gen_where = &generics.where_clause;
let call_sub = self
@@ -936,6 +944,12 @@
let solidity_events_idents = self.info.events.0.iter().map(|is| is.name.clone());
let docs = &self.docs;
+ let expect_selector = self.info.expect_selector.map(|s| {
+ quote! {
+ const _: () = assert!(#s == u32::from_be_bytes(<#call_name #gen_stub>::interface_id()), "selector mismatch, review contained function selectors");
+ }
+ });
+
quote! {
#(
const _: ::core::marker::PhantomData<#solidity_events_idents> = ::core::marker::PhantomData;
@@ -952,12 +966,15 @@
#call_sub,
)*
}
+
+ #expect_selector
+
impl #gen_ref #call_name #gen_ref {
#(
#consts
)*
/// Return this call ERC165 selector
- pub fn interface_id() -> ::evm_coder::types::bytes4 {
+ pub const fn interface_id() -> ::evm_coder::types::bytes4 {
let mut interface_id = 0;
#(#interface_id)*
#(#inline_interface_id)*
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -524,11 +524,6 @@
Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
}
-
- /// @notice Returns collection helper contract address
- fn collection_helper_address(&self) -> Result<address> {
- Ok(T::ContractAddress::get())
- }
}
/// @title ERC721 Token that can be irreversibly burned (destroyed).
@@ -1058,6 +1053,11 @@
Ok(token_id.into())
}
+
+ /// @notice Returns collection helper contract address
+ fn collection_helper_address(&self) -> Result<address> {
+ Ok(T::ContractAddress::get())
+ }
}
#[solidity_interface(
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
@@ -785,7 +785,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
+/// @dev the ERC-165 identifier for this interface is 0x16de3152
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -986,6 +986,15 @@
dummy = 0;
return 0;
}
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() public view returns (address) {
+ require(false, stub_error);
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
}
/// @dev anonymous struct
@@ -1043,7 +1052,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x983a942b
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
contract ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all NFTs assigned to an owner
/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -1175,15 +1184,6 @@
operator;
dummy;
return false;
- }
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() public view returns (address) {
- require(false, stub_error);
- dummy;
- return 0x0000000000000000000000000000000000000000;
}
}
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -295,7 +295,9 @@
MintingFinished {},
}
-#[solidity_interface(name = ERC721Metadata)]
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
+#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
impl<T: Config> RefungibleHandle<T>
where
T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
@@ -364,7 +366,7 @@
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
-#[solidity_interface(name = ERC721Enumerable)]
+#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]
impl<T: Config> RefungibleHandle<T> {
/// @notice Enumerate valid RFTs
/// @param index A counter less than `totalSupply()`
@@ -391,7 +393,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-#[solidity_interface(name = ERC721, events(ERC721Events))]
+#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]
impl<T: Config> RefungibleHandle<T> {
/// @notice Count all RFTs assigned to an owner
/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -422,6 +424,7 @@
}
/// @dev Not implemented
+ #[solidity(rename_selector = "safeTransferFrom")]
fn safe_transfer_from_with_data(
&mut self,
_from: address,
@@ -434,6 +437,7 @@
}
/// @dev Not implemented
+ #[solidity(rename_selector = "safeTransferFrom")]
fn safe_transfer_from(
&mut self,
_from: address,
@@ -517,11 +521,6 @@
Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))
}
-
- /// @notice Returns collection helper contract address
- fn collection_helper_address(&self) -> Result<address> {
- Ok(T::ContractAddress::get())
- }
}
/// Returns amount of pieces of `token` that `owner` have
@@ -1116,6 +1115,11 @@
token.try_into().map_err(|_| "token id overflow")?,
))
}
+
+ /// @notice Returns collection helper contract address
+ fn collection_helper_address(&self) -> Result<address> {
+ Ok(T::ContractAddress::get())
+ }
}
#[solidity_interface(
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
@@ -641,6 +641,8 @@
TransferEnabled
}
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
contract ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -783,7 +785,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
+/// @dev the ERC-165 identifier for this interface is 0xb365c124
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -985,6 +987,15 @@
dummy;
return 0x0000000000000000000000000000000000000000;
}
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() public view returns (address) {
+ require(false, stub_error);
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
}
/// @dev anonymous struct
@@ -1042,7 +1053,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x4016cd87
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
contract ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all RFTs assigned to an owner
/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -1075,9 +1086,9 @@
}
/// @dev Not implemented
- /// @dev EVM selector for this function is: 0x60a11672,
- /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)
- function safeTransferFromWithData(
+ /// @dev EVM selector for this function is: 0xb88d4fde,
+ /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)
+ function safeTransferFrom(
address from,
address to,
uint256 tokenId,
@@ -1172,15 +1183,6 @@
operator;
dummy;
return false;
- }
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() public view returns (address) {
- require(false, stub_error);
- dummy;
- return 0x0000000000000000000000000000000000000000;
}
}
runtime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -139,8 +139,7 @@
| BalanceOf { .. }
| OwnerOf { .. }
| GetApproved { .. }
- | IsApprovedForAll { .. }
- | CollectionHelperAddress => None,
+ | IsApprovedForAll { .. } => None,
// Not sponsored
SafeTransferFromWithData { .. }
@@ -230,7 +229,8 @@
| CrossOwnerOf { .. }
| Properties { .. }
| NextTokenId
- | TokenContractAddress { .. } => None,
+ | TokenContractAddress { .. }
+ | CollectionHelperAddress => None,
// Not sponsored
BurnFrom { .. }
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -451,7 +451,9 @@
}
fn account_code_at(address: H160) -> Vec<u8> {
- EVM::account_codes(address)
+ use pallet_evm::OnMethodCall;
+ <Runtime as pallet_evm::Config>::OnMethodCall::get_code(&address)
+ .unwrap_or_else(|| EVM::account_codes(address))
}
fn author() -> H160 {
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "approved",15 "type": "address"16 },17 {18 "indexed": true,19 "internalType": "uint256",20 "name": "tokenId",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "owner",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "operator",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "bool",45 "name": "approved",46 "type": "bool"47 }48 ],49 "name": "ApprovalForAll",50 "type": "event"51 },52 {53 "anonymous": false,54 "inputs": [],55 "name": "MintingFinished",56 "type": "event"57 },58 {59 "anonymous": false,60 "inputs": [61 {62 "indexed": true,63 "internalType": "address",64 "name": "from",65 "type": "address"66 },67 {68 "indexed": true,69 "internalType": "address",70 "name": "to",71 "type": "address"72 },73 {74 "indexed": true,75 "internalType": "uint256",76 "name": "tokenId",77 "type": "uint256"78 }79 ],80 "name": "Transfer",81 "type": "event"82 },83 {84 "inputs": [85 {86 "components": [87 { "internalType": "address", "name": "eth", "type": "address" },88 { "internalType": "uint256", "name": "sub", "type": "uint256" }89 ],90 "internalType": "struct CrossAddress",91 "name": "newAdmin",92 "type": "tuple"93 }94 ],95 "name": "addCollectionAdminCross",96 "outputs": [],97 "stateMutability": "nonpayable",98 "type": "function"99 },100 {101 "inputs": [102 {103 "components": [104 { "internalType": "address", "name": "eth", "type": "address" },105 { "internalType": "uint256", "name": "sub", "type": "uint256" }106 ],107 "internalType": "struct CrossAddress",108 "name": "user",109 "type": "tuple"110 }111 ],112 "name": "addToCollectionAllowListCross",113 "outputs": [],114 "stateMutability": "nonpayable",115 "type": "function"116 },117 {118 "inputs": [119 {120 "components": [121 { "internalType": "address", "name": "eth", "type": "address" },122 { "internalType": "uint256", "name": "sub", "type": "uint256" }123 ],124 "internalType": "struct CrossAddress",125 "name": "user",126 "type": "tuple"127 }128 ],129 "name": "allowlistedCross",130 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],131 "stateMutability": "view",132 "type": "function"133 },134 {135 "inputs": [136 { "internalType": "address", "name": "approved", "type": "address" },137 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }138 ],139 "name": "approve",140 "outputs": [],141 "stateMutability": "nonpayable",142 "type": "function"143 },144 {145 "inputs": [146 {147 "components": [148 { "internalType": "address", "name": "eth", "type": "address" },149 { "internalType": "uint256", "name": "sub", "type": "uint256" }150 ],151 "internalType": "struct CrossAddress",152 "name": "approved",153 "type": "tuple"154 },155 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }156 ],157 "name": "approveCross",158 "outputs": [],159 "stateMutability": "nonpayable",160 "type": "function"161 },162 {163 "inputs": [164 { "internalType": "address", "name": "owner", "type": "address" }165 ],166 "name": "balanceOf",167 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],168 "stateMutability": "view",169 "type": "function"170 },171 {172 "inputs": [173 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }174 ],175 "name": "burn",176 "outputs": [],177 "stateMutability": "nonpayable",178 "type": "function"179 },180 {181 "inputs": [182 {183 "components": [184 { "internalType": "address", "name": "eth", "type": "address" },185 { "internalType": "uint256", "name": "sub", "type": "uint256" }186 ],187 "internalType": "struct CrossAddress",188 "name": "from",189 "type": "tuple"190 },191 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }192 ],193 "name": "burnFromCross",194 "outputs": [],195 "stateMutability": "nonpayable",196 "type": "function"197 },198 {199 "inputs": [200 {201 "components": [202 { "internalType": "address", "name": "eth", "type": "address" },203 { "internalType": "uint256", "name": "sub", "type": "uint256" }204 ],205 "internalType": "struct CrossAddress",206 "name": "newOwner",207 "type": "tuple"208 }209 ],210 "name": "changeCollectionOwnerCross",211 "outputs": [],212 "stateMutability": "nonpayable",213 "type": "function"214 },215 {216 "inputs": [],217 "name": "collectionAdmins",218 "outputs": [219 {220 "components": [221 { "internalType": "address", "name": "eth", "type": "address" },222 { "internalType": "uint256", "name": "sub", "type": "uint256" }223 ],224 "internalType": "struct CrossAddress[]",225 "name": "",226 "type": "tuple[]"227 }228 ],229 "stateMutability": "view",230 "type": "function"231 },232 {233 "inputs": [],234 "name": "collectionHelperAddress",235 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],236 "stateMutability": "view",237 "type": "function"238 },239 {240 "inputs": [],241 "name": "collectionLimits",242 "outputs": [243 {244 "components": [245 {246 "internalType": "enum CollectionLimitField",247 "name": "field",248 "type": "uint8"249 },250 {251 "components": [252 { "internalType": "bool", "name": "status", "type": "bool" },253 { "internalType": "uint256", "name": "value", "type": "uint256" }254 ],255 "internalType": "struct OptionUint256",256 "name": "value",257 "type": "tuple"258 }259 ],260 "internalType": "struct CollectionLimit[]",261 "name": "",262 "type": "tuple[]"263 }264 ],265 "stateMutability": "view",266 "type": "function"267 },268 {269 "inputs": [],270 "name": "collectionNestingPermissions",271 "outputs": [272 {273 "components": [274 {275 "internalType": "enum CollectionPermissionField",276 "name": "field",277 "type": "uint8"278 },279 { "internalType": "bool", "name": "value", "type": "bool" }280 ],281 "internalType": "struct CollectionNestingPermission[]",282 "name": "",283 "type": "tuple[]"284 }285 ],286 "stateMutability": "view",287 "type": "function"288 },289 {290 "inputs": [],291 "name": "collectionNestingRestrictedCollectionIds",292 "outputs": [293 {294 "components": [295 { "internalType": "bool", "name": "token_owner", "type": "bool" },296 { "internalType": "uint256[]", "name": "ids", "type": "uint256[]" }297 ],298 "internalType": "struct CollectionNesting",299 "name": "",300 "type": "tuple"301 }302 ],303 "stateMutability": "view",304 "type": "function"305 },306 {307 "inputs": [],308 "name": "collectionOwner",309 "outputs": [310 {311 "components": [312 { "internalType": "address", "name": "eth", "type": "address" },313 { "internalType": "uint256", "name": "sub", "type": "uint256" }314 ],315 "internalType": "struct CrossAddress",316 "name": "",317 "type": "tuple"318 }319 ],320 "stateMutability": "view",321 "type": "function"322 },323 {324 "inputs": [325 { "internalType": "string[]", "name": "keys", "type": "string[]" }326 ],327 "name": "collectionProperties",328 "outputs": [329 {330 "components": [331 { "internalType": "string", "name": "key", "type": "string" },332 { "internalType": "bytes", "name": "value", "type": "bytes" }333 ],334 "internalType": "struct Property[]",335 "name": "",336 "type": "tuple[]"337 }338 ],339 "stateMutability": "view",340 "type": "function"341 },342 {343 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],344 "name": "collectionProperty",345 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],346 "stateMutability": "view",347 "type": "function"348 },349 {350 "inputs": [],351 "name": "collectionSponsor",352 "outputs": [353 {354 "components": [355 { "internalType": "address", "name": "eth", "type": "address" },356 { "internalType": "uint256", "name": "sub", "type": "uint256" }357 ],358 "internalType": "struct CrossAddress",359 "name": "",360 "type": "tuple"361 }362 ],363 "stateMutability": "view",364 "type": "function"365 },366 {367 "inputs": [],368 "name": "confirmCollectionSponsorship",369 "outputs": [],370 "stateMutability": "nonpayable",371 "type": "function"372 },373 {374 "inputs": [],375 "name": "contractAddress",376 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],377 "stateMutability": "view",378 "type": "function"379 },380 {381 "inputs": [382 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }383 ],384 "name": "crossOwnerOf",385 "outputs": [386 {387 "components": [388 { "internalType": "address", "name": "eth", "type": "address" },389 { "internalType": "uint256", "name": "sub", "type": "uint256" }390 ],391 "internalType": "struct CrossAddress",392 "name": "",393 "type": "tuple"394 }395 ],396 "stateMutability": "view",397 "type": "function"398 },399 {400 "inputs": [401 { "internalType": "string[]", "name": "keys", "type": "string[]" }402 ],403 "name": "deleteCollectionProperties",404 "outputs": [],405 "stateMutability": "nonpayable",406 "type": "function"407 },408 {409 "inputs": [410 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },411 { "internalType": "string[]", "name": "keys", "type": "string[]" }412 ],413 "name": "deleteProperties",414 "outputs": [],415 "stateMutability": "nonpayable",416 "type": "function"417 },418 {419 "inputs": [],420 "name": "description",421 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],422 "stateMutability": "view",423 "type": "function"424 },425 {426 "inputs": [],427 "name": "finishMinting",428 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],429 "stateMutability": "nonpayable",430 "type": "function"431 },432 {433 "inputs": [434 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }435 ],436 "name": "getApproved",437 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],438 "stateMutability": "view",439 "type": "function"440 },441 {442 "inputs": [],443 "name": "hasCollectionPendingSponsor",444 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],445 "stateMutability": "view",446 "type": "function"447 },448 {449 "inputs": [450 { "internalType": "address", "name": "owner", "type": "address" },451 { "internalType": "address", "name": "operator", "type": "address" }452 ],453 "name": "isApprovedForAll",454 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],455 "stateMutability": "view",456 "type": "function"457 },458 {459 "inputs": [460 {461 "components": [462 { "internalType": "address", "name": "eth", "type": "address" },463 { "internalType": "uint256", "name": "sub", "type": "uint256" }464 ],465 "internalType": "struct CrossAddress",466 "name": "user",467 "type": "tuple"468 }469 ],470 "name": "isOwnerOrAdminCross",471 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],472 "stateMutability": "view",473 "type": "function"474 },475 {476 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],477 "name": "mint",478 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],479 "stateMutability": "nonpayable",480 "type": "function"481 },482 {483 "inputs": [484 {485 "components": [486 { "internalType": "address", "name": "eth", "type": "address" },487 { "internalType": "uint256", "name": "sub", "type": "uint256" }488 ],489 "internalType": "struct CrossAddress",490 "name": "to",491 "type": "tuple"492 },493 {494 "components": [495 { "internalType": "string", "name": "key", "type": "string" },496 { "internalType": "bytes", "name": "value", "type": "bytes" }497 ],498 "internalType": "struct Property[]",499 "name": "properties",500 "type": "tuple[]"501 }502 ],503 "name": "mintCross",504 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],505 "stateMutability": "nonpayable",506 "type": "function"507 },508 {509 "inputs": [510 { "internalType": "address", "name": "to", "type": "address" },511 { "internalType": "string", "name": "tokenUri", "type": "string" }512 ],513 "name": "mintWithTokenURI",514 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],515 "stateMutability": "nonpayable",516 "type": "function"517 },518 {519 "inputs": [],520 "name": "mintingFinished",521 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],522 "stateMutability": "view",523 "type": "function"524 },525 {526 "inputs": [],527 "name": "name",528 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],529 "stateMutability": "view",530 "type": "function"531 },532 {533 "inputs": [],534 "name": "nextTokenId",535 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],536 "stateMutability": "view",537 "type": "function"538 },539 {540 "inputs": [541 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }542 ],543 "name": "ownerOf",544 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],545 "stateMutability": "view",546 "type": "function"547 },548 {549 "inputs": [550 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },551 { "internalType": "string[]", "name": "keys", "type": "string[]" }552 ],553 "name": "properties",554 "outputs": [555 {556 "components": [557 { "internalType": "string", "name": "key", "type": "string" },558 { "internalType": "bytes", "name": "value", "type": "bytes" }559 ],560 "internalType": "struct Property[]",561 "name": "",562 "type": "tuple[]"563 }564 ],565 "stateMutability": "view",566 "type": "function"567 },568 {569 "inputs": [570 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },571 { "internalType": "string", "name": "key", "type": "string" }572 ],573 "name": "property",574 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],575 "stateMutability": "view",576 "type": "function"577 },578 {579 "inputs": [580 {581 "components": [582 { "internalType": "address", "name": "eth", "type": "address" },583 { "internalType": "uint256", "name": "sub", "type": "uint256" }584 ],585 "internalType": "struct CrossAddress",586 "name": "admin",587 "type": "tuple"588 }589 ],590 "name": "removeCollectionAdminCross",591 "outputs": [],592 "stateMutability": "nonpayable",593 "type": "function"594 },595 {596 "inputs": [],597 "name": "removeCollectionSponsor",598 "outputs": [],599 "stateMutability": "nonpayable",600 "type": "function"601 },602 {603 "inputs": [604 {605 "components": [606 { "internalType": "address", "name": "eth", "type": "address" },607 { "internalType": "uint256", "name": "sub", "type": "uint256" }608 ],609 "internalType": "struct CrossAddress",610 "name": "user",611 "type": "tuple"612 }613 ],614 "name": "removeFromCollectionAllowListCross",615 "outputs": [],616 "stateMutability": "nonpayable",617 "type": "function"618 },619 {620 "inputs": [621 { "internalType": "address", "name": "from", "type": "address" },622 { "internalType": "address", "name": "to", "type": "address" },623 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }624 ],625 "name": "safeTransferFrom",626 "outputs": [],627 "stateMutability": "nonpayable",628 "type": "function"629 },630 {631 "inputs": [632 { "internalType": "address", "name": "from", "type": "address" },633 { "internalType": "address", "name": "to", "type": "address" },634 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },635 { "internalType": "bytes", "name": "data", "type": "bytes" }636 ],637 "name": "safeTransferFrom",638 "outputs": [],639 "stateMutability": "nonpayable",640 "type": "function"641 },642 {643 "inputs": [644 { "internalType": "address", "name": "operator", "type": "address" },645 { "internalType": "bool", "name": "approved", "type": "bool" }646 ],647 "name": "setApprovalForAll",648 "outputs": [],649 "stateMutability": "nonpayable",650 "type": "function"651 },652 {653 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],654 "name": "setCollectionAccess",655 "outputs": [],656 "stateMutability": "nonpayable",657 "type": "function"658 },659 {660 "inputs": [661 {662 "components": [663 {664 "internalType": "enum CollectionLimitField",665 "name": "field",666 "type": "uint8"667 },668 {669 "components": [670 { "internalType": "bool", "name": "status", "type": "bool" },671 { "internalType": "uint256", "name": "value", "type": "uint256" }672 ],673 "internalType": "struct OptionUint256",674 "name": "value",675 "type": "tuple"676 }677 ],678 "internalType": "struct CollectionLimit",679 "name": "limit",680 "type": "tuple"681 }682 ],683 "name": "setCollectionLimit",684 "outputs": [],685 "stateMutability": "nonpayable",686 "type": "function"687 },688 {689 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],690 "name": "setCollectionMintMode",691 "outputs": [],692 "stateMutability": "nonpayable",693 "type": "function"694 },695 {696 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],697 "name": "setCollectionNesting",698 "outputs": [],699 "stateMutability": "nonpayable",700 "type": "function"701 },702 {703 "inputs": [704 { "internalType": "bool", "name": "enable", "type": "bool" },705 {706 "internalType": "address[]",707 "name": "collections",708 "type": "address[]"709 }710 ],711 "name": "setCollectionNesting",712 "outputs": [],713 "stateMutability": "nonpayable",714 "type": "function"715 },716 {717 "inputs": [718 {719 "components": [720 { "internalType": "string", "name": "key", "type": "string" },721 { "internalType": "bytes", "name": "value", "type": "bytes" }722 ],723 "internalType": "struct Property[]",724 "name": "properties",725 "type": "tuple[]"726 }727 ],728 "name": "setCollectionProperties",729 "outputs": [],730 "stateMutability": "nonpayable",731 "type": "function"732 },733 {734 "inputs": [735 {736 "components": [737 { "internalType": "address", "name": "eth", "type": "address" },738 { "internalType": "uint256", "name": "sub", "type": "uint256" }739 ],740 "internalType": "struct CrossAddress",741 "name": "sponsor",742 "type": "tuple"743 }744 ],745 "name": "setCollectionSponsorCross",746 "outputs": [],747 "stateMutability": "nonpayable",748 "type": "function"749 },750 {751 "inputs": [752 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },753 {754 "components": [755 { "internalType": "string", "name": "key", "type": "string" },756 { "internalType": "bytes", "name": "value", "type": "bytes" }757 ],758 "internalType": "struct Property[]",759 "name": "properties",760 "type": "tuple[]"761 }762 ],763 "name": "setProperties",764 "outputs": [],765 "stateMutability": "nonpayable",766 "type": "function"767 },768 {769 "inputs": [770 {771 "components": [772 { "internalType": "string", "name": "key", "type": "string" },773 {774 "components": [775 {776 "internalType": "enum TokenPermissionField",777 "name": "code",778 "type": "uint8"779 },780 { "internalType": "bool", "name": "value", "type": "bool" }781 ],782 "internalType": "struct PropertyPermission[]",783 "name": "permissions",784 "type": "tuple[]"785 }786 ],787 "internalType": "struct TokenPropertyPermission[]",788 "name": "permissions",789 "type": "tuple[]"790 }791 ],792 "name": "setTokenPropertyPermissions",793 "outputs": [],794 "stateMutability": "nonpayable",795 "type": "function"796 },797 {798 "inputs": [799 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }800 ],801 "name": "supportsInterface",802 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],803 "stateMutability": "view",804 "type": "function"805 },806 {807 "inputs": [],808 "name": "symbol",809 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],810 "stateMutability": "view",811 "type": "function"812 },813 {814 "inputs": [815 { "internalType": "uint256", "name": "index", "type": "uint256" }816 ],817 "name": "tokenByIndex",818 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],819 "stateMutability": "view",820 "type": "function"821 },822 {823 "inputs": [824 { "internalType": "address", "name": "owner", "type": "address" },825 { "internalType": "uint256", "name": "index", "type": "uint256" }826 ],827 "name": "tokenOfOwnerByIndex",828 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],829 "stateMutability": "view",830 "type": "function"831 },832 {833 "inputs": [],834 "name": "tokenPropertyPermissions",835 "outputs": [836 {837 "components": [838 { "internalType": "string", "name": "key", "type": "string" },839 {840 "components": [841 {842 "internalType": "enum TokenPermissionField",843 "name": "code",844 "type": "uint8"845 },846 { "internalType": "bool", "name": "value", "type": "bool" }847 ],848 "internalType": "struct PropertyPermission[]",849 "name": "permissions",850 "type": "tuple[]"851 }852 ],853 "internalType": "struct TokenPropertyPermission[]",854 "name": "",855 "type": "tuple[]"856 }857 ],858 "stateMutability": "view",859 "type": "function"860 },861 {862 "inputs": [863 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }864 ],865 "name": "tokenURI",866 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],867 "stateMutability": "view",868 "type": "function"869 },870 {871 "inputs": [],872 "name": "totalSupply",873 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],874 "stateMutability": "view",875 "type": "function"876 },877 {878 "inputs": [879 { "internalType": "address", "name": "to", "type": "address" },880 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }881 ],882 "name": "transfer",883 "outputs": [],884 "stateMutability": "nonpayable",885 "type": "function"886 },887 {888 "inputs": [889 {890 "components": [891 { "internalType": "address", "name": "eth", "type": "address" },892 { "internalType": "uint256", "name": "sub", "type": "uint256" }893 ],894 "internalType": "struct CrossAddress",895 "name": "to",896 "type": "tuple"897 },898 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }899 ],900 "name": "transferCross",901 "outputs": [],902 "stateMutability": "nonpayable",903 "type": "function"904 },905 {906 "inputs": [907 { "internalType": "address", "name": "from", "type": "address" },908 { "internalType": "address", "name": "to", "type": "address" },909 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }910 ],911 "name": "transferFrom",912 "outputs": [],913 "stateMutability": "nonpayable",914 "type": "function"915 },916 {917 "inputs": [918 {919 "components": [920 { "internalType": "address", "name": "eth", "type": "address" },921 { "internalType": "uint256", "name": "sub", "type": "uint256" }922 ],923 "internalType": "struct CrossAddress",924 "name": "from",925 "type": "tuple"926 },927 {928 "components": [929 { "internalType": "address", "name": "eth", "type": "address" },930 { "internalType": "uint256", "name": "sub", "type": "uint256" }931 ],932 "internalType": "struct CrossAddress",933 "name": "to",934 "type": "tuple"935 },936 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }937 ],938 "name": "transferFromCross",939 "outputs": [],940 "stateMutability": "nonpayable",941 "type": "function"942 },943 {944 "inputs": [],945 "name": "uniqueCollectionType",946 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],947 "stateMutability": "view",948 "type": "function"949 }950]tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,6 +51,12 @@
},
{
"anonymous": false,
+ "inputs": [],
+ "name": "MintingFinished",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -399,6 +405,13 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "finishMinting",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
@@ -486,6 +499,13 @@
},
{
"inputs": [],
+ "name": "mintingFinished",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
@@ -596,7 +616,7 @@
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" },
{ "internalType": "bytes", "name": "data", "type": "bytes" }
],
- "name": "safeTransferFromWithData",
+ "name": "safeTransferFrom",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,6 +98,16 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "from", "type": "address" },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "burnFrom",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{
"components": [
{ "internalType": "address", "name": "eth", "type": "address" },
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -536,7 +536,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
+/// @dev the ERC-165 identifier for this interface is 0x16de3152
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -661,6 +661,11 @@
/// @dev EVM selector for this function is: 0xb904db03,
/// or in textual repr: mintCross((address,uint256),(string,bytes)[])
function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() external view returns (address);
}
/// @dev anonymous struct
@@ -703,7 +708,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x983a942b
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
interface ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all NFTs assigned to an owner
/// @dev NFTs assigned to the zero address are considered invalid, and this
@@ -786,11 +791,6 @@
/// @dev EVM selector for this function is: 0xe985e9c5,
/// or in textual repr: isApprovedForAll(address,address)
function isApprovedForAll(address owner, address operator) external view returns (bool);
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() external view returns (address);
}
interface UniqueNFT is
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -441,6 +441,8 @@
TransferEnabled
}
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
interface ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -534,7 +536,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
+/// @dev the ERC-165 identifier for this interface is 0xb365c124
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -660,6 +662,11 @@
/// @dev EVM selector for this function is: 0xab76fac6,
/// or in textual repr: tokenContractAddress(uint256)
function tokenContractAddress(uint256 token) external view returns (address);
+
+ /// @notice Returns collection helper contract address
+ /// @dev EVM selector for this function is: 0x1896cce6,
+ /// or in textual repr: collectionHelperAddress()
+ function collectionHelperAddress() external view returns (address);
}
/// @dev anonymous struct
@@ -702,7 +709,7 @@
/// @title ERC-721 Non-Fungible Token Standard
/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
-/// @dev the ERC-165 identifier for this interface is 0x4016cd87
+/// @dev the ERC-165 identifier for this interface is 0x80ac58cd
interface ERC721 is Dummy, ERC165, ERC721Events {
/// @notice Count all RFTs assigned to an owner
/// @dev RFTs assigned to the zero address are considered invalid, and this
@@ -725,9 +732,9 @@
function ownerOf(uint256 tokenId) external view returns (address);
/// @dev Not implemented
- /// @dev EVM selector for this function is: 0x60a11672,
- /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)
- function safeTransferFromWithData(
+ /// @dev EVM selector for this function is: 0xb88d4fde,
+ /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)
+ function safeTransferFrom(
address from,
address to,
uint256 tokenId,
@@ -783,11 +790,6 @@
/// @dev EVM selector for this function is: 0xe985e9c5,
/// or in textual repr: isApprovedForAll(address,address)
function isApprovedForAll(address owner, address operator) external view returns (bool);
-
- /// @notice Returns collection helper contract address
- /// @dev EVM selector for this function is: 0x1896cce6,
- /// or in textual repr: collectionHelperAddress()
- function collectionHelperAddress() external view returns (address);
}
interface UniqueRefungible is