difftreelog
feat evm collection creation event
in: master
39 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5912,6 +5912,7 @@
name = "pallet-common"
version = "0.1.0"
dependencies = [
+ "ethereum",
"evm-coder",
"fp-evm-mapping",
"frame-benchmarking",
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,12 @@
CONTRACT_HELPERS_ABI=./tests/src/eth/util/contractHelpersAbi.json
COLLECTION_HELPER_STUBS=./pallets/unique/src/eth/stubs/
-COLLECTION_HELPER_ABI=./tests/src/eth/collectionHelperAbi.json
+COLLECTION_HELPER_ABI=./tests/src/eth/collectionHelpersAbi.json
TESTS_API=./tests/src/eth/api/
.PHONY: regenerate_solidity
-regenerate_solidity: UniqueFungible.sol UniqueNFT.sol ContractHelpers.sol CollectionHelper.sol
+regenerate_solidity: UniqueFungible.sol UniqueNFT.sol ContractHelpers.sol CollectionHelpers.sol
UniqueFungible.sol:
PACKAGE=pallet-fungible NAME=erc::gen_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
@@ -35,7 +35,7 @@
PACKAGE=pallet-evm-contract-helpers NAME=eth::contract_helpers_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
PACKAGE=pallet-evm-contract-helpers NAME=eth::contract_helpers_impl OUTPUT=$(CONTRACT_HELPERS_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
-CollectionHelper.sol:
+CollectionHelpers.sol:
PACKAGE=pallet-unique NAME=eth::collection_helper_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
PACKAGE=pallet-unique NAME=eth::collection_helper_impl OUTPUT=$(COLLECTION_HELPER_STUBS)/$@ ./.maintain/scripts/generate_sol.sh
@@ -51,11 +51,11 @@
INPUT=$(CONTRACT_HELPERS_STUBS)/$< OUTPUT=$(CONTRACT_HELPERS_STUBS)/ContractHelpers.raw ./.maintain/scripts/compile_stub.sh
INPUT=$(CONTRACT_HELPERS_STUBS)/$< OUTPUT=$(CONTRACT_HELPERS_ABI) ./.maintain/scripts/generate_abi.sh
-CollectionHelper: CollectionHelper.sol
- INPUT=$(COLLECTION_HELPER_STUBS)/$< OUTPUT=$(COLLECTION_HELPER_STUBS)/CollectionHelper.raw ./.maintain/scripts/compile_stub.sh
+CollectionHelpers: CollectionHelpers.sol
+ INPUT=$(COLLECTION_HELPER_STUBS)/$< OUTPUT=$(COLLECTION_HELPER_STUBS)/CollectionHelpers.raw ./.maintain/scripts/compile_stub.sh
INPUT=$(COLLECTION_HELPER_STUBS)/$< OUTPUT=$(COLLECTION_HELPER_ABI) ./.maintain/scripts/generate_abi.sh
-evm_stubs: UniqueFungible UniqueNFT ContractHelpers CollectionHelper
+evm_stubs: UniqueFungible UniqueNFT ContractHelpers CollectionHelpers
.PHONY: _bench
_bench:
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -21,6 +21,7 @@
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
+ethereum = { version = "0.12.0", default-features = false }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
serde = { version = "1.0.130", default-features = false }
pallets/common/src/dispatch.rsdiffbeforeafterboth--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -56,7 +56,10 @@
}
pub trait CollectionDispatch<T: Config> {
- fn create(sender: T::AccountId, data: CreateCollectionData<T::AccountId>) -> DispatchResult;
+ fn create(
+ sender: T::CrossAccountId,
+ data: CreateCollectionData<T::AccountId>,
+ ) -> DispatchResult;
fn destroy(sender: T::CrossAccountId, handle: CollectionHandle<T>) -> DispatchResult;
fn dispatch(handle: CollectionHandle<T>) -> Self;
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -15,7 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use evm_coder::{
- solidity_interface, solidity,
+ solidity_interface, solidity, ToLog,
types::*,
execution::{Result, Error},
};
@@ -28,6 +28,16 @@
use crate::{Pallet, CollectionHandle, Config, CollectionProperties};
+#[derive(ToLog)]
+pub enum CollectionHelpersEvents {
+ CollectionCreated {
+ #[indexed]
+ owner: address,
+ #[indexed]
+ collection_id: address,
+ },
+}
+
/// Does not always represent a full collection, for RFT it is either
/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)
pub trait CommonEvmHandler {
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -21,12 +21,12 @@
use core::ops::{Deref, DerefMut};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_std::vec::Vec;
-use pallet_evm::account::CrossAccountId;
+use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
+use evm_coder::ToLog;
use frame_support::{
dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo, Weight, PostDispatchInfo},
ensure,
traits::{Imbalance, Get, Currency, WithdrawReasons, ExistenceRequirement},
- BoundedVec,
weights::Pays,
transactional,
};
@@ -54,7 +54,6 @@
CreateItemExData,
SponsoringRateLimit,
budget::Budget,
- COLLECTION_FIELD_LIMIT,
PhantomType,
Property,
Properties,
@@ -218,7 +217,11 @@
#[pallet::config]
pub trait Config:
- frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config
+ frame_system::Config
+ + pallet_evm_coder_substrate::Config
+ + pallet_evm::Config
+ + TypeInfo
+ + account::Config
{
type WeightInfo: WeightInfo;
type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;
@@ -232,6 +235,7 @@
type CollectionDispatch: CollectionDispatch<Self>;
type TreasuryAccountId: Get<Self::AccountId>;
+ type ContractAddress: Get<H160>;
type EvmTokenAddressMapping: TokenAddressMapping<H160>;
type CrossTokenAddressMapping: TokenAddressMapping<Self::CrossAccountId>;
@@ -722,7 +726,7 @@
impl<T: Config> Pallet<T> {
pub fn init_collection(
- owner: T::AccountId,
+ owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
{
@@ -748,7 +752,7 @@
// =========
let collection = Collection {
- owner: owner.clone(),
+ owner: owner.as_sub().clone(),
name: data.name,
mode: data.mode.clone(),
description: data.description,
@@ -794,7 +798,7 @@
),
);
<T as Config>::Currency::settle(
- &owner,
+ &owner.as_sub(),
imbalance,
WithdrawReasons::TRANSFER,
ExistenceRequirement::KeepAlive,
@@ -803,7 +807,18 @@
}
<CreatedCollectionCount<T>>::put(created_count);
- <Pallet<T>>::deposit_event(Event::CollectionCreated(id, data.mode.id(), owner.clone()));
+ <Pallet<T>>::deposit_event(Event::CollectionCreated(
+ id,
+ data.mode.id(),
+ owner.as_sub().clone(),
+ ));
+ <PalletEvm<T>>::deposit_log(
+ erc::CollectionHelpersEvents::CollectionCreated {
+ owner: *owner.as_eth(),
+ collection_id: eth::collection_id_to_address(id),
+ }
+ .to_log(T::ContractAddress::get()),
+ );
<CollectionById<T>>::insert(id, collection);
Ok(id)
}
pallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -66,9 +66,7 @@
}
#[pallet::config]
- pub trait Config: frame_system::Config {
- type GasWeightMapping: pallet_evm::GasWeightMapping;
- }
+ pub trait Config: frame_system::Config + pallet_evm::Config {}
#[pallet::pallet]
pub struct Pallet<T>(_);
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -134,7 +134,7 @@
impl<T: Config> Pallet<T> {
pub fn init_collection(
- owner: T::AccountId,
+ owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
<PalletCommon<T>>::init_collection(owner, data)
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
@@ -127,7 +127,7 @@
}
}
-// Selector: f5652829
+// Selector: c894dc35
contract Collection is Dummy, ERC165 {
// Selector: setCollectionProperty(string,bytes) 2f073f66
function setCollectionProperty(string memory key, bytes memory value)
@@ -173,8 +173,16 @@
dummy = 0;
}
- // Selector: setLimit(string,string) bf4d2014
- function setLimit(string memory limit, string memory value) public {
+ // Selector: setLimit(string,uint32) 68db30ca
+ function setLimit(string memory limit, uint32 value) public {
+ require(false, stub_error);
+ limit;
+ value;
+ dummy = 0;
+ }
+
+ // Selector: setLimit(string,bool) ea67e4c2
+ function setLimit(string memory limit, bool value) public {
require(false, stub_error);
limit;
value;
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -295,7 +295,7 @@
// unchecked calls skips any permission checks
impl<T: Config> Pallet<T> {
pub fn init_collection(
- owner: T::AccountId,
+ owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
<PalletCommon<T>>::init_collection(owner, data)
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
@@ -330,57 +330,7 @@
}
}
-// Selector: d74d154f
-contract ERC721UniqueExtensions is Dummy, ERC165 {
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) public {
- require(false, stub_error);
- to;
- tokenId;
- dummy = 0;
- }
-
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) public {
- require(false, stub_error);
- from;
- tokenId;
- dummy = 0;
- }
-
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- public
- returns (bool)
- {
- require(false, stub_error);
- to;
- tokenIds;
- dummy = 0;
- return false;
- }
-
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- public
- returns (bool)
- {
- require(false, stub_error);
- to;
- tokens;
- dummy = 0;
- return false;
- }
-}
-
-// Selector: f5652829
+// Selector: c894dc35
contract Collection is Dummy, ERC165 {
// Selector: setCollectionProperty(string,bytes) 2f073f66
function setCollectionProperty(string memory key, bytes memory value)
@@ -426,8 +376,16 @@
dummy = 0;
}
- // Selector: setLimit(string,string) bf4d2014
- function setLimit(string memory limit, string memory value) public {
+ // Selector: setLimit(string,uint32) 68db30ca
+ function setLimit(string memory limit, uint32 value) public {
+ require(false, stub_error);
+ limit;
+ value;
+ dummy = 0;
+ }
+
+ // Selector: setLimit(string,bool) ea67e4c2
+ function setLimit(string memory limit, bool value) public {
require(false, stub_error);
limit;
value;
@@ -442,6 +400,56 @@
}
}
+// Selector: d74d154f
+contract ERC721UniqueExtensions is Dummy, ERC165 {
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) public {
+ require(false, stub_error);
+ to;
+ tokenId;
+ dummy = 0;
+ }
+
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) public {
+ require(false, stub_error);
+ from;
+ tokenId;
+ dummy = 0;
+ }
+
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokenIds;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokens;
+ dummy = 0;
+ return false;
+ }
+}
+
contract UniqueNFT is
Dummy,
ERC165,
pallets/proxy-rmrk-core/src/lib.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#![cfg_attr(not(feature = "std"), no_std)]1819use frame_support::{pallet_prelude::*, transactional, BoundedVec, dispatch::DispatchResult};20use frame_system::{pallet_prelude::*, ensure_signed};21use sp_runtime::{DispatchError, Permill, traits::StaticLookup};22use sp_std::vec::Vec;23use up_data_structs::*;24use pallet_common::{25 Pallet as PalletCommon, Error as CommonError, CollectionHandle, CommonCollectionOperations,26};27use pallet_nonfungible::{Pallet as PalletNft, NonfungibleHandle, TokenData};28use pallet_evm::account::CrossAccountId;29use core::convert::AsRef;3031pub use pallet::*;3233pub mod misc;34pub mod property;3536use misc::*;37pub use property::*;3839use RmrkProperty::*;4041#[frame_support::pallet]42pub mod pallet {43 use super::*;44 use pallet_evm::account;4546 #[pallet::config]47 pub trait Config:48 frame_system::Config + pallet_common::Config + pallet_nonfungible::Config + account::Config49 {50 type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;51 }5253 #[pallet::storage]54 #[pallet::getter(fn collection_index)]55 pub type CollectionIndex<T: Config> = StorageValue<_, RmrkCollectionId, ValueQuery>;5657 #[pallet::pallet]58 #[pallet::generate_store(pub(super) trait Store)]59 pub struct Pallet<T>(_);6061 #[pallet::event]62 #[pallet::generate_deposit(pub(super) fn deposit_event)]63 pub enum Event<T: Config> {64 CollectionCreated {65 issuer: T::AccountId,66 collection_id: RmrkCollectionId,67 },68 CollectionDestroyed {69 issuer: T::AccountId,70 collection_id: RmrkCollectionId,71 },72 IssuerChanged {73 old_issuer: T::AccountId,74 new_issuer: T::AccountId,75 collection_id: RmrkCollectionId,76 },77 CollectionLocked {78 issuer: T::AccountId,79 collection_id: RmrkCollectionId,80 },81 NftMinted {82 owner: T::AccountId,83 collection_id: RmrkCollectionId,84 nft_id: RmrkNftId,85 },86 NFTBurned {87 owner: T::AccountId,88 nft_id: RmrkNftId,89 },90 PropertySet {91 collection_id: RmrkCollectionId,92 maybe_nft_id: Option<RmrkNftId>,93 key: RmrkKeyString,94 value: RmrkValueString,95 },96 }9798 #[pallet::error]99 pub enum Error<T> {100 /* Unique-specific events */101 CorruptedCollectionType,102 NftTypeEncodeError,103 RmrkPropertyKeyIsTooLong,104 RmrkPropertyValueIsTooLong,105106 /* RMRK compatible events */107 CollectionNotEmpty,108 NoAvailableCollectionId,109 NoAvailableNftId,110 CollectionUnknown,111 NoPermission,112 CollectionFullOrLocked,113 }114115 #[pallet::call]116 impl<T: Config> Pallet<T> {117 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]118 #[transactional]119 pub fn create_collection(120 origin: OriginFor<T>,121 metadata: RmrkString,122 max: Option<u32>,123 symbol: RmrkCollectionSymbol,124 ) -> DispatchResult {125 let sender = ensure_signed(origin)?;126127 let limits = CollectionLimits {128 owner_can_transfer: Some(false),129 token_limit: max,130 ..Default::default()131 };132133 let data = CreateCollectionData {134 limits: Some(limits),135 token_prefix: symbol136 .into_inner()137 .try_into()138 .map_err(|_| <CommonError<T>>::CollectionTokenPrefixLimitExceeded)?,139 ..Default::default()140 };141142 let collection_id_res = <PalletNft<T>>::init_collection(sender.clone(), data);143144 if let Err(DispatchError::Arithmetic(_)) = &collection_id_res {145 return Err(<Error<T>>::NoAvailableCollectionId.into());146 }147148 let collection_id = collection_id_res?;149150 <PalletCommon<T>>::set_scoped_collection_properties(151 collection_id,152 PropertyScope::Rmrk,153 [154 Self::rmrk_property(Metadata, &metadata)?,155 Self::rmrk_property(CollectionType, &misc::CollectionType::Regular)?,156 ]157 .into_iter(),158 )?;159160 <CollectionIndex<T>>::mutate(|n| *n += 1);161162 Self::deposit_event(Event::CollectionCreated {163 issuer: sender,164 collection_id: collection_id.0,165 });166167 Ok(())168 }169170 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]171 #[transactional]172 pub fn destroy_collection(173 origin: OriginFor<T>,174 collection_id: RmrkCollectionId,175 ) -> DispatchResult {176 let sender = ensure_signed(origin)?;177 let cross_sender = T::CrossAccountId::from_sub(sender.clone());178179 let unique_collection_id = collection_id.into();180181 let collection = Self::get_typed_nft_collection(182 unique_collection_id,183 misc::CollectionType::Regular,184 )?;185186 ensure!(187 collection.total_supply() == 0,188 <Error<T>>::CollectionNotEmpty189 );190191 <PalletNft<T>>::destroy_collection(collection, &cross_sender)192 .map_err(Self::map_common_err_to_proxy)?;193194 Self::deposit_event(Event::CollectionDestroyed {195 issuer: sender,196 collection_id,197 });198199 Ok(())200 }201202 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]203 #[transactional]204 pub fn change_collection_issuer(205 origin: OriginFor<T>,206 collection_id: RmrkCollectionId,207 new_issuer: <T::Lookup as StaticLookup>::Source,208 ) -> DispatchResult {209 let sender = ensure_signed(origin)?;210211 let new_issuer = T::Lookup::lookup(new_issuer)?;212213 Self::change_collection_owner(214 collection_id.into(),215 misc::CollectionType::Regular,216 sender.clone(),217 new_issuer.clone(),218 )?;219220 Self::deposit_event(Event::IssuerChanged {221 old_issuer: sender,222 new_issuer,223 collection_id,224 });225226 Ok(())227 }228229 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]230 #[transactional]231 pub fn lock_collection(232 origin: OriginFor<T>,233 collection_id: RmrkCollectionId,234 ) -> DispatchResult {235 let sender = ensure_signed(origin)?;236 let cross_sender = T::CrossAccountId::from_sub(sender.clone());237238 let collection = Self::get_typed_nft_collection(239 collection_id.into(),240 misc::CollectionType::Regular,241 )?;242243 Self::check_collection_owner(&collection, &cross_sender)?;244245 let token_count = collection.total_supply();246247 let mut collection = collection.into_inner();248 collection.limits.token_limit = Some(token_count);249 collection.save()?;250251 Self::deposit_event(Event::CollectionLocked {252 issuer: sender,253 collection_id,254 });255256 Ok(())257 }258259 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]260 #[transactional]261 pub fn mint_nft(262 origin: OriginFor<T>,263 owner: T::AccountId,264 collection_id: RmrkCollectionId,265 recipient: Option<T::AccountId>,266 royalty_amount: Option<Permill>,267 metadata: RmrkString,268 ) -> DispatchResult {269 let sender = ensure_signed(origin)?;270 let sender = T::CrossAccountId::from_sub(sender);271 let cross_owner = T::CrossAccountId::from_sub(owner.clone());272273 let royalty_info = royalty_amount.map(|amount| rmrk::RoyaltyInfo {274 recipient: recipient.unwrap_or_else(|| owner.clone()),275 amount,276 });277278 let collection = Self::get_typed_nft_collection(279 collection_id.into(),280 misc::CollectionType::Regular,281 )?;282283 let nft_id = Self::create_nft(284 &sender,285 &cross_owner,286 &collection,287 NftType::Regular,288 [289 Self::rmrk_property(RoyaltyInfo, &royalty_info)?,290 Self::rmrk_property(Metadata, &metadata)?,291 Self::rmrk_property(Equipped, &false)?,292 Self::rmrk_property(ResourceCollection, &None::<CollectionId>)?,293 Self::rmrk_property(ResourcePriorities, &<Vec<u8>>::new())?,294 ]295 .into_iter(),296 )297 .map_err(|err| match err {298 DispatchError::Arithmetic(_) => <Error<T>>::NoAvailableNftId.into(),299 err => Self::map_common_err_to_proxy(err),300 })?;301302 Self::deposit_event(Event::NftMinted {303 owner,304 collection_id,305 nft_id: nft_id.0,306 });307308 Ok(())309 }310311 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]312 #[transactional]313 pub fn burn_nft(314 origin: OriginFor<T>,315 collection_id: RmrkCollectionId,316 nft_id: RmrkNftId,317 ) -> DispatchResult {318 let sender = ensure_signed(origin)?;319 let cross_sender = T::CrossAccountId::from_sub(sender.clone());320321 Self::destroy_nft(322 cross_sender,323 collection_id.into(),324 misc::CollectionType::Regular,325 nft_id.into(),326 )?;327328 Self::deposit_event(Event::NFTBurned {329 owner: sender,330 nft_id,331 });332333 Ok(())334 }335336 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]337 #[transactional]338 pub fn set_property(339 origin: OriginFor<T>,340 #[pallet::compact] rmrk_collection_id: RmrkCollectionId,341 maybe_nft_id: Option<RmrkNftId>,342 key: RmrkKeyString,343 value: RmrkValueString,344 ) -> DispatchResult {345 let sender = ensure_signed(origin)?;346 let sender = T::CrossAccountId::from_sub(sender);347348 let collection_id: CollectionId = rmrk_collection_id.into();349350 match maybe_nft_id {351 Some(nft_id) => {352 let token_id: TokenId = nft_id.into();353354 Self::ensure_nft_owner(collection_id, token_id, &sender)?;355 Self::ensure_nft_type(collection_id, token_id, NftType::Regular)?;356357 <PalletNft<T>>::set_scoped_token_property(358 collection_id,359 token_id,360 PropertyScope::Rmrk,361 Self::rmrk_property(UserProperty(key.as_slice()), &value)?,362 )?;363 }364 None => {365 let collection = Self::get_typed_nft_collection(366 collection_id,367 misc::CollectionType::Regular,368 )?;369370 Self::check_collection_owner(&collection, &sender)?;371372 <PalletCommon<T>>::set_scoped_collection_property(373 collection_id,374 PropertyScope::Rmrk,375 Self::rmrk_property(UserProperty(key.as_slice()), &value)?,376 )?;377 }378 }379380 Self::deposit_event(Event::PropertySet {381 collection_id: rmrk_collection_id,382 maybe_nft_id,383 key,384 value,385 });386387 Ok(())388 }389 }390}391392impl<T: Config> Pallet<T> {393 pub fn rmrk_property_key(rmrk_key: RmrkProperty) -> Result<PropertyKey, DispatchError> {394 let key = rmrk_key.to_key::<T>()?;395396 let scoped_key = PropertyScope::Rmrk397 .apply(key)398 .map_err(|_| <Error<T>>::RmrkPropertyKeyIsTooLong)?;399400 Ok(scoped_key)401 }402403 pub fn rmrk_property<E: Encode>(404 rmrk_key: RmrkProperty,405 value: &E,406 ) -> Result<Property, DispatchError> {407 let key = rmrk_key.to_key::<T>()?;408409 let value = value410 .encode()411 .try_into()412 .map_err(|_| <Error<T>>::RmrkPropertyValueIsTooLong)?;413414 let property = Property { key, value };415416 Ok(property)417 }418419 pub fn create_nft(420 sender: &T::CrossAccountId,421 owner: &T::CrossAccountId,422 collection: &NonfungibleHandle<T>,423 nft_type: NftType,424 properties: impl Iterator<Item = Property>,425 ) -> Result<TokenId, DispatchError> {426 todo!("store nft type");427 let data = CreateNftExData {428 properties: BoundedVec::default(),429 owner: owner.clone(),430 };431432 let budget = budget::Value::new(2);433434 <PalletNft<T>>::create_item(collection, sender, data, &budget)?;435436 let nft_id = <PalletNft<T>>::current_token_id(collection.id);437438 <PalletNft<T>>::set_scoped_token_properties(439 collection.id,440 nft_id,441 PropertyScope::Rmrk,442 properties,443 )?;444445 Ok(nft_id)446 }447448 fn destroy_nft(449 sender: T::CrossAccountId,450 collection_id: CollectionId,451 collection_type: misc::CollectionType,452 token_id: TokenId,453 ) -> DispatchResult {454 let collection = Self::get_typed_nft_collection(collection_id, collection_type)?;455456 <PalletNft<T>>::burn(&collection, &sender, token_id)457 .map_err(Self::map_common_err_to_proxy)?;458459 Ok(())460 }461462 fn change_collection_owner(463 collection_id: CollectionId,464 collection_type: misc::CollectionType,465 sender: T::AccountId,466 new_owner: T::AccountId,467 ) -> DispatchResult {468 let collection = Self::get_typed_nft_collection(collection_id, collection_type)?;469 Self::check_collection_owner(&collection, &T::CrossAccountId::from_sub(sender))?;470471 let mut collection = collection.into_inner();472473 collection.owner = new_owner;474 collection.save()475 }476477 fn check_collection_owner(478 collection: &NonfungibleHandle<T>,479 account: &T::CrossAccountId,480 ) -> DispatchResult {481 collection482 .check_is_owner(account)483 .map_err(Self::map_common_err_to_proxy)484 }485486 pub fn last_collection_idx() -> RmrkCollectionId {487 <CollectionIndex<T>>::get()488 }489490 pub fn get_nft_collection(491 collection_id: CollectionId,492 ) -> Result<NonfungibleHandle<T>, DispatchError> {493 let collection = <CollectionHandle<T>>::try_get(collection_id)494 .map_err(|_| <Error<T>>::CollectionUnknown)?;495496 match collection.mode {497 CollectionMode::NFT => Ok(NonfungibleHandle::cast(collection)),498 _ => Err(<Error<T>>::CollectionUnknown.into()),499 }500 }501502 pub fn collection_exists(collection_id: CollectionId) -> bool {503 <CollectionHandle<T>>::try_get(collection_id).is_ok()504 }505506 pub fn nft_exists(collection_id: CollectionId, nft_id: TokenId) -> bool {507 <TokenData<T>>::contains_key((collection_id, nft_id))508 }509510 pub fn get_collection_property(511 collection_id: CollectionId,512 key: RmrkProperty,513 ) -> Result<PropertyValue, DispatchError> {514 let collection_property = <PalletCommon<T>>::collection_properties(collection_id)515 .get(&Self::rmrk_property_key(key)?)516 .ok_or(<Error<T>>::CollectionUnknown)?517 .clone();518519 Ok(collection_property)520 }521522 pub fn get_collection_type(523 collection_id: CollectionId,524 ) -> Result<misc::CollectionType, DispatchError> {525 let value = Self::get_collection_property(collection_id, CollectionType)?;526527 let mut value = value.as_slice();528529 misc::CollectionType::decode(&mut value)530 .map_err(|_| <Error<T>>::CorruptedCollectionType.into())531 }532533 pub fn ensure_collection_type(534 collection_id: CollectionId,535 collection_type: misc::CollectionType,536 ) -> DispatchResult {537 let actual_type = Self::get_collection_type(collection_id)?;538 ensure!(539 actual_type == collection_type,540 <CommonError<T>>::NoPermission541 );542543 Ok(())544 }545546 pub fn get_nft_property(547 collection_id: CollectionId,548 nft_id: TokenId,549 key: RmrkProperty,550 ) -> Result<PropertyValue, DispatchError> {551 let nft_property = <PalletNft<T>>::token_properties((collection_id, nft_id))552 .get(&Self::rmrk_property_key(key)?)553 .ok_or(<Error<T>>::NoAvailableNftId)?554 .clone();555556 Ok(nft_property)557 }558559 pub fn get_nft_type(560 _collection_id: CollectionId,561 _token_id: TokenId,562 ) -> Result<NftType, DispatchError> {563 todo!("should get it from properties?")564 }565566 pub fn ensure_nft_type(567 collection_id: CollectionId,568 token_id: TokenId,569 nft_type: NftType,570 ) -> DispatchResult {571 let actual_type = Self::get_nft_type(collection_id, token_id)?;572 ensure!(actual_type == nft_type, <Error<T>>::NoPermission);573574 Ok(())575 }576577 pub fn ensure_nft_owner(578 collection_id: CollectionId,579 token_id: TokenId,580 possible_owner: &T::CrossAccountId,581 ) -> DispatchResult {582 let token_data =583 <TokenData<T>>::get((collection_id, token_id)).ok_or(<Error<T>>::NoAvailableNftId)?;584585 ensure!(586 token_data.owner == *possible_owner,587 <Error<T>>::NoPermission588 );589590 Ok(())591 }592593 pub fn filter_user_properties<Key, Value, R, Mapper>(594 collection_id: CollectionId,595 token_id: Option<TokenId>,596 filter_keys: Option<Vec<RmrkPropertyKey>>,597 mapper: Mapper,598 ) -> Result<Vec<R>, DispatchError>599 where600 Key: TryFrom<RmrkPropertyKey> + AsRef<[u8]>,601 Value: Decode + Default,602 Mapper: Fn(Key, Value) -> R,603 {604 filter_keys605 .map(|keys| {606 let properties = keys607 .into_iter()608 .filter_map(|key| {609 let key: Key = key.try_into().ok()?;610611 let value = match token_id {612 Some(token_id) => Self::get_nft_property(613 collection_id,614 token_id,615 UserProperty(key.as_ref()),616 ),617 None => Self::get_collection_property(618 collection_id,619 UserProperty(key.as_ref()),620 ),621 }622 .ok()?623 .decode_or_default();624625 Some(mapper(key, value))626 })627 .collect();628629 Ok(properties)630 })631 .unwrap_or_else(|| {632 let properties =633 Self::iterate_user_properties(collection_id, token_id, mapper)?.collect();634635 Ok(properties)636 })637 }638639 pub fn iterate_user_properties<Key, Value, R, Mapper>(640 collection_id: CollectionId,641 token_id: Option<TokenId>,642 mapper: Mapper,643 ) -> Result<impl Iterator<Item = R>, DispatchError>644 where645 Key: TryFrom<RmrkPropertyKey> + AsRef<[u8]>,646 Value: Decode + Default,647 Mapper: Fn(Key, Value) -> R,648 {649 let key_prefix = Self::rmrk_property_key(UserProperty(b""))?;650651 let properties = match token_id {652 Some(token_id) => <PalletNft<T>>::token_properties((collection_id, token_id)),653 None => <PalletCommon<T>>::collection_properties(collection_id),654 };655656 let properties = properties.into_iter().filter_map(move |(key, value)| {657 let key = key.as_slice().strip_prefix(key_prefix.as_slice())?;658659 let key: Key = key.to_vec().try_into().ok()?;660 let value: Value = value.decode_or_default();661662 Some(mapper(key, value))663 });664665 Ok(properties)666 }667668 pub fn get_typed_nft_collection(669 collection_id: CollectionId,670 collection_type: misc::CollectionType,671 ) -> Result<NonfungibleHandle<T>, DispatchError> {672 Self::ensure_collection_type(collection_id, collection_type)?;673674 Self::get_nft_collection(collection_id)675 }676677 fn map_common_err_to_proxy(err: DispatchError) -> DispatchError {678 map_common_err_to_proxy! {679 match err {680 NoPermission => NoPermission,681 CollectionTokenLimitExceeded => CollectionFullOrLocked,682 PublicMintingNotAllowed => NoPermission,683 TokenNotFound => NoAvailableNftId684 }685 }686 }687}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#![cfg_attr(not(feature = "std"), no_std)]1819use frame_support::{pallet_prelude::*, transactional, BoundedVec, dispatch::DispatchResult};20use frame_system::{pallet_prelude::*, ensure_signed};21use sp_runtime::{DispatchError, Permill, traits::StaticLookup};22use sp_std::vec::Vec;23use up_data_structs::*;24use pallet_common::{25 Pallet as PalletCommon, Error as CommonError, CollectionHandle, CommonCollectionOperations,26};27use pallet_nonfungible::{Pallet as PalletNft, NonfungibleHandle, TokenData};28use pallet_evm::account::CrossAccountId;29use core::convert::AsRef;3031pub use pallet::*;3233pub mod misc;34pub mod property;3536use misc::*;37pub use property::*;3839use RmrkProperty::*;4041#[frame_support::pallet]42pub mod pallet {43 use super::*;44 use pallet_evm::account;4546 #[pallet::config]47 pub trait Config:48 frame_system::Config + pallet_common::Config + pallet_nonfungible::Config + account::Config49 {50 type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;51 }5253 #[pallet::storage]54 #[pallet::getter(fn collection_index)]55 pub type CollectionIndex<T: Config> = StorageValue<_, RmrkCollectionId, ValueQuery>;5657 #[pallet::pallet]58 #[pallet::generate_store(pub(super) trait Store)]59 pub struct Pallet<T>(_);6061 #[pallet::event]62 #[pallet::generate_deposit(pub(super) fn deposit_event)]63 pub enum Event<T: Config> {64 CollectionCreated {65 issuer: T::AccountId,66 collection_id: RmrkCollectionId,67 },68 CollectionDestroyed {69 issuer: T::AccountId,70 collection_id: RmrkCollectionId,71 },72 IssuerChanged {73 old_issuer: T::AccountId,74 new_issuer: T::AccountId,75 collection_id: RmrkCollectionId,76 },77 CollectionLocked {78 issuer: T::AccountId,79 collection_id: RmrkCollectionId,80 },81 NftMinted {82 owner: T::AccountId,83 collection_id: RmrkCollectionId,84 nft_id: RmrkNftId,85 },86 NFTBurned {87 owner: T::AccountId,88 nft_id: RmrkNftId,89 },90 PropertySet {91 collection_id: RmrkCollectionId,92 maybe_nft_id: Option<RmrkNftId>,93 key: RmrkKeyString,94 value: RmrkValueString,95 },96 }9798 #[pallet::error]99 pub enum Error<T> {100 /* Unique-specific events */101 CorruptedCollectionType,102 NftTypeEncodeError,103 RmrkPropertyKeyIsTooLong,104 RmrkPropertyValueIsTooLong,105106 /* RMRK compatible events */107 CollectionNotEmpty,108 NoAvailableCollectionId,109 NoAvailableNftId,110 CollectionUnknown,111 NoPermission,112 CollectionFullOrLocked,113 }114115 #[pallet::call]116 impl<T: Config> Pallet<T> {117 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]118 #[transactional]119 pub fn create_collection(120 origin: OriginFor<T>,121 metadata: RmrkString,122 max: Option<u32>,123 symbol: RmrkCollectionSymbol,124 ) -> DispatchResult {125 let sender = ensure_signed(origin)?;126127 let limits = CollectionLimits {128 owner_can_transfer: Some(false),129 token_limit: max,130 ..Default::default()131 };132133 let data = CreateCollectionData {134 limits: Some(limits),135 token_prefix: symbol136 .into_inner()137 .try_into()138 .map_err(|_| <CommonError<T>>::CollectionTokenPrefixLimitExceeded)?,139 ..Default::default()140 };141142 let collection_id_res =143 <PalletNft<T>>::init_collection(T::CrossAccountId::from_sub(sender.clone()), data);144145 if let Err(DispatchError::Arithmetic(_)) = &collection_id_res {146 return Err(<Error<T>>::NoAvailableCollectionId.into());147 }148149 let collection_id = collection_id_res?;150151 <PalletCommon<T>>::set_scoped_collection_properties(152 collection_id,153 PropertyScope::Rmrk,154 [155 Self::rmrk_property(Metadata, &metadata)?,156 Self::rmrk_property(CollectionType, &misc::CollectionType::Regular)?,157 ]158 .into_iter(),159 )?;160161 <CollectionIndex<T>>::mutate(|n| *n += 1);162163 Self::deposit_event(Event::CollectionCreated {164 issuer: sender,165 collection_id: collection_id.0,166 });167168 Ok(())169 }170171 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]172 #[transactional]173 pub fn destroy_collection(174 origin: OriginFor<T>,175 collection_id: RmrkCollectionId,176 ) -> DispatchResult {177 let sender = ensure_signed(origin)?;178 let cross_sender = T::CrossAccountId::from_sub(sender.clone());179180 let unique_collection_id = collection_id.into();181182 let collection = Self::get_typed_nft_collection(183 unique_collection_id,184 misc::CollectionType::Regular,185 )?;186187 ensure!(188 collection.total_supply() == 0,189 <Error<T>>::CollectionNotEmpty190 );191192 <PalletNft<T>>::destroy_collection(collection, &cross_sender)193 .map_err(Self::map_common_err_to_proxy)?;194195 Self::deposit_event(Event::CollectionDestroyed {196 issuer: sender,197 collection_id,198 });199200 Ok(())201 }202203 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]204 #[transactional]205 pub fn change_collection_issuer(206 origin: OriginFor<T>,207 collection_id: RmrkCollectionId,208 new_issuer: <T::Lookup as StaticLookup>::Source,209 ) -> DispatchResult {210 let sender = ensure_signed(origin)?;211212 let new_issuer = T::Lookup::lookup(new_issuer)?;213214 Self::change_collection_owner(215 collection_id.into(),216 misc::CollectionType::Regular,217 sender.clone(),218 new_issuer.clone(),219 )?;220221 Self::deposit_event(Event::IssuerChanged {222 old_issuer: sender,223 new_issuer,224 collection_id,225 });226227 Ok(())228 }229230 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]231 #[transactional]232 pub fn lock_collection(233 origin: OriginFor<T>,234 collection_id: RmrkCollectionId,235 ) -> DispatchResult {236 let sender = ensure_signed(origin)?;237 let cross_sender = T::CrossAccountId::from_sub(sender.clone());238239 let collection = Self::get_typed_nft_collection(240 collection_id.into(),241 misc::CollectionType::Regular,242 )?;243244 Self::check_collection_owner(&collection, &cross_sender)?;245246 let token_count = collection.total_supply();247248 let mut collection = collection.into_inner();249 collection.limits.token_limit = Some(token_count);250 collection.save()?;251252 Self::deposit_event(Event::CollectionLocked {253 issuer: sender,254 collection_id,255 });256257 Ok(())258 }259260 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]261 #[transactional]262 pub fn mint_nft(263 origin: OriginFor<T>,264 owner: T::AccountId,265 collection_id: RmrkCollectionId,266 recipient: Option<T::AccountId>,267 royalty_amount: Option<Permill>,268 metadata: RmrkString,269 ) -> DispatchResult {270 let sender = ensure_signed(origin)?;271 let sender = T::CrossAccountId::from_sub(sender);272 let cross_owner = T::CrossAccountId::from_sub(owner.clone());273274 let royalty_info = royalty_amount.map(|amount| rmrk::RoyaltyInfo {275 recipient: recipient.unwrap_or_else(|| owner.clone()),276 amount,277 });278279 let collection = Self::get_typed_nft_collection(280 collection_id.into(),281 misc::CollectionType::Regular,282 )?;283284 let nft_id = Self::create_nft(285 &sender,286 &cross_owner,287 &collection,288 NftType::Regular,289 [290 Self::rmrk_property(RoyaltyInfo, &royalty_info)?,291 Self::rmrk_property(Metadata, &metadata)?,292 Self::rmrk_property(Equipped, &false)?,293 Self::rmrk_property(ResourceCollection, &None::<CollectionId>)?,294 Self::rmrk_property(ResourcePriorities, &<Vec<u8>>::new())?,295 ]296 .into_iter(),297 )298 .map_err(|err| match err {299 DispatchError::Arithmetic(_) => <Error<T>>::NoAvailableNftId.into(),300 err => Self::map_common_err_to_proxy(err),301 })?;302303 Self::deposit_event(Event::NftMinted {304 owner,305 collection_id,306 nft_id: nft_id.0,307 });308309 Ok(())310 }311312 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]313 #[transactional]314 pub fn burn_nft(315 origin: OriginFor<T>,316 collection_id: RmrkCollectionId,317 nft_id: RmrkNftId,318 ) -> DispatchResult {319 let sender = ensure_signed(origin)?;320 let cross_sender = T::CrossAccountId::from_sub(sender.clone());321322 Self::destroy_nft(323 cross_sender,324 collection_id.into(),325 misc::CollectionType::Regular,326 nft_id.into(),327 )?;328329 Self::deposit_event(Event::NFTBurned {330 owner: sender,331 nft_id,332 });333334 Ok(())335 }336337 #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]338 #[transactional]339 pub fn set_property(340 origin: OriginFor<T>,341 #[pallet::compact] rmrk_collection_id: RmrkCollectionId,342 maybe_nft_id: Option<RmrkNftId>,343 key: RmrkKeyString,344 value: RmrkValueString,345 ) -> DispatchResult {346 let sender = ensure_signed(origin)?;347 let sender = T::CrossAccountId::from_sub(sender);348349 let collection_id: CollectionId = rmrk_collection_id.into();350351 match maybe_nft_id {352 Some(nft_id) => {353 let token_id: TokenId = nft_id.into();354355 Self::ensure_nft_owner(collection_id, token_id, &sender)?;356 Self::ensure_nft_type(collection_id, token_id, NftType::Regular)?;357358 <PalletNft<T>>::set_scoped_token_property(359 collection_id,360 token_id,361 PropertyScope::Rmrk,362 Self::rmrk_property(UserProperty(key.as_slice()), &value)?,363 )?;364 }365 None => {366 let collection = Self::get_typed_nft_collection(367 collection_id,368 misc::CollectionType::Regular,369 )?;370371 Self::check_collection_owner(&collection, &sender)?;372373 <PalletCommon<T>>::set_scoped_collection_property(374 collection_id,375 PropertyScope::Rmrk,376 Self::rmrk_property(UserProperty(key.as_slice()), &value)?,377 )?;378 }379 }380381 Self::deposit_event(Event::PropertySet {382 collection_id: rmrk_collection_id,383 maybe_nft_id,384 key,385 value,386 });387388 Ok(())389 }390 }391}392393impl<T: Config> Pallet<T> {394 pub fn rmrk_property_key(rmrk_key: RmrkProperty) -> Result<PropertyKey, DispatchError> {395 let key = rmrk_key.to_key::<T>()?;396397 let scoped_key = PropertyScope::Rmrk398 .apply(key)399 .map_err(|_| <Error<T>>::RmrkPropertyKeyIsTooLong)?;400401 Ok(scoped_key)402 }403404 pub fn rmrk_property<E: Encode>(405 rmrk_key: RmrkProperty,406 value: &E,407 ) -> Result<Property, DispatchError> {408 let key = rmrk_key.to_key::<T>()?;409410 let value = value411 .encode()412 .try_into()413 .map_err(|_| <Error<T>>::RmrkPropertyValueIsTooLong)?;414415 let property = Property { key, value };416417 Ok(property)418 }419420 pub fn create_nft(421 sender: &T::CrossAccountId,422 owner: &T::CrossAccountId,423 collection: &NonfungibleHandle<T>,424 nft_type: NftType,425 properties: impl Iterator<Item = Property>,426 ) -> Result<TokenId, DispatchError> {427 todo!("store nft type");428 let data = CreateNftExData {429 properties: BoundedVec::default(),430 owner: owner.clone(),431 };432433 let budget = budget::Value::new(2);434435 <PalletNft<T>>::create_item(collection, sender, data, &budget)?;436437 let nft_id = <PalletNft<T>>::current_token_id(collection.id);438439 <PalletNft<T>>::set_scoped_token_properties(440 collection.id,441 nft_id,442 PropertyScope::Rmrk,443 properties,444 )?;445446 Ok(nft_id)447 }448449 fn destroy_nft(450 sender: T::CrossAccountId,451 collection_id: CollectionId,452 collection_type: misc::CollectionType,453 token_id: TokenId,454 ) -> DispatchResult {455 let collection = Self::get_typed_nft_collection(collection_id, collection_type)?;456457 <PalletNft<T>>::burn(&collection, &sender, token_id)458 .map_err(Self::map_common_err_to_proxy)?;459460 Ok(())461 }462463 fn change_collection_owner(464 collection_id: CollectionId,465 collection_type: misc::CollectionType,466 sender: T::AccountId,467 new_owner: T::AccountId,468 ) -> DispatchResult {469 let collection = Self::get_typed_nft_collection(collection_id, collection_type)?;470 Self::check_collection_owner(&collection, &T::CrossAccountId::from_sub(sender))?;471472 let mut collection = collection.into_inner();473474 collection.owner = new_owner;475 collection.save()476 }477478 fn check_collection_owner(479 collection: &NonfungibleHandle<T>,480 account: &T::CrossAccountId,481 ) -> DispatchResult {482 collection483 .check_is_owner(account)484 .map_err(Self::map_common_err_to_proxy)485 }486487 pub fn last_collection_idx() -> RmrkCollectionId {488 <CollectionIndex<T>>::get()489 }490491 pub fn get_nft_collection(492 collection_id: CollectionId,493 ) -> Result<NonfungibleHandle<T>, DispatchError> {494 let collection = <CollectionHandle<T>>::try_get(collection_id)495 .map_err(|_| <Error<T>>::CollectionUnknown)?;496497 match collection.mode {498 CollectionMode::NFT => Ok(NonfungibleHandle::cast(collection)),499 _ => Err(<Error<T>>::CollectionUnknown.into()),500 }501 }502503 pub fn collection_exists(collection_id: CollectionId) -> bool {504 <CollectionHandle<T>>::try_get(collection_id).is_ok()505 }506507 pub fn nft_exists(collection_id: CollectionId, nft_id: TokenId) -> bool {508 <TokenData<T>>::contains_key((collection_id, nft_id))509 }510511 pub fn get_collection_property(512 collection_id: CollectionId,513 key: RmrkProperty,514 ) -> Result<PropertyValue, DispatchError> {515 let collection_property = <PalletCommon<T>>::collection_properties(collection_id)516 .get(&Self::rmrk_property_key(key)?)517 .ok_or(<Error<T>>::CollectionUnknown)?518 .clone();519520 Ok(collection_property)521 }522523 pub fn get_collection_type(524 collection_id: CollectionId,525 ) -> Result<misc::CollectionType, DispatchError> {526 let value = Self::get_collection_property(collection_id, CollectionType)?;527528 let mut value = value.as_slice();529530 misc::CollectionType::decode(&mut value)531 .map_err(|_| <Error<T>>::CorruptedCollectionType.into())532 }533534 pub fn ensure_collection_type(535 collection_id: CollectionId,536 collection_type: misc::CollectionType,537 ) -> DispatchResult {538 let actual_type = Self::get_collection_type(collection_id)?;539 ensure!(540 actual_type == collection_type,541 <CommonError<T>>::NoPermission542 );543544 Ok(())545 }546547 pub fn get_nft_property(548 collection_id: CollectionId,549 nft_id: TokenId,550 key: RmrkProperty,551 ) -> Result<PropertyValue, DispatchError> {552 let nft_property = <PalletNft<T>>::token_properties((collection_id, nft_id))553 .get(&Self::rmrk_property_key(key)?)554 .ok_or(<Error<T>>::NoAvailableNftId)?555 .clone();556557 Ok(nft_property)558 }559560 pub fn get_nft_type(561 _collection_id: CollectionId,562 _token_id: TokenId,563 ) -> Result<NftType, DispatchError> {564 todo!("should get it from properties?")565 }566567 pub fn ensure_nft_type(568 collection_id: CollectionId,569 token_id: TokenId,570 nft_type: NftType,571 ) -> DispatchResult {572 let actual_type = Self::get_nft_type(collection_id, token_id)?;573 ensure!(actual_type == nft_type, <Error<T>>::NoPermission);574575 Ok(())576 }577578 pub fn ensure_nft_owner(579 collection_id: CollectionId,580 token_id: TokenId,581 possible_owner: &T::CrossAccountId,582 ) -> DispatchResult {583 let token_data =584 <TokenData<T>>::get((collection_id, token_id)).ok_or(<Error<T>>::NoAvailableNftId)?;585586 ensure!(587 token_data.owner == *possible_owner,588 <Error<T>>::NoPermission589 );590591 Ok(())592 }593594 pub fn filter_user_properties<Key, Value, R, Mapper>(595 collection_id: CollectionId,596 token_id: Option<TokenId>,597 filter_keys: Option<Vec<RmrkPropertyKey>>,598 mapper: Mapper,599 ) -> Result<Vec<R>, DispatchError>600 where601 Key: TryFrom<RmrkPropertyKey> + AsRef<[u8]>,602 Value: Decode + Default,603 Mapper: Fn(Key, Value) -> R,604 {605 filter_keys606 .map(|keys| {607 let properties = keys608 .into_iter()609 .filter_map(|key| {610 let key: Key = key.try_into().ok()?;611612 let value = match token_id {613 Some(token_id) => Self::get_nft_property(614 collection_id,615 token_id,616 UserProperty(key.as_ref()),617 ),618 None => Self::get_collection_property(619 collection_id,620 UserProperty(key.as_ref()),621 ),622 }623 .ok()?624 .decode_or_default();625626 Some(mapper(key, value))627 })628 .collect();629630 Ok(properties)631 })632 .unwrap_or_else(|| {633 let properties =634 Self::iterate_user_properties(collection_id, token_id, mapper)?.collect();635636 Ok(properties)637 })638 }639640 pub fn iterate_user_properties<Key, Value, R, Mapper>(641 collection_id: CollectionId,642 token_id: Option<TokenId>,643 mapper: Mapper,644 ) -> Result<impl Iterator<Item = R>, DispatchError>645 where646 Key: TryFrom<RmrkPropertyKey> + AsRef<[u8]>,647 Value: Decode + Default,648 Mapper: Fn(Key, Value) -> R,649 {650 let key_prefix = Self::rmrk_property_key(UserProperty(b""))?;651652 let properties = match token_id {653 Some(token_id) => <PalletNft<T>>::token_properties((collection_id, token_id)),654 None => <PalletCommon<T>>::collection_properties(collection_id),655 };656657 let properties = properties.into_iter().filter_map(move |(key, value)| {658 let key = key.as_slice().strip_prefix(key_prefix.as_slice())?;659660 let key: Key = key.to_vec().try_into().ok()?;661 let value: Value = value.decode_or_default();662663 Some(mapper(key, value))664 });665666 Ok(properties)667 }668669 pub fn get_typed_nft_collection(670 collection_id: CollectionId,671 collection_type: misc::CollectionType,672 ) -> Result<NonfungibleHandle<T>, DispatchError> {673 Self::ensure_collection_type(collection_id, collection_type)?;674675 Self::get_nft_collection(collection_id)676 }677678 fn map_common_err_to_proxy(err: DispatchError) -> DispatchError {679 map_common_err_to_proxy! {680 match err {681 NoPermission => NoPermission,682 CollectionTokenLimitExceeded => CollectionFullOrLocked,683 PublicMintingNotAllowed => NoPermission,684 TokenNotFound => NoAvailableNftId685 }686 }687 }688}pallets/proxy-rmrk-equip/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-equip/src/lib.rs
+++ b/pallets/proxy-rmrk-equip/src/lib.rs
@@ -94,7 +94,7 @@
..Default::default()
};
- let collection_id_res = <PalletNft<T>>::init_collection(sender.clone(), data);
+ let collection_id_res = <PalletNft<T>>::init_collection(cross_sender.clone(), data);
if let Err(DispatchError::Arithmetic(_)) = &collection_id_res {
return Err(<Error<T>>::NoAvailableBaseId.into());
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -197,7 +197,7 @@
// unchecked calls skips any permission checks
impl<T: Config> Pallet<T> {
pub fn init_collection(
- owner: T::AccountId,
+ owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
<PalletCommon<T>>::init_collection(owner, data)
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -24,14 +24,17 @@
MAX_COLLECTION_NAME_LENGTH,
};
use frame_support::traits::Get;
-use pallet_common::{CollectionById, erc::token_uri_key};
+use pallet_common::{
+ CollectionById,
+ erc::{token_uri_key, CollectionHelpersEvents},
+};
use crate::{SelfWeightOf, Config, weights::WeightInfo};
use sp_std::vec::Vec;
use alloc::format;
-struct EvmCollectionHelper<T: Config>(SubstrateRecorder<T>);
-impl<T: Config> WithRecorder<T> for EvmCollectionHelper<T> {
+struct EvmCollectionHelpers<T: Config>(SubstrateRecorder<T>);
+impl<T: Config> WithRecorder<T> for EvmCollectionHelpers<T> {
fn recorder(&self) -> &SubstrateRecorder<T> {
&self.0
}
@@ -41,8 +44,8 @@
}
}
-#[solidity_interface(name = "CollectionHelper")]
-impl<T: Config + pallet_nonfungible::Config> EvmCollectionHelper<T> {
+#[solidity_interface(name = "CollectionHelpers", events(CollectionHelpersEvents))]
+impl<T: Config + pallet_nonfungible::Config> EvmCollectionHelpers<T> {
#[weight(<SelfWeightOf<T>>::create_collection())]
fn create_nonfungible_collection(
&self,
@@ -89,9 +92,8 @@
..Default::default()
};
- let collection_id =
- <pallet_nonfungible::Pallet<T>>::init_collection(caller.as_sub().clone(), data)
- .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+ let collection_id = <pallet_nonfungible::Pallet<T>>::init_collection(caller.clone(), data)
+ .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
let address = pallet_common::eth::collection_id_to_address(collection_id);
Ok(address)
@@ -107,8 +109,8 @@
}
}
-pub struct CollectionHelperOnMethodCall<T: Config>(PhantomData<*const T>);
-impl<T: Config + pallet_nonfungible::Config> OnMethodCall<T> for CollectionHelperOnMethodCall<T> {
+pub struct CollectionHelpersOnMethodCall<T: Config>(PhantomData<*const T>);
+impl<T: Config + pallet_nonfungible::Config> OnMethodCall<T> for CollectionHelpersOnMethodCall<T> {
fn is_reserved(contract: &sp_core::H160) -> bool {
contract == &T::ContractAddress::get()
}
@@ -128,18 +130,18 @@
return None;
}
- let helpers = EvmCollectionHelper::<T>(SubstrateRecorder::<T>::new(gas_left));
+ let helpers = EvmCollectionHelpers::<T>(SubstrateRecorder::<T>::new(gas_left));
pallet_evm_coder_substrate::call(*source, helpers, value, input)
}
fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {
(contract == &T::ContractAddress::get())
- .then(|| include_bytes!("./stubs/CollectionHelper.raw").to_vec())
+ .then(|| include_bytes!("./stubs/CollectionHelpers.raw").to_vec())
}
}
-generate_stubgen!(collection_helper_impl, CollectionHelperCall<()>, true);
-generate_stubgen!(collection_helper_iface, CollectionHelperCall<()>, false);
+generate_stubgen!(collection_helper_impl, CollectionHelpersCall<()>, true);
+generate_stubgen!(collection_helper_iface, CollectionHelpersCall<()>, false);
fn error_feild_too_long(feild: &str, bound: u32) -> Error {
Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))
pallets/unique/src/eth/stubs/CollectionHelper.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelper.soldiffbeforeafterboth--- a/pallets/unique/src/eth/stubs/CollectionHelper.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: OTHER
-// This code is automatically generated
-
-pragma solidity >=0.8.0 <0.9.0;
-
-// Common stubs holder
-contract Dummy {
- uint8 dummy;
- string stub_error = "this contract is implemented in native";
-}
-
-contract ERC165 is Dummy {
- function supportsInterface(bytes4 interfaceID)
- external
- view
- returns (bool)
- {
- require(false, stub_error);
- interfaceID;
- return true;
- }
-}
-
-// Selector: 56c215c5
-contract CollectionHelper is Dummy, ERC165 {
- // Selector: create721Collection(string,string,string) 951c0151
- function create721Collection(
- string memory name,
- string memory description,
- string memory tokenPrefix
- ) public view returns (address) {
- require(false, stub_error);
- name;
- description;
- tokenPrefix;
- dummy;
- return 0x0000000000000000000000000000000000000000;
- }
-
- // Selector: isCollectionExist(address) c3de1494
- function isCollectionExist(address collectionAddress)
- public
- view
- returns (bool)
- {
- require(false, stub_error);
- collectionAddress;
- dummy;
- return false;
- }
-}
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth--- /dev/null
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: OTHER
+// This code is automatically generated
+
+pragma solidity >=0.8.0 <0.9.0;
+
+// Common stubs holder
+contract Dummy {
+ uint8 dummy;
+ string stub_error = "this contract is implemented in native";
+}
+
+contract ERC165 is Dummy {
+ function supportsInterface(bytes4 interfaceID)
+ external
+ view
+ returns (bool)
+ {
+ require(false, stub_error);
+ interfaceID;
+ return true;
+ }
+}
+
+// Inline
+contract CollectionHelpersEvents {
+ event CollectionCreated(
+ address indexed owner,
+ address indexed collectionId
+ );
+}
+
+// Selector: 20947cd0
+contract CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
+ // Selector: createNonfungibleCollection(string,string,string) e34a6844
+ function createNonfungibleCollection(
+ string memory name,
+ string memory description,
+ string memory tokenPrefix
+ ) public view returns (address) {
+ require(false, stub_error);
+ name;
+ description;
+ tokenPrefix;
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
+
+ // Selector: isCollectionExist(address) c3de1494
+ function isCollectionExist(address collectionAddress)
+ public
+ view
+ returns (bool)
+ {
+ require(false, stub_error);
+ collectionAddress;
+ dummy;
+ return false;
+ }
+}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -30,10 +30,9 @@
ensure,
weights::{Weight},
transactional,
- pallet_prelude::{DispatchResultWithPostInfo, ConstU32, Get},
+ pallet_prelude::{DispatchResultWithPostInfo, ConstU32},
BoundedVec,
};
-use sp_core::H160;
use scale_info::TypeInfo;
use frame_system::{self as system, ensure_signed};
use sp_runtime::{sp_std::prelude::Vec};
@@ -75,7 +74,6 @@
/// Weight information for extrinsics in this pallet.
type WeightInfo: WeightInfo;
type CommonWeightInfo: CommonWeightInfo<Self::CrossAccountId>;
- type ContractAddress: Get<H160>;
}
decl_event! {
@@ -287,7 +285,7 @@
// =========
- T::CollectionDispatch::create(sender, data)?;
+ T::CollectionDispatch::create(T::CrossAccountId::from_sub(sender), data)?;
Ok(())
}
runtime/common/src/dispatch.rsdiffbeforeafterboth--- a/runtime/common/src/dispatch.rs
+++ b/runtime/common/src/dispatch.rs
@@ -30,7 +30,10 @@
+ pallet_nonfungible::Config
+ pallet_refungible::Config,
{
- fn create(sender: T::AccountId, data: CreateCollectionData<T::AccountId>) -> DispatchResult {
+ fn create(
+ sender: T::CrossAccountId,
+ data: CreateCollectionData<T::AccountId>,
+ ) -> DispatchResult {
let _id = match data.mode {
CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, data)?,
CollectionMode::Fungible(decimal_points) => {
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -306,7 +306,7 @@
pallet_evm_migration::OnMethodCall<Self>,
pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
CollectionDispatchT<Self>,
- pallet_unique::eth::CollectionHelperOnMethodCall<Self>,
+ pallet_unique::eth::CollectionHelpersOnMethodCall<Self>,
);
type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
type ChainId = ChainId;
@@ -821,9 +821,7 @@
XcmpQueue,
);
-impl pallet_evm_coder_substrate::Config for Runtime {
- type GasWeightMapping = FixedGasWeightMapping;
-}
+impl pallet_evm_coder_substrate::Config for Runtime {}
impl pallet_xcm::Config for Runtime {
type Event = Event;
@@ -885,6 +883,7 @@
type EvmTokenAddressMapping = EvmTokenAddressMapping;
type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;
+ type ContractAddress = EvmCollectionHelpersAddress;
}
impl pallet_structure::Config for Runtime {
@@ -917,7 +916,6 @@
type Event = Event;
type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;
type CommonWeightInfo = CommonWeights<Self>;
- type ContractAddress = EvmCollectionHelperAddress;
}
parameter_types! {
@@ -980,7 +978,7 @@
]);
// 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f
- pub const EvmCollectionHelperAddress: H160 = H160([
+ pub const EvmCollectionHelpersAddress: H160 = H160([
0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,
]);
}
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -285,7 +285,7 @@
pallet_evm_migration::OnMethodCall<Self>,
pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
CollectionDispatchT<Self>,
- pallet_unique::eth::CollectionHelperOnMethodCall<Self>,
+ pallet_unique::eth::CollectionHelpersOnMethodCall<Self>,
);
type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
type ChainId = ChainId;
@@ -800,9 +800,7 @@
XcmpQueue,
);
-impl pallet_evm_coder_substrate::Config for Runtime {
- type GasWeightMapping = FixedGasWeightMapping;
-}
+impl pallet_evm_coder_substrate::Config for Runtime {}
impl pallet_xcm::Config for Runtime {
type Event = Event;
@@ -864,6 +862,7 @@
type EvmTokenAddressMapping = EvmTokenAddressMapping;
type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;
+ type ContractAddress = EvmCollectionHelpersAddress;
}
impl pallet_structure::Config for Runtime {
@@ -900,7 +899,6 @@
type Event = Event;
type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;
type CommonWeightInfo = CommonWeights<Self>;
- type ContractAddress = EvmCollectionHelperAddress;
}
parameter_types! {
@@ -963,7 +961,7 @@
]);
// 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f
- pub const EvmCollectionHelperAddress: H160 = H160([
+ pub const EvmCollectionHelpersAddress: H160 = H160([
0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,
]);
}
runtime/tests/src/lib.rsdiffbeforeafterboth--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -208,9 +208,7 @@
type BlockHashMapping = SubstrateBlockHashMapping<Self>;
type TransactionValidityHack = ();
}
-impl pallet_evm_coder_substrate::Config for Test {
- type GasWeightMapping = ();
-}
+impl pallet_evm_coder_substrate::Config for Test {}
impl pallet_common::Config for Test {
type WeightInfo = ();
@@ -222,6 +220,7 @@
type CollectionDispatch = CollectionDispatchT<Self>;
type EvmTokenAddressMapping = EvmTokenAddressMapping;
type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;
+ type ContractAddress = EvmCollectionHelpersAddress;
}
impl pallet_evm::account::Config for Test {
@@ -247,7 +246,7 @@
parameter_types! {
// 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f
- pub const EvmCollectionHelperAddress: H160 = H160([
+ pub const EvmCollectionHelpersAddress: H160 = H160([
0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,
]);
}
@@ -256,7 +255,6 @@
type Event = ();
type WeightInfo = ();
type CommonWeightInfo = CommonWeights<Self>;
- type ContractAddress = EvmCollectionHelperAddress;
}
// Build genesis storage according to the mock runtime.
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -290,7 +290,7 @@
pallet_evm_migration::OnMethodCall<Self>,
pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,
CollectionDispatchT<Self>,
- pallet_unique::eth::CollectionHelperOnMethodCall<Self>,
+ pallet_unique::eth::CollectionHelpersOnMethodCall<Self>,
);
type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;
type ChainId = ChainId;
@@ -805,9 +805,7 @@
XcmpQueue,
);
-impl pallet_evm_coder_substrate::Config for Runtime {
- type GasWeightMapping = FixedGasWeightMapping;
-}
+impl pallet_evm_coder_substrate::Config for Runtime {}
impl pallet_xcm::Config for Runtime {
type Event = Event;
@@ -869,6 +867,7 @@
type EvmTokenAddressMapping = EvmTokenAddressMapping;
type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;
+ type ContractAddress = EvmCollectionHelpersAddress;
}
impl pallet_structure::Config for Runtime {
@@ -905,7 +904,6 @@
type Event = Event;
type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;
type CommonWeightInfo = CommonWeights<Self>;
- type ContractAddress = EvmCollectionHelperAddress;
}
parameter_types! {
@@ -968,7 +966,7 @@
]);
// 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f
- pub const EvmCollectionHelperAddress: H160 = H160([
+ pub const EvmCollectionHelpersAddress: H160 = H160([
0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,
]);
}
tests/src/eth/api/CollectionHelper.soldiffbeforeafterboth--- a/tests/src/eth/api/CollectionHelper.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: OTHER
-// This code is automatically generated
-
-pragma solidity >=0.8.0 <0.9.0;
-
-// Common stubs holder
-interface Dummy {
-
-}
-
-interface ERC165 is Dummy {
- function supportsInterface(bytes4 interfaceID) external view returns (bool);
-}
-
-// Selector: 56c215c5
-interface CollectionHelper is Dummy, ERC165 {
- // Selector: create721Collection(string,string,string) 951c0151
- function create721Collection(
- string memory name,
- string memory description,
- string memory tokenPrefix
- ) external view returns (address);
-
- // Selector: isCollectionExist(address) c3de1494
- function isCollectionExist(address collectionAddress)
- external
- view
- returns (bool);
-}
tests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: OTHER
+// This code is automatically generated
+
+pragma solidity >=0.8.0 <0.9.0;
+
+// Common stubs holder
+interface Dummy {
+
+}
+
+interface ERC165 is Dummy {
+ function supportsInterface(bytes4 interfaceID) external view returns (bool);
+}
+
+// Inline
+interface CollectionHelpersEvents {
+ event CollectionCreated(
+ address indexed owner,
+ address indexed collectionId
+ );
+}
+
+// Selector: 20947cd0
+interface CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
+ // Selector: createNonfungibleCollection(string,string,string) e34a6844
+ function createNonfungibleCollection(
+ string memory name,
+ string memory description,
+ string memory tokenPrefix
+ ) external view returns (address);
+
+ // Selector: isCollectionExist(address) c3de1494
+ function isCollectionExist(address collectionAddress)
+ external
+ view
+ returns (bool);
+}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -65,7 +65,7 @@
returns (uint256);
}
-// Selector: f5652829
+// Selector: c894dc35
interface Collection is Dummy, ERC165 {
// Selector: setCollectionProperty(string,bytes) 2f073f66
function setCollectionProperty(string memory key, bytes memory value)
@@ -88,8 +88,11 @@
// Selector: ethConfirmSponsorship() a8580d1a
function ethConfirmSponsorship() external;
- // Selector: setLimit(string,string) bf4d2014
- function setLimit(string memory limit, string memory value) external;
+ // Selector: setLimit(string,uint32) 68db30ca
+ function setLimit(string memory limit, uint32 value) external;
+
+ // Selector: setLimit(string,bool) ea67e4c2
+ function setLimit(string memory limit, bool value) external;
// Selector: contractAddress() f6b4dfb4
function contractAddress() external view returns (address);
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -191,29 +191,7 @@
function totalSupply() external view returns (uint256);
}
-// Selector: d74d154f
-interface ERC721UniqueExtensions is Dummy, ERC165 {
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) external;
-
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) external;
-
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() external view returns (uint256);
-
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- external
- returns (bool);
-
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- external
- returns (bool);
-}
-
-// Selector: f5652829
+// Selector: c894dc35
interface Collection is Dummy, ERC165 {
// Selector: setCollectionProperty(string,bytes) 2f073f66
function setCollectionProperty(string memory key, bytes memory value)
@@ -236,13 +214,38 @@
// Selector: ethConfirmSponsorship() a8580d1a
function ethConfirmSponsorship() external;
- // Selector: setLimit(string,string) bf4d2014
- function setLimit(string memory limit, string memory value) external;
+ // Selector: setLimit(string,uint32) 68db30ca
+ function setLimit(string memory limit, uint32 value) external;
+
+ // Selector: setLimit(string,bool) ea67e4c2
+ function setLimit(string memory limit, bool value) external;
// Selector: contractAddress() f6b4dfb4
function contractAddress() external view returns (address);
}
+// Selector: d74d154f
+interface ERC721UniqueExtensions is Dummy, ERC165 {
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) external;
+
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) external;
+
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() external view returns (uint256);
+
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ external
+ returns (bool);
+
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ external
+ returns (bool);
+}
+
interface UniqueNFT is
Dummy,
ERC165,
tests/src/eth/collectionHelperAbi.jsondiffbeforeafterboth--- a/tests/src/eth/collectionHelperAbi.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[
- {
- "inputs": [
- { "internalType": "string", "name": "name", "type": "string" },
- { "internalType": "string", "name": "description", "type": "string" },
- { "internalType": "string", "name": "tokenPrefix", "type": "string" }
- ],
- "name": "create721Collection",
- "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "collectionAddress",
- "type": "address"
- }
- ],
- "name": "isCollectionExist",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }
- ],
- "name": "supportsInterface",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
- "type": "function"
- }
-]
tests/src/eth/collectionHelpersAbi.jsondiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/collectionHelpersAbi.json
@@ -0,0 +1,54 @@
+[
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "owner",
+ "type": "address"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "collectionId",
+ "type": "address"
+ }
+ ],
+ "name": "CollectionCreated",
+ "type": "event"
+ },
+ {
+ "inputs": [
+ { "internalType": "string", "name": "name", "type": "string" },
+ { "internalType": "string", "name": "description", "type": "string" },
+ { "internalType": "string", "name": "tokenPrefix", "type": "string" }
+ ],
+ "name": "createNonfungibleCollection",
+ "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "collectionAddress",
+ "type": "address"
+ }
+ ],
+ "name": "isCollectionExist",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }
+ ],
+ "name": "supportsInterface",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ }
+]
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -29,7 +29,7 @@
normalizeEvents,
subToEth,
executeEthTxOnSub,
- evmCollectionHelper,
+ evmCollectionHelpers,
getCollectionAddressFromResult,
evmCollection,
} from './util/helpers';
@@ -224,8 +224,8 @@
//TODO: CORE-302 add eth methods
itWeb3.skip('Sponsoring evm address from substrate collection', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const collectionHelper = evmCollectionHelper(web3, owner);
- let result = await collectionHelper.methods.create721Collection('Sponsor collection', '1', '1').send();
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const sponsor = await createEthAccountWithBalance(api, web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
tests/src/eth/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createCollection.test.ts
+++ b/tests/src/eth/createCollection.test.ts
@@ -18,7 +18,7 @@
import {expect} from 'chai';
import {getCreatedCollectionCount, getDetailedCollectionInfo} from '../util/helpers';
import {
- evmCollectionHelper,
+ evmCollectionHelpers,
collectionIdToAddress,
createEthAccount,
createEthAccountWithBalance,
@@ -30,14 +30,14 @@
describe('Create collection from EVM', () => {
itWeb3('Create collection', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const helper = evmCollectionHelper(web3, owner);
+ const helper = evmCollectionHelpers(web3, owner);
const collectionName = 'CollectionEVM';
const description = 'Some description';
const tokenPrefix = 'token prefix';
const collectionCountBefore = await getCreatedCollectionCount(api);
const result = await helper.methods
- .create721Collection(collectionName, description, tokenPrefix)
+ .createNonfungibleCollection(collectionName, description, tokenPrefix)
.send();
const collectionCountAfter = await getCreatedCollectionCount(api);
@@ -51,27 +51,27 @@
itWeb3('Check collection address exist', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const collectionHelper = evmCollectionHelper(web3, owner);
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
const expectedCollectionId = await getCreatedCollectionCount(api) + 1;
const expectedCollectionAddress = collectionIdToAddress(expectedCollectionId);
- expect(await collectionHelper.methods
+ expect(await collectionHelpers.methods
.isCollectionExist(expectedCollectionAddress)
.call()).to.be.false;
- await collectionHelper.methods
- .create721Collection('A', 'A', 'A')
+ await collectionHelpers.methods
+ .createNonfungibleCollection('A', 'A', 'A')
.send();
- expect(await collectionHelper.methods
+ expect(await collectionHelpers.methods
.isCollectionExist(expectedCollectionAddress)
.call()).to.be.true;
});
itWeb3('Set sponsorship', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const collectionHelper = evmCollectionHelper(web3, owner);
- let result = await collectionHelper.methods.create721Collection('Sponsor collection', '1', '1').send();
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const sponsor = await createEthAccountWithBalance(api, web3);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
@@ -89,8 +89,8 @@
itWeb3('Set limits', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const collectionHelper = evmCollectionHelper(web3, owner);
- const result = await collectionHelper.methods.create721Collection('Const collection', '5', '5').send();
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelpers.methods.createNonfungibleCollection('Const collection', '5', '5').send();
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const limits = {
accountTokenOwnershipLimit: 1000,
@@ -105,15 +105,15 @@
};
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
- await collectionEvm.methods.setLimit('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit.toString()).send();
- await collectionEvm.methods.setLimit('sponsoredDataSize', limits.sponsoredDataSize.toString()).send();
- await collectionEvm.methods.setLimit('sponsoredDataRateLimit', limits.sponsoredDataRateLimit.toString()).send();
- await collectionEvm.methods.setLimit('tokenLimit', limits.tokenLimit.toString()).send();
- await collectionEvm.methods.setLimit('sponsorTransferTimeout', limits.sponsorTransferTimeout.toString()).send();
- await collectionEvm.methods.setLimit('sponsorApproveTimeout', limits.sponsorApproveTimeout.toString()).send();
- await collectionEvm.methods.setLimit('ownerCanTransfer', limits.ownerCanTransfer.toString()).send();
- await collectionEvm.methods.setLimit('ownerCanDestroy', limits.ownerCanDestroy.toString()).send();
- await collectionEvm.methods.setLimit('transfersEnabled', limits.transfersEnabled.toString()).send();
+ await collectionEvm.methods['setLimit(string,uint32)']('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();
+ await collectionEvm.methods['setLimit(string,uint32)']('sponsoredDataSize', limits.sponsoredDataSize).send();
+ await collectionEvm.methods['setLimit(string,uint32)']('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();
+ await collectionEvm.methods['setLimit(string,uint32)']('tokenLimit', limits.tokenLimit).send();
+ await collectionEvm.methods['setLimit(string,uint32)']('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();
+ await collectionEvm.methods['setLimit(string,uint32)']('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();
+ await collectionEvm.methods['setLimit(string,bool)']('ownerCanTransfer', limits.ownerCanTransfer).send();
+ await collectionEvm.methods['setLimit(string,bool)']('ownerCanDestroy', limits.ownerCanDestroy).send();
+ await collectionEvm.methods['setLimit(string,bool)']('transfersEnabled', limits.transfersEnabled).send();
const collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
expect(collectionSub.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.be.eq(limits.accountTokenOwnershipLimit);
@@ -130,14 +130,14 @@
itWeb3('Collection address exist', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233';
- const collectionHelper = evmCollectionHelper(web3, owner);
- expect(await collectionHelper.methods
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ expect(await collectionHelpers.methods
.isCollectionExist(collectionAddressForNonexistentCollection).call())
.to.be.false;
- const result = await collectionHelper.methods.create721Collection('Collection address exist', '7', '7').send();
+ const result = await collectionHelpers.methods.createNonfungibleCollection('Collection address exist', '7', '7').send();
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
- expect(await collectionHelper.methods
+ expect(await collectionHelpers.methods
.isCollectionExist(collectionIdAddress).call())
.to.be.true;
});
@@ -146,7 +146,7 @@
describe('(!negative tests!) Create collection from EVM', () => {
itWeb3('(!negative test!) Create collection (bad lengths)', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const helper = evmCollectionHelper(web3, owner);
+ const helper = evmCollectionHelpers(web3, owner);
{
const MAX_NAME_LENGHT = 64;
const collectionName = 'A'.repeat(MAX_NAME_LENGHT + 1);
@@ -154,7 +154,7 @@
const tokenPrefix = 'A';
await expect(helper.methods
- .create721Collection(collectionName, description, tokenPrefix)
+ .createNonfungibleCollection(collectionName, description, tokenPrefix)
.call()).to.be.rejectedWith('name is too long. Max length is ' + MAX_NAME_LENGHT);
}
@@ -164,7 +164,7 @@
const description = 'A'.repeat(MAX_DESCRIPTION_LENGHT + 1);
const tokenPrefix = 'A';
await expect(helper.methods
- .create721Collection(collectionName, description, tokenPrefix)
+ .createNonfungibleCollection(collectionName, description, tokenPrefix)
.call()).to.be.rejectedWith('description is too long. Max length is ' + MAX_DESCRIPTION_LENGHT);
}
{
@@ -173,28 +173,28 @@
const description = 'A';
const tokenPrefix = 'A'.repeat(MAX_TOKEN_PREFIX_LENGHT + 1);
await expect(helper.methods
- .create721Collection(collectionName, description, tokenPrefix)
+ .createNonfungibleCollection(collectionName, description, tokenPrefix)
.call()).to.be.rejectedWith('token_prefix is too long. Max length is ' + MAX_TOKEN_PREFIX_LENGHT);
}
});
itWeb3('(!negative test!) Create collection (no funds)', async ({web3}) => {
const owner = await createEthAccount(web3);
- const helper = evmCollectionHelper(web3, owner);
+ const helper = evmCollectionHelpers(web3, owner);
const collectionName = 'A';
const description = 'A';
const tokenPrefix = 'A';
await expect(helper.methods
- .create721Collection(collectionName, description, tokenPrefix)
+ .createNonfungibleCollection(collectionName, description, tokenPrefix)
.call()).to.be.rejectedWith('NotSufficientFounds');
});
itWeb3('(!negative test!) Check owner', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const notOwner = await createEthAccount(web3);
- const collectionHelper = evmCollectionHelper(web3, owner);
- const result = await collectionHelper.methods.create721Collection('A', 'A', 'A').send();
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelpers.methods.createNonfungibleCollection('A', 'A', 'A').send();
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
const contractEvmFromNotOwner = evmCollection(web3, notOwner, collectionIdAddress);
const EXPECTED_ERROR = 'NoPermission';
@@ -218,18 +218,12 @@
itWeb3('(!negative test!) Set limits', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const collectionHelper = evmCollectionHelper(web3, owner);
- const result = await collectionHelper.methods.create721Collection('Schema collection', 'A', 'A').send();
+ const collectionHelpers = evmCollectionHelpers(web3, owner);
+ const result = await collectionHelpers.methods.createNonfungibleCollection('Schema collection', 'A', 'A').send();
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
await expect(collectionEvm.methods
.setLimit('badLimit', 'true')
- .call()).to.be.rejectedWith('Unknown limit "badLimit"');
- await expect(collectionEvm.methods
- .setLimit('sponsoredDataSize', 'badValue')
- .call()).to.be.rejectedWith('Int value "badValue" parse error:');
- await expect(collectionEvm.methods
- .setLimit('ownerCanTransfer', 'badValue')
- .call()).to.be.rejectedWith('Bool value "badValue" parse error:');
+ .call()).to.be.rejectedWith('Unknown boolean limit "badLimit"');
});
});
\ No newline at end of file
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -152,7 +152,17 @@
{
"inputs": [
{ "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "string", "name": "value", "type": "string" }
+ { "internalType": "uint32", "name": "value", "type": "uint32" }
+ ],
+ "name": "setLimit",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "string", "name": "limit", "type": "string" },
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
"name": "setLimit",
"outputs": [],
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -16,7 +16,7 @@
import privateKey from '../substrate/privateKey';
import {approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE} from '../util/helpers';
-import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, evmCollection, evmCollectionHelper, GAS_ARGS, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';
+import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, evmCollection, evmCollectionHelpers, GAS_ARGS, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';
import nonFungibleAbi from './nonFungibleAbi.json';
import {expect} from 'chai';
import {submitTransactionAsync} from '../substrate/substrate-api';
@@ -76,8 +76,8 @@
describe('NFT: Plain calls', () => {
itWeb3('Can perform mint()', async ({web3, api}) => {
const owner = await createEthAccountWithBalance(api, web3);
- const helper = evmCollectionHelper(web3, owner);
- let result = await helper.methods.create721Collection('Mint collection', '6', '6').send();
+ const helper = evmCollectionHelpers(web3, owner);
+ let result = await helper.methods.createNonfungibleCollection('Mint collection', '6', '6').send();
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
const receiver = createEthAccount(web3);
const contract = evmCollection(web3, owner, collectionIdAddress);
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -326,7 +326,17 @@
{
"inputs": [
{ "internalType": "string", "name": "limit", "type": "string" },
- { "internalType": "string", "name": "value", "type": "string" }
+ { "internalType": "uint32", "name": "value", "type": "uint32" }
+ ],
+ "name": "setLimit",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "string", "name": "limit", "type": "string" },
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
"name": "setLimit",
"outputs": [],
tests/src/eth/util/helpers.tsdiffbeforeafterboth--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -29,7 +29,7 @@
import privateKey from '../../substrate/privateKey';
import contractHelpersAbi from './contractHelpersAbi.json';
import nonFungibleAbi from '../nonFungibleAbi.json';
-import collectionHelperAbi from '../collectionHelperAbi.json';
+import collectionHelpersAbi from '../collectionHelpersAbi.json';
import getBalance from '../../substrate/get-balance';
import waitNewBlocks from '../../substrate/wait-new-blocks';
@@ -69,7 +69,7 @@
}
export async function getCollectionAddressFromResult(api: ApiPromise, result: any) {
- const collectionIdAddress = normalizeAddress(result.events[0].raw.topics[2]);
+ const collectionIdAddress = normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const collectionId = collectionIdFromAddress(collectionIdAddress);
const collection = (await getDetailedCollectionInfo(api, collectionId))!;
return {collectionIdAddress, collectionId, collection};
@@ -297,8 +297,8 @@
* @param caller - eth address
* @returns
*/
-export function evmCollectionHelper(web3: Web3, caller: string) {
- return new web3.eth.Contract(collectionHelperAbi as any, '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f', {from: caller, ...GAS_ARGS});
+export function evmCollectionHelpers(web3: Web3, caller: string) {
+ return new web3.eth.Contract(collectionHelpersAbi as any, '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f', {from: caller, ...GAS_ARGS});
}
/**