git.delta.rocks / unique-network / refs/commits / 46475864a647

--- a/pallets/evm-collection/src/eth.rs
+++ b/pallets/evm-collection/src/eth.rs
@@ -18,7 +18,7 @@
 use evm_coder::{abi::AbiWriter, execution::*, generate_stubgen, solidity_interface, types::*, ToLog};
 use ethereum as _;
 use pallet_common::CollectionById;
-use pallet_common::CollectionHandle;
+use pallet_common::{CollectionHandle};
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
 use pallet_evm::{
 	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,
@@ -113,13 +113,11 @@
 		let mut collection = collection_from_address(collection_address, &self.0)?;
 		check_is_owner(caller, &collection)?;
 
-	fn set_offchain_shema(shema: string) -> Result<void> {
-		let shema = shema
-			.into_bytes()
-			.try_into()
-			.map_err(|_| error_feild_too_long(stringify!(shema), OFFCHAIN_SCHEMA_LIMIT))?;
-		collection.offchain_schema = shema;
-		save(collection)
+		let sponsor = T::CrossAccountId::from_eth(sponsor);
+		collection.set_sponsor(sponsor.as_sub().clone());
+		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(()).map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(())
 	}
 
 	fn confirm_sponsorship(&self, caller: caller, collection_address: address) -> Result<void> {
@@ -128,7 +126,8 @@
 		if !collection.confirm_sponsorship(caller.as_sub()) {
 			return Err(Error::Revert("Caller is not set as sponsor".into()));
 		}
-		save(collection)
+		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(())
 	}
 
 	fn set_offchain_shema(
@@ -144,8 +143,9 @@
 			.into_bytes()
 			.try_into()
 			.map_err(|_| error_feild_too_long(stringify!(shema), OFFCHAIN_SCHEMA_LIMIT))?;
-		collection.offchain_schema = shema;
-		save(collection)
+		// collection.offchain_schema = shema;
+		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(())
 	}
 
 	fn set_variable_on_chain_schema(
@@ -160,8 +160,9 @@
 		let variable = variable.into_bytes().try_into().map_err(|_| {
 			error_feild_too_long(stringify!(variable), VARIABLE_ON_CHAIN_SCHEMA_LIMIT)
 		})?;
-		collection.variable_on_chain_schema = variable;
-		save(collection)
+		// collection.variable_on_chain_schema = variable;
+		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(())
 	}
 
 	fn set_const_on_chain_schema(
@@ -176,8 +177,9 @@
 		let const_on_chain = const_on_chain.into_bytes().try_into().map_err(|_| {
 			error_feild_too_long(stringify!(const_on_chain), CONST_ON_CHAIN_SCHEMA_LIMIT)
 		})?;
-		collection.const_on_chain_schema = const_on_chain;
-		save(collection)
+		// collection.const_on_chain_schema = const_on_chain;
+		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(())
 	}
 
 	fn set_limits(
@@ -192,7 +194,8 @@
 		let limits = serde_json::from_str(limits_json.as_ref())
 			.map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?;
 		collection.limits = limits;
-		save(collection)
+		collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+		Ok(())
 	}
 }
 
@@ -202,12 +205,12 @@
 
 fn collection_from_address<T: Config>(
 	collection_address: address,
-	recorder: &Rc<SubstrateRecorder<T>>,
+	recorder: &SubstrateRecorder<T>,
 ) -> Result<CollectionHandle<T>> {
 	let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)
 		.ok_or(Error::Revert("Contract is not an unique collection".into()))?;
 	let collection =
-		pallet_common::CollectionHandle::new_with_recorder(collection_id, recorder.clone())
+		pallet_common::CollectionHandle::new_with_gas_limit(collection_id, recorder.gas_left())
 			.ok_or(Error::Revert("Create collection handle error".into()))?;
 	Ok(collection)
 }
@@ -218,12 +221,6 @@
 		.check_is_owner(&caller)
 		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
 	Ok(())
-}
-
-fn save<T: Config>(collection: CollectionHandle<T>) -> Result<()> {
-	Ok(collection
-		.save()
-		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?)
 }
 
 pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);

150    let result = await helper.methods.create721Collection('Mint collection', '6', '6').send();150    let result = await helper.methods.create721Collection('Mint collection', '6', '6').send();
151    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);151    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
152    const receiver = createEthAccount(web3);152    const receiver = createEthAccount(web3);
153    const contract = new web3.eth.Contract(nonFungibleAbi as any, collectionIdAddress.toLowerCase(), {from: owner, ...GAS_ARGS});153    const contract = new web3.eth.Contract(nonFungibleAbi as any, collectionIdAddress, {from: owner, ...GAS_ARGS});
154    const nextTokenId = await contract.methods.nextTokenId().call();154    const nextTokenId = await contract.methods.nextTokenId().call();
155155
156    expect(nextTokenId).to.be.equal('1');156    expect(nextTokenId).to.be.equal('1');