difftreelog
Merge branch 'develop' into tests/generalization
in: master
33 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2321,7 +2321,7 @@
[[package]]
name = "evm-coder"
-version = "0.1.5"
+version = "0.1.6"
dependencies = [
"ethereum 0.14.0",
"evm-coder-procedural",
crates/evm-coder/CHANGELOG.mddiffbeforeafterboth--- a/crates/evm-coder/CHANGELOG.md
+++ b/crates/evm-coder/CHANGELOG.md
@@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file.
<!-- bureaucrate goes here -->
+## [v0.1.6] - 2023-01-12
+
+### Added
+- Support Option<T> type.
+### Removed
+- Frontier dependency.
+
## [v0.1.5] - 2022-11-30
### Added
crates/evm-coder/Cargo.tomldiffbeforeafterboth--- a/crates/evm-coder/Cargo.toml
+++ b/crates/evm-coder/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "evm-coder"
-version = "0.1.5"
+version = "0.1.6"
license = "GPLv3"
edition = "2021"
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -258,3 +258,39 @@
impl_tuples! {A B C D E F G H}
impl_tuples! {A B C D E F G H I}
impl_tuples! {A B C D E F G H I J}
+
+//----- impls for Option -----
+impl<T: AbiType> AbiType for Option<T> {
+ const SIGNATURE: SignatureUnit = <(bool, T)>::SIGNATURE;
+
+ fn is_dynamic() -> bool {
+ <(bool, T)>::is_dynamic()
+ }
+
+ fn size() -> usize {
+ <(bool, T)>::size()
+ }
+}
+
+impl<T: AbiWrite + AbiType + Default> AbiWrite for Option<T> {
+ fn abi_write(&self, writer: &mut AbiWriter) {
+ match self {
+ Some(value) => (true, value).abi_write(writer),
+ None => (false, T::default()).abi_write(writer),
+ }
+ }
+}
+
+impl<T> AbiRead for Option<T>
+where
+ Self: AbiType,
+ T: AbiRead + AbiType,
+{
+ fn abi_read(reader: &mut AbiReader) -> Result<Self>
+ where
+ Self: Sized,
+ {
+ let (status, value) = <(bool, T)>::abi_read(reader)?;
+ Ok(if status { Some(value) } else { None })
+ }
+}
crates/evm-coder/src/abi/test.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/test.rs
+++ b/crates/evm-coder/src/abi/test.rs
@@ -538,3 +538,68 @@
assert_eq!(p1, 0x0a);
assert_eq!(p2, 0x0b);
}
+
+#[test]
+fn encode_decode_option_uint8_some() {
+ test_impl::<Option<u8>>(
+ 0xdeadbeef,
+ Some(44),
+ &hex!(
+ "
+ deadbeef
+ 0000000000000000000000000000000000000000000000000000000000000001
+ 000000000000000000000000000000000000000000000000000000000000002c
+ "
+ ),
+ );
+}
+
+#[test]
+fn encode_decode_option_uint8_none() {
+ test_impl::<Option<u8>>(
+ 0xdeadbeef,
+ None,
+ &hex!(
+ "
+ deadbeef
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ "
+ ),
+ );
+}
+
+#[test]
+fn encode_decode_option_string_some() {
+ test_impl::<Option<String>>(
+ 0xdeadbeef,
+ Some("some string".to_string()),
+ &hex!(
+ "
+ deadbeef
+ 0000000000000000000000000000000000000000000000000000000000000020
+ 0000000000000000000000000000000000000000000000000000000000000001
+ 0000000000000000000000000000000000000000000000000000000000000040
+ 000000000000000000000000000000000000000000000000000000000000000b
+ 736f6d6520737472696e67000000000000000000000000000000000000000000
+ "
+ ),
+ );
+}
+
+#[test]
+fn encode_decode_option_string_none() {
+ test_impl::<Option<String>>(
+ 0xdeadbeef,
+ None,
+ &hex!(
+ "
+ deadbeef
+ 0000000000000000000000000000000000000000000000000000000000000020
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000040
+ 0000000000000000000000000000000000000000000000000000000000000000
+ "
+ ),
+ );
+}
crates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -121,3 +121,59 @@
impl_tuples! {A B C D E F G H}
impl_tuples! {A B C D E F G H I}
impl_tuples! {A B C D E F G H I J}
+
+//----- impls for Option -----
+impl<T: SolidityTypeName + 'static> SolidityTypeName for Option<T> {
+ fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
+ write!(writer, "{}", tc.collect_struct::<Self>())
+ }
+ fn is_simple() -> bool {
+ false
+ }
+ fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
+ write!(writer, "{}(", tc.collect_struct::<Self>())?;
+ bool::solidity_default(writer, tc)?;
+ write!(writer, ", ");
+ T::solidity_default(writer, tc)?;
+ write!(writer, ")")
+ }
+}
+
+impl<T: SolidityTypeName> super::SolidityStructTy for Option<T> {
+ fn generate_solidity_interface(tc: &TypeCollector) -> String {
+ let mut solidity_name = "Option".to_string();
+ let mut generic_name = String::new();
+ T::solidity_name(&mut generic_name, tc);
+ solidity_name.push(
+ generic_name
+ .chars()
+ .next()
+ .expect("Generic name is empty")
+ .to_ascii_uppercase(),
+ );
+ solidity_name.push_str(&generic_name[1..]);
+
+ let interface = super::SolidityStruct {
+ docs: &[" Optional value"],
+ name: solidity_name.as_str(),
+ fields: (
+ super::SolidityStructField::<bool> {
+ docs: &[" Shows the status of accessibility of value"],
+ name: "status",
+ ty: ::core::marker::PhantomData,
+ },
+ super::SolidityStructField::<T> {
+ docs: &[" Actual value if `status` is true"],
+ name: "value",
+ ty: ::core::marker::PhantomData,
+ },
+ ),
+ };
+
+ let mut out = String::new();
+ let _ = interface.format(&mut out, tc);
+ tc.collect(out);
+
+ solidity_name.to_string()
+ }
+}
crates/evm-coder/src/solidity/mod.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/mod.rs
+++ b/crates/evm-coder/src/solidity/mod.rs
@@ -456,13 +456,13 @@
Ok(())
}
}
-pub struct SolidityStruct<F> {
- pub docs: &'static [&'static str],
+pub struct SolidityStruct<'a, F> {
+ pub docs: &'a [&'a str],
// pub generics:
- pub name: &'static str,
+ pub name: &'a str,
pub fields: F,
}
-impl<F> SolidityStruct<F>
+impl<F> SolidityStruct<'_, F>
where
F: SolidityItems,
{
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -284,6 +284,11 @@
fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {
let limits = &self.collection.limits;
+ let convert_value_from_bool = |ob: Option<bool>| match ob {
+ Some(b) => Some(b as u32),
+ None => None,
+ };
+
Ok(vec![
eth::CollectionLimit::new(
eth::CollectionLimitField::AccountTokenOwnership,
@@ -297,15 +302,15 @@
.sponsored_data_rate_limit
.and_then(|limit| {
if let SponsoringRateLimit::Blocks(blocks) = limit {
- Some(eth::CollectionLimit::new::<u32>(
+ Some(eth::CollectionLimit::new(
eth::CollectionLimitField::SponsoredDataRateLimit,
- blocks,
+ Some(blocks),
))
} else {
None
}
})
- .unwrap_or(eth::CollectionLimit::new::<u32>(
+ .unwrap_or(eth::CollectionLimit::new(
eth::CollectionLimitField::SponsoredDataRateLimit,
Default::default(),
)),
@@ -320,15 +325,15 @@
),
eth::CollectionLimit::new(
eth::CollectionLimitField::OwnerCanTransfer,
- limits.owner_can_transfer,
+ convert_value_from_bool(limits.owner_can_transfer),
),
eth::CollectionLimit::new(
eth::CollectionLimitField::OwnerCanDestroy,
- limits.owner_can_destroy,
+ convert_value_from_bool(limits.owner_can_destroy),
),
eth::CollectionLimit::new(
eth::CollectionLimitField::TransferEnabled,
- limits.transfers_enabled,
+ convert_value_from_bool(limits.transfers_enabled),
),
])
}
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -66,71 +66,6 @@
T::CrossAccountId::from_sub(account_id)
}
-/// Ethereum representation of Optional value with uint256.
-#[derive(Debug, Default, AbiCoder)]
-pub struct OptionUint {
- status: bool,
- value: uint256,
-}
-
-impl From<u32> for OptionUint {
- fn from(value: u32) -> Self {
- Self {
- status: true,
- value: uint256::from(value),
- }
- }
-}
-
-impl From<Option<u32>> for OptionUint {
- fn from(value: Option<u32>) -> Self {
- match value {
- Some(value) => Self {
- status: true,
- value: value.into(),
- },
- None => Self {
- status: false,
- value: Default::default(),
- },
- }
- }
-}
-
-impl From<bool> for OptionUint {
- fn from(value: bool) -> Self {
- Self {
- status: true,
- value: if value {
- uint256::from(1)
- } else {
- Default::default()
- },
- }
- }
-}
-
-impl From<Option<bool>> for OptionUint {
- fn from(value: Option<bool>) -> Self {
- match value {
- Some(value) => Self::from(value),
- None => Self {
- status: false,
- value: Default::default(),
- },
- }
- }
-}
-
-/// Ethereum representation of Optional value with CrossAddress.
-#[derive(Debug, Default, AbiCoder)]
-pub struct OptionCrossAddress {
- /// Whether or not this CrossAdress is valid and has meaning.
- pub status: bool,
- /// The underlying CrossAddress value. If the status is false, can be set to whatever.
- pub value: CrossAddress,
-}
-
/// Cross account struct
#[derive(Debug, Default, AbiCoder)]
pub struct CrossAddress {
@@ -252,23 +187,23 @@
#[derive(Debug, Default, AbiCoder)]
pub struct CollectionLimit {
field: CollectionLimitField,
- value: OptionUint,
+ value: Option<uint256>,
}
impl CollectionLimit {
/// Create [`CollectionLimit`] from field and value.
- pub fn new<T>(field: CollectionLimitField, value: T) -> Self
- where
- OptionUint: From<T>,
- {
+ pub fn new(field: CollectionLimitField, value: Option<u32>) -> Self {
Self {
field,
- value: value.into(),
+ value: match value {
+ Some(value) => Some(value.into()),
+ None => None,
+ },
}
}
/// Whether the field contains a value.
pub fn has_value(&self) -> bool {
- self.value.status
+ self.value.is_some()
}
}
@@ -276,52 +211,60 @@
type Error = evm_coder::execution::Error;
fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {
- let value = self.value.value.try_into().map_err(|error| {
+ let value = self
+ .value
+ .ok_or::<Self::Error>("can't convert `None` value to boolean".into())?;
+ let value = Some(value.try_into().map_err(|error| {
Self::Error::Revert(format!(
"can't convert value to u32 \"{}\" because: \"{error}\"",
- self.value.value
+ value
))
- })?;
+ })?);
let convert_value_to_bool = || match value {
- 0 => Ok(false),
- 1 => Ok(true),
- _ => {
- return Err(Self::Error::Revert(format!(
- "can't convert value to boolean \"{value}\""
- )))
- }
+ Some(value) => match value {
+ 0 => Ok(Some(false)),
+ 1 => Ok(Some(true)),
+ _ => {
+ return Err(Self::Error::Revert(format!(
+ "can't convert value to boolean \"{value}\""
+ )))
+ }
+ },
+ None => Ok(None),
};
let mut limits = up_data_structs::CollectionLimits::default();
match self.field {
CollectionLimitField::AccountTokenOwnership => {
- limits.account_token_ownership_limit = Some(value);
+ limits.account_token_ownership_limit = value;
}
CollectionLimitField::SponsoredDataSize => {
- limits.sponsored_data_size = Some(value);
+ limits.sponsored_data_size = value;
}
CollectionLimitField::SponsoredDataRateLimit => {
- limits.sponsored_data_rate_limit =
- Some(up_data_structs::SponsoringRateLimit::Blocks(value));
+ limits.sponsored_data_rate_limit = match value {
+ Some(value) => Some(up_data_structs::SponsoringRateLimit::Blocks(value)),
+ None => None,
+ };
}
CollectionLimitField::TokenLimit => {
- limits.token_limit = Some(value);
+ limits.token_limit = value;
}
CollectionLimitField::SponsorTransferTimeout => {
- limits.sponsor_transfer_timeout = Some(value);
+ limits.sponsor_transfer_timeout = value;
}
CollectionLimitField::SponsorApproveTimeout => {
- limits.sponsor_approve_timeout = Some(value);
+ limits.sponsor_approve_timeout = value;
}
CollectionLimitField::OwnerCanTransfer => {
- limits.owner_can_transfer = Some(convert_value_to_bool()?);
+ limits.owner_can_transfer = convert_value_to_bool()?;
}
CollectionLimitField::OwnerCanDestroy => {
- limits.owner_can_destroy = Some(convert_value_to_bool()?);
+ limits.owner_can_destroy = convert_value_to_bool()?;
}
CollectionLimitField::TransferEnabled => {
- limits.transfers_enabled = Some(convert_value_to_bool()?);
+ limits.transfers_enabled = convert_value_to_bool()?;
}
};
Ok(limits)
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -175,16 +175,10 @@
///
/// @param contractAddress The contract for which a sponsor is requested.
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- fn sponsor(&self, contract_address: address) -> Result<eth::OptionCrossAddress> {
+ fn sponsor(&self, contract_address: address) -> Result<Option<eth::CrossAddress>> {
Ok(match Pallet::<T>::get_sponsor(contract_address) {
- Some(ref value) => eth::OptionCrossAddress {
- status: true,
- value: eth::CrossAddress::from_sub_cross_account::<T>(value),
- },
- None => eth::OptionCrossAddress {
- status: false,
- value: Default::default(),
- },
+ Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::<T>(value)),
+ None => None,
})
}
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -281,10 +281,10 @@
uint256 sub;
}
-/// Ethereum representation of Optional value with CrossAddress.
+/// Optional value
struct OptionCrossAddress {
- /// Whether or not this CrossAdress is valid and has meaning.
+ /// Shows the status of accessibility of value
bool status;
- /// The underlying CrossAddress value. If the status is false, can be set to whatever.
+ /// Actual value if `status` is true
CrossAddress value;
}
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -466,12 +466,14 @@
/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
- OptionUint value;
+ OptionUint256 value;
}
-/// Ethereum representation of Optional value with uint256.
-struct OptionUint {
+/// Optional value
+struct OptionUint256 {
+ /// Shows the status of accessibility of value
bool status;
+ /// Actual value if `status` is true
uint256 value;
}
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/// @dev common stubs holder7contract Dummy {8 uint8 dummy;9 string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13 function supportsInterface(bytes4 interfaceID) external view returns (bool) {14 require(false, stub_error);15 interfaceID;16 return true;17 }18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23 // /// @notice Set permissions for token property.24 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25 // /// @param key Property key.26 // /// @param isMutable Permission to mutate property.27 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29 // /// @dev EVM selector for this function is: 0x222d97fa,30 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32 // require(false, stub_error);33 // key;34 // isMutable;35 // collectionAdmin;36 // tokenOwner;37 // dummy = 0;38 // }3940 /// @notice Set permissions for token property.41 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.42 /// @param permissions Permissions for keys.43 /// @dev EVM selector for this function is: 0xbd92983a,44 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45 function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {46 require(false, stub_error);47 permissions;48 dummy = 0;49 }5051 /// @notice Get permissions for token properties.52 /// @dev EVM selector for this function is: 0xf23d7790,53 /// or in textual repr: tokenPropertyPermissions()54 function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {55 require(false, stub_error);56 dummy;57 return new TokenPropertyPermission[](0);58 }5960 // /// @notice Set token property value.61 // /// @dev Throws error if `msg.sender` has no permission to edit the property.62 // /// @param tokenId ID of the token.63 // /// @param key Property key.64 // /// @param value Property value.65 // /// @dev EVM selector for this function is: 0x1752d67b,66 // /// or in textual repr: setProperty(uint256,string,bytes)67 // function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68 // require(false, stub_error);69 // tokenId;70 // key;71 // value;72 // dummy = 0;73 // }7475 /// @notice Set token properties value.76 /// @dev Throws error if `msg.sender` has no permission to edit the property.77 /// @param tokenId ID of the token.78 /// @param properties settable properties79 /// @dev EVM selector for this function is: 0x14ed3a6e,80 /// or in textual repr: setProperties(uint256,(string,bytes)[])81 function setProperties(uint256 tokenId, Property[] memory properties) public {82 require(false, stub_error);83 tokenId;84 properties;85 dummy = 0;86 }8788 // /// @notice Delete token property value.89 // /// @dev Throws error if `msg.sender` has no permission to edit the property.90 // /// @param tokenId ID of the token.91 // /// @param key Property key.92 // /// @dev EVM selector for this function is: 0x066111d1,93 // /// or in textual repr: deleteProperty(uint256,string)94 // function deleteProperty(uint256 tokenId, string memory key) public {95 // require(false, stub_error);96 // tokenId;97 // key;98 // dummy = 0;99 // }100101 /// @notice Delete token properties value.102 /// @dev Throws error if `msg.sender` has no permission to edit the property.103 /// @param tokenId ID of the token.104 /// @param keys Properties key.105 /// @dev EVM selector for this function is: 0xc472d371,106 /// or in textual repr: deleteProperties(uint256,string[])107 function deleteProperties(uint256 tokenId, string[] memory keys) public {108 require(false, stub_error);109 tokenId;110 keys;111 dummy = 0;112 }113114 /// @notice Get token property value.115 /// @dev Throws error if key not found116 /// @param tokenId ID of the token.117 /// @param key Property key.118 /// @return Property value bytes119 /// @dev EVM selector for this function is: 0x7228c327,120 /// or in textual repr: property(uint256,string)121 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122 require(false, stub_error);123 tokenId;124 key;125 dummy;126 return hex"";127 }128}129130/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).131struct Property {132 string key;133 bytes value;134}135136/// Ethereum representation of Token Property Permissions.137struct TokenPropertyPermission {138 /// Token property key.139 string key;140 /// Token property permissions.141 PropertyPermission[] permissions;142}143144/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.145struct PropertyPermission {146 /// TokenPermission field.147 TokenPermissionField code;148 /// TokenPermission value.149 bool value;150}151152/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.153enum TokenPermissionField {154 /// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]155 Mutable,156 /// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]157 TokenOwner,158 /// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]159 CollectionAdmin160}161162/// @title A contract that allows you to work with collections.163/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1164contract Collection is Dummy, ERC165 {165 // /// Set collection property.166 // ///167 // /// @param key Property key.168 // /// @param value Propery value.169 // /// @dev EVM selector for this function is: 0x2f073f66,170 // /// or in textual repr: setCollectionProperty(string,bytes)171 // function setCollectionProperty(string memory key, bytes memory value) public {172 // require(false, stub_error);173 // key;174 // value;175 // dummy = 0;176 // }177178 /// Set collection properties.179 ///180 /// @param properties Vector of properties key/value pair.181 /// @dev EVM selector for this function is: 0x50b26b2a,182 /// or in textual repr: setCollectionProperties((string,bytes)[])183 function setCollectionProperties(Property[] memory properties) public {184 require(false, stub_error);185 properties;186 dummy = 0;187 }188189 // /// Delete collection property.190 // ///191 // /// @param key Property key.192 // /// @dev EVM selector for this function is: 0x7b7debce,193 // /// or in textual repr: deleteCollectionProperty(string)194 // function deleteCollectionProperty(string memory key) public {195 // require(false, stub_error);196 // key;197 // dummy = 0;198 // }199200 /// Delete collection properties.201 ///202 /// @param keys Properties keys.203 /// @dev EVM selector for this function is: 0xee206ee3,204 /// or in textual repr: deleteCollectionProperties(string[])205 function deleteCollectionProperties(string[] memory keys) public {206 require(false, stub_error);207 keys;208 dummy = 0;209 }210211 /// Get collection property.212 ///213 /// @dev Throws error if key not found.214 ///215 /// @param key Property key.216 /// @return bytes The property corresponding to the key.217 /// @dev EVM selector for this function is: 0xcf24fd6d,218 /// or in textual repr: collectionProperty(string)219 function collectionProperty(string memory key) public view returns (bytes memory) {220 require(false, stub_error);221 key;222 dummy;223 return hex"";224 }225226 /// Get collection properties.227 ///228 /// @param keys Properties keys. Empty keys for all propertyes.229 /// @return Vector of properties key/value pairs.230 /// @dev EVM selector for this function is: 0x285fb8e6,231 /// or in textual repr: collectionProperties(string[])232 function collectionProperties(string[] memory keys) public view returns (Property[] memory) {233 require(false, stub_error);234 keys;235 dummy;236 return new Property[](0);237 }238239 // /// Set the sponsor of the collection.240 // ///241 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.242 // ///243 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.244 // /// @dev EVM selector for this function is: 0x7623402e,245 // /// or in textual repr: setCollectionSponsor(address)246 // function setCollectionSponsor(address sponsor) public {247 // require(false, stub_error);248 // sponsor;249 // dummy = 0;250 // }251252 /// Set the sponsor of the collection.253 ///254 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.255 ///256 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.257 /// @dev EVM selector for this function is: 0x84a1d5a8,258 /// or in textual repr: setCollectionSponsorCross((address,uint256))259 function setCollectionSponsorCross(CrossAddress memory sponsor) public {260 require(false, stub_error);261 sponsor;262 dummy = 0;263 }264265 /// Whether there is a pending sponsor.266 /// @dev EVM selector for this function is: 0x058ac185,267 /// or in textual repr: hasCollectionPendingSponsor()268 function hasCollectionPendingSponsor() public view returns (bool) {269 require(false, stub_error);270 dummy;271 return false;272 }273274 /// Collection sponsorship confirmation.275 ///276 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.277 /// @dev EVM selector for this function is: 0x3c50e97a,278 /// or in textual repr: confirmCollectionSponsorship()279 function confirmCollectionSponsorship() public {280 require(false, stub_error);281 dummy = 0;282 }283284 /// Remove collection sponsor.285 /// @dev EVM selector for this function is: 0x6e0326a3,286 /// or in textual repr: removeCollectionSponsor()287 function removeCollectionSponsor() public {288 require(false, stub_error);289 dummy = 0;290 }291292 /// Get current sponsor.293 ///294 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.295 /// @dev EVM selector for this function is: 0x6ec0a9f1,296 /// or in textual repr: collectionSponsor()297 function collectionSponsor() public view returns (CrossAddress memory) {298 require(false, stub_error);299 dummy;300 return CrossAddress(0x0000000000000000000000000000000000000000, 0);301 }302303 /// Get current collection limits.304 ///305 /// @return Array of collection limits306 /// @dev EVM selector for this function is: 0xf63bc572,307 /// or in textual repr: collectionLimits()308 function collectionLimits() public view returns (CollectionLimit[] memory) {309 require(false, stub_error);310 dummy;311 return new CollectionLimit[](0);312 }313314 /// Set limits for the collection.315 /// @dev Throws error if limit not found.316 /// @param limit Some limit.317 /// @dev EVM selector for this function is: 0x2316ee74,318 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))319 function setCollectionLimit(CollectionLimit memory limit) public {320 require(false, stub_error);321 limit;322 dummy = 0;323 }324325 /// Get contract address.326 /// @dev EVM selector for this function is: 0xf6b4dfb4,327 /// or in textual repr: contractAddress()328 function contractAddress() public view returns (address) {329 require(false, stub_error);330 dummy;331 return 0x0000000000000000000000000000000000000000;332 }333334 /// Add collection admin.335 /// @param newAdmin Cross account administrator address.336 /// @dev EVM selector for this function is: 0x859aa7d6,337 /// or in textual repr: addCollectionAdminCross((address,uint256))338 function addCollectionAdminCross(CrossAddress memory newAdmin) public {339 require(false, stub_error);340 newAdmin;341 dummy = 0;342 }343344 /// Remove collection admin.345 /// @param admin Cross account administrator address.346 /// @dev EVM selector for this function is: 0x6c0cd173,347 /// or in textual repr: removeCollectionAdminCross((address,uint256))348 function removeCollectionAdminCross(CrossAddress memory admin) public {349 require(false, stub_error);350 admin;351 dummy = 0;352 }353354 // /// Add collection admin.355 // /// @param newAdmin Address of the added administrator.356 // /// @dev EVM selector for this function is: 0x92e462c7,357 // /// or in textual repr: addCollectionAdmin(address)358 // function addCollectionAdmin(address newAdmin) public {359 // require(false, stub_error);360 // newAdmin;361 // dummy = 0;362 // }363364 // /// Remove collection admin.365 // ///366 // /// @param admin Address of the removed administrator.367 // /// @dev EVM selector for this function is: 0xfafd7b42,368 // /// or in textual repr: removeCollectionAdmin(address)369 // function removeCollectionAdmin(address admin) public {370 // require(false, stub_error);371 // admin;372 // dummy = 0;373 // }374375 /// Toggle accessibility of collection nesting.376 ///377 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'378 /// @dev EVM selector for this function is: 0x112d4586,379 /// or in textual repr: setCollectionNesting(bool)380 function setCollectionNesting(bool enable) public {381 require(false, stub_error);382 enable;383 dummy = 0;384 }385386 /// Toggle accessibility of collection nesting.387 ///388 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'389 /// @param collections Addresses of collections that will be available for nesting.390 /// @dev EVM selector for this function is: 0x64872396,391 /// or in textual repr: setCollectionNesting(bool,address[])392 function setCollectionNesting(bool enable, address[] memory collections) public {393 require(false, stub_error);394 enable;395 collections;396 dummy = 0;397 }398399 /// Returns nesting for a collection400 /// @dev EVM selector for this function is: 0x22d25bfe,401 /// or in textual repr: collectionNestingRestrictedCollectionIds()402 function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {403 require(false, stub_error);404 dummy;405 return CollectionNesting(false, new uint256[](0));406 }407408 /// Returns permissions for a collection409 /// @dev EVM selector for this function is: 0x5b2eaf4b,410 /// or in textual repr: collectionNestingPermissions()411 function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {412 require(false, stub_error);413 dummy;414 return new CollectionNestingPermission[](0);415 }416417 /// Set the collection access method.418 /// @param mode Access mode419 /// 0 for Normal420 /// 1 for AllowList421 /// @dev EVM selector for this function is: 0x41835d4c,422 /// or in textual repr: setCollectionAccess(uint8)423 function setCollectionAccess(uint8 mode) public {424 require(false, stub_error);425 mode;426 dummy = 0;427 }428429 /// Checks that user allowed to operate with collection.430 ///431 /// @param user User address to check.432 /// @dev EVM selector for this function is: 0x91b6df49,433 /// or in textual repr: allowlistedCross((address,uint256))434 function allowlistedCross(CrossAddress memory user) public view returns (bool) {435 require(false, stub_error);436 user;437 dummy;438 return false;439 }440441 // /// Add the user to the allowed list.442 // ///443 // /// @param user Address of a trusted user.444 // /// @dev EVM selector for this function is: 0x67844fe6,445 // /// or in textual repr: addToCollectionAllowList(address)446 // function addToCollectionAllowList(address user) public {447 // require(false, stub_error);448 // user;449 // dummy = 0;450 // }451452 /// Add user to allowed list.453 ///454 /// @param user User cross account address.455 /// @dev EVM selector for this function is: 0xa0184a3a,456 /// or in textual repr: addToCollectionAllowListCross((address,uint256))457 function addToCollectionAllowListCross(CrossAddress memory user) public {458 require(false, stub_error);459 user;460 dummy = 0;461 }462463 // /// Remove the user from the allowed list.464 // ///465 // /// @param user Address of a removed user.466 // /// @dev EVM selector for this function is: 0x85c51acb,467 // /// or in textual repr: removeFromCollectionAllowList(address)468 // function removeFromCollectionAllowList(address user) public {469 // require(false, stub_error);470 // user;471 // dummy = 0;472 // }473474 /// Remove user from allowed list.475 ///476 /// @param user User cross account address.477 /// @dev EVM selector for this function is: 0x09ba452a,478 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))479 function removeFromCollectionAllowListCross(CrossAddress memory user) public {480 require(false, stub_error);481 user;482 dummy = 0;483 }484485 /// Switch permission for minting.486 ///487 /// @param mode Enable if "true".488 /// @dev EVM selector for this function is: 0x00018e84,489 /// or in textual repr: setCollectionMintMode(bool)490 function setCollectionMintMode(bool mode) public {491 require(false, stub_error);492 mode;493 dummy = 0;494 }495496 // /// Check that account is the owner or admin of the collection497 // ///498 // /// @param user account to verify499 // /// @return "true" if account is the owner or admin500 // /// @dev EVM selector for this function is: 0x9811b0c7,501 // /// or in textual repr: isOwnerOrAdmin(address)502 // function isOwnerOrAdmin(address user) public view returns (bool) {503 // require(false, stub_error);504 // user;505 // dummy;506 // return false;507 // }508509 /// Check that account is the owner or admin of the collection510 ///511 /// @param user User cross account to verify512 /// @return "true" if account is the owner or admin513 /// @dev EVM selector for this function is: 0x3e75a905,514 /// or in textual repr: isOwnerOrAdminCross((address,uint256))515 function isOwnerOrAdminCross(CrossAddress memory user) public view returns (bool) {516 require(false, stub_error);517 user;518 dummy;519 return false;520 }521522 /// Returns collection type523 ///524 /// @return `Fungible` or `NFT` or `ReFungible`525 /// @dev EVM selector for this function is: 0xd34b55b8,526 /// or in textual repr: uniqueCollectionType()527 function uniqueCollectionType() public view returns (string memory) {528 require(false, stub_error);529 dummy;530 return "";531 }532533 /// Get collection owner.534 ///535 /// @return Tuble with sponsor address and his substrate mirror.536 /// If address is canonical then substrate mirror is zero and vice versa.537 /// @dev EVM selector for this function is: 0xdf727d3b,538 /// or in textual repr: collectionOwner()539 function collectionOwner() public view returns (CrossAddress memory) {540 require(false, stub_error);541 dummy;542 return CrossAddress(0x0000000000000000000000000000000000000000, 0);543 }544545 // /// Changes collection owner to another account546 // ///547 // /// @dev Owner can be changed only by current owner548 // /// @param newOwner new owner account549 // /// @dev EVM selector for this function is: 0x4f53e226,550 // /// or in textual repr: changeCollectionOwner(address)551 // function changeCollectionOwner(address newOwner) public {552 // require(false, stub_error);553 // newOwner;554 // dummy = 0;555 // }556557 /// Get collection administrators558 ///559 /// @return Vector of tuples with admins address and his substrate mirror.560 /// If address is canonical then substrate mirror is zero and vice versa.561 /// @dev EVM selector for this function is: 0x5813216b,562 /// or in textual repr: collectionAdmins()563 function collectionAdmins() public view returns (CrossAddress[] memory) {564 require(false, stub_error);565 dummy;566 return new CrossAddress[](0);567 }568569 /// Changes collection owner to another account570 ///571 /// @dev Owner can be changed only by current owner572 /// @param newOwner new owner cross account573 /// @dev EVM selector for this function is: 0x6496c497,574 /// or in textual repr: changeCollectionOwnerCross((address,uint256))575 function changeCollectionOwnerCross(CrossAddress memory newOwner) public {576 require(false, stub_error);577 newOwner;578 dummy = 0;579 }580}581582/// Cross account struct583struct CrossAddress {584 address eth;585 uint256 sub;586}587588/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.589struct CollectionNestingPermission {590 CollectionPermissionField field;591 bool value;592}593594/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.595enum CollectionPermissionField {596 /// Owner of token can nest tokens under it.597 TokenOwner,598 /// Admin of token collection can nest tokens under token.599 CollectionAdmin600}601602/// Nested collections.603struct CollectionNesting {604 bool token_owner;605 uint256[] ids;606}607608/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.609struct CollectionLimit {610 CollectionLimitField field;611 OptionUint value;612}613614/// Ethereum representation of Optional value with uint256.615struct OptionUint {616 bool status;617 uint256 value;618}619620/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.621enum CollectionLimitField {622 /// How many tokens can a user have on one account.623 AccountTokenOwnership,624 /// How many bytes of data are available for sponsorship.625 SponsoredDataSize,626 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]627 SponsoredDataRateLimit,628 /// How many tokens can be mined into this collection.629 TokenLimit,630 /// Timeouts for transfer sponsoring.631 SponsorTransferTimeout,632 /// Timeout for sponsoring an approval in passed blocks.633 SponsorApproveTimeout,634 /// Whether the collection owner of the collection can send tokens (which belong to other users).635 OwnerCanTransfer,636 /// Can the collection owner burn other people's tokens.637 OwnerCanDestroy,638 /// Is it possible to send tokens from this collection between users.639 TransferEnabled640}641642/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension643/// @dev See https://eips.ethereum.org/EIPS/eip-721644/// @dev the ERC-165 identifier for this interface is 0x5b5e139f645contract ERC721Metadata is Dummy, ERC165 {646 // /// @notice A descriptive name for a collection of NFTs in this contract647 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`648 // /// @dev EVM selector for this function is: 0x06fdde03,649 // /// or in textual repr: name()650 // function name() public view returns (string memory) {651 // require(false, stub_error);652 // dummy;653 // return "";654 // }655656 // /// @notice An abbreviated name for NFTs in this contract657 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`658 // /// @dev EVM selector for this function is: 0x95d89b41,659 // /// or in textual repr: symbol()660 // function symbol() public view returns (string memory) {661 // require(false, stub_error);662 // dummy;663 // return "";664 // }665666 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.667 ///668 /// @dev If the token has a `url` property and it is not empty, it is returned.669 /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.670 /// If the collection property `baseURI` is empty or absent, return "" (empty string)671 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix672 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).673 ///674 /// @return token's const_metadata675 /// @dev EVM selector for this function is: 0xc87b56dd,676 /// or in textual repr: tokenURI(uint256)677 function tokenURI(uint256 tokenId) public view returns (string memory) {678 require(false, stub_error);679 tokenId;680 dummy;681 return "";682 }683}684685/// @title ERC721 Token that can be irreversibly burned (destroyed).686/// @dev the ERC-165 identifier for this interface is 0x42966c68687contract ERC721Burnable is Dummy, ERC165 {688 /// @notice Burns a specific ERC721 token.689 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized690 /// operator of the current owner.691 /// @param tokenId The NFT to approve692 /// @dev EVM selector for this function is: 0x42966c68,693 /// or in textual repr: burn(uint256)694 function burn(uint256 tokenId) public {695 require(false, stub_error);696 tokenId;697 dummy = 0;698 }699}700701/// @dev inlined interface702contract ERC721UniqueMintableEvents {703 event MintingFinished();704}705706/// @title ERC721 minting logic.707/// @dev the ERC-165 identifier for this interface is 0x476ff149708contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {709 /// @dev EVM selector for this function is: 0x05d2035b,710 /// or in textual repr: mintingFinished()711 function mintingFinished() public view returns (bool) {712 require(false, stub_error);713 dummy;714 return false;715 }716717 /// @notice Function to mint a token.718 /// @param to The new owner719 /// @return uint256 The id of the newly minted token720 /// @dev EVM selector for this function is: 0x6a627842,721 /// or in textual repr: mint(address)722 function mint(address to) public returns (uint256) {723 require(false, stub_error);724 to;725 dummy = 0;726 return 0;727 }728729 // /// @notice Function to mint a token.730 // /// @dev `tokenId` should be obtained with `nextTokenId` method,731 // /// unlike standard, you can't specify it manually732 // /// @param to The new owner733 // /// @param tokenId ID of the minted NFT734 // /// @dev EVM selector for this function is: 0x40c10f19,735 // /// or in textual repr: mint(address,uint256)736 // function mint(address to, uint256 tokenId) public returns (bool) {737 // require(false, stub_error);738 // to;739 // tokenId;740 // dummy = 0;741 // return false;742 // }743744 /// @notice Function to mint token with the given tokenUri.745 /// @param to The new owner746 /// @param tokenUri Token URI that would be stored in the NFT properties747 /// @return uint256 The id of the newly minted token748 /// @dev EVM selector for this function is: 0x45c17782,749 /// or in textual repr: mintWithTokenURI(address,string)750 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {751 require(false, stub_error);752 to;753 tokenUri;754 dummy = 0;755 return 0;756 }757758 // /// @notice Function to mint token with the given tokenUri.759 // /// @dev `tokenId` should be obtained with `nextTokenId` method,760 // /// unlike standard, you can't specify it manually761 // /// @param to The new owner762 // /// @param tokenId ID of the minted NFT763 // /// @param tokenUri Token URI that would be stored in the NFT properties764 // /// @dev EVM selector for this function is: 0x50bb4e7f,765 // /// or in textual repr: mintWithTokenURI(address,uint256,string)766 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {767 // require(false, stub_error);768 // to;769 // tokenId;770 // tokenUri;771 // dummy = 0;772 // return false;773 // }774775 /// @dev Not implemented776 /// @dev EVM selector for this function is: 0x7d64bcb4,777 /// or in textual repr: finishMinting()778 function finishMinting() public returns (bool) {779 require(false, stub_error);780 dummy = 0;781 return false;782 }783}784785/// @title Unique extensions for ERC721.786/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4787contract ERC721UniqueExtensions is Dummy, ERC165 {788 /// @notice A descriptive name for a collection of NFTs in this contract789 /// @dev EVM selector for this function is: 0x06fdde03,790 /// or in textual repr: name()791 function name() public view returns (string memory) {792 require(false, stub_error);793 dummy;794 return "";795 }796797 /// @notice An abbreviated name for NFTs in this contract798 /// @dev EVM selector for this function is: 0x95d89b41,799 /// or in textual repr: symbol()800 function symbol() public view returns (string memory) {801 require(false, stub_error);802 dummy;803 return "";804 }805806 /// @notice A description for the collection.807 /// @dev EVM selector for this function is: 0x7284e416,808 /// or in textual repr: description()809 function description() public view returns (string memory) {810 require(false, stub_error);811 dummy;812 return "";813 }814815 /// Returns the owner (in cross format) of the token.816 ///817 /// @param tokenId Id for the token.818 /// @dev EVM selector for this function is: 0x2b29dace,819 /// or in textual repr: crossOwnerOf(uint256)820 function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {821 require(false, stub_error);822 tokenId;823 dummy;824 return CrossAddress(0x0000000000000000000000000000000000000000, 0);825 }826827 /// Returns the token properties.828 ///829 /// @param tokenId Id for the token.830 /// @param keys Properties keys. Empty keys for all propertyes.831 /// @return Vector of properties key/value pairs.832 /// @dev EVM selector for this function is: 0xe07ede7e,833 /// or in textual repr: properties(uint256,string[])834 function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {835 require(false, stub_error);836 tokenId;837 keys;838 dummy;839 return new Property[](0);840 }841842 /// @notice Set or reaffirm the approved address for an NFT843 /// @dev The zero address indicates there is no approved address.844 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized845 /// operator of the current owner.846 /// @param approved The new substrate address approved NFT controller847 /// @param tokenId The NFT to approve848 /// @dev EVM selector for this function is: 0x0ecd0ab0,849 /// or in textual repr: approveCross((address,uint256),uint256)850 function approveCross(CrossAddress memory approved, uint256 tokenId) public {851 require(false, stub_error);852 approved;853 tokenId;854 dummy = 0;855 }856857 /// @notice Transfer ownership of an NFT858 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`859 /// is the zero address. Throws if `tokenId` is not a valid NFT.860 /// @param to The new owner861 /// @param tokenId The NFT to transfer862 /// @dev EVM selector for this function is: 0xa9059cbb,863 /// or in textual repr: transfer(address,uint256)864 function transfer(address to, uint256 tokenId) public {865 require(false, stub_error);866 to;867 tokenId;868 dummy = 0;869 }870871 /// @notice Transfer ownership of an NFT872 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`873 /// is the zero address. Throws if `tokenId` is not a valid NFT.874 /// @param to The new owner875 /// @param tokenId The NFT to transfer876 /// @dev EVM selector for this function is: 0x2ada85ff,877 /// or in textual repr: transferCross((address,uint256),uint256)878 function transferCross(CrossAddress memory to, uint256 tokenId) public {879 require(false, stub_error);880 to;881 tokenId;882 dummy = 0;883 }884885 /// @notice Transfer ownership of an NFT from cross account address to cross account address886 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`887 /// is the zero address. Throws if `tokenId` is not a valid NFT.888 /// @param from Cross acccount address of current owner889 /// @param to Cross acccount address of new owner890 /// @param tokenId The NFT to transfer891 /// @dev EVM selector for this function is: 0xd5cf430b,892 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)893 function transferFromCross(894 CrossAddress memory from,895 CrossAddress memory to,896 uint256 tokenId897 ) public {898 require(false, stub_error);899 from;900 to;901 tokenId;902 dummy = 0;903 }904905 // /// @notice Burns a specific ERC721 token.906 // /// @dev Throws unless `msg.sender` is the current owner or an authorized907 // /// operator for this NFT. Throws if `from` is not the current owner. Throws908 // /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.909 // /// @param from The current owner of the NFT910 // /// @param tokenId The NFT to transfer911 // /// @dev EVM selector for this function is: 0x79cc6790,912 // /// or in textual repr: burnFrom(address,uint256)913 // function burnFrom(address from, uint256 tokenId) public {914 // require(false, stub_error);915 // from;916 // tokenId;917 // dummy = 0;918 // }919920 /// @notice Burns a specific ERC721 token.921 /// @dev Throws unless `msg.sender` is the current owner or an authorized922 /// operator for this NFT. Throws if `from` is not the current owner. Throws923 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.924 /// @param from The current owner of the NFT925 /// @param tokenId The NFT to transfer926 /// @dev EVM selector for this function is: 0xbb2f5a58,927 /// or in textual repr: burnFromCross((address,uint256),uint256)928 function burnFromCross(CrossAddress memory from, uint256 tokenId) public {929 require(false, stub_error);930 from;931 tokenId;932 dummy = 0;933 }934935 /// @notice Returns next free NFT ID.936 /// @dev EVM selector for this function is: 0x75794a3c,937 /// or in textual repr: nextTokenId()938 function nextTokenId() public view returns (uint256) {939 require(false, stub_error);940 dummy;941 return 0;942 }943944 // /// @notice Function to mint multiple tokens.945 // /// @dev `tokenIds` should be an array of consecutive numbers and first number946 // /// should be obtained with `nextTokenId` method947 // /// @param to The new owner948 // /// @param tokenIds IDs of the minted NFTs949 // /// @dev EVM selector for this function is: 0x44a9945e,950 // /// or in textual repr: mintBulk(address,uint256[])951 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {952 // require(false, stub_error);953 // to;954 // tokenIds;955 // dummy = 0;956 // return false;957 // }958959 // /// @notice Function to mint multiple tokens with the given tokenUris.960 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive961 // /// numbers and first number should be obtained with `nextTokenId` method962 // /// @param to The new owner963 // /// @param tokens array of pairs of token ID and token URI for minted tokens964 // /// @dev EVM selector for this function is: 0x36543006,965 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])966 // function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {967 // require(false, stub_error);968 // to;969 // tokens;970 // dummy = 0;971 // return false;972 // }973974 /// @notice Function to mint a token.975 /// @param to The new owner crossAccountId976 /// @param properties Properties of minted token977 /// @return uint256 The id of the newly minted token978 /// @dev EVM selector for this function is: 0xb904db03,979 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])980 function mintCross(CrossAddress memory to, Property[] memory properties) public returns (uint256) {981 require(false, stub_error);982 to;983 properties;984 dummy = 0;985 return 0;986 }987}988989/// @dev anonymous struct990struct Tuple15 {991 uint256 field_0;992 string field_1;993}994995/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension996/// @dev See https://eips.ethereum.org/EIPS/eip-721997/// @dev the ERC-165 identifier for this interface is 0x780e9d63998contract ERC721Enumerable is Dummy, ERC165 {999 /// @notice Enumerate valid NFTs1000 /// @param index A counter less than `totalSupply()`1001 /// @return The token identifier for the `index`th NFT,1002 /// (sort order not specified)1003 /// @dev EVM selector for this function is: 0x4f6ccce7,1004 /// or in textual repr: tokenByIndex(uint256)1005 function tokenByIndex(uint256 index) public view returns (uint256) {1006 require(false, stub_error);1007 index;1008 dummy;1009 return 0;1010 }10111012 /// @dev Not implemented1013 /// @dev EVM selector for this function is: 0x2f745c59,1014 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)1015 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1016 require(false, stub_error);1017 owner;1018 index;1019 dummy;1020 return 0;1021 }10221023 /// @notice Count NFTs tracked by this contract1024 /// @return A count of valid NFTs tracked by this contract, where each one of1025 /// them has an assigned and queryable owner not equal to the zero address1026 /// @dev EVM selector for this function is: 0x18160ddd,1027 /// or in textual repr: totalSupply()1028 function totalSupply() public view returns (uint256) {1029 require(false, stub_error);1030 dummy;1031 return 0;1032 }1033}10341035/// @dev inlined interface1036contract ERC721Events {1037 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1038 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1039 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1040}10411042/// @title ERC-721 Non-Fungible Token Standard1043/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1044/// @dev the ERC-165 identifier for this interface is 0x983a942b1045contract ERC721 is Dummy, ERC165, ERC721Events {1046 /// @notice Count all NFTs assigned to an owner1047 /// @dev NFTs assigned to the zero address are considered invalid, and this1048 /// function throws for queries about the zero address.1049 /// @param owner An address for whom to query the balance1050 /// @return The number of NFTs owned by `owner`, possibly zero1051 /// @dev EVM selector for this function is: 0x70a08231,1052 /// or in textual repr: balanceOf(address)1053 function balanceOf(address owner) public view returns (uint256) {1054 require(false, stub_error);1055 owner;1056 dummy;1057 return 0;1058 }10591060 /// @notice Find the owner of an NFT1061 /// @dev NFTs assigned to zero address are considered invalid, and queries1062 /// about them do throw.1063 /// @param tokenId The identifier for an NFT1064 /// @return The address of the owner of the NFT1065 /// @dev EVM selector for this function is: 0x6352211e,1066 /// or in textual repr: ownerOf(uint256)1067 function ownerOf(uint256 tokenId) public view returns (address) {1068 require(false, stub_error);1069 tokenId;1070 dummy;1071 return 0x0000000000000000000000000000000000000000;1072 }10731074 /// @dev Not implemented1075 /// @dev EVM selector for this function is: 0xb88d4fde,1076 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)1077 function safeTransferFrom(1078 address from,1079 address to,1080 uint256 tokenId,1081 bytes memory data1082 ) public {1083 require(false, stub_error);1084 from;1085 to;1086 tokenId;1087 data;1088 dummy = 0;1089 }10901091 /// @dev Not implemented1092 /// @dev EVM selector for this function is: 0x42842e0e,1093 /// or in textual repr: safeTransferFrom(address,address,uint256)1094 function safeTransferFrom(1095 address from,1096 address to,1097 uint256 tokenId1098 ) public {1099 require(false, stub_error);1100 from;1101 to;1102 tokenId;1103 dummy = 0;1104 }11051106 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1107 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1108 /// THEY MAY BE PERMANENTLY LOST1109 /// @dev Throws unless `msg.sender` is the current owner or an authorized1110 /// operator for this NFT. Throws if `from` is not the current owner. Throws1111 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1112 /// @param from The current owner of the NFT1113 /// @param to The new owner1114 /// @param tokenId The NFT to transfer1115 /// @dev EVM selector for this function is: 0x23b872dd,1116 /// or in textual repr: transferFrom(address,address,uint256)1117 function transferFrom(1118 address from,1119 address to,1120 uint256 tokenId1121 ) public {1122 require(false, stub_error);1123 from;1124 to;1125 tokenId;1126 dummy = 0;1127 }11281129 /// @notice Set or reaffirm the approved address for an NFT1130 /// @dev The zero address indicates there is no approved address.1131 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1132 /// operator of the current owner.1133 /// @param approved The new approved NFT controller1134 /// @param tokenId The NFT to approve1135 /// @dev EVM selector for this function is: 0x095ea7b3,1136 /// or in textual repr: approve(address,uint256)1137 function approve(address approved, uint256 tokenId) public {1138 require(false, stub_error);1139 approved;1140 tokenId;1141 dummy = 0;1142 }11431144 /// @notice Sets or unsets the approval of a given operator.1145 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1146 /// @param operator Operator1147 /// @param approved Should operator status be granted or revoked?1148 /// @dev EVM selector for this function is: 0xa22cb465,1149 /// or in textual repr: setApprovalForAll(address,bool)1150 function setApprovalForAll(address operator, bool approved) public {1151 require(false, stub_error);1152 operator;1153 approved;1154 dummy = 0;1155 }11561157 /// @dev Not implemented1158 /// @dev EVM selector for this function is: 0x081812fc,1159 /// or in textual repr: getApproved(uint256)1160 function getApproved(uint256 tokenId) public view returns (address) {1161 require(false, stub_error);1162 tokenId;1163 dummy;1164 return 0x0000000000000000000000000000000000000000;1165 }11661167 /// @notice Tells whether the given `owner` approves the `operator`.1168 /// @dev EVM selector for this function is: 0xe985e9c5,1169 /// or in textual repr: isApprovedForAll(address,address)1170 function isApprovedForAll(address owner, address operator) public view returns (bool) {1171 require(false, stub_error);1172 owner;1173 operator;1174 dummy;1175 return false;1176 }11771178 /// @notice Returns collection helper contract address1179 /// @dev EVM selector for this function is: 0x1896cce6,1180 /// or in textual repr: collectionHelperAddress()1181 function collectionHelperAddress() public view returns (address) {1182 require(false, stub_error);1183 dummy;1184 return 0x0000000000000000000000000000000000000000;1185 }1186}11871188contract UniqueNFT is1189 Dummy,1190 ERC165,1191 ERC721,1192 ERC721Enumerable,1193 ERC721UniqueExtensions,1194 ERC721UniqueMintable,1195 ERC721Burnable,1196 ERC721Metadata,1197 Collection,1198 TokenProperties1199{}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
@@ -608,12 +608,14 @@
/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
- OptionUint value;
+ OptionUint256 value;
}
-/// Ethereum representation of Optional value with uint256.
-struct OptionUint {
+/// Optional value
+struct OptionUint256 {
+ /// Shows the status of accessibility of value
bool status;
+ /// Actual value if `status` is true
uint256 value;
}
runtime/common/identity.rsdiffbeforeafterboth--- a/runtime/common/identity.rs
+++ b/runtime/common/identity.rs
@@ -24,9 +24,6 @@
transaction_validity::{TransactionValidity, ValidTransaction, TransactionValidityError},
};
-#[cfg(feature = "collator-selection")]
-use sp_runtime::transaction_validity::InvalidTransaction;
-
#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]
pub struct DisableIdentityCalls;
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -222,7 +222,7 @@
{ "internalType": "bool", "name": "status", "type": "bool" },
{ "internalType": "uint256", "name": "value", "type": "uint256" }
],
- "internalType": "struct OptionUint",
+ "internalType": "struct OptionUint256",
"name": "value",
"type": "tuple"
}
@@ -508,7 +508,7 @@
{ "internalType": "bool", "name": "status", "type": "bool" },
{ "internalType": "uint256", "name": "value", "type": "uint256" }
],
- "internalType": "struct OptionUint",
+ "internalType": "struct OptionUint256",
"name": "value",
"type": "tuple"
}
tests/src/eth/abi/fungibleDeprecated.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungibleDeprecated.json
+++ b/tests/src/eth/abi/fungibleDeprecated.json
@@ -88,14 +88,5 @@
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
- },
- {
- "inputs": [
- { "internalType": "address", "name": "newOwner", "type": "address" }
- ],
- "name": "changeCollectionOwner",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
}
]
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -51,12 +51,6 @@
},
{
"anonymous": false,
- "inputs": [],
- "name": "MintingFinished",
- "type": "event"
- },
- {
- "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -252,7 +246,7 @@
{ "internalType": "bool", "name": "status", "type": "bool" },
{ "internalType": "uint256", "name": "value", "type": "uint256" }
],
- "internalType": "struct OptionUint",
+ "internalType": "struct OptionUint256",
"name": "value",
"type": "tuple"
}
@@ -420,13 +414,6 @@
"name": "description",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "finishMinting",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "nonpayable",
"type": "function"
},
{
@@ -513,13 +500,6 @@
"name": "mintWithTokenURI",
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
"stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "mintingFinished",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
"type": "function"
},
{
@@ -670,7 +650,7 @@
{ "internalType": "bool", "name": "status", "type": "bool" },
{ "internalType": "uint256", "name": "value", "type": "uint256" }
],
- "internalType": "struct OptionUint",
+ "internalType": "struct OptionUint256",
"name": "value",
"type": "tuple"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,12 +51,6 @@
},
{
"anonymous": false,
- "inputs": [],
- "name": "MintingFinished",
- "type": "event"
- },
- {
- "anonymous": false,
"inputs": [
{
"indexed": true,
@@ -234,7 +228,7 @@
{ "internalType": "bool", "name": "status", "type": "bool" },
{ "internalType": "uint256", "name": "value", "type": "uint256" }
],
- "internalType": "struct OptionUint",
+ "internalType": "struct OptionUint256",
"name": "value",
"type": "tuple"
}
@@ -402,13 +396,6 @@
"name": "description",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
"stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "finishMinting",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "nonpayable",
"type": "function"
},
{
@@ -495,13 +482,6 @@
"name": "mintWithTokenURI",
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
"stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "mintingFinished",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
"type": "function"
},
{
@@ -652,7 +632,7 @@
{ "internalType": "bool", "name": "status", "type": "bool" },
{ "internalType": "uint256", "name": "value", "type": "uint256" }
],
- "internalType": "struct OptionUint",
+ "internalType": "struct OptionUint256",
"name": "value",
"type": "tuple"
}
tests/src/eth/abi/reFungibleDeprecated.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleDeprecated.json
+++ b/tests/src/eth/abi/reFungibleDeprecated.json
@@ -82,6 +82,17 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "name": "setProperty",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "changeCollectionOwner",
tests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,16 +98,6 @@
},
{
"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/abi/reFungibleTokenDeprecated.jsondiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/abi/reFungibleTokenDeprecated.json
@@ -0,0 +1,12 @@
+[
+ {
+ "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"
+ }
+]
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -181,11 +181,11 @@
Generous
}
-/// Ethereum representation of Optional value with CrossAddress.
+/// Optional value
struct OptionCrossAddress {
- /// Whether or not this CrossAdress is valid and has meaning.
+ /// Shows the status of accessibility of value
bool status;
- /// The underlying CrossAddress value. If the status is false, can be set to whatever.
+ /// Actual value if `status` is true
CrossAddress value;
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -308,12 +308,14 @@
/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
- OptionUint value;
+ OptionUint256 value;
}
-/// Ethereum representation of Optional value with uint256.
-struct OptionUint {
+/// Optional value
+struct OptionUint256 {
+ /// Shows the status of accessibility of value
bool status;
+ /// Actual value if `status` is true
uint256 value;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -408,12 +408,14 @@
/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
- OptionUint value;
+ OptionUint256 value;
}
-/// Ethereum representation of Optional value with uint256.
-struct OptionUint {
+/// Optional value
+struct OptionUint256 {
+ /// Shows the status of accessibility of value
bool status;
+ /// Actual value if `status` is true
uint256 value;
}
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -408,12 +408,14 @@
/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
struct CollectionLimit {
CollectionLimitField field;
- OptionUint value;
+ OptionUint256 value;
}
-/// Ethereum representation of Optional value with uint256.
-struct OptionUint {
+/// Optional value
+struct OptionUint256 {
+ /// Shows the status of accessibility of value
bool status;
+ /// Actual value if `status` is true
uint256 value;
}
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -213,7 +213,7 @@
const address = helper.ethAddress.fromCollectionId(collection.collectionId);
const contract = await helper.ethNativeContract.collection(address, 'rft');
- const rftToken = await helper.ethNativeContract.rftTokenById(token.collectionId, token.tokenId, owner);
+ const rftToken = await helper.ethNativeContract.rftTokenById(token.collectionId, token.tokenId, owner, true);
{
await rftToken.methods.approve(operator, 15n).send({from: owner});
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -413,7 +413,7 @@
const result = await contract.methods.mint(caller).send();
const tokenId = result.events.Transfer.returnValues.tokenId;
const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);
- const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, caller);
+ const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, caller, true);
await tokenContract.methods.repartition(2).send();
await tokenContract.methods.transfer(receiver, 1).send();
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -29,6 +29,7 @@
import refungibleAbi from '../../abi/reFungible.json';
import refungibleDeprecatedAbi from '../../abi/reFungibleDeprecated.json';
import refungibleTokenAbi from '../../abi/reFungibleToken.json';
+import refungibleTokenDeprecatedAbi from '../../abi/reFungibleTokenDeprecated.json';
import contractHelpersAbi from '../../abi/contractHelpers.json';
import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';
import {TCollectionMode} from '../../../util/playgrounds/types';
@@ -187,17 +188,18 @@
return this.collection(this.helper.ethAddress.fromCollectionId(collectionId), mode, caller, mergeDeprecated);
}
- async rftToken(address: string, caller?: string) {
+ async rftToken(address: string, caller?: string, mergeDeprecated = false) {
const web3 = this.helper.getWeb3();
- return unlimitedMoneyHack(new web3.eth.Contract(refungibleTokenAbi as any, address, {
+ const abi = mergeDeprecated ? [...refungibleTokenAbi, ...refungibleTokenDeprecatedAbi] : refungibleTokenAbi;
+ return unlimitedMoneyHack(new web3.eth.Contract(abi as any, address, {
gas: this.helper.eth.DEFAULT_GAS,
gasPrice: await this.getGasPrice(),
...(caller ? {from: caller} : {}),
}));
}
- rftTokenById(collectionId: number, tokenId: number, caller?: string) {
- return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);
+ rftTokenById(collectionId: number, tokenId: number, caller?: string, mergeDeprecated = false) {
+ return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller, mergeDeprecated);
}
}