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.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -139,7 +139,8 @@
..Default::default()
};
- let collection_id_res = <PalletNft<T>>::init_collection(sender.clone(), data);
+ let collection_id_res =
+ <PalletNft<T>>::init_collection(T::CrossAccountId::from_sub(sender.clone()), data);
if let Err(DispatchError::Arithmetic(_)) = &collection_id_res {
return Err(<Error<T>>::NoAvailableCollectionId.into());
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.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//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.1819#![cfg_attr(not(feature = "std"), no_std)]20// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.21#![recursion_limit = "1024"]22#![allow(clippy::from_over_into, clippy::identity_op)]23#![allow(clippy::fn_to_numeric_cast_with_truncation)]24// Make the WASM binary available.25#[cfg(feature = "std")]26include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));2728use sp_api::impl_runtime_apis;29use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};30use sp_runtime::DispatchError;31// #[cfg(any(feature = "std", test))]32// pub use sp_runtime::BuildStorage;3334use sp_runtime::{35 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,36 traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, AccountIdConversion, Zero},37 transaction_validity::{TransactionSource, TransactionValidity},38 ApplyExtrinsicResult, RuntimeAppPublic,39};4041use sp_std::prelude::*;4243#[cfg(feature = "std")]44use sp_version::NativeVersion;45use sp_version::RuntimeVersion;46pub use pallet_transaction_payment::{47 Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,48};49// A few exports that help ease life for downstream crates.50pub use pallet_balances::Call as BalancesCall;51pub use pallet_evm::{52 EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _, OnMethodCall,53 Account as EVMAccount, FeeCalculator, GasWeightMapping,54};55pub use frame_support::{56 construct_runtime, match_types,57 dispatch::DispatchResult,58 PalletId, parameter_types, StorageValue, ConsensusEngineId,59 traits::{60 tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Everything,61 Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,62 OnUnbalanced, Randomness, FindAuthor, ConstU32, Imbalance,63 },64 weights::{65 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},66 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,67 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,68 },69};70use unique_runtime_common::{71 dispatch::{CollectionDispatchT, CollectionDispatch},72 weights::CommonWeights,73 sponsoring::UniqueSponsorshipHandler,74 eth_sponsoring::UniqueEthSponsorshipHandler,75};76use up_data_structs::*;77// use pallet_contracts::weights::WeightInfo;78// #[cfg(any(feature = "std", test))]79use frame_system::{80 self as frame_system, EnsureRoot, EnsureSigned,81 limits::{BlockWeights, BlockLength},82};83use sp_arithmetic::{84 traits::{BaseArithmetic, Unsigned},85};86use smallvec::smallvec;87use codec::{Encode, Decode};88use fp_rpc::TransactionStatus;89use sp_runtime::{90 traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},91 transaction_validity::TransactionValidityError,92 SaturatedConversion,93};9495// pub use pallet_timestamp::Call as TimestampCall;9697// Polkadot imports98use pallet_xcm::XcmPassthrough;99use polkadot_parachain::primitives::Sibling;100use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};101use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};102use xcm_builder::{103 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,104 EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser,105 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,106 SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,107 ParentIsPreset,108};109use xcm_executor::{Config, XcmExecutor, Assets};110use sp_std::{marker::PhantomData};111112use xcm::latest::{113 // Xcm,114 AssetId::{Concrete},115 Fungibility::Fungible as XcmFungible,116 MultiAsset,117 Error as XcmError,118};119use xcm_executor::traits::{MatchesFungible, WeightTrader};120//use xcm_executor::traits::MatchesFungible;121use sp_runtime::traits::CheckedConversion;122123use unique_runtime_common::{124 impl_common_runtime_apis,125 types::*,126 constants::*,127 dispatch::{CollectionDispatchT, CollectionDispatch},128 sponsoring::UniqueSponsorshipHandler,129 eth_sponsoring::UniqueEthSponsorshipHandler,130 weights::CommonWeights,131};132133pub const RUNTIME_NAME: &str = "unique";134pub const TOKEN_SYMBOL: &str = "UNQ";135136type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;137138impl RuntimeInstance for Runtime {139 type CrossAccountId = self::CrossAccountId;140141 type TransactionConverter = self::TransactionConverter;142143 fn get_transaction_converter() -> TransactionConverter {144 TransactionConverter145 }146}147148/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know149/// the specifics of the runtime. They can then be made to be agnostic over specific formats150/// of data like extrinsics, allowing for them to continue syncing the network through upgrades151/// to even the core data structures.152pub mod opaque {153 use sp_std::prelude::*;154 use sp_runtime::impl_opaque_keys;155 use super::Aura;156157 pub use unique_runtime_common::types::*;158159 impl_opaque_keys! {160 pub struct SessionKeys {161 pub aura: Aura,162 }163 }164}165166/// This runtime version.167pub const VERSION: RuntimeVersion = RuntimeVersion {168 spec_name: create_runtime_str!(RUNTIME_NAME),169 impl_name: create_runtime_str!(RUNTIME_NAME),170 authoring_version: 1,171 spec_version: 921000,172 impl_version: 0,173 apis: RUNTIME_API_VERSIONS,174 transaction_version: 1,175 state_version: 0,176};177178#[derive(codec::Encode, codec::Decode)]179pub enum XCMPMessage<XAccountId, XBalance> {180 /// Transfer tokens to the given account from the Parachain account.181 TransferToken(XAccountId, XBalance),182}183184/// The version information used to identify this runtime when compiled natively.185#[cfg(feature = "std")]186pub fn native_version() -> NativeVersion {187 NativeVersion {188 runtime_version: VERSION,189 can_author_with: Default::default(),190 }191}192193type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;194195pub struct DealWithFees;196impl OnUnbalanced<NegativeImbalance> for DealWithFees {197 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {198 if let Some(fees) = fees_then_tips.next() {199 // for fees, 100% to treasury200 let mut split = fees.ration(100, 0);201 if let Some(tips) = fees_then_tips.next() {202 // for tips, if any, 100% to treasury203 tips.ration_merge_into(100, 0, &mut split);204 }205 Treasury::on_unbalanced(split.0);206 // Author::on_unbalanced(split.1);207 }208 }209}210211parameter_types! {212 pub const BlockHashCount: BlockNumber = 2400;213 pub RuntimeBlockLength: BlockLength =214 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);215 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);216 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;217 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()218 .base_block(BlockExecutionWeight::get())219 .for_class(DispatchClass::all(), |weights| {220 weights.base_extrinsic = ExtrinsicBaseWeight::get();221 })222 .for_class(DispatchClass::Normal, |weights| {223 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);224 })225 .for_class(DispatchClass::Operational, |weights| {226 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);227 // Operational transactions have some extra reserved space, so that they228 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.229 weights.reserved = Some(230 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT231 );232 })233 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)234 .build_or_panic();235 pub const Version: RuntimeVersion = VERSION;236 pub const SS58Prefix: u16 = 7391;237}238239parameter_types! {240 pub const ChainId: u64 = 8880;241}242243pub struct FixedFee;244impl FeeCalculator for FixedFee {245 fn min_gas_price() -> U256 {246 MIN_GAS_PRICE.into()247 }248}249250// Assuming slowest ethereum opcode is SSTORE, with gas price of 20000 as our worst case251// (contract, which only writes a lot of data),252// approximating on top of our real store write weight253parameter_types! {254 pub const WritesPerSecond: u64 = WEIGHT_PER_SECOND / <Runtime as frame_system::Config>::DbWeight::get().write;255 pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000;256 pub const WeightPerGas: u64 = WEIGHT_PER_SECOND / GasPerSecond::get();257}258259/// Limiting EVM execution to 50% of block for substrate users and management tasks260/// EVM transaction consumes more weight than substrate's, so we can't rely on them being261/// scheduled fairly262const EVM_DISPATCH_RATIO: Perbill = Perbill::from_percent(50);263parameter_types! {264 pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * EVM_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WeightPerGas::get());265}266267pub enum FixedGasWeightMapping {}268impl GasWeightMapping for FixedGasWeightMapping {269 fn gas_to_weight(gas: u64) -> Weight {270 gas.saturating_mul(WeightPerGas::get())271 }272 fn weight_to_gas(weight: Weight) -> u64 {273 weight / WeightPerGas::get()274 }275}276277impl pallet_evm::Config for Runtime {278 type BlockGasLimit = BlockGasLimit;279 type FeeCalculator = FixedFee;280 type GasWeightMapping = FixedGasWeightMapping;281 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;282 type CallOrigin = EnsureAddressTruncated<Self>;283 type WithdrawOrigin = EnsureAddressTruncated<Self>;284 type AddressMapping = HashedAddressMapping<Self::Hashing>;285 type PrecompilesType = ();286 type PrecompilesValue = ();287 type Currency = Balances;288 type Event = Event;289 type OnMethodCall = (290 pallet_evm_migration::OnMethodCall<Self>,291 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,292 CollectionDispatchT<Self>,293 pallet_unique::eth::CollectionHelperOnMethodCall<Self>,294 );295 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;296 type ChainId = ChainId;297 type Runner = pallet_evm::runner::stack::Runner<Self>;298 type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees>;299 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;300 type FindAuthor = EthereumFindAuthor<Aura>;301}302303impl pallet_evm_migration::Config for Runtime {304 type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;305}306307pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);308impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {309 fn find_author<'a, I>(digests: I) -> Option<H160>310 where311 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,312 {313 if let Some(author_index) = F::find_author(digests) {314 let authority_id = Aura::authorities()[author_index as usize].clone();315 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));316 }317 None318 }319}320321impl pallet_ethereum::Config for Runtime {322 type Event = Event;323 type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;324}325326impl pallet_randomness_collective_flip::Config for Runtime {}327328impl frame_system::Config for Runtime {329 /// The data to be stored in an account.330 type AccountData = pallet_balances::AccountData<Balance>;331 /// The identifier used to distinguish between accounts.332 type AccountId = AccountId;333 /// The basic call filter to use in dispatchable.334 type BaseCallFilter = Everything;335 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).336 type BlockHashCount = BlockHashCount;337 /// The maximum length of a block (in bytes).338 type BlockLength = RuntimeBlockLength;339 /// The index type for blocks.340 type BlockNumber = BlockNumber;341 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.342 type BlockWeights = RuntimeBlockWeights;343 /// The aggregated dispatch type that is available for extrinsics.344 type Call = Call;345 /// The weight of database operations that the runtime can invoke.346 type DbWeight = RocksDbWeight;347 /// The ubiquitous event type.348 type Event = Event;349 /// The type for hashing blocks and tries.350 type Hash = Hash;351 /// The hashing algorithm used.352 type Hashing = BlakeTwo256;353 /// The header type.354 type Header = generic::Header<BlockNumber, BlakeTwo256>;355 /// The index type for storing how many extrinsics an account has signed.356 type Index = Index;357 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.358 type Lookup = AccountIdLookup<AccountId, ()>;359 /// What to do if an account is fully reaped from the system.360 type OnKilledAccount = ();361 /// What to do if a new account is created.362 type OnNewAccount = ();363 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;364 /// The ubiquitous origin type.365 type Origin = Origin;366 /// This type is being generated by `construct_runtime!`.367 type PalletInfo = PalletInfo;368 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.369 type SS58Prefix = SS58Prefix;370 /// Weight information for the extrinsics of this pallet.371 type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;372 /// Version of the runtime.373 type Version = Version;374 type MaxConsumers = ConstU32<16>;375}376377parameter_types! {378 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;379}380381impl pallet_timestamp::Config for Runtime {382 /// A timestamp: milliseconds since the unix epoch.383 type Moment = u64;384 type OnTimestampSet = ();385 type MinimumPeriod = MinimumPeriod;386 type WeightInfo = ();387}388389parameter_types! {390 // pub const ExistentialDeposit: u128 = 500;391 pub const ExistentialDeposit: u128 = 0;392 pub const MaxLocks: u32 = 50;393}394395impl pallet_balances::Config for Runtime {396 type MaxLocks = MaxLocks;397 type MaxReserves = ();398 type ReserveIdentifier = [u8; 8];399 /// The type for recording an account's balance.400 type Balance = Balance;401 /// The ubiquitous event type.402 type Event = Event;403 type DustRemoval = Treasury;404 type ExistentialDeposit = ExistentialDeposit;405 type AccountStore = System;406 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;407}408409pub const fn deposit(items: u32, bytes: u32) -> Balance {410 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE411}412413/*414parameter_types! {415 pub TombstoneDeposit: Balance = deposit(416 1,417 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,418 );419 pub DepositPerContract: Balance = TombstoneDeposit::get();420 pub const DepositPerStorageByte: Balance = deposit(0, 1);421 pub const DepositPerStorageItem: Balance = deposit(1, 0);422 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);423 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;424 pub const SignedClaimHandicap: u32 = 2;425 pub const MaxDepth: u32 = 32;426 pub const MaxValueSize: u32 = 16 * 1024;427 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb428 // The lazy deletion runs inside on_initialize.429 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *430 RuntimeBlockWeights::get().max_block;431 // The weight needed for decoding the queue should be less or equal than a fifth432 // of the overall weight dedicated to the lazy deletion.433 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (434 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -435 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)436 )) / 5) as u32;437 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();438}439440impl pallet_contracts::Config for Runtime {441 type Time = Timestamp;442 type Randomness = RandomnessCollectiveFlip;443 type Currency = Balances;444 type Event = Event;445 type RentPayment = ();446 type SignedClaimHandicap = SignedClaimHandicap;447 type TombstoneDeposit = TombstoneDeposit;448 type DepositPerContract = DepositPerContract;449 type DepositPerStorageByte = DepositPerStorageByte;450 type DepositPerStorageItem = DepositPerStorageItem;451 type RentFraction = RentFraction;452 type SurchargeReward = SurchargeReward;453 type WeightPrice = pallet_transaction_payment::Pallet<Self>;454 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;455 type ChainExtension = NFTExtension;456 type DeletionQueueDepth = DeletionQueueDepth;457 type DeletionWeightLimit = DeletionWeightLimit;458 type Schedule = Schedule;459 type CallStack = [pallet_contracts::Frame<Self>; 31];460}461*/462463parameter_types! {464 /// This value increases the priority of `Operational` transactions by adding465 /// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.466 pub const OperationalFeeMultiplier: u8 = 5;467}468469/// Linear implementor of `WeightToFeePolynomial`470pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);471472impl<T> WeightToFeePolynomial for LinearFee<T>473where474 T: BaseArithmetic + From<u32> + Copy + Unsigned,475{476 type Balance = T;477478 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {479 smallvec!(WeightToFeeCoefficient {480 // Targeting 0.1 Unique per NFT transfer481 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),482 coeff_frac: Perbill::zero(),483 negative: false,484 degree: 1,485 })486 }487}488489impl pallet_transaction_payment::Config for Runtime {490 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;491 type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;492 type OperationalFeeMultiplier = OperationalFeeMultiplier;493 type WeightToFee = LinearFee<Balance>;494 type FeeMultiplierUpdate = ();495}496497parameter_types! {498 pub const ProposalBond: Permill = Permill::from_percent(5);499 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;500 pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;501 pub const SpendPeriod: BlockNumber = 5 * MINUTES;502 pub const Burn: Permill = Permill::from_percent(0);503 pub const TipCountdown: BlockNumber = 1 * DAYS;504 pub const TipFindersFee: Percent = Percent::from_percent(20);505 pub const TipReportDepositBase: Balance = 1 * UNIQUE;506 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;507 pub const BountyDepositBase: Balance = 1 * UNIQUE;508 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;509 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");510 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;511 pub const MaximumReasonLength: u32 = 16384;512 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);513 pub const BountyValueMinimum: Balance = 5 * UNIQUE;514 pub const MaxApprovals: u32 = 100;515}516517impl pallet_treasury::Config for Runtime {518 type PalletId = TreasuryModuleId;519 type Currency = Balances;520 type ApproveOrigin = EnsureRoot<AccountId>;521 type RejectOrigin = EnsureRoot<AccountId>;522 type Event = Event;523 type OnSlash = ();524 type ProposalBond = ProposalBond;525 type ProposalBondMinimum = ProposalBondMinimum;526 type ProposalBondMaximum = ProposalBondMaximum;527 type SpendPeriod = SpendPeriod;528 type Burn = Burn;529 type BurnDestination = ();530 type SpendFunds = ();531 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;532 type MaxApprovals = MaxApprovals;533}534535impl pallet_sudo::Config for Runtime {536 type Event = Event;537 type Call = Call;538}539540pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);541542impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider543 for RelayChainBlockNumberProvider<T>544{545 type BlockNumber = BlockNumber;546547 fn current_block_number() -> Self::BlockNumber {548 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()549 .map(|d| d.relay_parent_number)550 .unwrap_or_default()551 }552}553554parameter_types! {555 pub const MinVestedTransfer: Balance = 10 * UNIQUE;556 pub const MaxVestingSchedules: u32 = 28;557}558559impl orml_vesting::Config for Runtime {560 type Event = Event;561 type Currency = pallet_balances::Pallet<Runtime>;562 type MinVestedTransfer = MinVestedTransfer;563 type VestedTransferOrigin = EnsureSigned<AccountId>;564 type WeightInfo = ();565 type MaxVestingSchedules = MaxVestingSchedules;566 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;567}568569parameter_types! {570 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;571 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;572}573574impl cumulus_pallet_parachain_system::Config for Runtime {575 type Event = Event;576 type SelfParaId = parachain_info::Pallet<Self>;577 type OnSystemEvent = ();578 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<579 // MaxDownwardMessageWeight,580 // XcmExecutor<XcmConfig>,581 // Call,582 // >;583 type OutboundXcmpMessageSource = XcmpQueue;584 type DmpMessageHandler = DmpQueue;585 type ReservedDmpWeight = ReservedDmpWeight;586 type ReservedXcmpWeight = ReservedXcmpWeight;587 type XcmpMessageHandler = XcmpQueue;588}589590impl parachain_info::Config for Runtime {}591592impl cumulus_pallet_aura_ext::Config for Runtime {}593594parameter_types! {595 pub const RelayLocation: MultiLocation = MultiLocation::parent();596 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;597 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();598 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();599}600601/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used602/// when determining ownership of accounts for asset transacting and when attempting to use XCM603/// `Transact` in order to determine the dispatch Origin.604pub type LocationToAccountId = (605 // The parent (Relay-chain) origin converts to the default `AccountId`.606 ParentIsPreset<AccountId>,607 // Sibling parachain origins convert to AccountId via the `ParaId::into`.608 SiblingParachainConvertsVia<Sibling, AccountId>,609 // Straight up local `AccountId32` origins just alias directly to `AccountId`.610 AccountId32Aliases<RelayNetwork, AccountId>,611);612613pub struct OnlySelfCurrency;614impl<B: TryFrom<u128>> MatchesFungible<B> for OnlySelfCurrency {615 fn matches_fungible(a: &MultiAsset) -> Option<B> {616 match (&a.id, &a.fun) {617 (Concrete(_), XcmFungible(ref amount)) => CheckedConversion::checked_from(*amount),618 _ => None,619 }620 }621}622623/// Means for transacting assets on this chain.624pub type LocalAssetTransactor = CurrencyAdapter<625 // Use this currency:626 Balances,627 // Use this currency when it is a fungible asset matching the given location or name:628 OnlySelfCurrency,629 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:630 LocationToAccountId,631 // Our chain's account ID type (we can't get away without mentioning it explicitly):632 AccountId,633 // We don't track any teleports.634 (),635>;636637/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,638/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can639/// biases the kind of local `Origin` it will become.640pub type XcmOriginToTransactDispatchOrigin = (641 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location642 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for643 // foreign chains who want to have a local sovereign account on this chain which they control.644 SovereignSignedViaLocation<LocationToAccountId, Origin>,645 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when646 // recognised.647 RelayChainAsNative<RelayOrigin, Origin>,648 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when649 // recognised.650 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,651 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a652 // transaction from the Root origin.653 ParentAsSuperuser<Origin>,654 // Native signed account converter; this just converts an `AccountId32` origin into a normal655 // `Origin::Signed` origin of the same 32-byte value.656 SignedAccountId32AsNative<RelayNetwork, Origin>,657 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.658 XcmPassthrough<Origin>,659);660661parameter_types! {662 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.663 pub UnitWeightCost: Weight = 1_000_000;664 // 1200 UNIQUEs buy 1 second of weight.665 pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_200 * UNIQUE);666 pub const MaxInstructions: u32 = 100;667 pub const MaxAuthorities: u32 = 100_000;668}669670match_types! {671 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {672 MultiLocation { parents: 1, interior: Here } |673 MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }674 };675}676677pub type Barrier = (678 TakeWeightCredit,679 AllowTopLevelPaidExecutionFrom<Everything>,680 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,681 // ^^^ Parent & its unit plurality gets free execution682);683684pub struct UsingOnlySelfCurrencyComponents<685 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,686 AssetId: Get<MultiLocation>,687 AccountId,688 Currency: CurrencyT<AccountId>,689 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,690>(691 Weight,692 Currency::Balance,693 PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,694);695impl<696 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,697 AssetId: Get<MultiLocation>,698 AccountId,699 Currency: CurrencyT<AccountId>,700 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,701 > WeightTrader702 for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>703{704 fn new() -> Self {705 Self(0, Zero::zero(), PhantomData)706 }707708 fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError> {709 let amount = WeightToFee::calc(&weight);710 let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;711712 // location to this parachain through relay chain713 let option1: xcm::v1::AssetId = Concrete(MultiLocation {714 parents: 1,715 interior: X1(Parachain(ParachainInfo::parachain_id().into())),716 });717 // direct location718 let option2: xcm::v1::AssetId = Concrete(MultiLocation {719 parents: 0,720 interior: Here,721 });722723 let required = if payment.fungible.contains_key(&option1) {724 (option1, u128_amount).into()725 } else if payment.fungible.contains_key(&option2) {726 (option2, u128_amount).into()727 } else {728 (Concrete(MultiLocation::default()), u128_amount).into()729 };730731 let unused = payment732 .checked_sub(required)733 .map_err(|_| XcmError::TooExpensive)?;734 self.0 = self.0.saturating_add(weight);735 self.1 = self.1.saturating_add(amount);736 Ok(unused)737 }738739 fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {740 let weight = weight.min(self.0);741 let amount = WeightToFee::calc(&weight);742 self.0 -= weight;743 self.1 = self.1.saturating_sub(amount);744 let amount: u128 = amount.saturated_into();745 if amount > 0 {746 Some((AssetId::get(), amount).into())747 } else {748 None749 }750 }751}752impl<753 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,754 AssetId: Get<MultiLocation>,755 AccountId,756 Currency: CurrencyT<AccountId>,757 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,758 > Drop759 for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>760{761 fn drop(&mut self) {762 OnUnbalanced::on_unbalanced(Currency::issue(self.1));763 }764}765766pub struct XcmConfig;767impl Config for XcmConfig {768 type Call = Call;769 type XcmSender = XcmRouter;770 // How to withdraw and deposit an asset.771 type AssetTransactor = LocalAssetTransactor;772 type OriginConverter = XcmOriginToTransactDispatchOrigin;773 type IsReserve = NativeAsset;774 type IsTeleporter = (); // Teleportation is disabled775 type LocationInverter = LocationInverter<Ancestry>;776 type Barrier = Barrier;777 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;778 type Trader = UsingOnlySelfCurrencyComponents<779 IdentityFee<Balance>,780 RelayLocation,781 AccountId,782 Balances,783 (),784 >;785 type ResponseHandler = (); // Don't handle responses for now.786 type SubscriptionService = PolkadotXcm;787788 type AssetTrap = PolkadotXcm;789 type AssetClaims = PolkadotXcm;790}791792// parameter_types! {793// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;794// }795796/// No local origins on this chain are allowed to dispatch XCM sends/executions.797pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);798799/// The means for routing XCM messages which are not for local execution into the right message800/// queues.801pub type XcmRouter = (802 // Two routers - use UMP to communicate with the relay chain:803 cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,804 // ..and XCMP to communicate with the sibling chains.805 XcmpQueue,806);807808impl pallet_evm_coder_substrate::Config for Runtime {809 type GasWeightMapping = FixedGasWeightMapping;810}811812impl pallet_xcm::Config for Runtime {813 type Event = Event;814 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;815 type XcmRouter = XcmRouter;816 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;817 type XcmExecuteFilter = Everything;818 type XcmExecutor = XcmExecutor<XcmConfig>;819 type XcmTeleportFilter = Everything;820 type XcmReserveTransferFilter = Everything;821 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;822 type LocationInverter = LocationInverter<Ancestry>;823 type Origin = Origin;824 type Call = Call;825 const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;826 type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;827}828829impl cumulus_pallet_xcm::Config for Runtime {830 type Event = Event;831 type XcmExecutor = XcmExecutor<XcmConfig>;832}833834impl cumulus_pallet_xcmp_queue::Config for Runtime {835 type WeightInfo = ();836 type Event = Event;837 type XcmExecutor = XcmExecutor<XcmConfig>;838 type ChannelInfo = ParachainSystem;839 type VersionWrapper = ();840 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;841 type ControllerOrigin = EnsureRoot<AccountId>;842 type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;843}844845impl cumulus_pallet_dmp_queue::Config for Runtime {846 type Event = Event;847 type XcmExecutor = XcmExecutor<XcmConfig>;848 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;849}850851impl pallet_aura::Config for Runtime {852 type AuthorityId = AuraId;853 type DisabledValidators = ();854 type MaxAuthorities = MaxAuthorities;855}856857parameter_types! {858 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();859 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;860}861862impl pallet_common::Config for Runtime {863 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;864 type Event = Event;865 type Currency = Balances;866 type CollectionCreationPrice = CollectionCreationPrice;867 type TreasuryAccountId = TreasuryAccountId;868 type CollectionDispatch = CollectionDispatchT<Self>;869870 type EvmTokenAddressMapping = EvmTokenAddressMapping;871 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;872}873874impl pallet_structure::Config for Runtime {875 type Event = Event;876 type Call = Call;877 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;878}879880impl pallet_evm::account::Config for Runtime {881 type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;882 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;883 type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;884}885886impl pallet_fungible::Config for Runtime {887 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;888}889impl pallet_refungible::Config for Runtime {890 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;891}892impl pallet_nonfungible::Config for Runtime {893 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;894}895/* TODO free RMRK!896impl pallet_proxy_rmrk_core::Config for Runtime {897 type Event = Event;898}899900impl pallet_proxy_rmrk_equip::Config for Runtime {901 type Event = Event;902}*/903904impl pallet_unique::Config for Runtime {905 type Event = Event;906 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;907 type CommonWeightInfo = CommonWeights<Self>;908 type ContractAddress = EvmCollectionHelperAddress;909}910911parameter_types! {912 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied913}914915/// Used for the pallet inflation916impl pallet_inflation::Config for Runtime {917 type Currency = Balances;918 type TreasuryAccountId = TreasuryAccountId;919 type InflationBlockInterval = InflationBlockInterval;920 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;921}922923// parameter_types! {924// pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *925// RuntimeBlockWeights::get().max_block;926// pub const MaxScheduledPerBlock: u32 = 50;927// }928929type EvmSponsorshipHandler = (930 UniqueEthSponsorshipHandler<Runtime>,931 pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,932);933type SponsorshipHandler = (934 UniqueSponsorshipHandler<Runtime>,935 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,936 pallet_evm_transaction_payment::BridgeSponsorshipHandler<Runtime>,937);938939// impl pallet_unq_scheduler::Config for Runtime {940// type Event = Event;941// type Origin = Origin;942// type PalletsOrigin = OriginCaller;943// type Call = Call;944// type MaximumWeight = MaximumSchedulerWeight;945// type ScheduleOrigin = EnsureSigned<AccountId>;946// type MaxScheduledPerBlock = MaxScheduledPerBlock;947// type SponsorshipHandler = SponsorshipHandler;948// type WeightInfo = ();949// }950951impl pallet_evm_transaction_payment::Config for Runtime {952 type EvmSponsorshipHandler = EvmSponsorshipHandler;953 type Currency = Balances;954}955956impl pallet_charge_transaction::Config for Runtime {957 type SponsorshipHandler = SponsorshipHandler;958}959960// impl pallet_contract_helpers::Config for Runtime {961// type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;962// }963964parameter_types! {965 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049966 pub const HelpersContractAddress: H160 = H160([967 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,968 ]);969 970 // 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f971 pub const EvmCollectionHelperAddress: H160 = H160([972 0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,973 ]);974}975976impl pallet_evm_contract_helpers::Config for Runtime {977 type ContractAddress = HelpersContractAddress;978 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;979}980981construct_runtime!(982 pub enum Runtime where983 Block = Block,984 NodeBlock = opaque::Block,985 UncheckedExtrinsic = UncheckedExtrinsic986 {987 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,988 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,989990 Aura: pallet_aura::{Pallet, Config<T>} = 22,991 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,992993 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,994 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,995 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,996 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,997 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,998 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,999 System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,1000 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,1001 // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,1002 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,10031004 // XCM helpers.1005 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,1006 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,1007 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,1008 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,10091010 // Unique Pallets1011 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,1012 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,1013 // Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,1014 // free = 631015 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,1016 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,1017 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,1018 Fungible: pallet_fungible::{Pallet, Storage} = 67,1019 Refungible: pallet_refungible::{Pallet, Storage} = 68,1020 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,1021 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,1022 /* TODO free RMRK!1023 RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,1024 RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,*/10251026 // Frontier1027 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,1028 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,10291030 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,1031 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,1032 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,1033 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,1034 }1035);10361037pub struct TransactionConverter;10381039impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {1040 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {1041 UncheckedExtrinsic::new_unsigned(1042 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1043 )1044 }1045}10461047impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {1048 fn convert_transaction(1049 &self,1050 transaction: pallet_ethereum::Transaction,1051 ) -> opaque::UncheckedExtrinsic {1052 let extrinsic = UncheckedExtrinsic::new_unsigned(1053 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1054 );1055 let encoded = extrinsic.encode();1056 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])1057 .expect("Encoded extrinsic is always valid")1058 }1059}10601061/// The address format for describing accounts.1062pub type Address = sp_runtime::MultiAddress<AccountId, ()>;1063/// Block header type as expected by this runtime.1064pub type Header = generic::Header<BlockNumber, BlakeTwo256>;1065/// Block type as expected by this runtime.1066pub type Block = generic::Block<Header, UncheckedExtrinsic>;1067/// A Block signed with a Justification1068pub type SignedBlock = generic::SignedBlock<Block>;1069/// BlockId type as expected by this runtime.1070pub type BlockId = generic::BlockId<Block>;1071/// The SignedExtension to the basic transaction logic.1072pub type SignedExtra = (1073 frame_system::CheckSpecVersion<Runtime>,1074 // system::CheckTxVersion<Runtime>,1075 frame_system::CheckGenesis<Runtime>,1076 frame_system::CheckEra<Runtime>,1077 frame_system::CheckNonce<Runtime>,1078 frame_system::CheckWeight<Runtime>,1079 pallet_charge_transaction::ChargeTransactionPayment<Runtime>,1080 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,1081 pallet_ethereum::FakeTransactionFinalizer<Runtime>,1082);1083/// Unchecked extrinsic type as expected by this runtime.1084pub type UncheckedExtrinsic =1085 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;1086/// Extrinsic type that has already been checked.1087pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;1088/// Executive: handles dispatch to the various modules.1089pub type Executive = frame_executive::Executive<1090 Runtime,1091 Block,1092 frame_system::ChainContext<Runtime>,1093 Runtime,1094 AllPalletsReversedWithSystemFirst,1095>;10961097impl_opaque_keys! {1098 pub struct SessionKeys {1099 pub aura: Aura,1100 }1101}11021103impl fp_self_contained::SelfContainedCall for Call {1104 type SignedInfo = H160;11051106 fn is_self_contained(&self) -> bool {1107 match self {1108 Call::Ethereum(call) => call.is_self_contained(),1109 _ => false,1110 }1111 }11121113 fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>> {1114 match self {1115 Call::Ethereum(call) => call.check_self_contained(),1116 _ => None,1117 }1118 }11191120 fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {1121 match self {1122 Call::Ethereum(call) => call.validate_self_contained(info),1123 _ => None,1124 }1125 }11261127 fn pre_dispatch_self_contained(1128 &self,1129 info: &Self::SignedInfo,1130 ) -> Option<Result<(), TransactionValidityError>> {1131 match self {1132 Call::Ethereum(call) => call.pre_dispatch_self_contained(info),1133 _ => None,1134 }1135 }11361137 fn apply_self_contained(1138 self,1139 info: Self::SignedInfo,1140 ) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {1141 match self {1142 call @ Call::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(call.dispatch(1143 Origin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info)),1144 )),1145 _ => None,1146 }1147 }1148}11491150macro_rules! dispatch_unique_runtime {1151 ($collection:ident.$method:ident($($name:ident),*)) => {{1152 let collection = <Runtime as pallet_common::Config>::CollectionDispatch::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);1153 let dispatch = collection.as_dyn();11541155 Ok::<_, DispatchError>(dispatch.$method($($name),*))1156 }};1157}11581159impl_common_runtime_apis!();11601161struct CheckInherents;11621163impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1164 fn check_inherents(1165 block: &Block,1166 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1167 ) -> sp_inherents::CheckInherentsResult {1168 let relay_chain_slot = relay_state_proof1169 .read_slot()1170 .expect("Could not read the relay chain slot from the proof");11711172 let inherent_data =1173 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1174 relay_chain_slot,1175 sp_std::time::Duration::from_secs(6),1176 )1177 .create_inherent_data()1178 .expect("Could not create the timestamp inherent data");11791180 inherent_data.check_extrinsics(block)1181 }1182}11831184cumulus_pallet_parachain_system::register_validate_block!(1185 Runtime = Runtime,1186 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1187 CheckInherents = CheckInherents,1188);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//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.1819#![cfg_attr(not(feature = "std"), no_std)]20// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.21#![recursion_limit = "1024"]22#![allow(clippy::from_over_into, clippy::identity_op)]23#![allow(clippy::fn_to_numeric_cast_with_truncation)]24// Make the WASM binary available.25#[cfg(feature = "std")]26include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));2728use sp_api::impl_runtime_apis;29use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};30use sp_runtime::DispatchError;31// #[cfg(any(feature = "std", test))]32// pub use sp_runtime::BuildStorage;3334use sp_runtime::{35 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,36 traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, AccountIdConversion, Zero},37 transaction_validity::{TransactionSource, TransactionValidity},38 ApplyExtrinsicResult, RuntimeAppPublic,39};4041use sp_std::prelude::*;4243#[cfg(feature = "std")]44use sp_version::NativeVersion;45use sp_version::RuntimeVersion;46pub use pallet_transaction_payment::{47 Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,48};49// A few exports that help ease life for downstream crates.50pub use pallet_balances::Call as BalancesCall;51pub use pallet_evm::{52 EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _, OnMethodCall,53 Account as EVMAccount, FeeCalculator, GasWeightMapping,54};55pub use frame_support::{56 construct_runtime, match_types,57 dispatch::DispatchResult,58 PalletId, parameter_types, StorageValue, ConsensusEngineId,59 traits::{60 tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Everything,61 Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,62 OnUnbalanced, Randomness, FindAuthor, ConstU32, Imbalance,63 },64 weights::{65 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},66 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,67 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,68 },69};70use unique_runtime_common::{71 dispatch::{CollectionDispatchT, CollectionDispatch},72 weights::CommonWeights,73 sponsoring::UniqueSponsorshipHandler,74 eth_sponsoring::UniqueEthSponsorshipHandler,75};76use up_data_structs::*;77// use pallet_contracts::weights::WeightInfo;78// #[cfg(any(feature = "std", test))]79use frame_system::{80 self as frame_system, EnsureRoot, EnsureSigned,81 limits::{BlockWeights, BlockLength},82};83use sp_arithmetic::{84 traits::{BaseArithmetic, Unsigned},85};86use smallvec::smallvec;87use codec::{Encode, Decode};88use fp_rpc::TransactionStatus;89use sp_runtime::{90 traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},91 transaction_validity::TransactionValidityError,92 SaturatedConversion,93};9495// pub use pallet_timestamp::Call as TimestampCall;9697// Polkadot imports98use pallet_xcm::XcmPassthrough;99use polkadot_parachain::primitives::Sibling;100use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};101use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};102use xcm_builder::{103 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,104 EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser,105 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,106 SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,107 ParentIsPreset,108};109use xcm_executor::{Config, XcmExecutor, Assets};110use sp_std::{marker::PhantomData};111112use xcm::latest::{113 // Xcm,114 AssetId::{Concrete},115 Fungibility::Fungible as XcmFungible,116 MultiAsset,117 Error as XcmError,118};119use xcm_executor::traits::{MatchesFungible, WeightTrader};120//use xcm_executor::traits::MatchesFungible;121use sp_runtime::traits::CheckedConversion;122123use unique_runtime_common::{124 impl_common_runtime_apis,125 types::*,126 constants::*,127 dispatch::{CollectionDispatchT, CollectionDispatch},128 sponsoring::UniqueSponsorshipHandler,129 eth_sponsoring::UniqueEthSponsorshipHandler,130 weights::CommonWeights,131};132133pub const RUNTIME_NAME: &str = "unique";134pub const TOKEN_SYMBOL: &str = "UNQ";135136type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;137138impl RuntimeInstance for Runtime {139 type CrossAccountId = self::CrossAccountId;140141 type TransactionConverter = self::TransactionConverter;142143 fn get_transaction_converter() -> TransactionConverter {144 TransactionConverter145 }146}147148/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know149/// the specifics of the runtime. They can then be made to be agnostic over specific formats150/// of data like extrinsics, allowing for them to continue syncing the network through upgrades151/// to even the core data structures.152pub mod opaque {153 use sp_std::prelude::*;154 use sp_runtime::impl_opaque_keys;155 use super::Aura;156157 pub use unique_runtime_common::types::*;158159 impl_opaque_keys! {160 pub struct SessionKeys {161 pub aura: Aura,162 }163 }164}165166/// This runtime version.167pub const VERSION: RuntimeVersion = RuntimeVersion {168 spec_name: create_runtime_str!(RUNTIME_NAME),169 impl_name: create_runtime_str!(RUNTIME_NAME),170 authoring_version: 1,171 spec_version: 921000,172 impl_version: 0,173 apis: RUNTIME_API_VERSIONS,174 transaction_version: 1,175 state_version: 0,176};177178#[derive(codec::Encode, codec::Decode)]179pub enum XCMPMessage<XAccountId, XBalance> {180 /// Transfer tokens to the given account from the Parachain account.181 TransferToken(XAccountId, XBalance),182}183184/// The version information used to identify this runtime when compiled natively.185#[cfg(feature = "std")]186pub fn native_version() -> NativeVersion {187 NativeVersion {188 runtime_version: VERSION,189 can_author_with: Default::default(),190 }191}192193type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;194195pub struct DealWithFees;196impl OnUnbalanced<NegativeImbalance> for DealWithFees {197 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {198 if let Some(fees) = fees_then_tips.next() {199 // for fees, 100% to treasury200 let mut split = fees.ration(100, 0);201 if let Some(tips) = fees_then_tips.next() {202 // for tips, if any, 100% to treasury203 tips.ration_merge_into(100, 0, &mut split);204 }205 Treasury::on_unbalanced(split.0);206 // Author::on_unbalanced(split.1);207 }208 }209}210211parameter_types! {212 pub const BlockHashCount: BlockNumber = 2400;213 pub RuntimeBlockLength: BlockLength =214 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);215 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);216 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;217 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()218 .base_block(BlockExecutionWeight::get())219 .for_class(DispatchClass::all(), |weights| {220 weights.base_extrinsic = ExtrinsicBaseWeight::get();221 })222 .for_class(DispatchClass::Normal, |weights| {223 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);224 })225 .for_class(DispatchClass::Operational, |weights| {226 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);227 // Operational transactions have some extra reserved space, so that they228 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.229 weights.reserved = Some(230 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT231 );232 })233 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)234 .build_or_panic();235 pub const Version: RuntimeVersion = VERSION;236 pub const SS58Prefix: u16 = 7391;237}238239parameter_types! {240 pub const ChainId: u64 = 8880;241}242243pub struct FixedFee;244impl FeeCalculator for FixedFee {245 fn min_gas_price() -> U256 {246 MIN_GAS_PRICE.into()247 }248}249250// Assuming slowest ethereum opcode is SSTORE, with gas price of 20000 as our worst case251// (contract, which only writes a lot of data),252// approximating on top of our real store write weight253parameter_types! {254 pub const WritesPerSecond: u64 = WEIGHT_PER_SECOND / <Runtime as frame_system::Config>::DbWeight::get().write;255 pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000;256 pub const WeightPerGas: u64 = WEIGHT_PER_SECOND / GasPerSecond::get();257}258259/// Limiting EVM execution to 50% of block for substrate users and management tasks260/// EVM transaction consumes more weight than substrate's, so we can't rely on them being261/// scheduled fairly262const EVM_DISPATCH_RATIO: Perbill = Perbill::from_percent(50);263parameter_types! {264 pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * EVM_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WeightPerGas::get());265}266267pub enum FixedGasWeightMapping {}268impl GasWeightMapping for FixedGasWeightMapping {269 fn gas_to_weight(gas: u64) -> Weight {270 gas.saturating_mul(WeightPerGas::get())271 }272 fn weight_to_gas(weight: Weight) -> u64 {273 weight / WeightPerGas::get()274 }275}276277impl pallet_evm::Config for Runtime {278 type BlockGasLimit = BlockGasLimit;279 type FeeCalculator = FixedFee;280 type GasWeightMapping = FixedGasWeightMapping;281 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;282 type CallOrigin = EnsureAddressTruncated<Self>;283 type WithdrawOrigin = EnsureAddressTruncated<Self>;284 type AddressMapping = HashedAddressMapping<Self::Hashing>;285 type PrecompilesType = ();286 type PrecompilesValue = ();287 type Currency = Balances;288 type Event = Event;289 type OnMethodCall = (290 pallet_evm_migration::OnMethodCall<Self>,291 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,292 CollectionDispatchT<Self>,293 pallet_unique::eth::CollectionHelpersOnMethodCall<Self>,294 );295 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;296 type ChainId = ChainId;297 type Runner = pallet_evm::runner::stack::Runner<Self>;298 type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees>;299 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;300 type FindAuthor = EthereumFindAuthor<Aura>;301}302303impl pallet_evm_migration::Config for Runtime {304 type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;305}306307pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);308impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {309 fn find_author<'a, I>(digests: I) -> Option<H160>310 where311 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,312 {313 if let Some(author_index) = F::find_author(digests) {314 let authority_id = Aura::authorities()[author_index as usize].clone();315 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));316 }317 None318 }319}320321impl pallet_ethereum::Config for Runtime {322 type Event = Event;323 type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;324}325326impl pallet_randomness_collective_flip::Config for Runtime {}327328impl frame_system::Config for Runtime {329 /// The data to be stored in an account.330 type AccountData = pallet_balances::AccountData<Balance>;331 /// The identifier used to distinguish between accounts.332 type AccountId = AccountId;333 /// The basic call filter to use in dispatchable.334 type BaseCallFilter = Everything;335 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).336 type BlockHashCount = BlockHashCount;337 /// The maximum length of a block (in bytes).338 type BlockLength = RuntimeBlockLength;339 /// The index type for blocks.340 type BlockNumber = BlockNumber;341 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.342 type BlockWeights = RuntimeBlockWeights;343 /// The aggregated dispatch type that is available for extrinsics.344 type Call = Call;345 /// The weight of database operations that the runtime can invoke.346 type DbWeight = RocksDbWeight;347 /// The ubiquitous event type.348 type Event = Event;349 /// The type for hashing blocks and tries.350 type Hash = Hash;351 /// The hashing algorithm used.352 type Hashing = BlakeTwo256;353 /// The header type.354 type Header = generic::Header<BlockNumber, BlakeTwo256>;355 /// The index type for storing how many extrinsics an account has signed.356 type Index = Index;357 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.358 type Lookup = AccountIdLookup<AccountId, ()>;359 /// What to do if an account is fully reaped from the system.360 type OnKilledAccount = ();361 /// What to do if a new account is created.362 type OnNewAccount = ();363 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;364 /// The ubiquitous origin type.365 type Origin = Origin;366 /// This type is being generated by `construct_runtime!`.367 type PalletInfo = PalletInfo;368 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.369 type SS58Prefix = SS58Prefix;370 /// Weight information for the extrinsics of this pallet.371 type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;372 /// Version of the runtime.373 type Version = Version;374 type MaxConsumers = ConstU32<16>;375}376377parameter_types! {378 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;379}380381impl pallet_timestamp::Config for Runtime {382 /// A timestamp: milliseconds since the unix epoch.383 type Moment = u64;384 type OnTimestampSet = ();385 type MinimumPeriod = MinimumPeriod;386 type WeightInfo = ();387}388389parameter_types! {390 // pub const ExistentialDeposit: u128 = 500;391 pub const ExistentialDeposit: u128 = 0;392 pub const MaxLocks: u32 = 50;393}394395impl pallet_balances::Config for Runtime {396 type MaxLocks = MaxLocks;397 type MaxReserves = ();398 type ReserveIdentifier = [u8; 8];399 /// The type for recording an account's balance.400 type Balance = Balance;401 /// The ubiquitous event type.402 type Event = Event;403 type DustRemoval = Treasury;404 type ExistentialDeposit = ExistentialDeposit;405 type AccountStore = System;406 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;407}408409pub const fn deposit(items: u32, bytes: u32) -> Balance {410 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE411}412413/*414parameter_types! {415 pub TombstoneDeposit: Balance = deposit(416 1,417 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,418 );419 pub DepositPerContract: Balance = TombstoneDeposit::get();420 pub const DepositPerStorageByte: Balance = deposit(0, 1);421 pub const DepositPerStorageItem: Balance = deposit(1, 0);422 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);423 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;424 pub const SignedClaimHandicap: u32 = 2;425 pub const MaxDepth: u32 = 32;426 pub const MaxValueSize: u32 = 16 * 1024;427 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb428 // The lazy deletion runs inside on_initialize.429 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *430 RuntimeBlockWeights::get().max_block;431 // The weight needed for decoding the queue should be less or equal than a fifth432 // of the overall weight dedicated to the lazy deletion.433 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (434 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -435 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)436 )) / 5) as u32;437 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();438}439440impl pallet_contracts::Config for Runtime {441 type Time = Timestamp;442 type Randomness = RandomnessCollectiveFlip;443 type Currency = Balances;444 type Event = Event;445 type RentPayment = ();446 type SignedClaimHandicap = SignedClaimHandicap;447 type TombstoneDeposit = TombstoneDeposit;448 type DepositPerContract = DepositPerContract;449 type DepositPerStorageByte = DepositPerStorageByte;450 type DepositPerStorageItem = DepositPerStorageItem;451 type RentFraction = RentFraction;452 type SurchargeReward = SurchargeReward;453 type WeightPrice = pallet_transaction_payment::Pallet<Self>;454 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;455 type ChainExtension = NFTExtension;456 type DeletionQueueDepth = DeletionQueueDepth;457 type DeletionWeightLimit = DeletionWeightLimit;458 type Schedule = Schedule;459 type CallStack = [pallet_contracts::Frame<Self>; 31];460}461*/462463parameter_types! {464 /// This value increases the priority of `Operational` transactions by adding465 /// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.466 pub const OperationalFeeMultiplier: u8 = 5;467}468469/// Linear implementor of `WeightToFeePolynomial`470pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);471472impl<T> WeightToFeePolynomial for LinearFee<T>473where474 T: BaseArithmetic + From<u32> + Copy + Unsigned,475{476 type Balance = T;477478 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {479 smallvec!(WeightToFeeCoefficient {480 // Targeting 0.1 Unique per NFT transfer481 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),482 coeff_frac: Perbill::zero(),483 negative: false,484 degree: 1,485 })486 }487}488489impl pallet_transaction_payment::Config for Runtime {490 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;491 type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;492 type OperationalFeeMultiplier = OperationalFeeMultiplier;493 type WeightToFee = LinearFee<Balance>;494 type FeeMultiplierUpdate = ();495}496497parameter_types! {498 pub const ProposalBond: Permill = Permill::from_percent(5);499 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;500 pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;501 pub const SpendPeriod: BlockNumber = 5 * MINUTES;502 pub const Burn: Permill = Permill::from_percent(0);503 pub const TipCountdown: BlockNumber = 1 * DAYS;504 pub const TipFindersFee: Percent = Percent::from_percent(20);505 pub const TipReportDepositBase: Balance = 1 * UNIQUE;506 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;507 pub const BountyDepositBase: Balance = 1 * UNIQUE;508 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;509 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");510 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;511 pub const MaximumReasonLength: u32 = 16384;512 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);513 pub const BountyValueMinimum: Balance = 5 * UNIQUE;514 pub const MaxApprovals: u32 = 100;515}516517impl pallet_treasury::Config for Runtime {518 type PalletId = TreasuryModuleId;519 type Currency = Balances;520 type ApproveOrigin = EnsureRoot<AccountId>;521 type RejectOrigin = EnsureRoot<AccountId>;522 type Event = Event;523 type OnSlash = ();524 type ProposalBond = ProposalBond;525 type ProposalBondMinimum = ProposalBondMinimum;526 type ProposalBondMaximum = ProposalBondMaximum;527 type SpendPeriod = SpendPeriod;528 type Burn = Burn;529 type BurnDestination = ();530 type SpendFunds = ();531 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;532 type MaxApprovals = MaxApprovals;533}534535impl pallet_sudo::Config for Runtime {536 type Event = Event;537 type Call = Call;538}539540pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);541542impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider543 for RelayChainBlockNumberProvider<T>544{545 type BlockNumber = BlockNumber;546547 fn current_block_number() -> Self::BlockNumber {548 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()549 .map(|d| d.relay_parent_number)550 .unwrap_or_default()551 }552}553554parameter_types! {555 pub const MinVestedTransfer: Balance = 10 * UNIQUE;556 pub const MaxVestingSchedules: u32 = 28;557}558559impl orml_vesting::Config for Runtime {560 type Event = Event;561 type Currency = pallet_balances::Pallet<Runtime>;562 type MinVestedTransfer = MinVestedTransfer;563 type VestedTransferOrigin = EnsureSigned<AccountId>;564 type WeightInfo = ();565 type MaxVestingSchedules = MaxVestingSchedules;566 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;567}568569parameter_types! {570 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;571 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;572}573574impl cumulus_pallet_parachain_system::Config for Runtime {575 type Event = Event;576 type SelfParaId = parachain_info::Pallet<Self>;577 type OnSystemEvent = ();578 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<579 // MaxDownwardMessageWeight,580 // XcmExecutor<XcmConfig>,581 // Call,582 // >;583 type OutboundXcmpMessageSource = XcmpQueue;584 type DmpMessageHandler = DmpQueue;585 type ReservedDmpWeight = ReservedDmpWeight;586 type ReservedXcmpWeight = ReservedXcmpWeight;587 type XcmpMessageHandler = XcmpQueue;588}589590impl parachain_info::Config for Runtime {}591592impl cumulus_pallet_aura_ext::Config for Runtime {}593594parameter_types! {595 pub const RelayLocation: MultiLocation = MultiLocation::parent();596 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;597 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();598 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();599}600601/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used602/// when determining ownership of accounts for asset transacting and when attempting to use XCM603/// `Transact` in order to determine the dispatch Origin.604pub type LocationToAccountId = (605 // The parent (Relay-chain) origin converts to the default `AccountId`.606 ParentIsPreset<AccountId>,607 // Sibling parachain origins convert to AccountId via the `ParaId::into`.608 SiblingParachainConvertsVia<Sibling, AccountId>,609 // Straight up local `AccountId32` origins just alias directly to `AccountId`.610 AccountId32Aliases<RelayNetwork, AccountId>,611);612613pub struct OnlySelfCurrency;614impl<B: TryFrom<u128>> MatchesFungible<B> for OnlySelfCurrency {615 fn matches_fungible(a: &MultiAsset) -> Option<B> {616 match (&a.id, &a.fun) {617 (Concrete(_), XcmFungible(ref amount)) => CheckedConversion::checked_from(*amount),618 _ => None,619 }620 }621}622623/// Means for transacting assets on this chain.624pub type LocalAssetTransactor = CurrencyAdapter<625 // Use this currency:626 Balances,627 // Use this currency when it is a fungible asset matching the given location or name:628 OnlySelfCurrency,629 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:630 LocationToAccountId,631 // Our chain's account ID type (we can't get away without mentioning it explicitly):632 AccountId,633 // We don't track any teleports.634 (),635>;636637/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,638/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can639/// biases the kind of local `Origin` it will become.640pub type XcmOriginToTransactDispatchOrigin = (641 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location642 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for643 // foreign chains who want to have a local sovereign account on this chain which they control.644 SovereignSignedViaLocation<LocationToAccountId, Origin>,645 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when646 // recognised.647 RelayChainAsNative<RelayOrigin, Origin>,648 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when649 // recognised.650 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,651 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a652 // transaction from the Root origin.653 ParentAsSuperuser<Origin>,654 // Native signed account converter; this just converts an `AccountId32` origin into a normal655 // `Origin::Signed` origin of the same 32-byte value.656 SignedAccountId32AsNative<RelayNetwork, Origin>,657 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.658 XcmPassthrough<Origin>,659);660661parameter_types! {662 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.663 pub UnitWeightCost: Weight = 1_000_000;664 // 1200 UNIQUEs buy 1 second of weight.665 pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_200 * UNIQUE);666 pub const MaxInstructions: u32 = 100;667 pub const MaxAuthorities: u32 = 100_000;668}669670match_types! {671 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {672 MultiLocation { parents: 1, interior: Here } |673 MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }674 };675}676677pub type Barrier = (678 TakeWeightCredit,679 AllowTopLevelPaidExecutionFrom<Everything>,680 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,681 // ^^^ Parent & its unit plurality gets free execution682);683684pub struct UsingOnlySelfCurrencyComponents<685 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,686 AssetId: Get<MultiLocation>,687 AccountId,688 Currency: CurrencyT<AccountId>,689 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,690>(691 Weight,692 Currency::Balance,693 PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,694);695impl<696 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,697 AssetId: Get<MultiLocation>,698 AccountId,699 Currency: CurrencyT<AccountId>,700 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,701 > WeightTrader702 for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>703{704 fn new() -> Self {705 Self(0, Zero::zero(), PhantomData)706 }707708 fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError> {709 let amount = WeightToFee::calc(&weight);710 let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;711712 // location to this parachain through relay chain713 let option1: xcm::v1::AssetId = Concrete(MultiLocation {714 parents: 1,715 interior: X1(Parachain(ParachainInfo::parachain_id().into())),716 });717 // direct location718 let option2: xcm::v1::AssetId = Concrete(MultiLocation {719 parents: 0,720 interior: Here,721 });722723 let required = if payment.fungible.contains_key(&option1) {724 (option1, u128_amount).into()725 } else if payment.fungible.contains_key(&option2) {726 (option2, u128_amount).into()727 } else {728 (Concrete(MultiLocation::default()), u128_amount).into()729 };730731 let unused = payment732 .checked_sub(required)733 .map_err(|_| XcmError::TooExpensive)?;734 self.0 = self.0.saturating_add(weight);735 self.1 = self.1.saturating_add(amount);736 Ok(unused)737 }738739 fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {740 let weight = weight.min(self.0);741 let amount = WeightToFee::calc(&weight);742 self.0 -= weight;743 self.1 = self.1.saturating_sub(amount);744 let amount: u128 = amount.saturated_into();745 if amount > 0 {746 Some((AssetId::get(), amount).into())747 } else {748 None749 }750 }751}752impl<753 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,754 AssetId: Get<MultiLocation>,755 AccountId,756 Currency: CurrencyT<AccountId>,757 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,758 > Drop759 for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>760{761 fn drop(&mut self) {762 OnUnbalanced::on_unbalanced(Currency::issue(self.1));763 }764}765766pub struct XcmConfig;767impl Config for XcmConfig {768 type Call = Call;769 type XcmSender = XcmRouter;770 // How to withdraw and deposit an asset.771 type AssetTransactor = LocalAssetTransactor;772 type OriginConverter = XcmOriginToTransactDispatchOrigin;773 type IsReserve = NativeAsset;774 type IsTeleporter = (); // Teleportation is disabled775 type LocationInverter = LocationInverter<Ancestry>;776 type Barrier = Barrier;777 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;778 type Trader = UsingOnlySelfCurrencyComponents<779 IdentityFee<Balance>,780 RelayLocation,781 AccountId,782 Balances,783 (),784 >;785 type ResponseHandler = (); // Don't handle responses for now.786 type SubscriptionService = PolkadotXcm;787788 type AssetTrap = PolkadotXcm;789 type AssetClaims = PolkadotXcm;790}791792// parameter_types! {793// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;794// }795796/// No local origins on this chain are allowed to dispatch XCM sends/executions.797pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);798799/// The means for routing XCM messages which are not for local execution into the right message800/// queues.801pub type XcmRouter = (802 // Two routers - use UMP to communicate with the relay chain:803 cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,804 // ..and XCMP to communicate with the sibling chains.805 XcmpQueue,806);807808impl pallet_evm_coder_substrate::Config for Runtime {}809810impl pallet_xcm::Config for Runtime {811 type Event = Event;812 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;813 type XcmRouter = XcmRouter;814 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;815 type XcmExecuteFilter = Everything;816 type XcmExecutor = XcmExecutor<XcmConfig>;817 type XcmTeleportFilter = Everything;818 type XcmReserveTransferFilter = Everything;819 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;820 type LocationInverter = LocationInverter<Ancestry>;821 type Origin = Origin;822 type Call = Call;823 const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;824 type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;825}826827impl cumulus_pallet_xcm::Config for Runtime {828 type Event = Event;829 type XcmExecutor = XcmExecutor<XcmConfig>;830}831832impl cumulus_pallet_xcmp_queue::Config for Runtime {833 type WeightInfo = ();834 type Event = Event;835 type XcmExecutor = XcmExecutor<XcmConfig>;836 type ChannelInfo = ParachainSystem;837 type VersionWrapper = ();838 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;839 type ControllerOrigin = EnsureRoot<AccountId>;840 type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;841}842843impl cumulus_pallet_dmp_queue::Config for Runtime {844 type Event = Event;845 type XcmExecutor = XcmExecutor<XcmConfig>;846 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;847}848849impl pallet_aura::Config for Runtime {850 type AuthorityId = AuraId;851 type DisabledValidators = ();852 type MaxAuthorities = MaxAuthorities;853}854855parameter_types! {856 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();857 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;858}859860impl pallet_common::Config for Runtime {861 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;862 type Event = Event;863 type Currency = Balances;864 type CollectionCreationPrice = CollectionCreationPrice;865 type TreasuryAccountId = TreasuryAccountId;866 type CollectionDispatch = CollectionDispatchT<Self>;867868 type EvmTokenAddressMapping = EvmTokenAddressMapping;869 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;870 type ContractAddress = EvmCollectionHelpersAddress;871}872873impl pallet_structure::Config for Runtime {874 type Event = Event;875 type Call = Call;876 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;877}878879impl pallet_evm::account::Config for Runtime {880 type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;881 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;882 type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;883}884885impl pallet_fungible::Config for Runtime {886 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;887}888impl pallet_refungible::Config for Runtime {889 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;890}891impl pallet_nonfungible::Config for Runtime {892 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;893}894/* TODO free RMRK!895impl pallet_proxy_rmrk_core::Config for Runtime {896 type Event = Event;897}898899impl pallet_proxy_rmrk_equip::Config for Runtime {900 type Event = Event;901}*/902903impl pallet_unique::Config for Runtime {904 type Event = Event;905 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;906 type CommonWeightInfo = CommonWeights<Self>;907}908909parameter_types! {910 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied911}912913/// Used for the pallet inflation914impl pallet_inflation::Config for Runtime {915 type Currency = Balances;916 type TreasuryAccountId = TreasuryAccountId;917 type InflationBlockInterval = InflationBlockInterval;918 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;919}920921// parameter_types! {922// pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *923// RuntimeBlockWeights::get().max_block;924// pub const MaxScheduledPerBlock: u32 = 50;925// }926927type EvmSponsorshipHandler = (928 UniqueEthSponsorshipHandler<Runtime>,929 pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,930);931type SponsorshipHandler = (932 UniqueSponsorshipHandler<Runtime>,933 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,934 pallet_evm_transaction_payment::BridgeSponsorshipHandler<Runtime>,935);936937// impl pallet_unq_scheduler::Config for Runtime {938// type Event = Event;939// type Origin = Origin;940// type PalletsOrigin = OriginCaller;941// type Call = Call;942// type MaximumWeight = MaximumSchedulerWeight;943// type ScheduleOrigin = EnsureSigned<AccountId>;944// type MaxScheduledPerBlock = MaxScheduledPerBlock;945// type SponsorshipHandler = SponsorshipHandler;946// type WeightInfo = ();947// }948949impl pallet_evm_transaction_payment::Config for Runtime {950 type EvmSponsorshipHandler = EvmSponsorshipHandler;951 type Currency = Balances;952}953954impl pallet_charge_transaction::Config for Runtime {955 type SponsorshipHandler = SponsorshipHandler;956}957958// impl pallet_contract_helpers::Config for Runtime {959// type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;960// }961962parameter_types! {963 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049964 pub const HelpersContractAddress: H160 = H160([965 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,966 ]);967 968 // 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f969 pub const EvmCollectionHelpersAddress: H160 = H160([970 0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,971 ]);972}973974impl pallet_evm_contract_helpers::Config for Runtime {975 type ContractAddress = HelpersContractAddress;976 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;977}978979construct_runtime!(980 pub enum Runtime where981 Block = Block,982 NodeBlock = opaque::Block,983 UncheckedExtrinsic = UncheckedExtrinsic984 {985 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,986 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,987988 Aura: pallet_aura::{Pallet, Config<T>} = 22,989 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,990991 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,992 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,993 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,994 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,995 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,996 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,997 System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,998 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,999 // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,1000 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,10011002 // XCM helpers.1003 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,1004 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,1005 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,1006 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,10071008 // Unique Pallets1009 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,1010 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,1011 // Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,1012 // free = 631013 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,1014 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,1015 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,1016 Fungible: pallet_fungible::{Pallet, Storage} = 67,1017 Refungible: pallet_refungible::{Pallet, Storage} = 68,1018 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,1019 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,1020 /* TODO free RMRK!1021 RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,1022 RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,*/10231024 // Frontier1025 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,1026 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,10271028 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,1029 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,1030 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,1031 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,1032 }1033);10341035pub struct TransactionConverter;10361037impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {1038 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {1039 UncheckedExtrinsic::new_unsigned(1040 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1041 )1042 }1043}10441045impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {1046 fn convert_transaction(1047 &self,1048 transaction: pallet_ethereum::Transaction,1049 ) -> opaque::UncheckedExtrinsic {1050 let extrinsic = UncheckedExtrinsic::new_unsigned(1051 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1052 );1053 let encoded = extrinsic.encode();1054 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])1055 .expect("Encoded extrinsic is always valid")1056 }1057}10581059/// The address format for describing accounts.1060pub type Address = sp_runtime::MultiAddress<AccountId, ()>;1061/// Block header type as expected by this runtime.1062pub type Header = generic::Header<BlockNumber, BlakeTwo256>;1063/// Block type as expected by this runtime.1064pub type Block = generic::Block<Header, UncheckedExtrinsic>;1065/// A Block signed with a Justification1066pub type SignedBlock = generic::SignedBlock<Block>;1067/// BlockId type as expected by this runtime.1068pub type BlockId = generic::BlockId<Block>;1069/// The SignedExtension to the basic transaction logic.1070pub type SignedExtra = (1071 frame_system::CheckSpecVersion<Runtime>,1072 // system::CheckTxVersion<Runtime>,1073 frame_system::CheckGenesis<Runtime>,1074 frame_system::CheckEra<Runtime>,1075 frame_system::CheckNonce<Runtime>,1076 frame_system::CheckWeight<Runtime>,1077 pallet_charge_transaction::ChargeTransactionPayment<Runtime>,1078 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,1079 pallet_ethereum::FakeTransactionFinalizer<Runtime>,1080);1081/// Unchecked extrinsic type as expected by this runtime.1082pub type UncheckedExtrinsic =1083 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;1084/// Extrinsic type that has already been checked.1085pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;1086/// Executive: handles dispatch to the various modules.1087pub type Executive = frame_executive::Executive<1088 Runtime,1089 Block,1090 frame_system::ChainContext<Runtime>,1091 Runtime,1092 AllPalletsReversedWithSystemFirst,1093>;10941095impl_opaque_keys! {1096 pub struct SessionKeys {1097 pub aura: Aura,1098 }1099}11001101impl fp_self_contained::SelfContainedCall for Call {1102 type SignedInfo = H160;11031104 fn is_self_contained(&self) -> bool {1105 match self {1106 Call::Ethereum(call) => call.is_self_contained(),1107 _ => false,1108 }1109 }11101111 fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>> {1112 match self {1113 Call::Ethereum(call) => call.check_self_contained(),1114 _ => None,1115 }1116 }11171118 fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {1119 match self {1120 Call::Ethereum(call) => call.validate_self_contained(info),1121 _ => None,1122 }1123 }11241125 fn pre_dispatch_self_contained(1126 &self,1127 info: &Self::SignedInfo,1128 ) -> Option<Result<(), TransactionValidityError>> {1129 match self {1130 Call::Ethereum(call) => call.pre_dispatch_self_contained(info),1131 _ => None,1132 }1133 }11341135 fn apply_self_contained(1136 self,1137 info: Self::SignedInfo,1138 ) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {1139 match self {1140 call @ Call::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(call.dispatch(1141 Origin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info)),1142 )),1143 _ => None,1144 }1145 }1146}11471148macro_rules! dispatch_unique_runtime {1149 ($collection:ident.$method:ident($($name:ident),*)) => {{1150 let collection = <Runtime as pallet_common::Config>::CollectionDispatch::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);1151 let dispatch = collection.as_dyn();11521153 Ok::<_, DispatchError>(dispatch.$method($($name),*))1154 }};1155}11561157impl_common_runtime_apis!();11581159struct CheckInherents;11601161impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1162 fn check_inherents(1163 block: &Block,1164 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1165 ) -> sp_inherents::CheckInherentsResult {1166 let relay_chain_slot = relay_state_proof1167 .read_slot()1168 .expect("Could not read the relay chain slot from the proof");11691170 let inherent_data =1171 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1172 relay_chain_slot,1173 sp_std::time::Duration::from_secs(6),1174 )1175 .create_inherent_data()1176 .expect("Could not create the timestamp inherent data");11771178 inherent_data.check_extrinsics(block)1179 }1180}11811182cumulus_pallet_parachain_system::register_validate_block!(1183 Runtime = Runtime,1184 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1185 CheckInherents = CheckInherents,1186);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});
}
/**