difftreelog
CORE-302 Fix shema => schema
in: master
6 files changed
pallets/evm-collection/src/eth.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::*, generate_stubgen, solidity_interface, types::*, ToLog};19use ethereum as _;20use pallet_common::CollectionById;21use pallet_common::{CollectionHandle};22use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};23use pallet_evm::{24 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,25 account::CrossAccountId, Pallet as PalletEvm,26};27use sp_core::H160;28use up_data_structs::{29 CreateCollectionData, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,30 MAX_COLLECTION_NAME_LENGTH, OFFCHAIN_SCHEMA_LIMIT, VARIABLE_ON_CHAIN_SCHEMA_LIMIT,31 CONST_ON_CHAIN_SCHEMA_LIMIT,32};33use crate::{Config, Pallet};34use frame_support::traits::Get;3536use sp_std::{vec::Vec, rc::Rc};37use alloc::format;3839struct EvmCollection<T: Config>(SubstrateRecorder<T>);40impl<T: Config> WithRecorder<T> for EvmCollection<T> {41 fn recorder(&self) -> &SubstrateRecorder<T> {42 &self.043 }4445 fn into_recorder(self) -> SubstrateRecorder<T> {46 self.047 }48}4950#[derive(ToLog)]51pub enum CollectionEvent {52 CollectionCreated {53 #[indexed]54 owner: address,55 #[indexed]56 collection_id: address,57 },58}5960#[solidity_interface(name = "Collection")]61impl<T: Config> EvmCollection<T> {62 fn create_721_collection(63 &self,64 caller: caller,65 name: string,66 description: string,67 token_prefix: string,68 ) -> Result<address> {69 let caller = T::CrossAccountId::from_eth(caller);70 let name = name71 .encode_utf16()72 .collect::<Vec<u16>>()73 .try_into()74 .map_err(|_| error_feild_too_long("name", MAX_COLLECTION_NAME_LENGTH))?;75 let description = description76 .encode_utf16()77 .collect::<Vec<u16>>()78 .try_into()79 .map_err(|_| error_feild_too_long("description", MAX_COLLECTION_DESCRIPTION_LENGTH))?;80 let token_prefix = token_prefix81 .into_bytes()82 .try_into()83 .map_err(|_| error_feild_too_long("token_prefix", MAX_TOKEN_PREFIX_LENGTH))?;8485 let data = CreateCollectionData {86 name,87 description,88 token_prefix,89 ..Default::default()90 };9192 let collection_id =93 <pallet_nonfungible::Pallet<T>>::init_collection(caller.as_sub().clone(), data)94 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;9596 let address = pallet_common::eth::collection_id_to_address(collection_id);97 <PalletEvm<T>>::deposit_log(98 CollectionEvent::CollectionCreated {99 owner: *caller.as_eth(),100 collection_id: address,101 }102 .to_log(address),103 );104 Ok(address)105 }106107 fn set_sponsor(108 &self,109 caller: caller,110 collection_address: address,111 sponsor: address,112 ) -> Result<void> {113 let mut collection = collection_from_address(collection_address, &self.0)?;114 check_is_owner(caller, &collection)?;115116 let sponsor = T::CrossAccountId::from_eth(sponsor);117 collection.set_sponsor(sponsor.as_sub().clone());118 collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;119 Ok(()).map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;120 Ok(())121 }122123 fn confirm_sponsorship(&self, caller: caller, collection_address: address) -> Result<void> {124 let mut collection = collection_from_address(collection_address, &self.0)?;125 let caller = T::CrossAccountId::from_eth(caller);126 if !collection.confirm_sponsorship(caller.as_sub()) {127 return Err(Error::Revert("Caller is not set as sponsor".into()));128 }129 collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;130 Ok(())131 }132133 fn set_offchain_shema(134 &self,135 caller: caller,136 collection_address: address,137 shema: string,138 ) -> Result<void> {139 let mut collection = collection_from_address(collection_address, &self.0)?;140 check_is_owner(caller, &collection)?;141142 let shema = shema143 .into_bytes()144 .try_into()145 .map_err(|_| error_feild_too_long(stringify!(shema), OFFCHAIN_SCHEMA_LIMIT))?;146 // collection.offchain_schema = shema;147 collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;148 Ok(())149 }150151 fn set_variable_on_chain_schema(152 &self,153 caller: caller,154 collection_address: address,155 variable: string,156 ) -> Result<void> {157 let mut collection = collection_from_address(collection_address, &self.0)?;158 check_is_owner(caller, &collection)?;159160 let variable = variable.into_bytes().try_into().map_err(|_| {161 error_feild_too_long(stringify!(variable), VARIABLE_ON_CHAIN_SCHEMA_LIMIT)162 })?;163 // collection.variable_on_chain_schema = variable;164 collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;165 Ok(())166 }167168 fn set_const_on_chain_schema(169 &self,170 caller: caller,171 collection_address: address,172 const_on_chain: string,173 ) -> Result<void> {174 let mut collection = collection_from_address(collection_address, &self.0)?;175 check_is_owner(caller, &collection)?;176177 let const_on_chain = const_on_chain.into_bytes().try_into().map_err(|_| {178 error_feild_too_long(stringify!(const_on_chain), CONST_ON_CHAIN_SCHEMA_LIMIT)179 })?;180 // collection.const_on_chain_schema = const_on_chain;181 collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;182 Ok(())183 }184185 fn set_limits(186 &self,187 caller: caller,188 collection_address: address,189 limits_json: string,190 ) -> Result<void> {191 let mut collection = collection_from_address(collection_address, &self.0)?;192 check_is_owner(caller, &collection)?;193194 let limits = serde_json::from_str(limits_json.as_ref())195 .map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?;196 collection.limits = limits;197 collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;198 Ok(())199 }200}201202fn error_feild_too_long(feild: &str, bound: u32) -> Error {203 Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))204}205206fn collection_from_address<T: Config>(207 collection_address: address,208 recorder: &SubstrateRecorder<T>,209) -> Result<CollectionHandle<T>> {210 let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)211 .ok_or(Error::Revert("Contract is not an unique collection".into()))?;212 let collection =213 pallet_common::CollectionHandle::new_with_gas_limit(collection_id, recorder.gas_left())214 .ok_or(Error::Revert("Create collection handle error".into()))?;215 Ok(collection)216}217218fn check_is_owner<T: Config>(caller: caller, collection: &CollectionHandle<T>) -> Result<()> {219 let caller = T::CrossAccountId::from_eth(caller);220 collection221 .check_is_owner(&caller)222 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;223 Ok(())224}225226pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);227impl<T: Config> OnMethodCall<T> for CollectionOnMethodCall<T> {228 fn is_reserved(contract: &sp_core::H160) -> bool {229 contract == &T::ContractAddress::get()230 }231232 fn is_used(contract: &sp_core::H160) -> bool {233 contract == &T::ContractAddress::get()234 }235236 fn call(237 source: &sp_core::H160,238 target: &sp_core::H160,239 gas_left: u64,240 input: &[u8],241 value: sp_core::U256,242 ) -> Option<PrecompileResult> {243 if target != &T::ContractAddress::get() {244 return None;245 }246247 let helpers = EvmCollection::<T>(SubstrateRecorder::new(gas_left));248 pallet_evm_coder_substrate::call(*source, helpers, value, input)249 }250251 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {252 (contract == &T::ContractAddress::get())253 .then(|| include_bytes!("./stubs/Collection.raw").to_vec())254 }255}256257generate_stubgen!(collection_impl, CollectionCall<()>, true);258generate_stubgen!(collection_iface, CollectionCall<()>, false);pallets/evm-collection/src/stubs/Collection.rawdiffbeforeafterbothbinary blob — no preview
pallets/evm-collection/src/stubs/Collection.soldiffbeforeafterboth--- a/pallets/evm-collection/src/stubs/Collection.sol
+++ b/pallets/evm-collection/src/stubs/Collection.sol
@@ -21,7 +21,7 @@
}
}
-// Selector: 037b69c8
+// Selector: f83ad95b
contract Collection is Dummy, ERC165 {
// Selector: create721Collection(string,string,string) 951c0151
function create721Collection(
@@ -55,8 +55,8 @@
dummy;
}
- // Selector: setOffchainShema(address,string) d7dc2de3
- function setOffchainShema(address collectionAddress, string memory shema)
+ // Selector: setOffchainSchema(address,string) 2c9d9d70
+ function setOffchainSchema(address collectionAddress, string memory shema)
public
view
{
tests/src/eth/api/Collection.soldiffbeforeafterboth--- a/tests/src/eth/api/Collection.sol
+++ b/tests/src/eth/api/Collection.sol
@@ -12,7 +12,7 @@
function supportsInterface(bytes4 interfaceID) external view returns (bool);
}
-// Selector: 037b69c8
+// Selector: f83ad95b
interface Collection is Dummy, ERC165 {
// Selector: create721Collection(string,string,string) 951c0151
function create721Collection(
@@ -29,8 +29,8 @@
// Selector: confirmSponsorship(address) abc00001
function confirmSponsorship(address collectionAddress) external view;
- // Selector: setOffchainShema(address,string) d7dc2de3
- function setOffchainShema(address collectionAddress, string memory shema)
+ // Selector: setOffchainSchema(address,string) 2c9d9d70
+ function setOffchainSchema(address collectionAddress, string memory shema)
external
view;
tests/src/eth/collectionAbi.jsondiffbeforeafterboth--- a/tests/src/eth/collectionAbi.json
+++ b/tests/src/eth/collectionAbi.json
@@ -60,7 +60,7 @@
},
{ "internalType": "string", "name": "shema", "type": "string" }
],
- "name": "setOffchainShema",
+ "name": "setOffchainSchema",
"outputs": [],
"stateMutability": "view",
"type": "function"
tests/src/eth/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createCollection.test.ts
+++ b/tests/src/eth/createCollection.test.ts
@@ -79,15 +79,15 @@
expect(collection.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
});
- itWeb3('Set offchain shema', async ({api, web3}) => {
+ itWeb3('Set offchain schema', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const helper = collectionHelper(web3, owner);
- let result = await helper.methods.create721Collection('Shema collection', '2', '2').send();
+ let result = await helper.methods.create721Collection('Schema collection', '2', '2').send();
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
- const shema = 'Some shema';
- result = await helper.methods.setOffchainShema(collectionIdAddress, shema).send();
+ const schema = 'Some schema';
+ result = await helper.methods.setOffchainSchema(collectionIdAddress, schema).send();
const collection = (await getDetailedCollectionInfo(api, collectionId))!;
- expect(collection.offchainSchema.toHuman()).to.be.eq(shema);
+ expect(collection.offchainSchema.toHuman()).to.be.eq(schema);
});
itWeb3('Set variable on chain schema', async ({api, web3}) => {
@@ -106,10 +106,10 @@
const helper = collectionHelper(web3, owner);
let result = await helper.methods.create721Collection('Const collection', '4', '4').send();
const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
- const constShema = 'Some const';
- result = await helper.methods.setConstOnChainSchema(collectionIdAddress, constShema).send();
+ const constSchema = 'Some const';
+ result = await helper.methods.setConstOnChainSchema(collectionIdAddress, constSchema).send();
const collection = (await getDetailedCollectionInfo(api, collectionId))!;
- expect(collection.constOnChainSchema.toHuman()).to.be.eq(constShema);
+ expect(collection.constOnChainSchema.toHuman()).to.be.eq(constSchema);
});
itWeb3('Set limits', async ({api, web3}) => {
@@ -178,7 +178,7 @@
expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
// TODO: this wont work right now, need release 919000 first
- // await helper.methods.setOffchainShema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();
+ // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();
// const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
// expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);
});
@@ -248,9 +248,9 @@
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
{
- const shema = 'Some shema';
+ const schema = 'Some schema';
await expect(helper.methods
- .setOffchainShema(collectionAddressWithBadPrefix, shema)
+ .setOffchainSchema(collectionAddressWithBadPrefix, schema)
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
{
@@ -293,9 +293,9 @@
.call()).to.be.rejectedWith('Caller is not set as sponsor');
}
{
- const shema = 'Some shema';
+ const schema = 'Some schema';
await expect(helperFromNotOwner.methods
- .setOffchainShema(collectionIdAddress, shema)
+ .setOffchainSchema(collectionIdAddress, schema)
.call()).to.be.rejectedWith(EXPECTED_ERROR);
}
{
@@ -318,22 +318,22 @@
}
});
- itWeb3('(!negative test!) Set offchain shema (length limit)', async ({api, web3}) => {
+ itWeb3('(!negative test!) Set offchain schema (length limit)', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const helper = collectionHelper(web3, owner);
- const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();
+ const result = await helper.methods.create721Collection('Schema collection', 'A', 'A').send();
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
const OFFCHAIN_SCHEMA_LIMIT = 8192;
- const shema = 'A'.repeat(OFFCHAIN_SCHEMA_LIMIT + 1);
+ const schema = 'A'.repeat(OFFCHAIN_SCHEMA_LIMIT + 1);
await expect(helper.methods
- .setOffchainShema(collectionIdAddress, shema)
- .call()).to.be.rejectedWith('shema is too long. Max length is ' + OFFCHAIN_SCHEMA_LIMIT);
+ .setOffchainSchema(collectionIdAddress, schema)
+ .call()).to.be.rejectedWith('schema is too long. Max length is ' + OFFCHAIN_SCHEMA_LIMIT);
});
itWeb3('(!negative test!) Set variable on chain schema (length limit)', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const helper = collectionHelper(web3, owner);
- const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();
+ const result = await helper.methods.create721Collection('Schema collection', 'A', 'A').send();
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
const VARIABLE_ON_CHAIN_SCHEMA_LIMIT = 8192;
const variable = 'A'.repeat(VARIABLE_ON_CHAIN_SCHEMA_LIMIT + 1);
@@ -345,7 +345,7 @@
itWeb3('(!negative test!) Set const on chain schema (length limit)', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const helper = collectionHelper(web3, owner);
- const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();
+ const result = await helper.methods.create721Collection('Schema collection', 'A', 'A').send();
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
const CONST_ON_CHAIN_SCHEMA_LIMIT = 32768;
const constData = 'A'.repeat(CONST_ON_CHAIN_SCHEMA_LIMIT + 1);
@@ -357,7 +357,7 @@
itWeb3('(!negative test!) Set limits', async ({api, web3}) => {
const owner = await createEthAccountWithBalance(api, web3);
const helper = collectionHelper(web3, owner);
- const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();
+ const result = await helper.methods.create721Collection('Schema collection', 'A', 'A').send();
const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);
const badJson = '{accountTokenOwnershipLimit: 1000}';
await expect(helper.methods