difftreelog
Merge pull request #743 from UniqueNetwork/feature/mintCross
in: master
added `mintCross` function for `UniqueExtensoins` interfaces
39 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6085,7 +6085,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
@@ -6342,7 +6342,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
@@ -6501,7 +6501,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
dependencies = [
"derivative",
"ethereum 0.14.0",
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -36,7 +36,7 @@
use crate::{
Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
eth::{
- EthCrossAccount, convert_cross_account_to_uint256, CollectionPermissions as EvmPermissions,
+ EthCrossAccount, CollectionPermissions as EvmPermissions,
CollectionLimits as EvmCollectionLimits,
},
weights::WeightInfo,
@@ -289,20 +289,13 @@
/// Get current sponsor.
///
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- fn collection_sponsor(&self) -> Result<(address, uint256)> {
+ fn collection_sponsor(&self) -> Result<EthCrossAccount> {
let sponsor = match self.collection.sponsorship.sponsor() {
Some(sponsor) => sponsor,
None => return Ok(Default::default()),
};
- let sponsor = T::CrossAccountId::from_sub(sponsor.clone());
- let result: (address, uint256) = if sponsor.is_canonical_substrate() {
- let sponsor = convert_cross_account_to_uint256::<T>(&sponsor);
- (Default::default(), sponsor)
- } else {
- let sponsor = *sponsor.as_eth();
- (sponsor, Default::default())
- };
- Ok(result)
+
+ Ok(EthCrossAccount::from_sub::<T>(&sponsor))
}
/// Get current collection limits.
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -53,15 +53,6 @@
address[0..16] == ETH_COLLECTION_PREFIX
}
-/// Convert `CrossAccountId` to `uint256`.
-pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint256
-where
- T::AccountId: AsRef<[u8; 32]>,
-{
- let slice = from.as_sub().as_ref();
- uint256::from_big_endian(slice)
-}
-
/// Convert `uint256` to `CrossAccountId`.
pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
where
@@ -71,46 +62,6 @@
from.to_big_endian(&mut new_admin_arr);
let account_id = T::AccountId::from(new_admin_arr);
T::CrossAccountId::from_sub(account_id)
-}
-
-/// Convert `CrossAccountId` to `(address, uint256)`.
-pub fn convert_cross_account_to_tuple<T: Config>(
- cross_account_id: &T::CrossAccountId,
-) -> (address, uint256)
-where
- T::AccountId: AsRef<[u8; 32]>,
-{
- if cross_account_id.is_canonical_substrate() {
- let sub = convert_cross_account_to_uint256::<T>(cross_account_id);
- (Default::default(), sub)
- } else {
- let eth = *cross_account_id.as_eth();
- (eth, Default::default())
- }
-}
-
-/// Convert tuple `(address, uint256)` to `CrossAccountId`.
-///
-/// If `address` in the tuple has *default* value, then the canonical form is substrate,
-/// if `uint256` has *default* value, then the ethereum form is canonical,
-/// if both values are *default* or *non default*, then this is considered an invalid address and `Error` is returned.
-pub fn convert_tuple_to_cross_account<T: Config>(
- eth_cross_account_id: (address, uint256),
-) -> evm_coder::execution::Result<T::CrossAccountId>
-where
- T::AccountId: From<[u8; 32]>,
-{
- if eth_cross_account_id == Default::default() {
- Err("All fields of cross account is zeroed".into())
- } else if eth_cross_account_id.0 == Default::default() {
- Ok(convert_uint256_to_cross_account::<T>(
- eth_cross_account_id.1,
- ))
- } else if eth_cross_account_id.1 == Default::default() {
- Ok(T::CrossAccountId::from_eth(eth_cross_account_id.0))
- } else {
- Err("All fields of cross account is non zeroed".into())
- }
}
/// Cross account struct
@@ -121,16 +72,14 @@
}
impl EthCrossAccount {
+ /// Converts `CrossAccountId` to `EthCrossAccountId`
pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
where
T: pallet_evm::Config,
T::AccountId: AsRef<[u8; 32]>,
{
if cross_account_id.is_canonical_substrate() {
- Self {
- eth: Default::default(),
- sub: convert_cross_account_to_uint256::<T>(cross_account_id),
- }
+ Self::from_sub::<T>(cross_account_id.as_sub())
} else {
Self {
eth: *cross_account_id.as_eth(),
@@ -138,7 +87,18 @@
}
}
}
-
+ /// Creates `EthCrossAccount` from substrate account
+ pub fn from_sub<T>(account_id: &T::AccountId) -> Self
+ where
+ T: pallet_evm::Config,
+ T::AccountId: AsRef<[u8; 32]>,
+ {
+ Self {
+ eth: Default::default(),
+ sub: uint256::from_big_endian(account_id.as_ref()),
+ }
+ }
+ /// Converts `EthCrossAccount` to `CrossAccountId`
pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
where
T: pallet_evm::Config,
@@ -163,29 +123,41 @@
/// How many tokens can a user have on one account.
#[default]
AccountTokenOwnership,
+
/// How many bytes of data are available for sponsorship.
SponsoredDataSize,
+
/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]
SponsoredDataRateLimit,
+
/// How many tokens can be mined into this collection.
TokenLimit,
+
/// Timeouts for transfer sponsoring.
SponsorTransferTimeout,
+
/// Timeout for sponsoring an approval in passed blocks.
SponsorApproveTimeout,
+
/// Whether the collection owner of the collection can send tokens (which belong to other users).
OwnerCanTransfer,
+
/// Can the collection owner burn other people's tokens.
OwnerCanDestroy,
+
/// Is it possible to send tokens from this collection between users.
TransferEnabled,
}
+/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
#[derive(Default, Debug, Clone, Copy, AbiCoder)]
#[repr(u8)]
pub enum CollectionPermissions {
+ /// Owner of token can nest tokens under it.
#[default]
- CollectionAdmin,
TokenOwner,
+
+ /// Admin of token collection can nest tokens under token.
+ CollectionAdmin,
}
/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -50,6 +50,7 @@
"pallet-evm-coder-substrate/std",
"pallet-evm/std",
"up-sponsorship/std",
+ "pallet-common/std",
]
try-runtime = ["frame-support/try-runtime"]
-stubgen = ["evm-coder/stubgen"]
+stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22 abi::{AbiWriter, AbiType},23 execution::Result,24 generate_stubgen, solidity_interface,25 types::*,26 ToLog,27};28use pallet_evm::{29 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,30 account::CrossAccountId,31};32use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};33use pallet_evm_transaction_payment::CallContext;34use sp_core::{H160, U256};35use up_data_structs::SponsorshipState;36use crate::{37 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,38 SponsoringRateLimit, SponsoringModeT, Sponsoring,39};40use frame_support::traits::Get;41use up_sponsorship::SponsorshipHandler;42use sp_std::vec::Vec;4344/// Pallet events.45#[derive(ToLog)]46pub enum ContractHelpersEvents {47 /// Contract sponsor was set.48 ContractSponsorSet {49 /// Contract address of the affected collection.50 #[indexed]51 contract_address: address,52 /// New sponsor address.53 sponsor: address,54 },5556 /// New sponsor was confirm.57 ContractSponsorshipConfirmed {58 /// Contract address of the affected collection.59 #[indexed]60 contract_address: address,61 /// New sponsor address.62 sponsor: address,63 },6465 /// Collection sponsor was removed.66 ContractSponsorRemoved {67 /// Contract address of the affected collection.68 #[indexed]69 contract_address: address,70 },71}7273/// See [`ContractHelpersCall`]74pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);75impl<T: Config> WithRecorder<T> for ContractHelpers<T> {76 fn recorder(&self) -> &SubstrateRecorder<T> {77 &self.078 }7980 fn into_recorder(self) -> SubstrateRecorder<T> {81 self.082 }83}8485/// @title Magic contract, which allows users to reconfigure other contracts86#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]87impl<T: Config> ContractHelpers<T>88where89 T::AccountId: AsRef<[u8; 32]>,90{91 /// Get user, which deployed specified contract92 /// @dev May return zero address in case if contract is deployed93 /// using uniquenetwork evm-migration pallet, or using other terms not94 /// intended by pallet-evm95 /// @dev Returns zero address if contract does not exists96 /// @param contractAddress Contract to get owner of97 /// @return address Owner of contract98 fn contract_owner(&self, contract_address: address) -> Result<address> {99 Ok(<Owner<T>>::get(contract_address))100 }101102 /// Set sponsor.103 /// @param contractAddress Contract for which a sponsor is being established.104 /// @param sponsor User address who set as pending sponsor.105 fn set_sponsor(106 &mut self,107 caller: caller,108 contract_address: address,109 sponsor: address,110 ) -> Result<void> {111 self.recorder().consume_sload()?;112 self.recorder().consume_sstore()?;113114 Pallet::<T>::set_sponsor(115 &T::CrossAccountId::from_eth(caller),116 contract_address,117 &T::CrossAccountId::from_eth(sponsor),118 )119 .map_err(dispatch_to_evm::<T>)?;120121 Ok(())122 }123124 /// Set contract as self sponsored.125 ///126 /// @param contractAddress Contract for which a self sponsoring is being enabled.127 fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {128 self.recorder().consume_sload()?;129 self.recorder().consume_sstore()?;130131 let caller = T::CrossAccountId::from_eth(caller);132133 Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())134 .map_err(dispatch_to_evm::<T>)?;135136 Pallet::<T>::force_set_sponsor(137 contract_address,138 &T::CrossAccountId::from_eth(contract_address),139 )140 .map_err(dispatch_to_evm::<T>)?;141142 Ok(())143 }144145 /// Remove sponsor.146 ///147 /// @param contractAddress Contract for which a sponsorship is being removed.148 fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {149 self.recorder().consume_sload()?;150 self.recorder().consume_sstore()?;151152 Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)153 .map_err(dispatch_to_evm::<T>)?;154155 Ok(())156 }157158 /// Confirm sponsorship.159 ///160 /// @dev Caller must be same that set via [`setSponsor`].161 ///162 /// @param contractAddress Сontract for which need to confirm sponsorship.163 fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {164 self.recorder().consume_sload()?;165 self.recorder().consume_sstore()?;166167 Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)168 .map_err(dispatch_to_evm::<T>)?;169170 Ok(())171 }172173 /// Get current sponsor.174 ///175 /// @param contractAddress The contract for which a sponsor is requested.176 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.177 fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {178 let sponsor =179 Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;180 Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(181 &sponsor,182 ))183 }184185 /// Check tat contract has confirmed sponsor.186 ///187 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.188 /// @return **true** if contract has confirmed sponsor.189 fn has_sponsor(&self, contract_address: address) -> Result<bool> {190 Ok(Pallet::<T>::get_sponsor(contract_address).is_some())191 }192193 /// Check tat contract has pending sponsor.194 ///195 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.196 /// @return **true** if contract has pending sponsor.197 fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {198 Ok(match Sponsoring::<T>::get(contract_address) {199 SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,200 SponsorshipState::Unconfirmed(_) => true,201 })202 }203204 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {205 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)206 }207208 fn set_sponsoring_mode(209 &mut self,210 caller: caller,211 contract_address: address,212 // TODO: implement support for enums in evm-coder213 mode: uint8,214 ) -> Result<void> {215 self.recorder().consume_sload()?;216 self.recorder().consume_sstore()?;217218 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;219 let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;220 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);221222 Ok(())223 }224225 /// Get current contract sponsoring rate limit226 /// @param contractAddress Contract to get sponsoring rate limit of227 /// @return uint32 Amount of blocks between two sponsored transactions228 fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {229 self.recorder().consume_sload()?;230231 Ok(<SponsoringRateLimit<T>>::get(contract_address)232 .try_into()233 .map_err(|_| "rate limit > u32::MAX")?)234 }235236 /// Set contract sponsoring rate limit237 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should238 /// pass between two sponsored transactions239 /// @param contractAddress Contract to change sponsoring rate limit of240 /// @param rateLimit Target rate limit241 /// @dev Only contract owner can change this setting242 fn set_sponsoring_rate_limit(243 &mut self,244 caller: caller,245 contract_address: address,246 rate_limit: uint32,247 ) -> Result<void> {248 self.recorder().consume_sload()?;249 self.recorder().consume_sstore()?;250251 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;252 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());253 Ok(())254 }255256 /// Set contract sponsoring fee limit257 /// @dev Sponsoring fee limit - is maximum fee that could be spent by258 /// single transaction259 /// @param contractAddress Contract to change sponsoring fee limit of260 /// @param feeLimit Fee limit261 /// @dev Only contract owner can change this setting262 fn set_sponsoring_fee_limit(263 &mut self,264 caller: caller,265 contract_address: address,266 fee_limit: uint256,267 ) -> Result<void> {268 self.recorder().consume_sload()?;269 self.recorder().consume_sstore()?;270271 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;272 <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())273 .map_err(dispatch_to_evm::<T>)?;274 Ok(())275 }276277 /// Get current contract sponsoring fee limit278 /// @param contractAddress Contract to get sponsoring fee limit of279 /// @return uint256 Maximum amount of fee that could be spent by single280 /// transaction281 fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {282 self.recorder().consume_sload()?;283284 Ok(get_sponsoring_fee_limit::<T>(contract_address))285 }286287 /// Is specified user present in contract allow list288 /// @dev Contract owner always implicitly included289 /// @param contractAddress Contract to check allowlist of290 /// @param user User to check291 /// @return bool Is specified users exists in contract allowlist292 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {293 self.0.consume_sload()?;294 Ok(<Pallet<T>>::allowed(contract_address, user))295 }296297 /// Toggle user presence in contract allowlist298 /// @param contractAddress Contract to change allowlist of299 /// @param user Which user presence should be toggled300 /// @param isAllowed `true` if user should be allowed to be sponsored301 /// or call this contract, `false` otherwise302 /// @dev Only contract owner can change this setting303 fn toggle_allowed(304 &mut self,305 caller: caller,306 contract_address: address,307 user: address,308 is_allowed: bool,309 ) -> Result<void> {310 self.recorder().consume_sload()?;311 self.recorder().consume_sstore()?;312313 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;314 <Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);315316 Ok(())317 }318319 /// Is this contract has allowlist access enabled320 /// @dev Allowlist always can have users, and it is used for two purposes:321 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist322 /// in case of allowlist access enabled, only users from allowlist may call this contract323 /// @param contractAddress Contract to get allowlist access of324 /// @return bool Is specified contract has allowlist access enabled325 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {326 Ok(<AllowlistEnabled<T>>::get(contract_address))327 }328329 /// Toggle contract allowlist access330 /// @param contractAddress Contract to change allowlist access of331 /// @param enabled Should allowlist access to be enabled?332 fn toggle_allowlist(333 &mut self,334 caller: caller,335 contract_address: address,336 enabled: bool,337 ) -> Result<void> {338 self.recorder().consume_sload()?;339 self.recorder().consume_sstore()?;340341 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;342 <Pallet<T>>::toggle_allowlist(contract_address, enabled);343 Ok(())344 }345}346347/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]348pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);349impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>350where351 T::AccountId: AsRef<[u8; 32]>,352{353 fn is_reserved(contract: &sp_core::H160) -> bool {354 contract == &T::ContractAddress::get()355 }356357 fn is_used(contract: &sp_core::H160) -> bool {358 contract == &T::ContractAddress::get()359 }360361 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {362 // TODO: Extract to another OnMethodCall handler363 if <AllowlistEnabled<T>>::get(handle.code_address())364 && !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)365 {366 return Some(Err(PrecompileFailure::Revert {367 exit_status: ExitRevert::Reverted,368 output: {369 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));370 writer.string("Target contract is allowlisted");371 writer.finish()372 },373 }));374 }375376 if handle.code_address() != T::ContractAddress::get() {377 return None;378 }379380 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));381 pallet_evm_coder_substrate::call(handle, helpers)382 }383384 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {385 (contract == &T::ContractAddress::get())386 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())387 }388}389390/// Hooks into contract creation, storing owner of newly deployed contract391pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);392impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {393 fn on_create(owner: H160, contract: H160) {394 <Owner<T>>::insert(contract, owner);395 }396}397398/// Bridge to pallet-sponsoring399pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);400impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>401 for HelpersContractSponsoring<T>402{403 fn get_sponsor(404 who: &T::CrossAccountId,405 call_context: &CallContext,406 ) -> Option<T::CrossAccountId> {407 let contract_address = call_context.contract_address;408 let mode = <Pallet<T>>::sponsoring_mode(contract_address);409 if mode == SponsoringModeT::Disabled {410 return None;411 }412413 let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {414 Some(sponsor) => sponsor,415 None => return None,416 };417418 if mode == SponsoringModeT::Allowlisted419 && !<Pallet<T>>::allowed(contract_address, *who.as_eth())420 {421 return None;422 }423 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;424425 if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {426 let limit = <SponsoringRateLimit<T>>::get(contract_address);427428 let timeout = last_tx_block + limit;429 if block_number < timeout {430 return None;431 }432 }433434 let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);435436 if call_context.max_fee > sponsored_fee_limit {437 return None;438 }439440 <SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);441442 Some(sponsor)443 }444}445446fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {447 <SponsoringFeeLimit<T>>::get(contract_address)448 .get(&0xffffffff)449 .cloned()450 .unwrap_or(U256::MAX)451}452453generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);454generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22 abi::{AbiWriter, AbiType},23 execution::Result,24 generate_stubgen, solidity_interface,25 types::*,26 ToLog,27};28use pallet_common::eth::EthCrossAccount;29use pallet_evm::{30 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,31 account::CrossAccountId,32};33use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};34use pallet_evm_transaction_payment::CallContext;35use sp_core::{H160, U256};36use up_data_structs::SponsorshipState;37use crate::{38 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,39 SponsoringRateLimit, SponsoringModeT, Sponsoring,40};41use frame_support::traits::Get;42use up_sponsorship::SponsorshipHandler;43use sp_std::vec::Vec;4445/// Pallet events.46#[derive(ToLog)]47pub enum ContractHelpersEvents {48 /// Contract sponsor was set.49 ContractSponsorSet {50 /// Contract address of the affected collection.51 #[indexed]52 contract_address: address,53 /// New sponsor address.54 sponsor: address,55 },5657 /// New sponsor was confirm.58 ContractSponsorshipConfirmed {59 /// Contract address of the affected collection.60 #[indexed]61 contract_address: address,62 /// New sponsor address.63 sponsor: address,64 },6566 /// Collection sponsor was removed.67 ContractSponsorRemoved {68 /// Contract address of the affected collection.69 #[indexed]70 contract_address: address,71 },72}7374/// See [`ContractHelpersCall`]75pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);76impl<T: Config> WithRecorder<T> for ContractHelpers<T> {77 fn recorder(&self) -> &SubstrateRecorder<T> {78 &self.079 }8081 fn into_recorder(self) -> SubstrateRecorder<T> {82 self.083 }84}8586/// @title Magic contract, which allows users to reconfigure other contracts87#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]88impl<T: Config> ContractHelpers<T>89where90 T::AccountId: AsRef<[u8; 32]>,91{92 /// Get user, which deployed specified contract93 /// @dev May return zero address in case if contract is deployed94 /// using uniquenetwork evm-migration pallet, or using other terms not95 /// intended by pallet-evm96 /// @dev Returns zero address if contract does not exists97 /// @param contractAddress Contract to get owner of98 /// @return address Owner of contract99 fn contract_owner(&self, contract_address: address) -> Result<address> {100 Ok(<Owner<T>>::get(contract_address))101 }102103 /// Set sponsor.104 /// @param contractAddress Contract for which a sponsor is being established.105 /// @param sponsor User address who set as pending sponsor.106 fn set_sponsor(107 &mut self,108 caller: caller,109 contract_address: address,110 sponsor: address,111 ) -> Result<void> {112 self.recorder().consume_sload()?;113 self.recorder().consume_sstore()?;114115 Pallet::<T>::set_sponsor(116 &T::CrossAccountId::from_eth(caller),117 contract_address,118 &T::CrossAccountId::from_eth(sponsor),119 )120 .map_err(dispatch_to_evm::<T>)?;121122 Ok(())123 }124125 /// Set contract as self sponsored.126 ///127 /// @param contractAddress Contract for which a self sponsoring is being enabled.128 fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {129 self.recorder().consume_sload()?;130 self.recorder().consume_sstore()?;131132 let caller = T::CrossAccountId::from_eth(caller);133134 Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())135 .map_err(dispatch_to_evm::<T>)?;136137 Pallet::<T>::force_set_sponsor(138 contract_address,139 &T::CrossAccountId::from_eth(contract_address),140 )141 .map_err(dispatch_to_evm::<T>)?;142143 Ok(())144 }145146 /// Remove sponsor.147 ///148 /// @param contractAddress Contract for which a sponsorship is being removed.149 fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {150 self.recorder().consume_sload()?;151 self.recorder().consume_sstore()?;152153 Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)154 .map_err(dispatch_to_evm::<T>)?;155156 Ok(())157 }158159 /// Confirm sponsorship.160 ///161 /// @dev Caller must be same that set via [`setSponsor`].162 ///163 /// @param contractAddress Сontract for which need to confirm sponsorship.164 fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {165 self.recorder().consume_sload()?;166 self.recorder().consume_sstore()?;167168 Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)169 .map_err(dispatch_to_evm::<T>)?;170171 Ok(())172 }173174 /// Get current sponsor.175 ///176 /// @param contractAddress The contract for which a sponsor is requested.177 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.178 fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {179 Ok(EthCrossAccount::from_sub_cross_account::<T>(180 &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,181 ))182 }183184 /// Check tat contract has confirmed sponsor.185 ///186 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.187 /// @return **true** if contract has confirmed sponsor.188 fn has_sponsor(&self, contract_address: address) -> Result<bool> {189 Ok(Pallet::<T>::get_sponsor(contract_address).is_some())190 }191192 /// Check tat contract has pending sponsor.193 ///194 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.195 /// @return **true** if contract has pending sponsor.196 fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {197 Ok(match Sponsoring::<T>::get(contract_address) {198 SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,199 SponsorshipState::Unconfirmed(_) => true,200 })201 }202203 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {204 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)205 }206207 fn set_sponsoring_mode(208 &mut self,209 caller: caller,210 contract_address: address,211 // TODO: implement support for enums in evm-coder212 mode: uint8,213 ) -> Result<void> {214 self.recorder().consume_sload()?;215 self.recorder().consume_sstore()?;216217 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;218 let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;219 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);220221 Ok(())222 }223224 /// Get current contract sponsoring rate limit225 /// @param contractAddress Contract to get sponsoring rate limit of226 /// @return uint32 Amount of blocks between two sponsored transactions227 fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {228 self.recorder().consume_sload()?;229230 Ok(<SponsoringRateLimit<T>>::get(contract_address)231 .try_into()232 .map_err(|_| "rate limit > u32::MAX")?)233 }234235 /// Set contract sponsoring rate limit236 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should237 /// pass between two sponsored transactions238 /// @param contractAddress Contract to change sponsoring rate limit of239 /// @param rateLimit Target rate limit240 /// @dev Only contract owner can change this setting241 fn set_sponsoring_rate_limit(242 &mut self,243 caller: caller,244 contract_address: address,245 rate_limit: uint32,246 ) -> Result<void> {247 self.recorder().consume_sload()?;248 self.recorder().consume_sstore()?;249250 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;251 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());252 Ok(())253 }254255 /// Set contract sponsoring fee limit256 /// @dev Sponsoring fee limit - is maximum fee that could be spent by257 /// single transaction258 /// @param contractAddress Contract to change sponsoring fee limit of259 /// @param feeLimit Fee limit260 /// @dev Only contract owner can change this setting261 fn set_sponsoring_fee_limit(262 &mut self,263 caller: caller,264 contract_address: address,265 fee_limit: uint256,266 ) -> Result<void> {267 self.recorder().consume_sload()?;268 self.recorder().consume_sstore()?;269270 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;271 <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())272 .map_err(dispatch_to_evm::<T>)?;273 Ok(())274 }275276 /// Get current contract sponsoring fee limit277 /// @param contractAddress Contract to get sponsoring fee limit of278 /// @return uint256 Maximum amount of fee that could be spent by single279 /// transaction280 fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {281 self.recorder().consume_sload()?;282283 Ok(get_sponsoring_fee_limit::<T>(contract_address))284 }285286 /// Is specified user present in contract allow list287 /// @dev Contract owner always implicitly included288 /// @param contractAddress Contract to check allowlist of289 /// @param user User to check290 /// @return bool Is specified users exists in contract allowlist291 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {292 self.0.consume_sload()?;293 Ok(<Pallet<T>>::allowed(contract_address, user))294 }295296 /// Toggle user presence in contract allowlist297 /// @param contractAddress Contract to change allowlist of298 /// @param user Which user presence should be toggled299 /// @param isAllowed `true` if user should be allowed to be sponsored300 /// or call this contract, `false` otherwise301 /// @dev Only contract owner can change this setting302 fn toggle_allowed(303 &mut self,304 caller: caller,305 contract_address: address,306 user: address,307 is_allowed: bool,308 ) -> Result<void> {309 self.recorder().consume_sload()?;310 self.recorder().consume_sstore()?;311312 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;313 <Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);314315 Ok(())316 }317318 /// Is this contract has allowlist access enabled319 /// @dev Allowlist always can have users, and it is used for two purposes:320 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist321 /// in case of allowlist access enabled, only users from allowlist may call this contract322 /// @param contractAddress Contract to get allowlist access of323 /// @return bool Is specified contract has allowlist access enabled324 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {325 Ok(<AllowlistEnabled<T>>::get(contract_address))326 }327328 /// Toggle contract allowlist access329 /// @param contractAddress Contract to change allowlist access of330 /// @param enabled Should allowlist access to be enabled?331 fn toggle_allowlist(332 &mut self,333 caller: caller,334 contract_address: address,335 enabled: bool,336 ) -> Result<void> {337 self.recorder().consume_sload()?;338 self.recorder().consume_sstore()?;339340 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;341 <Pallet<T>>::toggle_allowlist(contract_address, enabled);342 Ok(())343 }344}345346/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]347pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);348impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>349where350 T::AccountId: AsRef<[u8; 32]>,351{352 fn is_reserved(contract: &sp_core::H160) -> bool {353 contract == &T::ContractAddress::get()354 }355356 fn is_used(contract: &sp_core::H160) -> bool {357 contract == &T::ContractAddress::get()358 }359360 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {361 // TODO: Extract to another OnMethodCall handler362 if <AllowlistEnabled<T>>::get(handle.code_address())363 && !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)364 {365 return Some(Err(PrecompileFailure::Revert {366 exit_status: ExitRevert::Reverted,367 output: {368 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));369 writer.string("Target contract is allowlisted");370 writer.finish()371 },372 }));373 }374375 if handle.code_address() != T::ContractAddress::get() {376 return None;377 }378379 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));380 pallet_evm_coder_substrate::call(handle, helpers)381 }382383 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {384 (contract == &T::ContractAddress::get())385 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())386 }387}388389/// Hooks into contract creation, storing owner of newly deployed contract390pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);391impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {392 fn on_create(owner: H160, contract: H160) {393 <Owner<T>>::insert(contract, owner);394 }395}396397/// Bridge to pallet-sponsoring398pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);399impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>400 for HelpersContractSponsoring<T>401{402 fn get_sponsor(403 who: &T::CrossAccountId,404 call_context: &CallContext,405 ) -> Option<T::CrossAccountId> {406 let contract_address = call_context.contract_address;407 let mode = <Pallet<T>>::sponsoring_mode(contract_address);408 if mode == SponsoringModeT::Disabled {409 return None;410 }411412 let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {413 Some(sponsor) => sponsor,414 None => return None,415 };416417 if mode == SponsoringModeT::Allowlisted418 && !<Pallet<T>>::allowed(contract_address, *who.as_eth())419 {420 return None;421 }422 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;423424 if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {425 let limit = <SponsoringRateLimit<T>>::get(contract_address);426427 let timeout = last_tx_block + limit;428 if block_number < timeout {429 return None;430 }431 }432433 let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);434435 if call_context.max_fee > sponsored_fee_limit {436 return None;437 }438439 <SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);440441 Some(sponsor)442 }443}444445fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {446 <SponsoringFeeLimit<T>>::get(contract_address)447 .get(&0xffffffff)448 .cloned()449 .unwrap_or(U256::MAX)450}451452generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);453generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);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
@@ -96,11 +96,11 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) public view returns (Tuple0 memory) {
+ function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
require(false, stub_error);
contractAddress;
dummy;
- return Tuple0(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Check tat contract has confirmed sponsor.
@@ -265,8 +265,8 @@
}
}
-/// @dev anonymous struct
-struct Tuple0 {
- address field_0;
- uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
}
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.9] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC20UniqueExtensions` interface.
+
## [0.1.8] - 2022-11-18
### Added
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -174,6 +174,19 @@
.collect::<string>())
}
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(&mut self, caller: caller, to: EthCrossAccount, amount: uint256) -> Result<bool> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let to = to.into_sub_cross_account::<T>()?;
+ let amount = amount.try_into().map_err(|_| "amount overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+ <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)
+ .map_err(dispatch_to_evm::<T>)?;
+ Ok(true)
+ }
+
#[weight(<SelfWeightOf<T>>::approve())]
fn approve_cross(
&mut self,
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
@@ -152,10 +152,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple8 memory) {
+ function collectionSponsor() public view returns (EthCrossAccount memory) {
require(false, stub_error);
dummy;
- return Tuple8(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -173,10 +173,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple20[] memory) {
+ function collectionLimits() public view returns (Tuple23[] memory) {
require(false, stub_error);
dummy;
- return new Tuple20[](0);
+ return new Tuple23[](0);
}
/// Set limits for the collection.
@@ -284,19 +284,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple26 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple29 memory) {
require(false, stub_error);
dummy;
- return Tuple26(false, new uint256[](0));
+ return Tuple29(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple29[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple32[] memory) {
require(false, stub_error);
dummy;
- return new Tuple29[](0);
+ return new Tuple32[](0);
}
/// Set the collection access method.
@@ -476,13 +476,13 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple32 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple29 {
bool field_0;
uint256[] field_1;
}
@@ -510,7 +510,7 @@
}
/// @dev anonymous struct
-struct Tuple20 {
+struct Tuple23 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
@@ -522,7 +522,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
@@ -533,6 +533,16 @@
return "";
}
+ /// @dev EVM selector for this function is: 0x269e6158,
+ /// or in textual repr: mintCross((address,uint256),uint256)
+ function mintCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
@@ -577,7 +587,7 @@
/// @param amounts array of pairs of account address and amount
/// @dev EVM selector for this function is: 0x1acf2d55,
/// or in textual repr: mintBulk((address,uint256)[])
- function mintBulk(Tuple8[] memory amounts) public returns (bool) {
+ function mintBulk(Tuple9[] memory amounts) public returns (bool) {
require(false, stub_error);
amounts;
dummy = 0;
@@ -611,7 +621,7 @@
}
/// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
address field_0;
uint256 field_1;
}
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.1.11] - 2022-12-16
+## [0.1.12] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.1.11] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.1.10] - 2022-11-18
### Added
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -605,7 +605,7 @@
Ok(false)
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
@@ -618,7 +618,7 @@
Ok(token_id)
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @dev `tokenId` should be obtained with `nextTokenId` method,
/// unlike standard, you can't specify it manually
/// @param to The new owner
@@ -1069,6 +1069,58 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
+
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: EthCrossAccount,
+ properties: Vec<PropertyStruct>,
+ ) -> Result<uint256> {
+ let token_id = <TokensMinted<T>>::get(self.id)
+ .checked_add(1)
+ .ok_or("item id overflow")?;
+
+ let to = to.into_sub_cross_account::<T>()?;
+
+ let properties = properties
+ .into_iter()
+ .map(|PropertyStruct { key, value }| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?
+ .try_into()
+ .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+ let caller = T::CrossAccountId::from_eth(caller);
+
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ <Pallet<T>>::create_item(
+ self,
+ &caller,
+ CreateItemData::<T> {
+ properties,
+ owner: to,
+ },
+ &budget,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(token_id.into())
+ }
}
#[solidity_interface(
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -42,7 +42,7 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple59[] memory permissions) public {
+ function setTokenPropertyPermissions(Tuple61[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +51,10 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() public view returns (Tuple59[] memory) {
+ function tokenPropertyPermissions() public view returns (Tuple61[] memory) {
require(false, stub_error);
dummy;
- return new Tuple59[](0);
+ return new Tuple61[](0);
}
// /// @notice Set token property value.
@@ -144,13 +144,13 @@
}
/// @dev anonymous struct
-struct Tuple59 {
+struct Tuple61 {
string field_0;
- Tuple57[] field_1;
+ Tuple59[] field_1;
}
/// @dev anonymous struct
-struct Tuple57 {
+struct Tuple59 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -290,10 +290,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple30 memory) {
+ function collectionSponsor() public view returns (EthCrossAccount memory) {
require(false, stub_error);
dummy;
- return Tuple30(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -311,10 +311,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple33[] memory) {
+ function collectionLimits() public view returns (Tuple35[] memory) {
require(false, stub_error);
dummy;
- return new Tuple33[](0);
+ return new Tuple35[](0);
}
/// Set limits for the collection.
@@ -422,19 +422,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple39 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {
require(false, stub_error);
dummy;
- return Tuple39(false, new uint256[](0));
+ return Tuple41(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple42[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple44[] memory) {
require(false, stub_error);
dummy;
- return new Tuple42[](0);
+ return new Tuple44[](0);
}
/// Set the collection access method.
@@ -614,13 +614,13 @@
}
/// @dev anonymous struct
-struct Tuple42 {
+struct Tuple44 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple39 {
+struct Tuple41 {
bool field_0;
uint256[] field_1;
}
@@ -648,18 +648,12 @@
}
/// @dev anonymous struct
-struct Tuple33 {
+struct Tuple35 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple30 {
- address field_0;
- uint256 field_1;
-}
-
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -735,7 +729,7 @@
return false;
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
@@ -747,7 +741,7 @@
return 0;
}
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -804,7 +798,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -961,6 +955,7 @@
dummy;
return 0;
}
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -991,6 +986,19 @@
// return false;
// }
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
}
/// @dev anonymous struct
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.2.10] - 2022-12-16
+## [0.2.11] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.2.10] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.2.9] - 2022-11-18
### Added
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
license = "GPLv3"
edition = "2021"
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -165,9 +165,9 @@
fn map_create_data<T: Config>(
data: up_data_structs::CreateItemData,
to: &T::CrossAccountId,
-) -> Result<CreateItemData<T::CrossAccountId>, DispatchError> {
+) -> Result<CreateItemData<T>, DispatchError> {
match data {
- up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData {
+ up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData::<T> {
users: {
let mut out = BTreeMap::new();
out.insert(to.clone(), data.pieces);
@@ -230,7 +230,7 @@
CreateItemExData::RefungibleMultipleOwners(CreateRefungibleExMultipleOwners {
users,
properties,
- }) => vec![CreateItemData { users, properties }],
+ }) => vec![CreateItemData::<T> { users, properties }],
CreateItemExData::RefungibleMultipleItems(r) => r
.into_inner()
.into_iter()
@@ -239,7 +239,7 @@
user,
pieces,
properties,
- }| CreateItemData {
+ }| CreateItemData::<T> {
users: BTreeMap::from([(user, pieces)])
.try_into()
.expect("limit >= 1"),
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -637,7 +637,7 @@
Ok(false)
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
@@ -650,7 +650,7 @@
Ok(token_id)
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @dev `tokenId` should be obtained with `nextTokenId` method,
/// unlike standard, you can't specify it manually
/// @param to The new owner
@@ -681,7 +681,7 @@
<Pallet<T>>::create_item(
self,
&caller,
- CreateItemData::<T::CrossAccountId> {
+ CreateItemData::<T> {
users,
properties: CollectionPropertiesVec::default(),
},
@@ -767,7 +767,7 @@
<Pallet<T>>::create_item(
self,
&caller,
- CreateItemData::<T::CrossAccountId> { users, properties },
+ CreateItemData::<T> { users, properties },
&budget,
)
.map_err(dispatch_to_evm::<T>)?;
@@ -1048,7 +1048,7 @@
.collect::<BTreeMap<_, _>>()
.try_into()
.unwrap();
- let create_item_data = CreateItemData::<T::CrossAccountId> {
+ let create_item_data = CreateItemData::<T> {
users,
properties: CollectionPropertiesVec::default(),
};
@@ -1108,7 +1108,7 @@
})
.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
- let create_item_data = CreateItemData::<T::CrossAccountId> {
+ let create_item_data = CreateItemData::<T> {
users: users.clone(),
properties,
};
@@ -1120,6 +1120,60 @@
Ok(true)
}
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: EthCrossAccount,
+ properties: Vec<PropertyStruct>,
+ ) -> Result<uint256> {
+ let token_id = <TokensMinted<T>>::get(self.id)
+ .checked_add(1)
+ .ok_or("item id overflow")?;
+
+ let to = to.into_sub_cross_account::<T>()?;
+
+ let properties = properties
+ .into_iter()
+ .map(|PropertyStruct { key, value }| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?
+ .try_into()
+ .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+ let caller = T::CrossAccountId::from_eth(caller);
+
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ let users = [(to, 1)]
+ .into_iter()
+ .collect::<BTreeMap<_, _>>()
+ .try_into()
+ .unwrap();
+ <Pallet<T>>::create_item(
+ self,
+ &caller,
+ CreateItemData::<T> { users, properties },
+ &budget,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(token_id.into())
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -114,6 +114,7 @@
CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
+ CreateRefungibleExMultipleOwners,
};
pub use pallet::*;
@@ -124,13 +125,8 @@
pub mod erc_token;
pub mod weights;
-#[derive(Derivative, Clone)]
-pub struct CreateItemData<CrossAccountId> {
- #[derivative(Debug(format_with = "bounded::map_debug"))]
- pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,
- #[derivative(Debug(format_with = "bounded::vec_debug"))]
- pub properties: CollectionPropertiesVec,
-}
+pub type CreateItemData<T> =
+ CreateRefungibleExMultipleOwners<<T as pallet_evm::Config>::CrossAccountId>;
pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
/// Token data, stored independently from other data used to describe it
@@ -913,7 +909,7 @@
pub fn create_multiple_items(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
- data: Vec<CreateItemData<T::CrossAccountId>>,
+ data: Vec<CreateItemData<T>>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
if !collection.is_owner_or_admin(sender) {
@@ -1259,7 +1255,7 @@
pub fn create_item(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
- data: CreateItemData<T::CrossAccountId>,
+ data: CreateItemData<T>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
Self::create_multiple_items(collection, sender, vec![data], nesting_budget)
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
@@ -42,7 +42,7 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple58[] memory permissions) public {
+ function setTokenPropertyPermissions(Tuple60[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +51,10 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() public view returns (Tuple58[] memory) {
+ function tokenPropertyPermissions() public view returns (Tuple60[] memory) {
require(false, stub_error);
dummy;
- return new Tuple58[](0);
+ return new Tuple60[](0);
}
// /// @notice Set token property value.
@@ -144,13 +144,13 @@
}
/// @dev anonymous struct
-struct Tuple58 {
+struct Tuple60 {
string field_0;
- Tuple56[] field_1;
+ Tuple58[] field_1;
}
/// @dev anonymous struct
-struct Tuple56 {
+struct Tuple58 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -290,10 +290,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple29 memory) {
+ function collectionSponsor() public view returns (EthCrossAccount memory) {
require(false, stub_error);
dummy;
- return Tuple29(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -311,10 +311,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple32[] memory) {
+ function collectionLimits() public view returns (Tuple34[] memory) {
require(false, stub_error);
dummy;
- return new Tuple32[](0);
+ return new Tuple34[](0);
}
/// Set limits for the collection.
@@ -422,19 +422,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple40 memory) {
require(false, stub_error);
dummy;
- return Tuple38(false, new uint256[](0));
+ return Tuple40(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple41[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple43[] memory) {
require(false, stub_error);
dummy;
- return new Tuple41[](0);
+ return new Tuple43[](0);
}
/// Set the collection access method.
@@ -614,13 +614,13 @@
}
/// @dev anonymous struct
-struct Tuple41 {
+struct Tuple43 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple38 {
+struct Tuple40 {
bool field_0;
uint256[] field_1;
}
@@ -648,18 +648,12 @@
}
/// @dev anonymous struct
-struct Tuple32 {
+struct Tuple34 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple29 {
- address field_0;
- uint256 field_1;
-}
-
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
contract ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -733,7 +727,7 @@
return false;
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
@@ -745,7 +739,7 @@
return 0;
}
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -802,7 +796,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -979,6 +973,20 @@
// return false;
// }
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple0",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -220,7 +220,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple20[]",
+ "internalType": "struct Tuple23[]",
"name": "",
"type": "tuple[]"
}
@@ -241,7 +241,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple29[]",
+ "internalType": "struct Tuple32[]",
"name": "",
"type": "tuple[]"
}
@@ -262,7 +262,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple26",
+ "internalType": "struct Tuple29",
"name": "",
"type": "tuple"
}
@@ -319,10 +319,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple8",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
@@ -408,7 +408,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Tuple9[]",
"name": "amounts",
"type": "tuple[]"
}
@@ -419,6 +419,24 @@
"type": "function"
},
{
+ "inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -250,7 +250,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple33[]",
+ "internalType": "struct Tuple35[]",
"name": "",
"type": "tuple[]"
}
@@ -271,7 +271,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple42[]",
+ "internalType": "struct Tuple44[]",
"name": "",
"type": "tuple[]"
}
@@ -292,7 +292,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple39",
+ "internalType": "struct Tuple41",
"name": "",
"type": "tuple"
}
@@ -349,10 +349,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple30",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
@@ -478,6 +478,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
@@ -736,12 +762,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple57[]",
+ "internalType": "struct Tuple59[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple59[]",
+ "internalType": "struct Tuple61[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -802,12 +828,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple57[]",
+ "internalType": "struct Tuple59[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple59[]",
+ "internalType": "struct Tuple61[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -232,7 +232,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple32[]",
+ "internalType": "struct Tuple34[]",
"name": "",
"type": "tuple[]"
}
@@ -253,7 +253,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple41[]",
+ "internalType": "struct Tuple43[]",
"name": "",
"type": "tuple[]"
}
@@ -274,7 +274,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple38",
+ "internalType": "struct Tuple40",
"name": "",
"type": "tuple"
}
@@ -331,10 +331,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple29",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
@@ -460,6 +460,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
@@ -718,12 +744,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple56[]",
+ "internalType": "struct Tuple58[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple58[]",
+ "internalType": "struct Tuple60[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -793,12 +819,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple56[]",
+ "internalType": "struct Tuple58[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple58[]",
+ "internalType": "struct Tuple60[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) external view returns (Tuple0 memory);
+ function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
/// Check tat contract has confirmed sponsor.
///
@@ -171,8 +171,8 @@
function toggleAllowlist(address contractAddress, bool enabled) external;
}
-/// @dev anonymous struct
-struct Tuple0 {
- address field_0;
- uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -102,7 +102,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple8 memory);
+ function collectionSponsor() external view returns (EthCrossAccount memory);
/// Get current collection limits.
///
@@ -119,7 +119,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple19[] memory);
+ function collectionLimits() external view returns (Tuple21[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -191,12 +191,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple26 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple27[] memory);
+ function collectionNestingPermissions() external view returns (Tuple29[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -311,7 +311,7 @@
}
/// @dev anonymous struct
-struct Tuple27 {
+struct Tuple29 {
CollectionPermissions field_0;
bool field_1;
}
@@ -322,7 +322,7 @@
}
/// @dev anonymous struct
-struct Tuple24 {
+struct Tuple26 {
bool field_0;
uint256[] field_1;
}
@@ -350,7 +350,7 @@
}
/// @dev anonymous struct
-struct Tuple19 {
+struct Tuple21 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
@@ -362,13 +362,17 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
/// or in textual repr: description()
function description() external view returns (string memory);
+ /// @dev EVM selector for this function is: 0x269e6158,
+ /// or in textual repr: mintCross((address,uint256),uint256)
+ function mintCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
@@ -395,7 +399,7 @@
/// @param amounts array of pairs of account address and amount
/// @dev EVM selector for this function is: 0x1acf2d55,
/// or in textual repr: mintBulk((address,uint256)[])
- function mintBulk(Tuple8[] memory amounts) external returns (bool);
+ function mintBulk(Tuple9[] memory amounts) external returns (bool);
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
@@ -411,7 +415,7 @@
}
/// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
address field_0;
uint256 field_1;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,12 +30,12 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
+ function setTokenPropertyPermissions(Tuple53[] memory permissions) external;
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() external view returns (Tuple52[] memory);
+ function tokenPropertyPermissions() external view returns (Tuple53[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,13 +97,13 @@
}
/// @dev anonymous struct
-struct Tuple52 {
+struct Tuple53 {
string field_0;
- Tuple50[] field_1;
+ Tuple51[] field_1;
}
/// @dev anonymous struct
-struct Tuple50 {
+struct Tuple51 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -198,7 +198,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple27 memory);
+ function collectionSponsor() external view returns (EthCrossAccount memory);
/// Get current collection limits.
///
@@ -215,7 +215,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple30[] memory);
+ function collectionLimits() external view returns (Tuple31[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -287,12 +287,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple36 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple38[] memory);
+ function collectionNestingPermissions() external view returns (Tuple39[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -407,7 +407,7 @@
}
/// @dev anonymous struct
-struct Tuple38 {
+struct Tuple39 {
CollectionPermissions field_0;
bool field_1;
}
@@ -418,7 +418,7 @@
}
/// @dev anonymous struct
-struct Tuple35 {
+struct Tuple36 {
bool field_0;
uint256[] field_1;
}
@@ -446,18 +446,12 @@
}
/// @dev anonymous struct
-struct Tuple30 {
+struct Tuple31 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple27 {
- address field_0;
- uint256 field_1;
-}
-
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -512,14 +506,14 @@
/// or in textual repr: mintingFinished()
function mintingFinished() external view returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
/// or in textual repr: mint(address)
function mint(address to) external returns (uint256);
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -553,7 +547,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -652,6 +646,7 @@
/// @dev EVM selector for this function is: 0x75794a3c,
/// or in textual repr: nextTokenId()
function nextTokenId() external view returns (uint256);
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -670,6 +665,13 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,12 +30,12 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple51[] memory permissions) external;
+ function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() external view returns (Tuple51[] memory);
+ function tokenPropertyPermissions() external view returns (Tuple52[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,13 +97,13 @@
}
/// @dev anonymous struct
-struct Tuple51 {
+struct Tuple52 {
string field_0;
- Tuple49[] field_1;
+ Tuple50[] field_1;
}
/// @dev anonymous struct
-struct Tuple49 {
+struct Tuple50 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -198,7 +198,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple26 memory);
+ function collectionSponsor() external view returns (EthCrossAccount memory);
/// Get current collection limits.
///
@@ -215,7 +215,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple29[] memory);
+ function collectionLimits() external view returns (Tuple30[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -287,12 +287,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple34 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple37[] memory);
+ function collectionNestingPermissions() external view returns (Tuple38[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -407,7 +407,7 @@
}
/// @dev anonymous struct
-struct Tuple37 {
+struct Tuple38 {
CollectionPermissions field_0;
bool field_1;
}
@@ -418,7 +418,7 @@
}
/// @dev anonymous struct
-struct Tuple34 {
+struct Tuple35 {
bool field_0;
uint256[] field_1;
}
@@ -446,18 +446,12 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple30 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple26 {
- address field_0;
- uint256 field_1;
-}
-
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
interface ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -510,14 +504,14 @@
/// or in textual repr: mintingFinished()
function mintingFinished() external view returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
/// or in textual repr: mint(address)
function mint(address to) external returns (uint256);
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -551,7 +545,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -663,6 +657,14 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -116,7 +116,7 @@
await checkInterface(helper, '0x780e9d63', true, true);
});
- itEth('ERC721UniqueExtensions support', async ({helper}) => {
+ itEth.skip('ERC721UniqueExtensions support', async ({helper}) => {
await checkInterface(helper, '0xb74c26b7', true, true);
});
tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -106,7 +106,7 @@
await collectionEvm.methods.removeCollectionSponsor().send({from: owner});
const sponsorTuple = await collectionEvm.methods.collectionSponsor().call({from: owner});
- expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');
+ expect(sponsorTuple.eth).to.be.eq('0x0000000000000000000000000000000000000000');
}));
[
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -57,7 +57,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
donor = await privateKey({filename: __filename});
- [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);
+ [alice, owner] = await helper.arrange.createAccounts([30n, 20n], donor);
});
});
@@ -78,6 +78,25 @@
expect(event.returnValues.to).to.equal(receiver);
expect(event.returnValues.value).to.equal('100');
});
+
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(owner);
+ const ethOwner = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.ft.mintCollection(alice);
+ await collection.addAdmin(alice, {Ethereum: ethOwner});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', ethOwner);
+
+ const result = await contract.methods.mintCross(receiverCross, 100).send();
+
+ const event = result.events.Transfer;
+ expect(event.address).to.equal(collectionAddress);
+ expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.equal(helper.address.substrateToEth(owner.address));
+ expect(event.returnValues.value).to.equal('100');
+ });
itEth('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -62,9 +62,9 @@
expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, []]);
await contract.methods.setCollectionNesting(true, [unnsetedCollectionAddress]).send({from: owner});
expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, [unnestedCollsectionId.toString()]]);
- expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', true]]);
+ expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['1', false], ['0', true]]);
await contract.methods.setCollectionNesting(false).send({from: owner});
- expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', false]]);
+ expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['1', false], ['0', false]]);
});
itEth('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async ({helper}) => {
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,6 +17,7 @@
import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
import {IKeyringPair} from '@polkadot/types/types';
import {Contract} from 'web3-eth-contract';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
describe('NFT: Information getting', () => {
@@ -173,7 +174,58 @@
// const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
// expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
+ const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
+ const permissions: ITokenPropertyPermission[] = properties
+ .map(p => {
+ return {
+ key: p.key, permission: {
+ tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true,
+ },
+ };
+ });
+
+
+ const collection = await helper.nft.mintCollection(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ let event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ tokenId = result.events.Transfer.returnValues.tokenId;
+
+ expect(tokenId).to.be.equal(expectedTokenId);
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
+ .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ });
+
//TODO: CORE-302 add eth methods
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -17,6 +17,7 @@
import {Pallets, requirePalletsOrSkip} from '../util';
import {expect, itEth, usingEthPlaygrounds} from './util';
import {IKeyringPair} from '@polkadot/types/types';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
describe('Refungible: Information getting', () => {
let donor: IKeyringPair;
@@ -135,6 +136,50 @@
expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
+ const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
+ const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true}}; });
+
+
+ const collection = await helper.rft.mintCollection(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ let event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ tokenId = result.events.Transfer.returnValues.tokenId;
+
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
+ .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ });
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
tests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-consts.ts
+++ b/tests/src/interfaces/augment-api-consts.ts
@@ -83,7 +83,7 @@
dayRelayBlocks: u32 & AugmentedConst<ApiType>;
defaultMinGasPrice: u64 & AugmentedConst<ApiType>;
defaultWeightToFeeCoefficient: u32 & AugmentedConst<ApiType>;
- maxOverridedAllowedLocations: u32 & AugmentedConst<ApiType>;
+ maxXcmAllowedLocations: u32 & AugmentedConst<ApiType>;
/**
* Generic const
**/