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.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.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;
}
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.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0xde0695c217interface TokenProperties is Dummy, ERC165 {18 // /// @notice Set permissions for token property.19 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20 // /// @param key Property key.21 // /// @param isMutable Permission to mutate property.22 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24 // /// @dev EVM selector for this function is: 0x222d97fa,25 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) external;2728 /// @notice Set permissions for token property.29 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.30 /// @param permissions Permissions for keys.31 /// @dev EVM selector for this function is: 0xbd92983a,32 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])33 function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;3435 /// @notice Get permissions for token properties.36 /// @dev EVM selector for this function is: 0xf23d7790,37 /// or in textual repr: tokenPropertyPermissions()38 function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);3940 // /// @notice Set token property value.41 // /// @dev Throws error if `msg.sender` has no permission to edit the property.42 // /// @param tokenId ID of the token.43 // /// @param key Property key.44 // /// @param value Property value.45 // /// @dev EVM selector for this function is: 0x1752d67b,46 // /// or in textual repr: setProperty(uint256,string,bytes)47 // function setProperty(uint256 tokenId, string memory key, bytes memory value) external;4849 /// @notice Set token properties value.50 /// @dev Throws error if `msg.sender` has no permission to edit the property.51 /// @param tokenId ID of the token.52 /// @param properties settable properties53 /// @dev EVM selector for this function is: 0x14ed3a6e,54 /// or in textual repr: setProperties(uint256,(string,bytes)[])55 function setProperties(uint256 tokenId, Property[] memory properties) external;5657 // /// @notice Delete token property value.58 // /// @dev Throws error if `msg.sender` has no permission to edit the property.59 // /// @param tokenId ID of the token.60 // /// @param key Property key.61 // /// @dev EVM selector for this function is: 0x066111d1,62 // /// or in textual repr: deleteProperty(uint256,string)63 // function deleteProperty(uint256 tokenId, string memory key) external;6465 /// @notice Delete token properties value.66 /// @dev Throws error if `msg.sender` has no permission to edit the property.67 /// @param tokenId ID of the token.68 /// @param keys Properties key.69 /// @dev EVM selector for this function is: 0xc472d371,70 /// or in textual repr: deleteProperties(uint256,string[])71 function deleteProperties(uint256 tokenId, string[] memory keys) external;7273 /// @notice Get token property value.74 /// @dev Throws error if key not found75 /// @param tokenId ID of the token.76 /// @param key Property key.77 /// @return Property value bytes78 /// @dev EVM selector for this function is: 0x7228c327,79 /// or in textual repr: property(uint256,string)80 function property(uint256 tokenId, string memory key) external view returns (bytes memory);81}8283/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).84struct Property {85 string key;86 bytes value;87}8889/// Ethereum representation of Token Property Permissions.90struct TokenPropertyPermission {91 /// Token property key.92 string key;93 /// Token property permissions.94 PropertyPermission[] permissions;95}9697/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.98struct PropertyPermission {99 /// TokenPermission field.100 TokenPermissionField code;101 /// TokenPermission value.102 bool value;103}104105/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.106enum TokenPermissionField {107 /// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]108 Mutable,109 /// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]110 TokenOwner,111 /// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]112 CollectionAdmin113}114115/// @title A contract that allows you to work with collections.116/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1117interface Collection is Dummy, ERC165 {118 // /// Set collection property.119 // ///120 // /// @param key Property key.121 // /// @param value Propery value.122 // /// @dev EVM selector for this function is: 0x2f073f66,123 // /// or in textual repr: setCollectionProperty(string,bytes)124 // function setCollectionProperty(string memory key, bytes memory value) external;125126 /// Set collection properties.127 ///128 /// @param properties Vector of properties key/value pair.129 /// @dev EVM selector for this function is: 0x50b26b2a,130 /// or in textual repr: setCollectionProperties((string,bytes)[])131 function setCollectionProperties(Property[] memory properties) external;132133 // /// Delete collection property.134 // ///135 // /// @param key Property key.136 // /// @dev EVM selector for this function is: 0x7b7debce,137 // /// or in textual repr: deleteCollectionProperty(string)138 // function deleteCollectionProperty(string memory key) external;139140 /// Delete collection properties.141 ///142 /// @param keys Properties keys.143 /// @dev EVM selector for this function is: 0xee206ee3,144 /// or in textual repr: deleteCollectionProperties(string[])145 function deleteCollectionProperties(string[] memory keys) external;146147 /// Get collection property.148 ///149 /// @dev Throws error if key not found.150 ///151 /// @param key Property key.152 /// @return bytes The property corresponding to the key.153 /// @dev EVM selector for this function is: 0xcf24fd6d,154 /// or in textual repr: collectionProperty(string)155 function collectionProperty(string memory key) external view returns (bytes memory);156157 /// Get collection properties.158 ///159 /// @param keys Properties keys. Empty keys for all propertyes.160 /// @return Vector of properties key/value pairs.161 /// @dev EVM selector for this function is: 0x285fb8e6,162 /// or in textual repr: collectionProperties(string[])163 function collectionProperties(string[] memory keys) external view returns (Property[] memory);164165 // /// Set the sponsor of the collection.166 // ///167 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.168 // ///169 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.170 // /// @dev EVM selector for this function is: 0x7623402e,171 // /// or in textual repr: setCollectionSponsor(address)172 // function setCollectionSponsor(address sponsor) external;173174 /// Set the sponsor of the collection.175 ///176 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.177 ///178 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.179 /// @dev EVM selector for this function is: 0x84a1d5a8,180 /// or in textual repr: setCollectionSponsorCross((address,uint256))181 function setCollectionSponsorCross(CrossAddress memory sponsor) external;182183 /// Whether there is a pending sponsor.184 /// @dev EVM selector for this function is: 0x058ac185,185 /// or in textual repr: hasCollectionPendingSponsor()186 function hasCollectionPendingSponsor() external view returns (bool);187188 /// Collection sponsorship confirmation.189 ///190 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.191 /// @dev EVM selector for this function is: 0x3c50e97a,192 /// or in textual repr: confirmCollectionSponsorship()193 function confirmCollectionSponsorship() external;194195 /// Remove collection sponsor.196 /// @dev EVM selector for this function is: 0x6e0326a3,197 /// or in textual repr: removeCollectionSponsor()198 function removeCollectionSponsor() external;199200 /// Get current sponsor.201 ///202 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.203 /// @dev EVM selector for this function is: 0x6ec0a9f1,204 /// or in textual repr: collectionSponsor()205 function collectionSponsor() external view returns (CrossAddress memory);206207 /// Get current collection limits.208 ///209 /// @return Array of collection limits210 /// @dev EVM selector for this function is: 0xf63bc572,211 /// or in textual repr: collectionLimits()212 function collectionLimits() external view returns (CollectionLimit[] memory);213214 /// Set limits for the collection.215 /// @dev Throws error if limit not found.216 /// @param limit Some limit.217 /// @dev EVM selector for this function is: 0x2316ee74,218 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))219 function setCollectionLimit(CollectionLimit memory limit) external;220221 /// Get contract address.222 /// @dev EVM selector for this function is: 0xf6b4dfb4,223 /// or in textual repr: contractAddress()224 function contractAddress() external view returns (address);225226 /// Add collection admin.227 /// @param newAdmin Cross account administrator address.228 /// @dev EVM selector for this function is: 0x859aa7d6,229 /// or in textual repr: addCollectionAdminCross((address,uint256))230 function addCollectionAdminCross(CrossAddress memory newAdmin) external;231232 /// Remove collection admin.233 /// @param admin Cross account administrator address.234 /// @dev EVM selector for this function is: 0x6c0cd173,235 /// or in textual repr: removeCollectionAdminCross((address,uint256))236 function removeCollectionAdminCross(CrossAddress memory admin) external;237238 // /// Add collection admin.239 // /// @param newAdmin Address of the added administrator.240 // /// @dev EVM selector for this function is: 0x92e462c7,241 // /// or in textual repr: addCollectionAdmin(address)242 // function addCollectionAdmin(address newAdmin) external;243244 // /// Remove collection admin.245 // ///246 // /// @param admin Address of the removed administrator.247 // /// @dev EVM selector for this function is: 0xfafd7b42,248 // /// or in textual repr: removeCollectionAdmin(address)249 // function removeCollectionAdmin(address admin) external;250251 /// Toggle accessibility of collection nesting.252 ///253 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'254 /// @dev EVM selector for this function is: 0x112d4586,255 /// or in textual repr: setCollectionNesting(bool)256 function setCollectionNesting(bool enable) external;257258 /// Toggle accessibility of collection nesting.259 ///260 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'261 /// @param collections Addresses of collections that will be available for nesting.262 /// @dev EVM selector for this function is: 0x64872396,263 /// or in textual repr: setCollectionNesting(bool,address[])264 function setCollectionNesting(bool enable, address[] memory collections) external;265266 /// Returns nesting for a collection267 /// @dev EVM selector for this function is: 0x22d25bfe,268 /// or in textual repr: collectionNestingRestrictedCollectionIds()269 function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);270271 /// Returns permissions for a collection272 /// @dev EVM selector for this function is: 0x5b2eaf4b,273 /// or in textual repr: collectionNestingPermissions()274 function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);275276 /// Set the collection access method.277 /// @param mode Access mode278 /// 0 for Normal279 /// 1 for AllowList280 /// @dev EVM selector for this function is: 0x41835d4c,281 /// or in textual repr: setCollectionAccess(uint8)282 function setCollectionAccess(uint8 mode) external;283284 /// Checks that user allowed to operate with collection.285 ///286 /// @param user User address to check.287 /// @dev EVM selector for this function is: 0x91b6df49,288 /// or in textual repr: allowlistedCross((address,uint256))289 function allowlistedCross(CrossAddress memory user) external view returns (bool);290291 // /// Add the user to the allowed list.292 // ///293 // /// @param user Address of a trusted user.294 // /// @dev EVM selector for this function is: 0x67844fe6,295 // /// or in textual repr: addToCollectionAllowList(address)296 // function addToCollectionAllowList(address user) external;297298 /// Add user to allowed list.299 ///300 /// @param user User cross account address.301 /// @dev EVM selector for this function is: 0xa0184a3a,302 /// or in textual repr: addToCollectionAllowListCross((address,uint256))303 function addToCollectionAllowListCross(CrossAddress memory user) external;304305 // /// Remove the user from the allowed list.306 // ///307 // /// @param user Address of a removed user.308 // /// @dev EVM selector for this function is: 0x85c51acb,309 // /// or in textual repr: removeFromCollectionAllowList(address)310 // function removeFromCollectionAllowList(address user) external;311312 /// Remove user from allowed list.313 ///314 /// @param user User cross account address.315 /// @dev EVM selector for this function is: 0x09ba452a,316 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))317 function removeFromCollectionAllowListCross(CrossAddress memory user) external;318319 /// Switch permission for minting.320 ///321 /// @param mode Enable if "true".322 /// @dev EVM selector for this function is: 0x00018e84,323 /// or in textual repr: setCollectionMintMode(bool)324 function setCollectionMintMode(bool mode) external;325326 // /// Check that account is the owner or admin of the collection327 // ///328 // /// @param user account to verify329 // /// @return "true" if account is the owner or admin330 // /// @dev EVM selector for this function is: 0x9811b0c7,331 // /// or in textual repr: isOwnerOrAdmin(address)332 // function isOwnerOrAdmin(address user) external view returns (bool);333334 /// Check that account is the owner or admin of the collection335 ///336 /// @param user User cross account to verify337 /// @return "true" if account is the owner or admin338 /// @dev EVM selector for this function is: 0x3e75a905,339 /// or in textual repr: isOwnerOrAdminCross((address,uint256))340 function isOwnerOrAdminCross(CrossAddress memory user) external view returns (bool);341342 /// Returns collection type343 ///344 /// @return `Fungible` or `NFT` or `ReFungible`345 /// @dev EVM selector for this function is: 0xd34b55b8,346 /// or in textual repr: uniqueCollectionType()347 function uniqueCollectionType() external view returns (string memory);348349 /// Get collection owner.350 ///351 /// @return Tuble with sponsor address and his substrate mirror.352 /// If address is canonical then substrate mirror is zero and vice versa.353 /// @dev EVM selector for this function is: 0xdf727d3b,354 /// or in textual repr: collectionOwner()355 function collectionOwner() external view returns (CrossAddress memory);356357 // /// Changes collection owner to another account358 // ///359 // /// @dev Owner can be changed only by current owner360 // /// @param newOwner new owner account361 // /// @dev EVM selector for this function is: 0x4f53e226,362 // /// or in textual repr: changeCollectionOwner(address)363 // function changeCollectionOwner(address newOwner) external;364365 /// Get collection administrators366 ///367 /// @return Vector of tuples with admins address and his substrate mirror.368 /// If address is canonical then substrate mirror is zero and vice versa.369 /// @dev EVM selector for this function is: 0x5813216b,370 /// or in textual repr: collectionAdmins()371 function collectionAdmins() external view returns (CrossAddress[] memory);372373 /// Changes collection owner to another account374 ///375 /// @dev Owner can be changed only by current owner376 /// @param newOwner new owner cross account377 /// @dev EVM selector for this function is: 0x6496c497,378 /// or in textual repr: changeCollectionOwnerCross((address,uint256))379 function changeCollectionOwnerCross(CrossAddress memory newOwner) external;380}381382/// Cross account struct383struct CrossAddress {384 address eth;385 uint256 sub;386}387388/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.389struct CollectionNestingPermission {390 CollectionPermissionField field;391 bool value;392}393394/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.395enum CollectionPermissionField {396 /// Owner of token can nest tokens under it.397 TokenOwner,398 /// Admin of token collection can nest tokens under token.399 CollectionAdmin400}401402/// Nested collections.403struct CollectionNesting {404 bool token_owner;405 uint256[] ids;406}407408/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.409struct CollectionLimit {410 CollectionLimitField field;411 OptionUint value;412}413414/// Ethereum representation of Optional value with uint256.415struct OptionUint {416 bool status;417 uint256 value;418}419420/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.421enum CollectionLimitField {422 /// How many tokens can a user have on one account.423 AccountTokenOwnership,424 /// How many bytes of data are available for sponsorship.425 SponsoredDataSize,426 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]427 SponsoredDataRateLimit,428 /// How many tokens can be mined into this collection.429 TokenLimit,430 /// Timeouts for transfer sponsoring.431 SponsorTransferTimeout,432 /// Timeout for sponsoring an approval in passed blocks.433 SponsorApproveTimeout,434 /// Whether the collection owner of the collection can send tokens (which belong to other users).435 OwnerCanTransfer,436 /// Can the collection owner burn other people's tokens.437 OwnerCanDestroy,438 /// Is it possible to send tokens from this collection between users.439 TransferEnabled440}441442/// @dev the ERC-165 identifier for this interface is 0x5b5e139f443interface ERC721Metadata is Dummy, ERC165 {444 // /// @notice A descriptive name for a collection of NFTs in this contract445 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`446 // /// @dev EVM selector for this function is: 0x06fdde03,447 // /// or in textual repr: name()448 // function name() external view returns (string memory);449450 // /// @notice An abbreviated name for NFTs in this contract451 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`452 // /// @dev EVM selector for this function is: 0x95d89b41,453 // /// or in textual repr: symbol()454 // function symbol() external view returns (string memory);455456 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.457 ///458 /// @dev If the token has a `url` property and it is not empty, it is returned.459 /// 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`.460 /// If the collection property `baseURI` is empty or absent, return "" (empty string)461 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix462 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).463 ///464 /// @return token's const_metadata465 /// @dev EVM selector for this function is: 0xc87b56dd,466 /// or in textual repr: tokenURI(uint256)467 function tokenURI(uint256 tokenId) external view returns (string memory);468}469470/// @title ERC721 Token that can be irreversibly burned (destroyed).471/// @dev the ERC-165 identifier for this interface is 0x42966c68472interface ERC721Burnable is Dummy, ERC165 {473 /// @notice Burns a specific ERC721 token.474 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized475 /// operator of the current owner.476 /// @param tokenId The RFT to approve477 /// @dev EVM selector for this function is: 0x42966c68,478 /// or in textual repr: burn(uint256)479 function burn(uint256 tokenId) external;480}481482/// @dev inlined interface483interface ERC721UniqueMintableEvents {484 event MintingFinished();485}486487/// @title ERC721 minting logic.488/// @dev the ERC-165 identifier for this interface is 0x476ff149489interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {490 /// @dev EVM selector for this function is: 0x05d2035b,491 /// or in textual repr: mintingFinished()492 function mintingFinished() external view returns (bool);493494 /// @notice Function to mint a token.495 /// @param to The new owner496 /// @return uint256 The id of the newly minted token497 /// @dev EVM selector for this function is: 0x6a627842,498 /// or in textual repr: mint(address)499 function mint(address to) external returns (uint256);500501 // /// @notice Function to mint a token.502 // /// @dev `tokenId` should be obtained with `nextTokenId` method,503 // /// unlike standard, you can't specify it manually504 // /// @param to The new owner505 // /// @param tokenId ID of the minted RFT506 // /// @dev EVM selector for this function is: 0x40c10f19,507 // /// or in textual repr: mint(address,uint256)508 // function mint(address to, uint256 tokenId) external returns (bool);509510 /// @notice Function to mint token with the given tokenUri.511 /// @param to The new owner512 /// @param tokenUri Token URI that would be stored in the NFT properties513 /// @return uint256 The id of the newly minted token514 /// @dev EVM selector for this function is: 0x45c17782,515 /// or in textual repr: mintWithTokenURI(address,string)516 function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);517518 // /// @notice Function to mint token with the given tokenUri.519 // /// @dev `tokenId` should be obtained with `nextTokenId` method,520 // /// unlike standard, you can't specify it manually521 // /// @param to The new owner522 // /// @param tokenId ID of the minted RFT523 // /// @param tokenUri Token URI that would be stored in the RFT properties524 // /// @dev EVM selector for this function is: 0x50bb4e7f,525 // /// or in textual repr: mintWithTokenURI(address,uint256,string)526 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);527528 /// @dev Not implemented529 /// @dev EVM selector for this function is: 0x7d64bcb4,530 /// or in textual repr: finishMinting()531 function finishMinting() external returns (bool);532}533534/// @title Unique extensions for ERC721.535/// @dev the ERC-165 identifier for this interface is 0xabf30dc2536interface ERC721UniqueExtensions is Dummy, ERC165 {537 /// @notice A descriptive name for a collection of NFTs in this contract538 /// @dev EVM selector for this function is: 0x06fdde03,539 /// or in textual repr: name()540 function name() external view returns (string memory);541542 /// @notice An abbreviated name for NFTs in this contract543 /// @dev EVM selector for this function is: 0x95d89b41,544 /// or in textual repr: symbol()545 function symbol() external view returns (string memory);546547 /// @notice A description for the collection.548 /// @dev EVM selector for this function is: 0x7284e416,549 /// or in textual repr: description()550 function description() external view returns (string memory);551552 /// Returns the owner (in cross format) of the token.553 ///554 /// @param tokenId Id for the token.555 /// @dev EVM selector for this function is: 0x2b29dace,556 /// or in textual repr: crossOwnerOf(uint256)557 function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);558559 /// Returns the token properties.560 ///561 /// @param tokenId Id for the token.562 /// @param keys Properties keys. Empty keys for all propertyes.563 /// @return Vector of properties key/value pairs.564 /// @dev EVM selector for this function is: 0xe07ede7e,565 /// or in textual repr: properties(uint256,string[])566 function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);567568 /// @notice Transfer ownership of an RFT569 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`570 /// is the zero address. Throws if `tokenId` is not a valid RFT.571 /// Throws if RFT pieces have multiple owners.572 /// @param to The new owner573 /// @param tokenId The RFT to transfer574 /// @dev EVM selector for this function is: 0xa9059cbb,575 /// or in textual repr: transfer(address,uint256)576 function transfer(address to, uint256 tokenId) external;577578 /// @notice Transfer ownership of an RFT579 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`580 /// is the zero address. Throws if `tokenId` is not a valid RFT.581 /// Throws if RFT pieces have multiple owners.582 /// @param to The new owner583 /// @param tokenId The RFT to transfer584 /// @dev EVM selector for this function is: 0x2ada85ff,585 /// or in textual repr: transferCross((address,uint256),uint256)586 function transferCross(CrossAddress memory to, uint256 tokenId) external;587588 /// @notice Transfer ownership of an RFT589 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`590 /// is the zero address. Throws if `tokenId` is not a valid RFT.591 /// Throws if RFT pieces have multiple owners.592 /// @param to The new owner593 /// @param tokenId The RFT to transfer594 /// @dev EVM selector for this function is: 0xd5cf430b,595 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)596 function transferFromCross(597 CrossAddress memory from,598 CrossAddress memory to,599 uint256 tokenId600 ) external;601602 // /// @notice Burns a specific ERC721 token.603 // /// @dev Throws unless `msg.sender` is the current owner or an authorized604 // /// operator for this RFT. Throws if `from` is not the current owner. Throws605 // /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.606 // /// Throws if RFT pieces have multiple owners.607 // /// @param from The current owner of the RFT608 // /// @param tokenId The RFT to transfer609 // /// @dev EVM selector for this function is: 0x79cc6790,610 // /// or in textual repr: burnFrom(address,uint256)611 // function burnFrom(address from, uint256 tokenId) external;612613 /// @notice Burns a specific ERC721 token.614 /// @dev Throws unless `msg.sender` is the current owner or an authorized615 /// operator for this RFT. Throws if `from` is not the current owner. Throws616 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.617 /// Throws if RFT pieces have multiple owners.618 /// @param from The current owner of the RFT619 /// @param tokenId The RFT to transfer620 /// @dev EVM selector for this function is: 0xbb2f5a58,621 /// or in textual repr: burnFromCross((address,uint256),uint256)622 function burnFromCross(CrossAddress memory from, uint256 tokenId) external;623624 /// @notice Returns next free RFT ID.625 /// @dev EVM selector for this function is: 0x75794a3c,626 /// or in textual repr: nextTokenId()627 function nextTokenId() external view returns (uint256);628629 // /// @notice Function to mint multiple tokens.630 // /// @dev `tokenIds` should be an array of consecutive numbers and first number631 // /// should be obtained with `nextTokenId` method632 // /// @param to The new owner633 // /// @param tokenIds IDs of the minted RFTs634 // /// @dev EVM selector for this function is: 0x44a9945e,635 // /// or in textual repr: mintBulk(address,uint256[])636 // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);637638 // /// @notice Function to mint multiple tokens with the given tokenUris.639 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive640 // /// numbers and first number should be obtained with `nextTokenId` method641 // /// @param to The new owner642 // /// @param tokens array of pairs of token ID and token URI for minted tokens643 // /// @dev EVM selector for this function is: 0x36543006,644 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])645 // function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);646647 /// @notice Function to mint a token.648 /// @param to The new owner crossAccountId649 /// @param properties Properties of minted token650 /// @return uint256 The id of the newly minted token651 /// @dev EVM selector for this function is: 0xb904db03,652 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])653 function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);654655 /// Returns EVM address for refungible token656 ///657 /// @param token ID of the token658 /// @dev EVM selector for this function is: 0xab76fac6,659 /// or in textual repr: tokenContractAddress(uint256)660 function tokenContractAddress(uint256 token) external view returns (address);661}662663/// @dev anonymous struct664struct Tuple12 {665 uint256 field_0;666 string field_1;667}668669/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension670/// @dev See https://eips.ethereum.org/EIPS/eip-721671/// @dev the ERC-165 identifier for this interface is 0x780e9d63672interface ERC721Enumerable is Dummy, ERC165 {673 /// @notice Enumerate valid RFTs674 /// @param index A counter less than `totalSupply()`675 /// @return The token identifier for the `index`th NFT,676 /// (sort order not specified)677 /// @dev EVM selector for this function is: 0x4f6ccce7,678 /// or in textual repr: tokenByIndex(uint256)679 function tokenByIndex(uint256 index) external view returns (uint256);680681 /// Not implemented682 /// @dev EVM selector for this function is: 0x2f745c59,683 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)684 function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);685686 /// @notice Count RFTs tracked by this contract687 /// @return A count of valid RFTs tracked by this contract, where each one of688 /// them has an assigned and queryable owner not equal to the zero address689 /// @dev EVM selector for this function is: 0x18160ddd,690 /// or in textual repr: totalSupply()691 function totalSupply() external view returns (uint256);692}693694/// @dev inlined interface695interface ERC721Events {696 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);697 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);698 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);699}700701/// @title ERC-721 Non-Fungible Token Standard702/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md703/// @dev the ERC-165 identifier for this interface is 0x4016cd87704interface ERC721 is Dummy, ERC165, ERC721Events {705 /// @notice Count all RFTs assigned to an owner706 /// @dev RFTs assigned to the zero address are considered invalid, and this707 /// function throws for queries about the zero address.708 /// @param owner An address for whom to query the balance709 /// @return The number of RFTs owned by `owner`, possibly zero710 /// @dev EVM selector for this function is: 0x70a08231,711 /// or in textual repr: balanceOf(address)712 function balanceOf(address owner) external view returns (uint256);713714 /// @notice Find the owner of an RFT715 /// @dev RFTs assigned to zero address are considered invalid, and queries716 /// about them do throw.717 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for718 /// the tokens that are partially owned.719 /// @param tokenId The identifier for an RFT720 /// @return The address of the owner of the RFT721 /// @dev EVM selector for this function is: 0x6352211e,722 /// or in textual repr: ownerOf(uint256)723 function ownerOf(uint256 tokenId) external view returns (address);724725 /// @dev Not implemented726 /// @dev EVM selector for this function is: 0x60a11672,727 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)728 function safeTransferFromWithData(729 address from,730 address to,731 uint256 tokenId,732 bytes memory data733 ) external;734735 /// @dev Not implemented736 /// @dev EVM selector for this function is: 0x42842e0e,737 /// or in textual repr: safeTransferFrom(address,address,uint256)738 function safeTransferFrom(739 address from,740 address to,741 uint256 tokenId742 ) external;743744 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE745 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE746 /// THEY MAY BE PERMANENTLY LOST747 /// @dev Throws unless `msg.sender` is the current owner or an authorized748 /// operator for this RFT. Throws if `from` is not the current owner. Throws749 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.750 /// Throws if RFT pieces have multiple owners.751 /// @param from The current owner of the NFT752 /// @param to The new owner753 /// @param tokenId The NFT to transfer754 /// @dev EVM selector for this function is: 0x23b872dd,755 /// or in textual repr: transferFrom(address,address,uint256)756 function transferFrom(757 address from,758 address to,759 uint256 tokenId760 ) external;761762 /// @dev Not implemented763 /// @dev EVM selector for this function is: 0x095ea7b3,764 /// or in textual repr: approve(address,uint256)765 function approve(address approved, uint256 tokenId) external;766767 /// @notice Sets or unsets the approval of a given operator.768 /// The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.769 /// @param operator Operator770 /// @param approved Should operator status be granted or revoked?771 /// @dev EVM selector for this function is: 0xa22cb465,772 /// or in textual repr: setApprovalForAll(address,bool)773 function setApprovalForAll(address operator, bool approved) external;774775 /// @dev Not implemented776 /// @dev EVM selector for this function is: 0x081812fc,777 /// or in textual repr: getApproved(uint256)778 function getApproved(uint256 tokenId) external view returns (address);779780 /// @notice Tells whether the given `owner` approves the `operator`.781 /// @dev EVM selector for this function is: 0xe985e9c5,782 /// or in textual repr: isApprovedForAll(address,address)783 function isApprovedForAll(address owner, address operator) external view returns (bool);784785 /// @notice Returns collection helper contract address786 /// @dev EVM selector for this function is: 0x1896cce6,787 /// or in textual repr: collectionHelperAddress()788 function collectionHelperAddress() external view returns (address);789}790791interface UniqueRefungible is792 Dummy,793 ERC165,794 ERC721,795 ERC721Enumerable,796 ERC721UniqueExtensions,797 ERC721UniqueMintable,798 ERC721Burnable,799 ERC721Metadata,800 Collection,801 TokenProperties802{}1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0xde0695c217interface TokenProperties is Dummy, ERC165 {18 // /// @notice Set permissions for token property.19 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20 // /// @param key Property key.21 // /// @param isMutable Permission to mutate property.22 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24 // /// @dev EVM selector for this function is: 0x222d97fa,25 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) external;2728 /// @notice Set permissions for token property.29 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.30 /// @param permissions Permissions for keys.31 /// @dev EVM selector for this function is: 0xbd92983a,32 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])33 function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;3435 /// @notice Get permissions for token properties.36 /// @dev EVM selector for this function is: 0xf23d7790,37 /// or in textual repr: tokenPropertyPermissions()38 function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);3940 // /// @notice Set token property value.41 // /// @dev Throws error if `msg.sender` has no permission to edit the property.42 // /// @param tokenId ID of the token.43 // /// @param key Property key.44 // /// @param value Property value.45 // /// @dev EVM selector for this function is: 0x1752d67b,46 // /// or in textual repr: setProperty(uint256,string,bytes)47 // function setProperty(uint256 tokenId, string memory key, bytes memory value) external;4849 /// @notice Set token properties value.50 /// @dev Throws error if `msg.sender` has no permission to edit the property.51 /// @param tokenId ID of the token.52 /// @param properties settable properties53 /// @dev EVM selector for this function is: 0x14ed3a6e,54 /// or in textual repr: setProperties(uint256,(string,bytes)[])55 function setProperties(uint256 tokenId, Property[] memory properties) external;5657 // /// @notice Delete token property value.58 // /// @dev Throws error if `msg.sender` has no permission to edit the property.59 // /// @param tokenId ID of the token.60 // /// @param key Property key.61 // /// @dev EVM selector for this function is: 0x066111d1,62 // /// or in textual repr: deleteProperty(uint256,string)63 // function deleteProperty(uint256 tokenId, string memory key) external;6465 /// @notice Delete token properties value.66 /// @dev Throws error if `msg.sender` has no permission to edit the property.67 /// @param tokenId ID of the token.68 /// @param keys Properties key.69 /// @dev EVM selector for this function is: 0xc472d371,70 /// or in textual repr: deleteProperties(uint256,string[])71 function deleteProperties(uint256 tokenId, string[] memory keys) external;7273 /// @notice Get token property value.74 /// @dev Throws error if key not found75 /// @param tokenId ID of the token.76 /// @param key Property key.77 /// @return Property value bytes78 /// @dev EVM selector for this function is: 0x7228c327,79 /// or in textual repr: property(uint256,string)80 function property(uint256 tokenId, string memory key) external view returns (bytes memory);81}8283/// Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).84struct Property {85 string key;86 bytes value;87}8889/// Ethereum representation of Token Property Permissions.90struct TokenPropertyPermission {91 /// Token property key.92 string key;93 /// Token property permissions.94 PropertyPermission[] permissions;95}9697/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.98struct PropertyPermission {99 /// TokenPermission field.100 TokenPermissionField code;101 /// TokenPermission value.102 bool value;103}104105/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.106enum TokenPermissionField {107 /// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]108 Mutable,109 /// Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]110 TokenOwner,111 /// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]112 CollectionAdmin113}114115/// @title A contract that allows you to work with collections.116/// @dev the ERC-165 identifier for this interface is 0x2a14cfd1117interface Collection is Dummy, ERC165 {118 // /// Set collection property.119 // ///120 // /// @param key Property key.121 // /// @param value Propery value.122 // /// @dev EVM selector for this function is: 0x2f073f66,123 // /// or in textual repr: setCollectionProperty(string,bytes)124 // function setCollectionProperty(string memory key, bytes memory value) external;125126 /// Set collection properties.127 ///128 /// @param properties Vector of properties key/value pair.129 /// @dev EVM selector for this function is: 0x50b26b2a,130 /// or in textual repr: setCollectionProperties((string,bytes)[])131 function setCollectionProperties(Property[] memory properties) external;132133 // /// Delete collection property.134 // ///135 // /// @param key Property key.136 // /// @dev EVM selector for this function is: 0x7b7debce,137 // /// or in textual repr: deleteCollectionProperty(string)138 // function deleteCollectionProperty(string memory key) external;139140 /// Delete collection properties.141 ///142 /// @param keys Properties keys.143 /// @dev EVM selector for this function is: 0xee206ee3,144 /// or in textual repr: deleteCollectionProperties(string[])145 function deleteCollectionProperties(string[] memory keys) external;146147 /// Get collection property.148 ///149 /// @dev Throws error if key not found.150 ///151 /// @param key Property key.152 /// @return bytes The property corresponding to the key.153 /// @dev EVM selector for this function is: 0xcf24fd6d,154 /// or in textual repr: collectionProperty(string)155 function collectionProperty(string memory key) external view returns (bytes memory);156157 /// Get collection properties.158 ///159 /// @param keys Properties keys. Empty keys for all propertyes.160 /// @return Vector of properties key/value pairs.161 /// @dev EVM selector for this function is: 0x285fb8e6,162 /// or in textual repr: collectionProperties(string[])163 function collectionProperties(string[] memory keys) external view returns (Property[] memory);164165 // /// Set the sponsor of the collection.166 // ///167 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.168 // ///169 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.170 // /// @dev EVM selector for this function is: 0x7623402e,171 // /// or in textual repr: setCollectionSponsor(address)172 // function setCollectionSponsor(address sponsor) external;173174 /// Set the sponsor of the collection.175 ///176 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.177 ///178 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.179 /// @dev EVM selector for this function is: 0x84a1d5a8,180 /// or in textual repr: setCollectionSponsorCross((address,uint256))181 function setCollectionSponsorCross(CrossAddress memory sponsor) external;182183 /// Whether there is a pending sponsor.184 /// @dev EVM selector for this function is: 0x058ac185,185 /// or in textual repr: hasCollectionPendingSponsor()186 function hasCollectionPendingSponsor() external view returns (bool);187188 /// Collection sponsorship confirmation.189 ///190 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.191 /// @dev EVM selector for this function is: 0x3c50e97a,192 /// or in textual repr: confirmCollectionSponsorship()193 function confirmCollectionSponsorship() external;194195 /// Remove collection sponsor.196 /// @dev EVM selector for this function is: 0x6e0326a3,197 /// or in textual repr: removeCollectionSponsor()198 function removeCollectionSponsor() external;199200 /// Get current sponsor.201 ///202 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.203 /// @dev EVM selector for this function is: 0x6ec0a9f1,204 /// or in textual repr: collectionSponsor()205 function collectionSponsor() external view returns (CrossAddress memory);206207 /// Get current collection limits.208 ///209 /// @return Array of collection limits210 /// @dev EVM selector for this function is: 0xf63bc572,211 /// or in textual repr: collectionLimits()212 function collectionLimits() external view returns (CollectionLimit[] memory);213214 /// Set limits for the collection.215 /// @dev Throws error if limit not found.216 /// @param limit Some limit.217 /// @dev EVM selector for this function is: 0x2316ee74,218 /// or in textual repr: setCollectionLimit((uint8,(bool,uint256)))219 function setCollectionLimit(CollectionLimit memory limit) external;220221 /// Get contract address.222 /// @dev EVM selector for this function is: 0xf6b4dfb4,223 /// or in textual repr: contractAddress()224 function contractAddress() external view returns (address);225226 /// Add collection admin.227 /// @param newAdmin Cross account administrator address.228 /// @dev EVM selector for this function is: 0x859aa7d6,229 /// or in textual repr: addCollectionAdminCross((address,uint256))230 function addCollectionAdminCross(CrossAddress memory newAdmin) external;231232 /// Remove collection admin.233 /// @param admin Cross account administrator address.234 /// @dev EVM selector for this function is: 0x6c0cd173,235 /// or in textual repr: removeCollectionAdminCross((address,uint256))236 function removeCollectionAdminCross(CrossAddress memory admin) external;237238 // /// Add collection admin.239 // /// @param newAdmin Address of the added administrator.240 // /// @dev EVM selector for this function is: 0x92e462c7,241 // /// or in textual repr: addCollectionAdmin(address)242 // function addCollectionAdmin(address newAdmin) external;243244 // /// Remove collection admin.245 // ///246 // /// @param admin Address of the removed administrator.247 // /// @dev EVM selector for this function is: 0xfafd7b42,248 // /// or in textual repr: removeCollectionAdmin(address)249 // function removeCollectionAdmin(address admin) external;250251 /// Toggle accessibility of collection nesting.252 ///253 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'254 /// @dev EVM selector for this function is: 0x112d4586,255 /// or in textual repr: setCollectionNesting(bool)256 function setCollectionNesting(bool enable) external;257258 /// Toggle accessibility of collection nesting.259 ///260 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'261 /// @param collections Addresses of collections that will be available for nesting.262 /// @dev EVM selector for this function is: 0x64872396,263 /// or in textual repr: setCollectionNesting(bool,address[])264 function setCollectionNesting(bool enable, address[] memory collections) external;265266 /// Returns nesting for a collection267 /// @dev EVM selector for this function is: 0x22d25bfe,268 /// or in textual repr: collectionNestingRestrictedCollectionIds()269 function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);270271 /// Returns permissions for a collection272 /// @dev EVM selector for this function is: 0x5b2eaf4b,273 /// or in textual repr: collectionNestingPermissions()274 function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);275276 /// Set the collection access method.277 /// @param mode Access mode278 /// 0 for Normal279 /// 1 for AllowList280 /// @dev EVM selector for this function is: 0x41835d4c,281 /// or in textual repr: setCollectionAccess(uint8)282 function setCollectionAccess(uint8 mode) external;283284 /// Checks that user allowed to operate with collection.285 ///286 /// @param user User address to check.287 /// @dev EVM selector for this function is: 0x91b6df49,288 /// or in textual repr: allowlistedCross((address,uint256))289 function allowlistedCross(CrossAddress memory user) external view returns (bool);290291 // /// Add the user to the allowed list.292 // ///293 // /// @param user Address of a trusted user.294 // /// @dev EVM selector for this function is: 0x67844fe6,295 // /// or in textual repr: addToCollectionAllowList(address)296 // function addToCollectionAllowList(address user) external;297298 /// Add user to allowed list.299 ///300 /// @param user User cross account address.301 /// @dev EVM selector for this function is: 0xa0184a3a,302 /// or in textual repr: addToCollectionAllowListCross((address,uint256))303 function addToCollectionAllowListCross(CrossAddress memory user) external;304305 // /// Remove the user from the allowed list.306 // ///307 // /// @param user Address of a removed user.308 // /// @dev EVM selector for this function is: 0x85c51acb,309 // /// or in textual repr: removeFromCollectionAllowList(address)310 // function removeFromCollectionAllowList(address user) external;311312 /// Remove user from allowed list.313 ///314 /// @param user User cross account address.315 /// @dev EVM selector for this function is: 0x09ba452a,316 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))317 function removeFromCollectionAllowListCross(CrossAddress memory user) external;318319 /// Switch permission for minting.320 ///321 /// @param mode Enable if "true".322 /// @dev EVM selector for this function is: 0x00018e84,323 /// or in textual repr: setCollectionMintMode(bool)324 function setCollectionMintMode(bool mode) external;325326 // /// Check that account is the owner or admin of the collection327 // ///328 // /// @param user account to verify329 // /// @return "true" if account is the owner or admin330 // /// @dev EVM selector for this function is: 0x9811b0c7,331 // /// or in textual repr: isOwnerOrAdmin(address)332 // function isOwnerOrAdmin(address user) external view returns (bool);333334 /// Check that account is the owner or admin of the collection335 ///336 /// @param user User cross account to verify337 /// @return "true" if account is the owner or admin338 /// @dev EVM selector for this function is: 0x3e75a905,339 /// or in textual repr: isOwnerOrAdminCross((address,uint256))340 function isOwnerOrAdminCross(CrossAddress memory user) external view returns (bool);341342 /// Returns collection type343 ///344 /// @return `Fungible` or `NFT` or `ReFungible`345 /// @dev EVM selector for this function is: 0xd34b55b8,346 /// or in textual repr: uniqueCollectionType()347 function uniqueCollectionType() external view returns (string memory);348349 /// Get collection owner.350 ///351 /// @return Tuble with sponsor address and his substrate mirror.352 /// If address is canonical then substrate mirror is zero and vice versa.353 /// @dev EVM selector for this function is: 0xdf727d3b,354 /// or in textual repr: collectionOwner()355 function collectionOwner() external view returns (CrossAddress memory);356357 // /// Changes collection owner to another account358 // ///359 // /// @dev Owner can be changed only by current owner360 // /// @param newOwner new owner account361 // /// @dev EVM selector for this function is: 0x4f53e226,362 // /// or in textual repr: changeCollectionOwner(address)363 // function changeCollectionOwner(address newOwner) external;364365 /// Get collection administrators366 ///367 /// @return Vector of tuples with admins address and his substrate mirror.368 /// If address is canonical then substrate mirror is zero and vice versa.369 /// @dev EVM selector for this function is: 0x5813216b,370 /// or in textual repr: collectionAdmins()371 function collectionAdmins() external view returns (CrossAddress[] memory);372373 /// Changes collection owner to another account374 ///375 /// @dev Owner can be changed only by current owner376 /// @param newOwner new owner cross account377 /// @dev EVM selector for this function is: 0x6496c497,378 /// or in textual repr: changeCollectionOwnerCross((address,uint256))379 function changeCollectionOwnerCross(CrossAddress memory newOwner) external;380}381382/// Cross account struct383struct CrossAddress {384 address eth;385 uint256 sub;386}387388/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.389struct CollectionNestingPermission {390 CollectionPermissionField field;391 bool value;392}393394/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.395enum CollectionPermissionField {396 /// Owner of token can nest tokens under it.397 TokenOwner,398 /// Admin of token collection can nest tokens under token.399 CollectionAdmin400}401402/// Nested collections.403struct CollectionNesting {404 bool token_owner;405 uint256[] ids;406}407408/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.409struct CollectionLimit {410 CollectionLimitField field;411 OptionUint256 value;412}413414/// Optional value415struct OptionUint256 {416 /// Shows the status of accessibility of value417 bool status;418 /// Actual value if `status` is true419 uint256 value;420}421422/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.423enum CollectionLimitField {424 /// How many tokens can a user have on one account.425 AccountTokenOwnership,426 /// How many bytes of data are available for sponsorship.427 SponsoredDataSize,428 /// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]429 SponsoredDataRateLimit,430 /// How many tokens can be mined into this collection.431 TokenLimit,432 /// Timeouts for transfer sponsoring.433 SponsorTransferTimeout,434 /// Timeout for sponsoring an approval in passed blocks.435 SponsorApproveTimeout,436 /// Whether the collection owner of the collection can send tokens (which belong to other users).437 OwnerCanTransfer,438 /// Can the collection owner burn other people's tokens.439 OwnerCanDestroy,440 /// Is it possible to send tokens from this collection between users.441 TransferEnabled442}443444/// @dev the ERC-165 identifier for this interface is 0x5b5e139f445interface ERC721Metadata is Dummy, ERC165 {446 // /// @notice A descriptive name for a collection of NFTs in this contract447 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`448 // /// @dev EVM selector for this function is: 0x06fdde03,449 // /// or in textual repr: name()450 // function name() external view returns (string memory);451452 // /// @notice An abbreviated name for NFTs in this contract453 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`454 // /// @dev EVM selector for this function is: 0x95d89b41,455 // /// or in textual repr: symbol()456 // function symbol() external view returns (string memory);457458 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.459 ///460 /// @dev If the token has a `url` property and it is not empty, it is returned.461 /// 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`.462 /// If the collection property `baseURI` is empty or absent, return "" (empty string)463 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix464 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).465 ///466 /// @return token's const_metadata467 /// @dev EVM selector for this function is: 0xc87b56dd,468 /// or in textual repr: tokenURI(uint256)469 function tokenURI(uint256 tokenId) external view returns (string memory);470}471472/// @title ERC721 Token that can be irreversibly burned (destroyed).473/// @dev the ERC-165 identifier for this interface is 0x42966c68474interface ERC721Burnable is Dummy, ERC165 {475 /// @notice Burns a specific ERC721 token.476 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized477 /// operator of the current owner.478 /// @param tokenId The RFT to approve479 /// @dev EVM selector for this function is: 0x42966c68,480 /// or in textual repr: burn(uint256)481 function burn(uint256 tokenId) external;482}483484/// @dev inlined interface485interface ERC721UniqueMintableEvents {486 event MintingFinished();487}488489/// @title ERC721 minting logic.490/// @dev the ERC-165 identifier for this interface is 0x476ff149491interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {492 /// @dev EVM selector for this function is: 0x05d2035b,493 /// or in textual repr: mintingFinished()494 function mintingFinished() external view returns (bool);495496 /// @notice Function to mint a token.497 /// @param to The new owner498 /// @return uint256 The id of the newly minted token499 /// @dev EVM selector for this function is: 0x6a627842,500 /// or in textual repr: mint(address)501 function mint(address to) external returns (uint256);502503 // /// @notice Function to mint a token.504 // /// @dev `tokenId` should be obtained with `nextTokenId` method,505 // /// unlike standard, you can't specify it manually506 // /// @param to The new owner507 // /// @param tokenId ID of the minted RFT508 // /// @dev EVM selector for this function is: 0x40c10f19,509 // /// or in textual repr: mint(address,uint256)510 // function mint(address to, uint256 tokenId) external returns (bool);511512 /// @notice Function to mint token with the given tokenUri.513 /// @param to The new owner514 /// @param tokenUri Token URI that would be stored in the NFT properties515 /// @return uint256 The id of the newly minted token516 /// @dev EVM selector for this function is: 0x45c17782,517 /// or in textual repr: mintWithTokenURI(address,string)518 function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);519520 // /// @notice Function to mint token with the given tokenUri.521 // /// @dev `tokenId` should be obtained with `nextTokenId` method,522 // /// unlike standard, you can't specify it manually523 // /// @param to The new owner524 // /// @param tokenId ID of the minted RFT525 // /// @param tokenUri Token URI that would be stored in the RFT properties526 // /// @dev EVM selector for this function is: 0x50bb4e7f,527 // /// or in textual repr: mintWithTokenURI(address,uint256,string)528 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);529530 /// @dev Not implemented531 /// @dev EVM selector for this function is: 0x7d64bcb4,532 /// or in textual repr: finishMinting()533 function finishMinting() external returns (bool);534}535536/// @title Unique extensions for ERC721.537/// @dev the ERC-165 identifier for this interface is 0xabf30dc2538interface ERC721UniqueExtensions is Dummy, ERC165 {539 /// @notice A descriptive name for a collection of NFTs in this contract540 /// @dev EVM selector for this function is: 0x06fdde03,541 /// or in textual repr: name()542 function name() external view returns (string memory);543544 /// @notice An abbreviated name for NFTs in this contract545 /// @dev EVM selector for this function is: 0x95d89b41,546 /// or in textual repr: symbol()547 function symbol() external view returns (string memory);548549 /// @notice A description for the collection.550 /// @dev EVM selector for this function is: 0x7284e416,551 /// or in textual repr: description()552 function description() external view returns (string memory);553554 /// Returns the owner (in cross format) of the token.555 ///556 /// @param tokenId Id for the token.557 /// @dev EVM selector for this function is: 0x2b29dace,558 /// or in textual repr: crossOwnerOf(uint256)559 function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);560561 /// Returns the token properties.562 ///563 /// @param tokenId Id for the token.564 /// @param keys Properties keys. Empty keys for all propertyes.565 /// @return Vector of properties key/value pairs.566 /// @dev EVM selector for this function is: 0xe07ede7e,567 /// or in textual repr: properties(uint256,string[])568 function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);569570 /// @notice Transfer ownership of an RFT571 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`572 /// is the zero address. Throws if `tokenId` is not a valid RFT.573 /// Throws if RFT pieces have multiple owners.574 /// @param to The new owner575 /// @param tokenId The RFT to transfer576 /// @dev EVM selector for this function is: 0xa9059cbb,577 /// or in textual repr: transfer(address,uint256)578 function transfer(address to, uint256 tokenId) external;579580 /// @notice Transfer ownership of an RFT581 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`582 /// is the zero address. Throws if `tokenId` is not a valid RFT.583 /// Throws if RFT pieces have multiple owners.584 /// @param to The new owner585 /// @param tokenId The RFT to transfer586 /// @dev EVM selector for this function is: 0x2ada85ff,587 /// or in textual repr: transferCross((address,uint256),uint256)588 function transferCross(CrossAddress memory to, uint256 tokenId) external;589590 /// @notice Transfer ownership of an RFT591 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`592 /// is the zero address. Throws if `tokenId` is not a valid RFT.593 /// Throws if RFT pieces have multiple owners.594 /// @param to The new owner595 /// @param tokenId The RFT to transfer596 /// @dev EVM selector for this function is: 0xd5cf430b,597 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)598 function transferFromCross(599 CrossAddress memory from,600 CrossAddress memory to,601 uint256 tokenId602 ) external;603604 // /// @notice Burns a specific ERC721 token.605 // /// @dev Throws unless `msg.sender` is the current owner or an authorized606 // /// operator for this RFT. Throws if `from` is not the current owner. Throws607 // /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.608 // /// Throws if RFT pieces have multiple owners.609 // /// @param from The current owner of the RFT610 // /// @param tokenId The RFT to transfer611 // /// @dev EVM selector for this function is: 0x79cc6790,612 // /// or in textual repr: burnFrom(address,uint256)613 // function burnFrom(address from, uint256 tokenId) external;614615 /// @notice Burns a specific ERC721 token.616 /// @dev Throws unless `msg.sender` is the current owner or an authorized617 /// operator for this RFT. Throws if `from` is not the current owner. Throws618 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.619 /// Throws if RFT pieces have multiple owners.620 /// @param from The current owner of the RFT621 /// @param tokenId The RFT to transfer622 /// @dev EVM selector for this function is: 0xbb2f5a58,623 /// or in textual repr: burnFromCross((address,uint256),uint256)624 function burnFromCross(CrossAddress memory from, uint256 tokenId) external;625626 /// @notice Returns next free RFT ID.627 /// @dev EVM selector for this function is: 0x75794a3c,628 /// or in textual repr: nextTokenId()629 function nextTokenId() external view returns (uint256);630631 // /// @notice Function to mint multiple tokens.632 // /// @dev `tokenIds` should be an array of consecutive numbers and first number633 // /// should be obtained with `nextTokenId` method634 // /// @param to The new owner635 // /// @param tokenIds IDs of the minted RFTs636 // /// @dev EVM selector for this function is: 0x44a9945e,637 // /// or in textual repr: mintBulk(address,uint256[])638 // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);639640 // /// @notice Function to mint multiple tokens with the given tokenUris.641 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive642 // /// numbers and first number should be obtained with `nextTokenId` method643 // /// @param to The new owner644 // /// @param tokens array of pairs of token ID and token URI for minted tokens645 // /// @dev EVM selector for this function is: 0x36543006,646 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])647 // function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);648649 /// @notice Function to mint a token.650 /// @param to The new owner crossAccountId651 /// @param properties Properties of minted token652 /// @return uint256 The id of the newly minted token653 /// @dev EVM selector for this function is: 0xb904db03,654 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])655 function mintCross(CrossAddress memory to, Property[] memory properties) external returns (uint256);656657 /// Returns EVM address for refungible token658 ///659 /// @param token ID of the token660 /// @dev EVM selector for this function is: 0xab76fac6,661 /// or in textual repr: tokenContractAddress(uint256)662 function tokenContractAddress(uint256 token) external view returns (address);663}664665/// @dev anonymous struct666struct Tuple12 {667 uint256 field_0;668 string field_1;669}670671/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension672/// @dev See https://eips.ethereum.org/EIPS/eip-721673/// @dev the ERC-165 identifier for this interface is 0x780e9d63674interface ERC721Enumerable is Dummy, ERC165 {675 /// @notice Enumerate valid RFTs676 /// @param index A counter less than `totalSupply()`677 /// @return The token identifier for the `index`th NFT,678 /// (sort order not specified)679 /// @dev EVM selector for this function is: 0x4f6ccce7,680 /// or in textual repr: tokenByIndex(uint256)681 function tokenByIndex(uint256 index) external view returns (uint256);682683 /// Not implemented684 /// @dev EVM selector for this function is: 0x2f745c59,685 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)686 function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);687688 /// @notice Count RFTs tracked by this contract689 /// @return A count of valid RFTs tracked by this contract, where each one of690 /// them has an assigned and queryable owner not equal to the zero address691 /// @dev EVM selector for this function is: 0x18160ddd,692 /// or in textual repr: totalSupply()693 function totalSupply() external view returns (uint256);694}695696/// @dev inlined interface697interface ERC721Events {698 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);699 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);700 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);701}702703/// @title ERC-721 Non-Fungible Token Standard704/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md705/// @dev the ERC-165 identifier for this interface is 0x4016cd87706interface ERC721 is Dummy, ERC165, ERC721Events {707 /// @notice Count all RFTs assigned to an owner708 /// @dev RFTs assigned to the zero address are considered invalid, and this709 /// function throws for queries about the zero address.710 /// @param owner An address for whom to query the balance711 /// @return The number of RFTs owned by `owner`, possibly zero712 /// @dev EVM selector for this function is: 0x70a08231,713 /// or in textual repr: balanceOf(address)714 function balanceOf(address owner) external view returns (uint256);715716 /// @notice Find the owner of an RFT717 /// @dev RFTs assigned to zero address are considered invalid, and queries718 /// about them do throw.719 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for720 /// the tokens that are partially owned.721 /// @param tokenId The identifier for an RFT722 /// @return The address of the owner of the RFT723 /// @dev EVM selector for this function is: 0x6352211e,724 /// or in textual repr: ownerOf(uint256)725 function ownerOf(uint256 tokenId) external view returns (address);726727 /// @dev Not implemented728 /// @dev EVM selector for this function is: 0x60a11672,729 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)730 function safeTransferFromWithData(731 address from,732 address to,733 uint256 tokenId,734 bytes memory data735 ) external;736737 /// @dev Not implemented738 /// @dev EVM selector for this function is: 0x42842e0e,739 /// or in textual repr: safeTransferFrom(address,address,uint256)740 function safeTransferFrom(741 address from,742 address to,743 uint256 tokenId744 ) external;745746 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE747 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE748 /// THEY MAY BE PERMANENTLY LOST749 /// @dev Throws unless `msg.sender` is the current owner or an authorized750 /// operator for this RFT. Throws if `from` is not the current owner. Throws751 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.752 /// Throws if RFT pieces have multiple owners.753 /// @param from The current owner of the NFT754 /// @param to The new owner755 /// @param tokenId The NFT to transfer756 /// @dev EVM selector for this function is: 0x23b872dd,757 /// or in textual repr: transferFrom(address,address,uint256)758 function transferFrom(759 address from,760 address to,761 uint256 tokenId762 ) external;763764 /// @dev Not implemented765 /// @dev EVM selector for this function is: 0x095ea7b3,766 /// or in textual repr: approve(address,uint256)767 function approve(address approved, uint256 tokenId) external;768769 /// @notice Sets or unsets the approval of a given operator.770 /// The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.771 /// @param operator Operator772 /// @param approved Should operator status be granted or revoked?773 /// @dev EVM selector for this function is: 0xa22cb465,774 /// or in textual repr: setApprovalForAll(address,bool)775 function setApprovalForAll(address operator, bool approved) external;776777 /// @dev Not implemented778 /// @dev EVM selector for this function is: 0x081812fc,779 /// or in textual repr: getApproved(uint256)780 function getApproved(uint256 tokenId) external view returns (address);781782 /// @notice Tells whether the given `owner` approves the `operator`.783 /// @dev EVM selector for this function is: 0xe985e9c5,784 /// or in textual repr: isApprovedForAll(address,address)785 function isApprovedForAll(address owner, address operator) external view returns (bool);786787 /// @notice Returns collection helper contract address788 /// @dev EVM selector for this function is: 0x1896cce6,789 /// or in textual repr: collectionHelperAddress()790 function collectionHelperAddress() external view returns (address);791}792793interface UniqueRefungible is794 Dummy,795 ERC165,796 ERC721,797 ERC721Enumerable,798 ERC721UniqueExtensions,799 ERC721UniqueMintable,800 ERC721Burnable,801 ERC721Metadata,802 Collection,803 TokenProperties804{}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);
}
}