git.delta.rocks / unique-network / refs/commits / d7a4e69fe08d

difftreelog

added erc20 api for refungible tokens

Grigoriy Simonov2022-07-22parent: #5ffdcf0.patch.diff
in: master

7 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6322,11 +6322,14 @@
 name = "pallet-refungible"
 version = "0.1.1"
 dependencies = [
+ "ethereum",
+ "evm-coder",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "pallet-common",
  "pallet-evm",
+ "pallet-evm-coder-substrate",
  "pallet-structure",
  "parity-scale-codec 3.1.5",
  "scale-info",
modifiedpallets/refungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -11,36 +11,43 @@
 version = '3.1.2'
 
 [dependencies]
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }
+evm-coder = { default-features = false, path = '../../crates/evm-coder' }
+pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
 pallet-common = { default-features = false, path = '../common' }
 pallet-structure = { default-features = false, path = '../structure' }
+struct-versioning = { path = "../../crates/struct-versioning" }
 up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
+
+ethereum = { version = "0.12.0", default-features = false }
+scale-info = { version = "2.0.1", default-features = false, features = ["derive",] }
+
 frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
-scale-info = { version = "2.0.1", default-features = false, features = [
-    "derive",
-] }
-struct-versioning = { path = "../../crates/struct-versioning" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
+pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.24" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
 
 [features]
 default = ["std"]
 std = [
+    "ethereum/std",
+    "evm-coder/std",
+    'frame-benchmarking/std',
     "frame-support/std",
     "frame-system/std",
+    "pallet-common/std",
+    "pallet-evm/std",
+    "pallet-evm-coder-substrate/std",
+    "pallet-structure/std",
     "sp-runtime/std",
     "sp-std/std",
     "up-data-structs/std",
-    "pallet-common/std",
-    "pallet-structure/std",
-    'frame-benchmarking/std',
-    "pallet-evm/std",
 ]
 runtime-benchmarks = [
     'frame-benchmarking',
     'frame-support/runtime-benchmarks',
     'frame-system/runtime-benchmarks',
+    'up-data-structs/runtime-benchmarks',
 ]
deletedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use up_data_structs::TokenId;
-use pallet_common::erc::CommonEvmHandler;
-use pallet_evm::PrecompileHandle;
-
-use crate::{Config, RefungibleHandle};
-
-impl<T: Config> CommonEvmHandler for RefungibleHandle<T> {
-	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");
-
-	fn call(
-		self,
-		_handle: &mut impl PrecompileHandle,
-	) -> Option<pallet_common::erc::PrecompileResult> {
-		// TODO: Implement RFT variant of ERC721
-		None
-	}
-}
-
-pub struct RefungibleTokenHandle<T: Config>(pub RefungibleHandle<T>, pub TokenId);
-
-impl<T: Config> CommonEvmHandler for RefungibleTokenHandle<T> {
-	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungibleToken.raw");
-
-	fn call(
-		self,
-		_handle: &mut impl PrecompileHandle,
-	) -> Option<pallet_common::erc::PrecompileResult> {
-		// TODO: Implement RFT variant of ERC20
-		None
-	}
-}
addedpallets/refungible/src/erc20.rsdiffbeforeafterboth
--- /dev/null
+++ b/pallets/refungible/src/erc20.rs
@@ -0,0 +1,204 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+extern crate alloc;
+use core::{
+	char::{REPLACEMENT_CHARACTER, decode_utf16},
+	convert::TryInto,
+	ops::Deref,
+};
+use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
+use pallet_common::{
+	CommonWeightInfo,
+	erc::{CommonEvmHandler, PrecompileResult},
+};
+use pallet_evm::{account::CrossAccountId, PrecompileHandle};
+use pallet_evm_coder_substrate::{call, dispatch_to_evm, WithRecorder};
+use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
+use sp_std::vec::Vec;
+use up_data_structs::{CollectionMode, TokenId};
+
+use crate::{
+	Allowance, Balance, common::CommonWeights, Config, erc721::UniqueRFTCall, Pallet,
+	RefungibleHandle, SelfWeightOf, weights::WeightInfo, TotalSupply,
+};
+
+pub struct RefungibleTokenHandle<T: Config>(pub RefungibleHandle<T>, pub TokenId);
+
+#[derive(ToLog)]
+pub enum ERC20Events {
+	Transfer {
+		#[indexed]
+		from: address,
+		#[indexed]
+		to: address,
+		value: uint256,
+	},
+	Approval {
+		#[indexed]
+		owner: address,
+		#[indexed]
+		spender: address,
+		value: uint256,
+	},
+}
+
+#[solidity_interface(name = "ERC20", events(ERC20Events))]
+impl<T: Config> RefungibleTokenHandle<T> {
+	fn name(&self) -> Result<string> {
+		Ok(decode_utf16(self.name.iter().copied())
+			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
+			.collect::<string>())
+	}
+	fn symbol(&self) -> Result<string> {
+		Ok(string::from_utf8_lossy(&self.token_prefix).into())
+	}
+	fn total_supply(&self) -> Result<uint256> {
+		self.consume_store_reads(1)?;
+		Ok(<TotalSupply<T>>::get((self.id, self.1)).into())
+	}
+
+	fn decimals(&self) -> Result<uint8> {
+		Ok(if let CollectionMode::Fungible(decimals) = &self.mode {
+			*decimals
+		} else {
+			unreachable!()
+		})
+	}
+	fn balance_of(&self, owner: address) -> Result<uint256> {
+		self.consume_store_reads(1)?;
+		let owner = T::CrossAccountId::from_eth(owner);
+		let balance = <Balance<T>>::get((self.id, self.1, owner));
+		Ok(balance.into())
+	}
+	#[weight(<CommonWeights<T>>::transfer())]
+	fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		let to = T::CrossAccountId::from_eth(to);
+		let amount = amount.try_into().map_err(|_| "amount overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		<Pallet<T>>::transfer(self, &caller, &to, self.1, amount, &budget)
+			.map_err(|_| "transfer error")?;
+		Ok(true)
+	}
+	#[weight(<CommonWeights<T>>::transfer_from())]
+	fn transfer_from(
+		&mut self,
+		caller: caller,
+		from: address,
+		to: address,
+		amount: uint256,
+	) -> Result<bool> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		let from = T::CrossAccountId::from_eth(from);
+		let to = T::CrossAccountId::from_eth(to);
+		let amount = amount.try_into().map_err(|_| "amount overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		<Pallet<T>>::transfer_from(self, &caller, &from, &to, self.1, amount, &budget)
+			.map_err(dispatch_to_evm::<T>)?;
+		Ok(true)
+	}
+	#[weight(<SelfWeightOf<T>>::approve())]
+	fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		let spender = T::CrossAccountId::from_eth(spender);
+		let amount = amount.try_into().map_err(|_| "amount overflow")?;
+
+		<Pallet<T>>::set_allowance(self, &caller, &spender, self.1, amount)
+			.map_err(dispatch_to_evm::<T>)?;
+		Ok(true)
+	}
+	fn allowance(&self, owner: address, spender: address) -> Result<uint256> {
+		self.consume_store_reads(1)?;
+		let owner = T::CrossAccountId::from_eth(owner);
+		let spender = T::CrossAccountId::from_eth(spender);
+
+		Ok(<Allowance<T>>::get((self.id, self.1, owner, spender)).into())
+	}
+}
+
+#[solidity_interface(name = "ERC20UniqueExtensions")]
+impl<T: Config> RefungibleTokenHandle<T> {
+	#[weight(<SelfWeightOf<T>>::burn_from())]
+	fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		let from = T::CrossAccountId::from_eth(from);
+		let amount = amount.try_into().map_err(|_| "amount overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		<Pallet<T>>::burn_from(self, &caller, &from, self.1, amount, &budget)
+			.map_err(dispatch_to_evm::<T>)?;
+		Ok(true)
+	}
+}
+
+impl<T: Config> RefungibleTokenHandle<T> {
+	pub fn into_inner(self) -> RefungibleHandle<T> {
+		self.0
+	}
+	pub fn common_mut(&mut self) -> &mut RefungibleHandle<T> {
+		&mut self.0
+	}
+}
+
+impl<T: Config> WithRecorder<T> for RefungibleTokenHandle<T> {
+	fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {
+		self.0.recorder()
+	}
+	fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {
+		self.0.into_recorder()
+	}
+}
+
+impl<T: Config> Deref for RefungibleTokenHandle<T> {
+	type Target = RefungibleHandle<T>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+#[solidity_interface(
+	name = "UniqueRefungibleToken",
+	is(
+		ERC20,
+		ERC20UniqueExtensions,
+		via("RefungibleHandle<T>", common_mut, UniqueRFT)
+	)
+)]
+impl<T: Config> RefungibleTokenHandle<T> where T::AccountId: From<[u8; 32]> {}
+
+generate_stubgen!(gen_impl, UniqueRefungibleTokenCall<()>, true);
+generate_stubgen!(gen_iface, UniqueRefungibleTokenCall<()>, false);
+
+impl<T: Config> CommonEvmHandler for RefungibleTokenHandle<T>
+where
+	T::AccountId: From<[u8; 32]>,
+{
+	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungibleToken.raw");
+
+	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {
+		call::<T, UniqueRefungibleTokenCall<T>, _, _>(handle, self)
+	}
+}
addedpallets/refungible/src/erc721.rsdiffbeforeafterboth
--- /dev/null
+++ b/pallets/refungible/src/erc721.rs
@@ -0,0 +1,32 @@
+extern crate alloc;
+use evm_coder::{generate_stubgen, solidity_interface, types::*};
+
+use pallet_common::{CollectionHandle, erc::CollectionCall, erc::CommonEvmHandler};
+
+use pallet_evm::PrecompileHandle;
+use pallet_evm_coder_substrate::call;
+
+use crate::{Config, RefungibleHandle};
+
+#[solidity_interface(
+	name = "UniqueRFT",
+	is(via("CollectionHandle<T>", common_mut, Collection),)
+)]
+impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> {}
+
+// Not a tests, but code generators
+generate_stubgen!(gen_impl, UniqueRFTCall<()>, true);
+generate_stubgen!(gen_iface, UniqueRFTCall<()>, false);
+
+impl<T: Config> CommonEvmHandler for RefungibleHandle<T>
+where
+	T::AccountId: From<[u8; 32]>,
+{
+	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");
+	fn call(
+		self,
+		handle: &mut impl PrecompileHandle,
+	) -> Option<pallet_common::erc::PrecompileResult> {
+		call::<T, UniqueRFTCall<T>, _, _>(handle, self)
+	}
+}
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
8787
88#![cfg_attr(not(feature = "std"), no_std)]88#![cfg_attr(not(feature = "std"), no_std)]
8989
90use crate::erc20::ERC20Events;
91
92use codec::{Encode, Decode, MaxEncodedLen};
93use core::ops::Deref;
94use evm_coder::ToLog;
90use frame_support::{ensure, fail, BoundedVec, transactional, storage::with_transaction};95use frame_support::{BoundedVec, ensure, fail, storage::with_transaction, transactional};
91use up_data_structs::{96use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
92	AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,
93	CreateCollectionData, CreateRefungibleExData, mapping::TokenAddressMapping, budget::Budget,
94	Property, PropertyScope, TrySetProperty, PropertyKey, PropertyValue, PropertyPermission,
95	PropertyKeyPermission,
96};
97use pallet_evm::account::CrossAccountId;97use pallet_evm_coder_substrate::WithRecorder;
98use pallet_common::{98use pallet_common::{CommonCollectionOperations, Error as CommonError, Event as CommonEvent, Pallet as PalletCommon};
99	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
100	CommonCollectionOperations as _,
101};
102use pallet_structure::Pallet as PalletStructure;99use pallet_structure::Pallet as PalletStructure;
100use scale_info::TypeInfo;
101use sp_core::H160;
103use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};102use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
104use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};103use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
105use core::ops::Deref;
106use codec::{Encode, Decode, MaxEncodedLen};104use up_data_structs::{
107use scale_info::TypeInfo;105	AccessMode, budget::Budget, CollectionId, CreateCollectionData, CreateRefungibleExData, CustomDataLimit, mapping::TokenAddressMapping, MAX_REFUNGIBLE_PIECES, TokenId,
106	Property, PropertyKey, PropertyKeyPermission, PropertyPermission, PropertyScope, PropertyValue, TrySetProperty
107};
108108
109pub use pallet::*;109pub use pallet::*;
110#[cfg(feature = "runtime-benchmarks")]110#[cfg(feature = "runtime-benchmarks")]
111pub mod benchmarking;111pub mod benchmarking;
112pub mod common;112pub mod common;
113pub mod erc;113pub mod erc20;
114pub mod erc721;
114pub mod weights;115pub mod weights;
115pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;116pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
116117
271	pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {272	pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {
272		self.0273		self.0
273	}274	}
275	pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {
276		&mut self.0
277	}
274}278}
279
275impl<T: Config> Deref for RefungibleHandle<T> {280impl<T: Config> Deref for RefungibleHandle<T> {
280	}285	}
281}286}
287
288impl<T: Config> WithRecorder<T> for RefungibleHandle<T> {
289	fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {
290		self.0.recorder()
291	}
292	fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {
293		self.0.into_recorder()
294	}
295}
282296
283impl<T: Config> Pallet<T> {297impl<T: Config> Pallet<T> {
284	/// Get number of RFT tokens in collection298	/// Get number of RFT tokens in collection
460			<Balance<T>>::insert((collection.id, token, owner), balance);474			<Balance<T>>::insert((collection.id, token, owner), balance);
461		}475		}
462		<TotalSupply<T>>::insert((collection.id, token), total_supply);476		<TotalSupply<T>>::insert((collection.id, token), total_supply);
463		// TODO: ERC20 transfer event477
478		<PalletEvm<T>>::deposit_log(
479			ERC20Events::Transfer {
480				from: *owner.as_eth(),
481				to: H160::default(),
482				value: amount.into(),
483			}
484			.to_log(T::EvmTokenAddressMapping::token_to_address(
485				collection.id,
486				token,
487			)),
488		);
464		<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(489		<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(
465			collection.id,490			collection.id,
466			token,491			token,
736			}761			}
737		}762		}
738763
739		// TODO: ERC20 transfer event764		<PalletEvm<T>>::deposit_log(
765			ERC20Events::Transfer {
766				from: *from.as_eth(),
767				to: *to.as_eth(),
768				value: amount.into(),
769			}
770			.to_log(T::EvmTokenAddressMapping::token_to_address(
771				collection.id,
772				token,
773			)),
774		);
740		<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(775		<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(
741			collection.id,776			collection.id,
742			token,777			token,
889					continue;924					continue;
890				}925				}
891926
892				// TODO: ERC20 transfer event927				<PalletEvm<T>>::deposit_log(
928					ERC20Events::Transfer {
929						from: H160::default(),
930						to: *user.as_eth(),
931						value: amount.into(),
932					}
933					.to_log(T::EvmTokenAddressMapping::token_to_address(
934						collection.id,
935						TokenId(token_id),
936					)),
937				);
893				<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(938				<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(
894					collection.id,939					collection.id,
895					TokenId(token_id),940					TokenId(token_id),
913		} else {958		} else {
914			<Allowance<T>>::insert((collection.id, token, sender, spender), amount);959			<Allowance<T>>::insert((collection.id, token, sender, spender), amount);
915		}960		}
916		// TODO: ERC20 approval event961
962		<PalletEvm<T>>::deposit_log(
963			ERC20Events::Approval {
964				owner: *sender.as_eth(),
965				spender: *spender.as_eth(),
966				value: amount.into(),
967			}
968			.to_log(T::EvmTokenAddressMapping::token_to_address(
969				collection.id,
970				token,
971			)),
972		);
917		<PalletCommon<T>>::deposit_event(CommonEvent::Approved(973		<PalletCommon<T>>::deposit_event(CommonEvent::Approved(
918			collection.id,974			collection.id,
919			token,975			token,
modifiedruntime/common/src/dispatch.rsdiffbeforeafterboth
--- a/runtime/common/src/dispatch.rs
+++ b/runtime/common/src/dispatch.rs
@@ -25,7 +25,7 @@
 pub use pallet_common::dispatch::CollectionDispatch;
 use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
 use pallet_nonfungible::{Pallet as PalletNonfungible, NonfungibleHandle};
-use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle, erc::RefungibleTokenHandle};
+use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle, erc20::RefungibleTokenHandle};
 use up_data_structs::{
 	CollectionMode, CreateCollectionData, MAX_DECIMAL_POINTS, mapping::TokenAddressMapping,
 };