difftreelog
Merge pull request #336 from UniqueNetwork/feature/CORE-325
in: master
Feature/core-325
5 files changed
pallets/nonfungible/src/erc.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/>.1617use core::{18 char::{REPLACEMENT_CHARACTER, decode_utf16},19 convert::TryInto,20};21use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};22use frame_support::BoundedVec;23use up_data_structs::TokenId;24use pallet_evm_coder_substrate::dispatch_to_evm;25use sp_core::{H160, U256};26use sp_std::{vec::Vec, vec};27use pallet_common::{28 erc::{CommonEvmHandler, PrecompileResult},29};30use pallet_evm::account::CrossAccountId;31use pallet_evm_coder_substrate::call;3233use crate::{34 AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,35 SelfWeightOf, weights::WeightInfo,36};3738#[derive(ToLog)]39pub enum ERC721Events {40 Transfer {41 #[indexed]42 from: address,43 #[indexed]44 to: address,45 #[indexed]46 token_id: uint256,47 },48 Approval {49 #[indexed]50 owner: address,51 #[indexed]52 approved: address,53 #[indexed]54 token_id: uint256,55 },56 #[allow(dead_code)]57 ApprovalForAll {58 #[indexed]59 owner: address,60 #[indexed]61 operator: address,62 approved: bool,63 },64}6566#[derive(ToLog)]67pub enum ERC721MintableEvents {68 #[allow(dead_code)]69 MintingFinished {},70}7172#[solidity_interface(name = "ERC721Metadata")]73impl<T: Config> NonfungibleHandle<T> {74 fn name(&self) -> Result<string> {75 Ok(decode_utf16(self.name.iter().copied())76 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))77 .collect::<string>())78 }79 fn symbol(&self) -> Result<string> {80 Ok(string::from_utf8_lossy(&self.token_prefix).into())81 }8283 /// Returns token's const_metadata84 #[solidity(rename_selector = "tokenURI")]85 fn token_uri(&self, token_id: uint256) -> Result<string> {86 self.consume_store_reads(1)?;87 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;88 Ok(string::from_utf8_lossy(89 &<TokenData<T>>::get((self.id, token_id))90 .ok_or("token not found")?91 .const_data,92 )93 .into())94 }95}9697#[solidity_interface(name = "ERC721Enumerable")]98impl<T: Config> NonfungibleHandle<T> {99 fn token_by_index(&self, index: uint256) -> Result<uint256> {100 Ok(index)101 }102103 /// Not implemented104 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {105 // TODO: Not implemetable106 Err("not implemented".into())107 }108109 fn total_supply(&self) -> Result<uint256> {110 self.consume_store_reads(1)?;111 Ok(<Pallet<T>>::total_supply(self).into())112 }113}114115#[solidity_interface(name = "ERC721", events(ERC721Events))]116impl<T: Config> NonfungibleHandle<T> {117 fn balance_of(&self, owner: address) -> Result<uint256> {118 self.consume_store_reads(1)?;119 let owner = T::CrossAccountId::from_eth(owner);120 let balance = <AccountBalance<T>>::get((self.id, owner));121 Ok(balance.into())122 }123 fn owner_of(&self, token_id: uint256) -> Result<address> {124 self.consume_store_reads(1)?;125 let token: TokenId = token_id.try_into()?;126 Ok(*<TokenData<T>>::get((self.id, token))127 .ok_or("token not found")?128 .owner129 .as_eth())130 }131 /// Not implemented132 fn safe_transfer_from_with_data(133 &mut self,134 _from: address,135 _to: address,136 _token_id: uint256,137 _data: bytes,138 _value: value,139 ) -> Result<void> {140 // TODO: Not implemetable141 Err("not implemented".into())142 }143 /// Not implemented144 fn safe_transfer_from(145 &mut self,146 _from: address,147 _to: address,148 _token_id: uint256,149 _value: value,150 ) -> Result<void> {151 // TODO: Not implemetable152 Err("not implemented".into())153 }154155 #[weight(<SelfWeightOf<T>>::transfer_from())]156 fn transfer_from(157 &mut self,158 caller: caller,159 from: address,160 to: address,161 token_id: uint256,162 _value: value,163 ) -> Result<void> {164 let caller = T::CrossAccountId::from_eth(caller);165 let from = T::CrossAccountId::from_eth(from);166 let to = T::CrossAccountId::from_eth(to);167 let token = token_id.try_into()?;168169 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token)170 .map_err(dispatch_to_evm::<T>)?;171 Ok(())172 }173174 #[weight(<SelfWeightOf<T>>::approve())]175 fn approve(176 &mut self,177 caller: caller,178 approved: address,179 token_id: uint256,180 _value: value,181 ) -> Result<void> {182 let caller = T::CrossAccountId::from_eth(caller);183 let approved = T::CrossAccountId::from_eth(approved);184 let token = token_id.try_into()?;185186 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))187 .map_err(dispatch_to_evm::<T>)?;188 Ok(())189 }190191 /// Not implemented192 fn set_approval_for_all(193 &mut self,194 _caller: caller,195 _operator: address,196 _approved: bool,197 ) -> Result<void> {198 // TODO: Not implemetable199 Err("not implemented".into())200 }201202 /// Not implemented203 fn get_approved(&self, _token_id: uint256) -> Result<address> {204 // TODO: Not implemetable205 Err("not implemented".into())206 }207208 /// Not implemented209 fn is_approved_for_all(&self, _owner: address, _operator: address) -> Result<address> {210 // TODO: Not implemetable211 Err("not implemented".into())212 }213}214215#[solidity_interface(name = "ERC721Burnable")]216impl<T: Config> NonfungibleHandle<T> {217 #[weight(<SelfWeightOf<T>>::burn_item())]218 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {219 let caller = T::CrossAccountId::from_eth(caller);220 let token = token_id.try_into()?;221222 <Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;223 Ok(())224 }225}226227#[solidity_interface(name = "ERC721Mintable", events(ERC721MintableEvents))]228impl<T: Config> NonfungibleHandle<T> {229 fn minting_finished(&self) -> Result<bool> {230 Ok(false)231 }232233 /// `token_id` should be obtained with `next_token_id` method,234 /// unlike standard, you can't specify it manually235 #[weight(<SelfWeightOf<T>>::create_item())]236 fn mint(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {237 let caller = T::CrossAccountId::from_eth(caller);238 let to = T::CrossAccountId::from_eth(to);239 let token_id: u32 = token_id.try_into()?;240 if <TokensMinted<T>>::get(self.id)241 .checked_add(1)242 .ok_or("item id overflow")?243 != token_id244 {245 return Err("item id should be next".into());246 }247248 <Pallet<T>>::create_item(249 self,250 &caller,251 CreateItemData::<T> {252 const_data: BoundedVec::default(),253 variable_data: BoundedVec::default(),254 owner: to,255 },256 )257 .map_err(dispatch_to_evm::<T>)?;258259 Ok(true)260 }261262 /// `token_id` should be obtained with `next_token_id` method,263 /// unlike standard, you can't specify it manually264 #[solidity(rename_selector = "mintWithTokenURI")]265 #[weight(<SelfWeightOf<T>>::create_item())]266 fn mint_with_token_uri(267 &mut self,268 caller: caller,269 to: address,270 token_id: uint256,271 token_uri: string,272 ) -> Result<bool> {273 let caller = T::CrossAccountId::from_eth(caller);274 let to = T::CrossAccountId::from_eth(to);275 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;276 if <TokensMinted<T>>::get(self.id)277 .checked_add(1)278 .ok_or("item id overflow")?279 != token_id280 {281 return Err("item id should be next".into());282 }283284 <Pallet<T>>::create_item(285 self,286 &caller,287 CreateItemData::<T> {288 const_data: Vec::<u8>::from(token_uri)289 .try_into()290 .map_err(|_| "token uri is too long")?,291 variable_data: BoundedVec::default(),292 owner: to,293 },294 )295 .map_err(dispatch_to_evm::<T>)?;296 Ok(true)297 }298299 /// Not implemented300 fn finish_minting(&mut self, _caller: caller) -> Result<bool> {301 Err("not implementable".into())302 }303}304305#[solidity_interface(name = "ERC721UniqueExtensions")]306impl<T: Config> NonfungibleHandle<T> {307 #[weight(<SelfWeightOf<T>>::transfer())]308 fn transfer(309 &mut self,310 caller: caller,311 to: address,312 token_id: uint256,313 _value: value,314 ) -> Result<void> {315 let caller = T::CrossAccountId::from_eth(caller);316 let to = T::CrossAccountId::from_eth(to);317 let token = token_id.try_into()?;318319 <Pallet<T>>::transfer(self, &caller, &to, token).map_err(dispatch_to_evm::<T>)?;320 Ok(())321 }322323 #[weight(<SelfWeightOf<T>>::burn_from())]324 fn burn_from(325 &mut self,326 caller: caller,327 from: address,328 token_id: uint256,329 _value: value,330 ) -> Result<void> {331 let caller = T::CrossAccountId::from_eth(caller);332 let from = T::CrossAccountId::from_eth(from);333 let token = token_id.try_into()?;334335 <Pallet<T>>::burn_from(self, &caller, &from, token).map_err(dispatch_to_evm::<T>)?;336 Ok(())337 }338339 fn next_token_id(&self) -> Result<uint256> {340 self.consume_store_reads(1)?;341 Ok(<TokensMinted<T>>::get(self.id)342 .checked_add(1)343 .ok_or("item id overflow")?344 .into())345 }346347 #[weight(<SelfWeightOf<T>>::set_variable_metadata(data.len() as u32))]348 fn set_variable_metadata(349 &mut self,350 caller: caller,351 token_id: uint256,352 data: bytes,353 ) -> Result<void> {354 let caller = T::CrossAccountId::from_eth(caller);355 let token = token_id.try_into()?;356357 <Pallet<T>>::set_variable_metadata(358 self,359 &caller,360 token,361 data.try_into()362 .map_err(|_| "metadata size exceeded limit")?,363 )364 .map_err(dispatch_to_evm::<T>)?;365 Ok(())366 }367368 fn get_variable_metadata(&self, token_id: uint256) -> Result<bytes> {369 self.consume_store_reads(1)?;370 let token: TokenId = token_id.try_into()?;371372 Ok(<TokenData<T>>::get((self.id, token))373 .ok_or("token not found")?374 .variable_data375 .into_inner())376 }377378 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]379 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {380 let caller = T::CrossAccountId::from_eth(caller);381 let to = T::CrossAccountId::from_eth(to);382 let mut expected_index = <TokensMinted<T>>::get(self.id)383 .checked_add(1)384 .ok_or("item id overflow")?;385386 let total_tokens = token_ids.len();387 for id in token_ids.into_iter() {388 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;389 if id != expected_index {390 return Err("item id should be next".into());391 }392 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;393 }394 let data = (0..total_tokens)395 .map(|_| CreateItemData::<T> {396 const_data: BoundedVec::default(),397 variable_data: BoundedVec::default(),398 owner: to.clone(),399 })400 .collect();401402 <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;403 Ok(true)404 }405406 #[solidity(rename_selector = "mintBulkWithTokenURI")]407 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]408 fn mint_bulk_with_token_uri(409 &mut self,410 caller: caller,411 to: address,412 tokens: Vec<(uint256, string)>,413 ) -> Result<bool> {414 let caller = T::CrossAccountId::from_eth(caller);415 let to = T::CrossAccountId::from_eth(to);416 let mut expected_index = <TokensMinted<T>>::get(self.id)417 .checked_add(1)418 .ok_or("item id overflow")?;419420 let mut data = Vec::with_capacity(tokens.len());421 for (id, token_uri) in tokens {422 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;423 if id != expected_index {424 panic!("item id should be next ({}) but got {}", expected_index, id);425 }426 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;427428 data.push(CreateItemData::<T> {429 const_data: Vec::<u8>::from(token_uri)430 .try_into()431 .map_err(|_| "token uri is too long")?,432 variable_data: vec![].try_into().unwrap(),433 owner: to.clone(),434 });435 }436437 <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;438 Ok(true)439 }440}441442#[solidity_interface(443 name = "UniqueNFT",444 is(445 ERC721,446 ERC721Metadata,447 ERC721Enumerable,448 ERC721UniqueExtensions,449 ERC721Mintable,450 ERC721Burnable,451 )452)]453impl<T: Config> NonfungibleHandle<T> {}454455// Not a tests, but code generators456generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);457generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);458459impl<T: Config> CommonEvmHandler for NonfungibleHandle<T> {460 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");461462 fn call(self, source: &H160, input: &[u8], value: U256) -> Option<PrecompileResult> {463 call::<T, UniqueNFTCall<T>, _>(*source, self, value, input)464 }465}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/>.1617extern crate alloc;18use core::{19 char::{REPLACEMENT_CHARACTER, decode_utf16},20 convert::TryInto,21};22use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};23use frame_support::BoundedVec;24use up_data_structs::{TokenId, SchemaVersion};25use pallet_evm_coder_substrate::dispatch_to_evm;26use sp_core::{H160, U256};27use sp_std::{vec::Vec, vec};28use pallet_common::{29 erc::{CommonEvmHandler, PrecompileResult},30};31use pallet_evm::account::CrossAccountId;32use pallet_evm_coder_substrate::call;3334use crate::{35 AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,36 SelfWeightOf, weights::WeightInfo,37};3839fn error_unsupported_schema_version() -> Error {40 alloc::format!(41 "Unsupported schema version! Support only {:?}",42 SchemaVersion::ImageURL43 )44 .as_str()45 .into()46}4748#[derive(ToLog)]49pub enum ERC721Events {50 Transfer {51 #[indexed]52 from: address,53 #[indexed]54 to: address,55 #[indexed]56 token_id: uint256,57 },58 Approval {59 #[indexed]60 owner: address,61 #[indexed]62 approved: address,63 #[indexed]64 token_id: uint256,65 },66 #[allow(dead_code)]67 ApprovalForAll {68 #[indexed]69 owner: address,70 #[indexed]71 operator: address,72 approved: bool,73 },74}7576#[derive(ToLog)]77pub enum ERC721MintableEvents {78 #[allow(dead_code)]79 MintingFinished {},80}8182#[solidity_interface(name = "ERC721Metadata")]83impl<T: Config> NonfungibleHandle<T> {84 fn name(&self) -> Result<string> {85 Ok(decode_utf16(self.name.iter().copied())86 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))87 .collect::<string>())88 }8990 fn symbol(&self) -> Result<string> {91 Ok(string::from_utf8_lossy(&self.token_prefix).into())92 }9394 /// Returns token's const_metadata95 #[solidity(rename_selector = "tokenURI")]96 fn token_uri(&self, token_id: uint256) -> Result<string> {97 if !matches!(self.schema_version, SchemaVersion::ImageURL) {98 return Err(error_unsupported_schema_version());99 }100101 self.consume_store_reads(1)?;102 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;103 Ok(string::from_utf8_lossy(104 &<TokenData<T>>::get((self.id, token_id))105 .ok_or("token not found")?106 .const_data,107 )108 .into())109 }110}111112#[solidity_interface(name = "ERC721Enumerable")]113impl<T: Config> NonfungibleHandle<T> {114 fn token_by_index(&self, index: uint256) -> Result<uint256> {115 Ok(index)116 }117118 /// Not implemented119 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {120 // TODO: Not implemetable121 Err("not implemented".into())122 }123124 fn total_supply(&self) -> Result<uint256> {125 self.consume_store_reads(1)?;126 Ok(<Pallet<T>>::total_supply(self).into())127 }128}129130#[solidity_interface(name = "ERC721", events(ERC721Events))]131impl<T: Config> NonfungibleHandle<T> {132 fn balance_of(&self, owner: address) -> Result<uint256> {133 self.consume_store_reads(1)?;134 let owner = T::CrossAccountId::from_eth(owner);135 let balance = <AccountBalance<T>>::get((self.id, owner));136 Ok(balance.into())137 }138 fn owner_of(&self, token_id: uint256) -> Result<address> {139 self.consume_store_reads(1)?;140 let token: TokenId = token_id.try_into()?;141 Ok(*<TokenData<T>>::get((self.id, token))142 .ok_or("token not found")?143 .owner144 .as_eth())145 }146 /// Not implemented147 fn safe_transfer_from_with_data(148 &mut self,149 _from: address,150 _to: address,151 _token_id: uint256,152 _data: bytes,153 _value: value,154 ) -> Result<void> {155 // TODO: Not implemetable156 Err("not implemented".into())157 }158 /// Not implemented159 fn safe_transfer_from(160 &mut self,161 _from: address,162 _to: address,163 _token_id: uint256,164 _value: value,165 ) -> Result<void> {166 // TODO: Not implemetable167 Err("not implemented".into())168 }169170 #[weight(<SelfWeightOf<T>>::transfer_from())]171 fn transfer_from(172 &mut self,173 caller: caller,174 from: address,175 to: address,176 token_id: uint256,177 _value: value,178 ) -> Result<void> {179 let caller = T::CrossAccountId::from_eth(caller);180 let from = T::CrossAccountId::from_eth(from);181 let to = T::CrossAccountId::from_eth(to);182 let token = token_id.try_into()?;183184 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token)185 .map_err(dispatch_to_evm::<T>)?;186 Ok(())187 }188189 #[weight(<SelfWeightOf<T>>::approve())]190 fn approve(191 &mut self,192 caller: caller,193 approved: address,194 token_id: uint256,195 _value: value,196 ) -> Result<void> {197 let caller = T::CrossAccountId::from_eth(caller);198 let approved = T::CrossAccountId::from_eth(approved);199 let token = token_id.try_into()?;200201 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))202 .map_err(dispatch_to_evm::<T>)?;203 Ok(())204 }205206 /// Not implemented207 fn set_approval_for_all(208 &mut self,209 _caller: caller,210 _operator: address,211 _approved: bool,212 ) -> Result<void> {213 // TODO: Not implemetable214 Err("not implemented".into())215 }216217 /// Not implemented218 fn get_approved(&self, _token_id: uint256) -> Result<address> {219 // TODO: Not implemetable220 Err("not implemented".into())221 }222223 /// Not implemented224 fn is_approved_for_all(&self, _owner: address, _operator: address) -> Result<address> {225 // TODO: Not implemetable226 Err("not implemented".into())227 }228}229230#[solidity_interface(name = "ERC721Burnable")]231impl<T: Config> NonfungibleHandle<T> {232 #[weight(<SelfWeightOf<T>>::burn_item())]233 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {234 let caller = T::CrossAccountId::from_eth(caller);235 let token = token_id.try_into()?;236237 <Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;238 Ok(())239 }240}241242#[solidity_interface(name = "ERC721Mintable", events(ERC721MintableEvents))]243impl<T: Config> NonfungibleHandle<T> {244 fn minting_finished(&self) -> Result<bool> {245 Ok(false)246 }247248 /// `token_id` should be obtained with `next_token_id` method,249 /// unlike standard, you can't specify it manually250 #[weight(<SelfWeightOf<T>>::create_item())]251 fn mint(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {252 let caller = T::CrossAccountId::from_eth(caller);253 let to = T::CrossAccountId::from_eth(to);254 let token_id: u32 = token_id.try_into()?;255 if <TokensMinted<T>>::get(self.id)256 .checked_add(1)257 .ok_or("item id overflow")?258 != token_id259 {260 return Err("item id should be next".into());261 }262263 <Pallet<T>>::create_item(264 self,265 &caller,266 CreateItemData::<T> {267 const_data: BoundedVec::default(),268 variable_data: BoundedVec::default(),269 owner: to,270 },271 )272 .map_err(dispatch_to_evm::<T>)?;273274 Ok(true)275 }276277 /// `token_id` should be obtained with `next_token_id` method,278 /// unlike standard, you can't specify it manually279 #[solidity(rename_selector = "mintWithTokenURI")]280 #[weight(<SelfWeightOf<T>>::create_item())]281 fn mint_with_token_uri(282 &mut self,283 caller: caller,284 to: address,285 token_id: uint256,286 token_uri: string,287 ) -> Result<bool> {288 if !matches!(self.schema_version, SchemaVersion::ImageURL) {289 return Err(error_unsupported_schema_version());290 }291292 let caller = T::CrossAccountId::from_eth(caller);293 let to = T::CrossAccountId::from_eth(to);294 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;295 if <TokensMinted<T>>::get(self.id)296 .checked_add(1)297 .ok_or("item id overflow")?298 != token_id299 {300 return Err("item id should be next".into());301 }302303 <Pallet<T>>::create_item(304 self,305 &caller,306 CreateItemData::<T> {307 const_data: Vec::<u8>::from(token_uri)308 .try_into()309 .map_err(|_| "token uri is too long")?,310 variable_data: BoundedVec::default(),311 owner: to,312 },313 )314 .map_err(dispatch_to_evm::<T>)?;315 Ok(true)316 }317318 /// Not implemented319 fn finish_minting(&mut self, _caller: caller) -> Result<bool> {320 Err("not implementable".into())321 }322}323324#[solidity_interface(name = "ERC721UniqueExtensions")]325impl<T: Config> NonfungibleHandle<T> {326 #[weight(<SelfWeightOf<T>>::transfer())]327 fn transfer(328 &mut self,329 caller: caller,330 to: address,331 token_id: uint256,332 _value: value,333 ) -> Result<void> {334 let caller = T::CrossAccountId::from_eth(caller);335 let to = T::CrossAccountId::from_eth(to);336 let token = token_id.try_into()?;337338 <Pallet<T>>::transfer(self, &caller, &to, token).map_err(dispatch_to_evm::<T>)?;339 Ok(())340 }341342 #[weight(<SelfWeightOf<T>>::burn_from())]343 fn burn_from(344 &mut self,345 caller: caller,346 from: address,347 token_id: uint256,348 _value: value,349 ) -> Result<void> {350 let caller = T::CrossAccountId::from_eth(caller);351 let from = T::CrossAccountId::from_eth(from);352 let token = token_id.try_into()?;353354 <Pallet<T>>::burn_from(self, &caller, &from, token).map_err(dispatch_to_evm::<T>)?;355 Ok(())356 }357358 fn next_token_id(&self) -> Result<uint256> {359 self.consume_store_reads(1)?;360 Ok(<TokensMinted<T>>::get(self.id)361 .checked_add(1)362 .ok_or("item id overflow")?363 .into())364 }365366 #[weight(<SelfWeightOf<T>>::set_variable_metadata(data.len() as u32))]367 fn set_variable_metadata(368 &mut self,369 caller: caller,370 token_id: uint256,371 data: bytes,372 ) -> Result<void> {373 let caller = T::CrossAccountId::from_eth(caller);374 let token = token_id.try_into()?;375376 <Pallet<T>>::set_variable_metadata(377 self,378 &caller,379 token,380 data.try_into()381 .map_err(|_| "metadata size exceeded limit")?,382 )383 .map_err(dispatch_to_evm::<T>)?;384 Ok(())385 }386387 fn get_variable_metadata(&self, token_id: uint256) -> Result<bytes> {388 self.consume_store_reads(1)?;389 let token: TokenId = token_id.try_into()?;390391 Ok(<TokenData<T>>::get((self.id, token))392 .ok_or("token not found")?393 .variable_data394 .into_inner())395 }396397 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]398 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {399 let caller = T::CrossAccountId::from_eth(caller);400 let to = T::CrossAccountId::from_eth(to);401 let mut expected_index = <TokensMinted<T>>::get(self.id)402 .checked_add(1)403 .ok_or("item id overflow")?;404405 let total_tokens = token_ids.len();406 for id in token_ids.into_iter() {407 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;408 if id != expected_index {409 return Err("item id should be next".into());410 }411 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;412 }413 let data = (0..total_tokens)414 .map(|_| CreateItemData::<T> {415 const_data: BoundedVec::default(),416 variable_data: BoundedVec::default(),417 owner: to.clone(),418 })419 .collect();420421 <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;422 Ok(true)423 }424425 #[solidity(rename_selector = "mintBulkWithTokenURI")]426 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]427 fn mint_bulk_with_token_uri(428 &mut self,429 caller: caller,430 to: address,431 tokens: Vec<(uint256, string)>,432 ) -> Result<bool> {433 if !matches!(self.schema_version, SchemaVersion::ImageURL) {434 return Err(error_unsupported_schema_version());435 }436437 let caller = T::CrossAccountId::from_eth(caller);438 let to = T::CrossAccountId::from_eth(to);439 let mut expected_index = <TokensMinted<T>>::get(self.id)440 .checked_add(1)441 .ok_or("item id overflow")?;442443 let mut data = Vec::with_capacity(tokens.len());444 for (id, token_uri) in tokens {445 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;446 if id != expected_index {447 panic!("item id should be next ({}) but got {}", expected_index, id);448 }449 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;450451 data.push(CreateItemData::<T> {452 const_data: Vec::<u8>::from(token_uri)453 .try_into()454 .map_err(|_| "token uri is too long")?,455 variable_data: vec![].try_into().unwrap(),456 owner: to.clone(),457 });458 }459460 <Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;461 Ok(true)462 }463}464465#[solidity_interface(466 name = "UniqueNFT",467 is(468 ERC721,469 ERC721Metadata,470 ERC721Enumerable,471 ERC721UniqueExtensions,472 ERC721Mintable,473 ERC721Burnable,474 )475)]476impl<T: Config> NonfungibleHandle<T> {}477478// Not a tests, but code generators479generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);480generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);481482impl<T: Config> CommonEvmHandler for NonfungibleHandle<T> {483 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");484485 fn call(self, source: &H160, input: &[u8], value: U256) -> Option<PrecompileResult> {486 call::<T, UniqueNFTCall<T>, _>(*source, self, value, input)487 }488}tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -1,19 +1,16 @@
import privateKey from '../substrate/privateKey';
import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, setCollectionSponsorExpectSuccess} from '../util/helpers';
-import {itWeb3, transferBalanceToEth, subToEth, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents} from './util/helpers';
+import {itWeb3, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents} from './util/helpers';
import nonFungibleAbi from './nonFungibleAbi.json';
import {expect} from 'chai';
describe('evm collection sponsoring', () => {
- itWeb3('sponsors mint transactions', async ({api, web3}) => {
+ itWeb3('sponsors mint transactions', async ({web3}) => {
const alice = privateKey('//Alice');
const collection = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collection, alice.address);
await confirmSponsorshipExpectSuccess(collection);
-
- // Wouldn't be needed after CORE-300
- await transferBalanceToEth(api, alice, subToEth(alice.address));
const minter = createEthAccount(web3);
expect(await web3.eth.getBalance(minter)).to.equal('0');
tests/src/eth/metadata.test.tsdiffbeforeafterboth--- a/tests/src/eth/metadata.test.ts
+++ b/tests/src/eth/metadata.test.ts
@@ -16,8 +16,11 @@
import {expect} from 'chai';
import {createCollectionExpectSuccess} from '../util/helpers';
-import {collectionIdToAddress, createEthAccountWithBalance, GAS_ARGS, itWeb3} from './util/helpers';
+import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents} from './util/helpers';
import fungibleMetadataAbi from './fungibleMetadataAbi.json';
+import privateKey from '../substrate/privateKey';
+import {submitTransactionAsync} from '../substrate/substrate-api';
+import nonFungibleAbi from './nonFungibleAbi.json';
describe('Common metadata', () => {
itWeb3('Returns collection name', async ({api, web3}) => {
@@ -62,4 +65,146 @@
expect(+decimals).to.equal(6);
});
-});
\ No newline at end of file
+});
+
+describe('Support ERC721Metadata', () => {
+ itWeb3('Check unsupport ERC721Metadata SchemaVersion::Unique', async ({web3, api}) => {
+ const collectionId = await createCollectionExpectSuccess({
+ mode: {type: 'NFT'},
+ schemaVersion: 'Unique',
+ name: 'some_name',
+ tokenPrefix: 'some_prefix',
+ });
+ const collection = await api.rpc.unique.collectionById(collectionId);
+ expect(collection.isSome).to.be.true;
+ expect(collection.unwrap().schemaVersion.toHuman()).to.be.eq('Unique');
+
+ const alice = privateKey('//Alice');
+
+ const caller = await createEthAccountWithBalance(api, web3);
+ const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, {Ethereum: caller});
+ await submitTransactionAsync(alice, changeAdminTx);
+
+ const address = collectionIdToAddress(collectionId);
+ const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});
+
+ expect(await contract.methods.name().call()).to.be.eq('some_name');
+ expect(await contract.methods.symbol().call()).to.be.eq('some_prefix');
+
+ const receiver = createEthAccount(web3);
+ const nextTokenId = await contract.methods.nextTokenId().call();
+ expect(nextTokenId).to.be.equal('1');
+ await expect(contract.methods.mintWithTokenURI(
+ receiver,
+ nextTokenId,
+ 'Test URI',
+ ).call({from: caller})).to.be.rejectedWith('Unsupported schema version! Support only ImageURL');
+
+ await expect(contract.methods.mintBulkWithTokenURI(
+ receiver,
+ [
+ [nextTokenId, 'Test URI 0'],
+ [+nextTokenId + 1, 'Test URI 1'],
+ [+nextTokenId + 2, 'Test URI 2'],
+ ],
+ ).call({from: caller})).to.be.rejectedWith('Unsupported schema version! Support only ImageURL');
+ });
+
+ itWeb3('Check support ERC721Metadata for SchemaVersion::ImageURL', async ({web3, api}) => {
+ const collectionId = await createCollectionExpectSuccess({
+ mode: {type: 'NFT'},
+ name: 'some_name',
+ tokenPrefix: 'some_prefix',
+ });
+ const collection = await api.rpc.unique.collectionById(collectionId);
+ expect(collection.isSome).to.be.true;
+ expect(collection.unwrap().schemaVersion.toHuman()).to.be.eq('ImageURL');
+
+ const alice = privateKey('//Alice');
+
+ const caller = await createEthAccountWithBalance(api, web3);
+ const changeAdminTx = api.tx.unique.addCollectionAdmin(collectionId, {Ethereum: caller});
+ await submitTransactionAsync(alice, changeAdminTx);
+
+ const address = collectionIdToAddress(collectionId);
+ const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});
+
+ expect(await contract.methods.name().call()).to.be.eq('some_name');
+ expect(await contract.methods.symbol().call()).to.be.eq('some_prefix');
+
+ const receiver = createEthAccount(web3);
+ { // mintWithTokenURI
+ const nextTokenId = await contract.methods.nextTokenId().call();
+ expect(nextTokenId).to.be.equal('1');
+ const result = await contract.methods.mintWithTokenURI(
+ receiver,
+ nextTokenId,
+ 'Test URI',
+ ).send({from: caller});
+ const events = normalizeEvents(result.events);
+
+ expect(events).to.be.deep.equal([
+ {
+ address,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver,
+ tokenId: nextTokenId,
+ },
+ },
+ ]);
+
+ expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+ }
+
+ { // mintBulkWithTokenURI
+ const nextTokenId = await contract.methods.nextTokenId().call();
+ expect(nextTokenId).to.be.equal('2');
+ const result = await contract.methods.mintBulkWithTokenURI(
+ receiver,
+ [
+ [nextTokenId, 'Test URI 0'],
+ [+nextTokenId + 1, 'Test URI 1'],
+ [+nextTokenId + 2, 'Test URI 2'],
+ ],
+ ).send({from: caller});
+ const events = normalizeEvents(result.events);
+
+ expect(events).to.be.deep.equal([
+ {
+ address,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver,
+ tokenId: nextTokenId,
+ },
+ },
+ {
+ address,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver,
+ tokenId: String(+nextTokenId + 1),
+ },
+ },
+ {
+ address,
+ event: 'Transfer',
+ args: {
+ from: '0x0000000000000000000000000000000000000000',
+ to: receiver,
+ tokenId: String(+nextTokenId + 2),
+ },
+ },
+ ]);
+
+ expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');
+ expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');
+ expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');
+ }
+ });
+});
+
tests/src/setConstOnChainSchema.test.tsdiffbeforeafterboth--- a/tests/src/setConstOnChainSchema.test.ts
+++ b/tests/src/setConstOnChainSchema.test.ts
@@ -32,16 +32,16 @@
let alice: IKeyringPair;
let bob: IKeyringPair;
-let shema: any;
-let largeShema: any;
+let schema: any;
+let largeSchema: any;
before(async () => {
await usingApi(async () => {
const keyring = new Keyring({type: 'sr25519'});
alice = keyring.addFromUri('//Alice');
bob = keyring.addFromUri('//Bob');
- shema = '0x31';
- largeShema = new Array(1024 * 1024 + 10).fill(0xff);
+ schema = '0x31';
+ largeSchema = new Array(1024 * 1024 + 10).fill(0xff);
});
});
describe('Integration Test ext. setConstOnChainSchema()', () => {
@@ -51,8 +51,8 @@
const collectionId = await createCollectionExpectSuccess();
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
- const setShema = api.tx.unique.setConstOnChainSchema(collectionId, shema);
- await submitTransactionAsync(alice, setShema);
+ const setSchema = api.tx.unique.setConstOnChainSchema(collectionId, schema);
+ await submitTransactionAsync(alice, setSchema);
});
});
@@ -62,18 +62,18 @@
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
- const setShema = api.tx.unique.setConstOnChainSchema(collectionId, shema);
- await submitTransactionAsync(bob, setShema);
+ const setSchema = api.tx.unique.setConstOnChainSchema(collectionId, schema);
+ await submitTransactionAsync(bob, setSchema);
});
});
it('Checking collection data using the ConstOnChainSchema parameter', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const setShema = api.tx.unique.setConstOnChainSchema(collectionId, shema);
- await submitTransactionAsync(alice, setShema);
+ const setSchema = api.tx.unique.setConstOnChainSchema(collectionId, schema);
+ await submitTransactionAsync(alice, setSchema);
const collection = await queryCollectionExpectSuccess(api, collectionId);
- expect(collection.constOnChainSchema.toString()).to.be.eq(shema);
+ expect(collection.constOnChainSchema.toString()).to.be.eq(schema);
});
});
});
@@ -84,8 +84,8 @@
await usingApi(async (api) => {
// tslint:disable-next-line: radix
const collectionId = await getCreatedCollectionCount(api) + 1;
- const setShema = api.tx.unique.setConstOnChainSchema(collectionId, shema);
- await expect(submitTransactionExpectFailAsync(alice, setShema)).to.be.rejected;
+ const setSchema = api.tx.unique.setConstOnChainSchema(collectionId, schema);
+ await expect(submitTransactionExpectFailAsync(alice, setSchema)).to.be.rejected;
});
});
@@ -93,16 +93,16 @@
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(collectionId);
- const setShema = api.tx.unique.setConstOnChainSchema(collectionId, shema);
- await expect(submitTransactionExpectFailAsync(alice, setShema)).to.be.rejected;
+ const setSchema = api.tx.unique.setConstOnChainSchema(collectionId, schema);
+ await expect(submitTransactionExpectFailAsync(alice, setSchema)).to.be.rejected;
});
});
it('Set invalid data in schema (size too large:> 1MB)', async () => {
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
- const setShema = api.tx.unique.setConstOnChainSchema(collectionId, largeShema);
- await expect(submitTransactionExpectFailAsync(alice, setShema)).to.be.rejected;
+ const setSchema = api.tx.unique.setConstOnChainSchema(collectionId, largeSchema);
+ await expect(submitTransactionExpectFailAsync(alice, setSchema)).to.be.rejected;
});
});
@@ -111,8 +111,8 @@
const collectionId = await createCollectionExpectSuccess();
const collection = await queryCollectionExpectSuccess(api, collectionId);
expect(collection.owner.toString()).to.be.eq(alice.address);
- const setShema = api.tx.unique.setConstOnChainSchema(collectionId, shema);
- await expect(submitTransactionExpectFailAsync(bob, setShema)).to.be.rejected;
+ const setSchema = api.tx.unique.setConstOnChainSchema(collectionId, schema);
+ await expect(submitTransactionExpectFailAsync(bob, setSchema)).to.be.rejected;
});
});
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -268,6 +268,7 @@
name: string,
description: string,
tokenPrefix: string,
+ schemaVersion: string,
};
const defaultCreateCollectionParams: CreateCollectionParams = {
@@ -275,10 +276,11 @@
mode: {type: 'NFT'},
name: 'name',
tokenPrefix: 'prefix',
+ schemaVersion: 'ImageURL',
};
export async function createCollectionExpectSuccess(params: Partial<CreateCollectionParams> = {}): Promise<number> {
- const {name, description, mode, tokenPrefix} = {...defaultCreateCollectionParams, ...params};
+ const {name, description, mode, tokenPrefix, schemaVersion} = {...defaultCreateCollectionParams, ...params};
let collectionId = 0;
await usingApi(async (api) => {
@@ -297,7 +299,13 @@
modeprm = {refungible: null};
}
- const tx = api.tx.unique.createCollectionEx({name: strToUTF16(name), description: strToUTF16(description), tokenPrefix: strToUTF16(tokenPrefix), mode: modeprm as any});
+ const tx = api.tx.unique.createCollectionEx({
+ name: strToUTF16(name),
+ description: strToUTF16(description),
+ tokenPrefix: strToUTF16(tokenPrefix),
+ mode: modeprm as any,
+ schemaVersion: schemaVersion,
+ });
const events = await submitTransactionAsync(alicePrivateKey, tx);
const result = getCreateCollectionResult(events);