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.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 _,53};54pub use frame_support::{55 construct_runtime, match_types,56 dispatch::DispatchResult,57 PalletId, parameter_types, StorageValue, ConsensusEngineId,58 traits::{59 tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Everything,60 Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,61 OnUnbalanced, Randomness, FindAuthor, ConstU32, Imbalance,62 },63 weights::{64 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},65 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,66 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,67 },68};69use up_data_structs::*;70// use pallet_contracts::weights::WeightInfo;71// #[cfg(any(feature = "std", test))]72use frame_system::{73 self as frame_system, EnsureRoot, EnsureSigned,74 limits::{BlockWeights, BlockLength},75};76use sp_arithmetic::{77 traits::{BaseArithmetic, Unsigned},78};79use smallvec::smallvec;80use codec::{Encode, Decode};81use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping};82use fp_rpc::TransactionStatus;83use sp_runtime::{84 traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},85 transaction_validity::TransactionValidityError,86 SaturatedConversion,87};8889// pub use pallet_timestamp::Call as TimestampCall;90pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;9192// Polkadot imports93use pallet_xcm::XcmPassthrough;94use polkadot_parachain::primitives::Sibling;95use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};96use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};97use xcm_builder::{98 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,99 EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentAsSuperuser,100 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,101 SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,102 ParentIsPreset,103};104use xcm_executor::{Config, XcmExecutor, Assets};105use sp_std::{marker::PhantomData};106107use xcm::latest::{108 // Xcm,109 AssetId::{Concrete},110 Fungibility::Fungible as XcmFungible,111 MultiAsset,112 Error as XcmError,113};114use xcm_executor::traits::{MatchesFungible, WeightTrader};115//use xcm_executor::traits::MatchesFungible;116use sp_runtime::traits::CheckedConversion;117118use unique_runtime_common::{119 impl_common_runtime_apis,120 types::*,121 constants::*,122 dispatch::{CollectionDispatchT, CollectionDispatch},123 sponsoring::UniqueSponsorshipHandler,124 eth_sponsoring::UniqueEthSponsorshipHandler,125 weights::CommonWeights,126};127128pub const RUNTIME_NAME: &str = "quartz";129pub const TOKEN_SYMBOL: &str = "QTZ";130131type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;132133impl RuntimeInstance for Runtime {134 type CrossAccountId = self::CrossAccountId;135136 type TransactionConverter = self::TransactionConverter;137138 fn get_transaction_converter() -> TransactionConverter {139 TransactionConverter140 }141}142143/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know144/// the specifics of the runtime. They can then be made to be agnostic over specific formats145/// of data like extrinsics, allowing for them to continue syncing the network through upgrades146/// to even the core data structures.147pub mod opaque {148 use sp_std::prelude::*;149 use sp_runtime::impl_opaque_keys;150 use super::Aura;151152 pub use unique_runtime_common::types::*;153154 impl_opaque_keys! {155 pub struct SessionKeys {156 pub aura: Aura,157 }158 }159}160161/// This runtime version.162pub const VERSION: RuntimeVersion = RuntimeVersion {163 spec_name: create_runtime_str!(RUNTIME_NAME),164 impl_name: create_runtime_str!(RUNTIME_NAME),165 authoring_version: 1,166 spec_version: 921000,167 impl_version: 0,168 apis: RUNTIME_API_VERSIONS,169 transaction_version: 1,170 state_version: 0,171};172173#[derive(codec::Encode, codec::Decode)]174pub enum XCMPMessage<XAccountId, XBalance> {175 /// Transfer tokens to the given account from the Parachain account.176 TransferToken(XAccountId, XBalance),177}178179/// The version information used to identify this runtime when compiled natively.180#[cfg(feature = "std")]181pub fn native_version() -> NativeVersion {182 NativeVersion {183 runtime_version: VERSION,184 can_author_with: Default::default(),185 }186}187188type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;189190pub struct DealWithFees;191impl OnUnbalanced<NegativeImbalance> for DealWithFees {192 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {193 if let Some(fees) = fees_then_tips.next() {194 // for fees, 100% to treasury195 let mut split = fees.ration(100, 0);196 if let Some(tips) = fees_then_tips.next() {197 // for tips, if any, 100% to treasury198 tips.ration_merge_into(100, 0, &mut split);199 }200 Treasury::on_unbalanced(split.0);201 // Author::on_unbalanced(split.1);202 }203 }204}205206parameter_types! {207 pub const BlockHashCount: BlockNumber = 2400;208 pub RuntimeBlockLength: BlockLength =209 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);210 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);211 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;212 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()213 .base_block(BlockExecutionWeight::get())214 .for_class(DispatchClass::all(), |weights| {215 weights.base_extrinsic = ExtrinsicBaseWeight::get();216 })217 .for_class(DispatchClass::Normal, |weights| {218 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);219 })220 .for_class(DispatchClass::Operational, |weights| {221 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);222 // Operational transactions have some extra reserved space, so that they223 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.224 weights.reserved = Some(225 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT226 );227 })228 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)229 .build_or_panic();230 pub const Version: RuntimeVersion = VERSION;231 pub const SS58Prefix: u8 = 255;232}233234parameter_types! {235 pub const ChainId: u64 = 8881;236}237238pub struct FixedFee;239impl FeeCalculator for FixedFee {240 fn min_gas_price() -> U256 {241 MIN_GAS_PRICE.into()242 }243}244245// Assuming slowest ethereum opcode is SSTORE, with gas price of 20000 as our worst case246// (contract, which only writes a lot of data),247// approximating on top of our real store write weight248parameter_types! {249 pub const WritesPerSecond: u64 = WEIGHT_PER_SECOND / <Runtime as frame_system::Config>::DbWeight::get().write;250 pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000;251 pub const WeightPerGas: u64 = WEIGHT_PER_SECOND / GasPerSecond::get();252}253254/// Limiting EVM execution to 50% of block for substrate users and management tasks255/// EVM transaction consumes more weight than substrate's, so we can't rely on them being256/// scheduled fairly257const EVM_DISPATCH_RATIO: Perbill = Perbill::from_percent(50);258parameter_types! {259 pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * EVM_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WeightPerGas::get());260}261262pub enum FixedGasWeightMapping {}263impl GasWeightMapping for FixedGasWeightMapping {264 fn gas_to_weight(gas: u64) -> Weight {265 gas.saturating_mul(WeightPerGas::get())266 }267 fn weight_to_gas(weight: Weight) -> u64 {268 weight / WeightPerGas::get()269 }270}271272impl pallet_evm::Config for Runtime {273 type BlockGasLimit = BlockGasLimit;274 type FeeCalculator = FixedFee;275 type GasWeightMapping = FixedGasWeightMapping;276 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;277 type CallOrigin = EnsureAddressTruncated<Self>;278 type WithdrawOrigin = EnsureAddressTruncated<Self>;279 type AddressMapping = HashedAddressMapping<Self::Hashing>;280 type PrecompilesType = ();281 type PrecompilesValue = ();282 type Currency = Balances;283 type Event = Event;284 type OnMethodCall = (285 pallet_evm_migration::OnMethodCall<Self>,286 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,287 CollectionDispatchT<Self>,288 pallet_unique::eth::CollectionHelperOnMethodCall<Self>,289 );290 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;291 type ChainId = ChainId;292 type Runner = pallet_evm::runner::stack::Runner<Self>;293 type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees>;294 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;295 type FindAuthor = EthereumFindAuthor<Aura>;296}297298impl pallet_evm_migration::Config for Runtime {299 type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;300}301302pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);303impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {304 fn find_author<'a, I>(digests: I) -> Option<H160>305 where306 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,307 {308 if let Some(author_index) = F::find_author(digests) {309 let authority_id = Aura::authorities()[author_index as usize].clone();310 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));311 }312 None313 }314}315316impl pallet_ethereum::Config for Runtime {317 type Event = Event;318 type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;319}320321impl pallet_randomness_collective_flip::Config for Runtime {}322323impl frame_system::Config for Runtime {324 /// The data to be stored in an account.325 type AccountData = pallet_balances::AccountData<Balance>;326 /// The identifier used to distinguish between accounts.327 type AccountId = AccountId;328 /// The basic call filter to use in dispatchable.329 type BaseCallFilter = Everything;330 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).331 type BlockHashCount = BlockHashCount;332 /// The maximum length of a block (in bytes).333 type BlockLength = RuntimeBlockLength;334 /// The index type for blocks.335 type BlockNumber = BlockNumber;336 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.337 type BlockWeights = RuntimeBlockWeights;338 /// The aggregated dispatch type that is available for extrinsics.339 type Call = Call;340 /// The weight of database operations that the runtime can invoke.341 type DbWeight = RocksDbWeight;342 /// The ubiquitous event type.343 type Event = Event;344 /// The type for hashing blocks and tries.345 type Hash = Hash;346 /// The hashing algorithm used.347 type Hashing = BlakeTwo256;348 /// The header type.349 type Header = generic::Header<BlockNumber, BlakeTwo256>;350 /// The index type for storing how many extrinsics an account has signed.351 type Index = Index;352 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.353 type Lookup = AccountIdLookup<AccountId, ()>;354 /// What to do if an account is fully reaped from the system.355 type OnKilledAccount = ();356 /// What to do if a new account is created.357 type OnNewAccount = ();358 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;359 /// The ubiquitous origin type.360 type Origin = Origin;361 /// This type is being generated by `construct_runtime!`.362 type PalletInfo = PalletInfo;363 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.364 type SS58Prefix = SS58Prefix;365 /// Weight information for the extrinsics of this pallet.366 type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;367 /// Version of the runtime.368 type Version = Version;369 type MaxConsumers = ConstU32<16>;370}371372parameter_types! {373 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;374}375376impl pallet_timestamp::Config for Runtime {377 /// A timestamp: milliseconds since the unix epoch.378 type Moment = u64;379 type OnTimestampSet = ();380 type MinimumPeriod = MinimumPeriod;381 type WeightInfo = ();382}383384parameter_types! {385 // pub const ExistentialDeposit: u128 = 500;386 pub const ExistentialDeposit: u128 = 0;387 pub const MaxLocks: u32 = 50;388}389390impl pallet_balances::Config for Runtime {391 type MaxLocks = MaxLocks;392 type MaxReserves = ();393 type ReserveIdentifier = [u8; 8];394 /// The type for recording an account's balance.395 type Balance = Balance;396 /// The ubiquitous event type.397 type Event = Event;398 type DustRemoval = Treasury;399 type ExistentialDeposit = ExistentialDeposit;400 type AccountStore = System;401 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;402}403404pub const fn deposit(items: u32, bytes: u32) -> Balance {405 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE406}407408/*409parameter_types! {410 pub TombstoneDeposit: Balance = deposit(411 1,412 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,413 );414 pub DepositPerContract: Balance = TombstoneDeposit::get();415 pub const DepositPerStorageByte: Balance = deposit(0, 1);416 pub const DepositPerStorageItem: Balance = deposit(1, 0);417 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);418 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;419 pub const SignedClaimHandicap: u32 = 2;420 pub const MaxDepth: u32 = 32;421 pub const MaxValueSize: u32 = 16 * 1024;422 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb423 // The lazy deletion runs inside on_initialize.424 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *425 RuntimeBlockWeights::get().max_block;426 // The weight needed for decoding the queue should be less or equal than a fifth427 // of the overall weight dedicated to the lazy deletion.428 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (429 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -430 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)431 )) / 5) as u32;432 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();433}434435impl pallet_contracts::Config for Runtime {436 type Time = Timestamp;437 type Randomness = RandomnessCollectiveFlip;438 type Currency = Balances;439 type Event = Event;440 type RentPayment = ();441 type SignedClaimHandicap = SignedClaimHandicap;442 type TombstoneDeposit = TombstoneDeposit;443 type DepositPerContract = DepositPerContract;444 type DepositPerStorageByte = DepositPerStorageByte;445 type DepositPerStorageItem = DepositPerStorageItem;446 type RentFraction = RentFraction;447 type SurchargeReward = SurchargeReward;448 type WeightPrice = pallet_transaction_payment::Pallet<Self>;449 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;450 type ChainExtension = NFTExtension;451 type DeletionQueueDepth = DeletionQueueDepth;452 type DeletionWeightLimit = DeletionWeightLimit;453 type Schedule = Schedule;454 type CallStack = [pallet_contracts::Frame<Self>; 31];455}456*/457458parameter_types! {459 /// This value increases the priority of `Operational` transactions by adding460 /// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.461 pub const OperationalFeeMultiplier: u8 = 5;462}463464/// Linear implementor of `WeightToFeePolynomial`465pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);466467impl<T> WeightToFeePolynomial for LinearFee<T>468where469 T: BaseArithmetic + From<u32> + Copy + Unsigned,470{471 type Balance = T;472473 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {474 smallvec!(WeightToFeeCoefficient {475 // Targeting 0.1 Unique per NFT transfer476 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),477 coeff_frac: Perbill::zero(),478 negative: false,479 degree: 1,480 })481 }482}483484impl pallet_transaction_payment::Config for Runtime {485 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;486 type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;487 type OperationalFeeMultiplier = OperationalFeeMultiplier;488 type WeightToFee = LinearFee<Balance>;489 type FeeMultiplierUpdate = ();490}491492parameter_types! {493 pub const ProposalBond: Permill = Permill::from_percent(5);494 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;495 pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;496 pub const SpendPeriod: BlockNumber = 5 * MINUTES;497 pub const Burn: Permill = Permill::from_percent(0);498 pub const TipCountdown: BlockNumber = 1 * DAYS;499 pub const TipFindersFee: Percent = Percent::from_percent(20);500 pub const TipReportDepositBase: Balance = 1 * UNIQUE;501 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;502 pub const BountyDepositBase: Balance = 1 * UNIQUE;503 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;504 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");505 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;506 pub const MaximumReasonLength: u32 = 16384;507 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);508 pub const BountyValueMinimum: Balance = 5 * UNIQUE;509 pub const MaxApprovals: u32 = 100;510}511512impl pallet_treasury::Config for Runtime {513 type PalletId = TreasuryModuleId;514 type Currency = Balances;515 type ApproveOrigin = EnsureRoot<AccountId>;516 type RejectOrigin = EnsureRoot<AccountId>;517 type Event = Event;518 type OnSlash = ();519 type ProposalBond = ProposalBond;520 type ProposalBondMinimum = ProposalBondMinimum;521 type ProposalBondMaximum = ProposalBondMaximum;522 type SpendPeriod = SpendPeriod;523 type Burn = Burn;524 type BurnDestination = ();525 type SpendFunds = ();526 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;527 type MaxApprovals = MaxApprovals;528}529530impl pallet_sudo::Config for Runtime {531 type Event = Event;532 type Call = Call;533}534535pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);536537impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider538 for RelayChainBlockNumberProvider<T>539{540 type BlockNumber = BlockNumber;541542 fn current_block_number() -> Self::BlockNumber {543 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()544 .map(|d| d.relay_parent_number)545 .unwrap_or_default()546 }547}548549parameter_types! {550 pub const MinVestedTransfer: Balance = 10 * UNIQUE;551 pub const MaxVestingSchedules: u32 = 28;552}553554impl orml_vesting::Config for Runtime {555 type Event = Event;556 type Currency = pallet_balances::Pallet<Runtime>;557 type MinVestedTransfer = MinVestedTransfer;558 type VestedTransferOrigin = EnsureSigned<AccountId>;559 type WeightInfo = ();560 type MaxVestingSchedules = MaxVestingSchedules;561 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;562}563564parameter_types! {565 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;566 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;567}568569impl cumulus_pallet_parachain_system::Config for Runtime {570 type Event = Event;571 type SelfParaId = parachain_info::Pallet<Self>;572 type OnSystemEvent = ();573 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<574 // MaxDownwardMessageWeight,575 // XcmExecutor<XcmConfig>,576 // Call,577 // >;578 type OutboundXcmpMessageSource = XcmpQueue;579 type DmpMessageHandler = DmpQueue;580 type ReservedDmpWeight = ReservedDmpWeight;581 type ReservedXcmpWeight = ReservedXcmpWeight;582 type XcmpMessageHandler = XcmpQueue;583}584585impl parachain_info::Config for Runtime {}586587impl cumulus_pallet_aura_ext::Config for Runtime {}588589parameter_types! {590 pub const RelayLocation: MultiLocation = MultiLocation::parent();591 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;592 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();593 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();594}595596/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used597/// when determining ownership of accounts for asset transacting and when attempting to use XCM598/// `Transact` in order to determine the dispatch Origin.599pub type LocationToAccountId = (600 // The parent (Relay-chain) origin converts to the default `AccountId`.601 ParentIsPreset<AccountId>,602 // Sibling parachain origins convert to AccountId via the `ParaId::into`.603 SiblingParachainConvertsVia<Sibling, AccountId>,604 // Straight up local `AccountId32` origins just alias directly to `AccountId`.605 AccountId32Aliases<RelayNetwork, AccountId>,606);607608pub struct OnlySelfCurrency;609impl<B: TryFrom<u128>> MatchesFungible<B> for OnlySelfCurrency {610 fn matches_fungible(a: &MultiAsset) -> Option<B> {611 match (&a.id, &a.fun) {612 (Concrete(_), XcmFungible(ref amount)) => CheckedConversion::checked_from(*amount),613 _ => None,614 }615 }616}617618/// Means for transacting assets on this chain.619pub type LocalAssetTransactor = CurrencyAdapter<620 // Use this currency:621 Balances,622 // Use this currency when it is a fungible asset matching the given location or name:623 OnlySelfCurrency,624 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:625 LocationToAccountId,626 // Our chain's account ID type (we can't get away without mentioning it explicitly):627 AccountId,628 // We don't track any teleports.629 (),630>;631632/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,633/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can634/// biases the kind of local `Origin` it will become.635pub type XcmOriginToTransactDispatchOrigin = (636 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location637 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for638 // foreign chains who want to have a local sovereign account on this chain which they control.639 SovereignSignedViaLocation<LocationToAccountId, Origin>,640 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when641 // recognised.642 RelayChainAsNative<RelayOrigin, Origin>,643 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when644 // recognised.645 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,646 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a647 // transaction from the Root origin.648 ParentAsSuperuser<Origin>,649 // Native signed account converter; this just converts an `AccountId32` origin into a normal650 // `Origin::Signed` origin of the same 32-byte value.651 SignedAccountId32AsNative<RelayNetwork, Origin>,652 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.653 XcmPassthrough<Origin>,654);655656parameter_types! {657 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.658 pub UnitWeightCost: Weight = 1_000_000;659 // 1200 UNIQUEs buy 1 second of weight.660 pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_200 * UNIQUE);661 pub const MaxInstructions: u32 = 100;662 pub const MaxAuthorities: u32 = 100_000;663}664665match_types! {666 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {667 MultiLocation { parents: 1, interior: Here } |668 MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }669 };670}671672pub type Barrier = (673 TakeWeightCredit,674 AllowTopLevelPaidExecutionFrom<Everything>,675 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,676 // ^^^ Parent & its unit plurality gets free execution677);678679pub struct UsingOnlySelfCurrencyComponents<680 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,681 AssetId: Get<MultiLocation>,682 AccountId,683 Currency: CurrencyT<AccountId>,684 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,685>(686 Weight,687 Currency::Balance,688 PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,689);690impl<691 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,692 AssetId: Get<MultiLocation>,693 AccountId,694 Currency: CurrencyT<AccountId>,695 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,696 > WeightTrader697 for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>698{699 fn new() -> Self {700 Self(0, Zero::zero(), PhantomData)701 }702703 fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError> {704 let amount = WeightToFee::calc(&weight);705 let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;706707 // location to this parachain through relay chain708 let option1: xcm::v1::AssetId = Concrete(MultiLocation {709 parents: 1,710 interior: X1(Parachain(ParachainInfo::parachain_id().into())),711 });712 // direct location713 let option2: xcm::v1::AssetId = Concrete(MultiLocation {714 parents: 0,715 interior: Here,716 });717718 let required = if payment.fungible.contains_key(&option1) {719 (option1, u128_amount).into()720 } else if payment.fungible.contains_key(&option2) {721 (option2, u128_amount).into()722 } else {723 (Concrete(MultiLocation::default()), u128_amount).into()724 };725726 let unused = payment727 .checked_sub(required)728 .map_err(|_| XcmError::TooExpensive)?;729 self.0 = self.0.saturating_add(weight);730 self.1 = self.1.saturating_add(amount);731 Ok(unused)732 }733734 fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {735 let weight = weight.min(self.0);736 let amount = WeightToFee::calc(&weight);737 self.0 -= weight;738 self.1 = self.1.saturating_sub(amount);739 let amount: u128 = amount.saturated_into();740 if amount > 0 {741 Some((AssetId::get(), amount).into())742 } else {743 None744 }745 }746}747impl<748 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,749 AssetId: Get<MultiLocation>,750 AccountId,751 Currency: CurrencyT<AccountId>,752 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,753 > Drop754 for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>755{756 fn drop(&mut self) {757 OnUnbalanced::on_unbalanced(Currency::issue(self.1));758 }759}760761pub struct XcmConfig;762impl Config for XcmConfig {763 type Call = Call;764 type XcmSender = XcmRouter;765 // How to withdraw and deposit an asset.766 type AssetTransactor = LocalAssetTransactor;767 type OriginConverter = XcmOriginToTransactDispatchOrigin;768 type IsReserve = NativeAsset;769 type IsTeleporter = (); // Teleportation is disabled770 type LocationInverter = LocationInverter<Ancestry>;771 type Barrier = Barrier;772 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;773 type Trader = UsingOnlySelfCurrencyComponents<774 IdentityFee<Balance>,775 RelayLocation,776 AccountId,777 Balances,778 (),779 >;780 type ResponseHandler = (); // Don't handle responses for now.781 type SubscriptionService = PolkadotXcm;782783 type AssetTrap = PolkadotXcm;784 type AssetClaims = PolkadotXcm;785}786787// parameter_types! {788// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;789// }790791/// No local origins on this chain are allowed to dispatch XCM sends/executions.792pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);793794/// The means for routing XCM messages which are not for local execution into the right message795/// queues.796pub type XcmRouter = (797 // Two routers - use UMP to communicate with the relay chain:798 cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,799 // ..and XCMP to communicate with the sibling chains.800 XcmpQueue,801);802803impl pallet_evm_coder_substrate::Config for Runtime {804 type GasWeightMapping = FixedGasWeightMapping;805}806807impl pallet_xcm::Config for Runtime {808 type Event = Event;809 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;810 type XcmRouter = XcmRouter;811 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;812 type XcmExecuteFilter = Everything;813 type XcmExecutor = XcmExecutor<XcmConfig>;814 type XcmTeleportFilter = Everything;815 type XcmReserveTransferFilter = Everything;816 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;817 type LocationInverter = LocationInverter<Ancestry>;818 type Origin = Origin;819 type Call = Call;820 const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;821 type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;822}823824impl cumulus_pallet_xcm::Config for Runtime {825 type Event = Event;826 type XcmExecutor = XcmExecutor<XcmConfig>;827}828829impl cumulus_pallet_xcmp_queue::Config for Runtime {830 type WeightInfo = ();831 type Event = Event;832 type XcmExecutor = XcmExecutor<XcmConfig>;833 type ChannelInfo = ParachainSystem;834 type VersionWrapper = ();835 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;836 type ControllerOrigin = EnsureRoot<AccountId>;837 type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;838}839840impl cumulus_pallet_dmp_queue::Config for Runtime {841 type Event = Event;842 type XcmExecutor = XcmExecutor<XcmConfig>;843 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;844}845846impl pallet_aura::Config for Runtime {847 type AuthorityId = AuraId;848 type DisabledValidators = ();849 type MaxAuthorities = MaxAuthorities;850}851852parameter_types! {853 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();854 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;855}856857impl pallet_common::Config for Runtime {858 type Event = Event;859860 type Currency = Balances;861 type CollectionCreationPrice = CollectionCreationPrice;862 type TreasuryAccountId = TreasuryAccountId;863 type CollectionDispatch = CollectionDispatchT<Self>;864865 type EvmTokenAddressMapping = EvmTokenAddressMapping;866 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;867}868869impl pallet_structure::Config for Runtime {870 type Event = Event;871 type Call = Call;872 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;873}874875impl pallet_evm::account::Config for Runtime {876 type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Self>;877 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;878 type EvmBackwardsAddressMapping = fp_evm_mapping::MapBackwardsAddressTruncated;879}880881impl pallet_fungible::Config for Runtime {882 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;883}884impl pallet_refungible::Config for Runtime {885 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;886}887impl pallet_nonfungible::Config for Runtime {888 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;889}890/* TODO free RMRK!891impl pallet_proxy_rmrk_core::Config for Runtime {892 type Event = Event;893}894895impl pallet_proxy_rmrk_equip::Config for Runtime {896 type Event = Event;897}*/898899impl pallet_unique::Config for Runtime {900 type Event = Event;901 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;902 type CommonWeightInfo = CommonWeights<Self>;903 type ContractAddress = EvmCollectionHelperAddress;904}905906parameter_types! {907 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied908}909910/// Used for the pallet inflation911impl pallet_inflation::Config for Runtime {912 type Currency = Balances;913 type TreasuryAccountId = TreasuryAccountId;914 type InflationBlockInterval = InflationBlockInterval;915 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;916}917918// parameter_types! {919// pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *920// RuntimeBlockWeights::get().max_block;921// pub const MaxScheduledPerBlock: u32 = 50;922// }923924type EvmSponsorshipHandler = (925 UniqueEthSponsorshipHandler<Runtime>,926 pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,927);928type SponsorshipHandler = (929 UniqueSponsorshipHandler<Runtime>,930 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,931 pallet_evm_transaction_payment::BridgeSponsorshipHandler<Runtime>,932);933934// impl pallet_unq_scheduler::Config for Runtime {935// type Event = Event;936// type Origin = Origin;937// type PalletsOrigin = OriginCaller;938// type Call = Call;939// type MaximumWeight = MaximumSchedulerWeight;940// type ScheduleOrigin = EnsureSigned<AccountId>;941// type MaxScheduledPerBlock = MaxScheduledPerBlock;942// type SponsorshipHandler = SponsorshipHandler;943// type WeightInfo = ();944// }945946impl pallet_evm_transaction_payment::Config for Runtime {947 type EvmSponsorshipHandler = EvmSponsorshipHandler;948 type Currency = Balances;949}950951impl pallet_charge_transaction::Config for Runtime {952 type SponsorshipHandler = SponsorshipHandler;953}954955// impl pallet_contract_helpers::Config for Runtime {956// type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;957// }958959parameter_types! {960 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049961 pub const HelpersContractAddress: H160 = H160([962 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,963 ]);964 965 // 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f966 pub const EvmCollectionHelperAddress: H160 = H160([967 0x6c, 0x4e, 0x9f, 0xe1, 0xae, 0x37, 0xa4, 0x1e, 0x93, 0xce, 0xe4, 0x29, 0xe8, 0xe1, 0x88, 0x1a, 0xbd, 0xcb, 0xb5, 0x4f,968 ]);969}970971impl pallet_evm_contract_helpers::Config for Runtime {972 type ContractAddress = HelpersContractAddress;973 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;974}975976construct_runtime!(977 pub enum Runtime where978 Block = Block,979 NodeBlock = opaque::Block,980 UncheckedExtrinsic = UncheckedExtrinsic981 {982 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,983 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,984985 Aura: pallet_aura::{Pallet, Config<T>} = 22,986 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,987988 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,989 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,990 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,991 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,992 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,993 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,994 System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,995 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,996 // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,997 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,998999 // XCM helpers.1000 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,1001 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,1002 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,1003 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,10041005 // Unique Pallets1006 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,1007 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,1008 // Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,1009 // free = 631010 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,1011 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,1012 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,1013 Fungible: pallet_fungible::{Pallet, Storage} = 67,1014 Refungible: pallet_refungible::{Pallet, Storage} = 68,1015 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,1016 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,1017 /* TODO free RMRK!1018 RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,1019 RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,*/10201021 // Frontier1022 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,1023 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,10241025 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,1026 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,1027 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,1028 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,1029 }1030);10311032pub struct TransactionConverter;10331034impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {1035 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {1036 UncheckedExtrinsic::new_unsigned(1037 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1038 )1039 }1040}10411042impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {1043 fn convert_transaction(1044 &self,1045 transaction: pallet_ethereum::Transaction,1046 ) -> opaque::UncheckedExtrinsic {1047 let extrinsic = UncheckedExtrinsic::new_unsigned(1048 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),1049 );1050 let encoded = extrinsic.encode();1051 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])1052 .expect("Encoded extrinsic is always valid")1053 }1054}10551056/// The address format for describing accounts.1057pub type Address = sp_runtime::MultiAddress<AccountId, ()>;1058/// Block header type as expected by this runtime.1059pub type Header = generic::Header<BlockNumber, BlakeTwo256>;1060/// Block type as expected by this runtime.1061pub type Block = generic::Block<Header, UncheckedExtrinsic>;1062/// A Block signed with a Justification1063pub type SignedBlock = generic::SignedBlock<Block>;1064/// BlockId type as expected by this runtime.1065pub type BlockId = generic::BlockId<Block>;1066/// The SignedExtension to the basic transaction logic.1067pub type SignedExtra = (1068 frame_system::CheckSpecVersion<Runtime>,1069 // system::CheckTxVersion<Runtime>,1070 frame_system::CheckGenesis<Runtime>,1071 frame_system::CheckEra<Runtime>,1072 frame_system::CheckNonce<Runtime>,1073 frame_system::CheckWeight<Runtime>,1074 pallet_charge_transaction::ChargeTransactionPayment<Runtime>,1075 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,1076 pallet_ethereum::FakeTransactionFinalizer<Runtime>,1077);1078/// Unchecked extrinsic type as expected by this runtime.1079pub type UncheckedExtrinsic =1080 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;1081/// Extrinsic type that has already been checked.1082pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;1083/// Executive: handles dispatch to the various modules.1084pub type Executive = frame_executive::Executive<1085 Runtime,1086 Block,1087 frame_system::ChainContext<Runtime>,1088 Runtime,1089 AllPalletsReversedWithSystemFirst,1090>;10911092impl_opaque_keys! {1093 pub struct SessionKeys {1094 pub aura: Aura,1095 }1096}10971098impl fp_self_contained::SelfContainedCall for Call {1099 type SignedInfo = H160;11001101 fn is_self_contained(&self) -> bool {1102 match self {1103 Call::Ethereum(call) => call.is_self_contained(),1104 _ => false,1105 }1106 }11071108 fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>> {1109 match self {1110 Call::Ethereum(call) => call.check_self_contained(),1111 _ => None,1112 }1113 }11141115 fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {1116 match self {1117 Call::Ethereum(call) => call.validate_self_contained(info),1118 _ => None,1119 }1120 }11211122 fn pre_dispatch_self_contained(1123 &self,1124 info: &Self::SignedInfo,1125 ) -> Option<Result<(), TransactionValidityError>> {1126 match self {1127 Call::Ethereum(call) => call.pre_dispatch_self_contained(info),1128 _ => None,1129 }1130 }11311132 fn apply_self_contained(1133 self,1134 info: Self::SignedInfo,1135 ) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {1136 match self {1137 call @ Call::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(call.dispatch(1138 Origin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info)),1139 )),1140 _ => None,1141 }1142 }1143}11441145macro_rules! dispatch_unique_runtime {1146 ($collection:ident.$method:ident($($name:ident),*)) => {{1147 let collection = <Runtime as pallet_common::Config>::CollectionDispatch::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);1148 let dispatch = collection.as_dyn();11491150 Ok::<_, DispatchError>(dispatch.$method($($name),*))1151 }};1152}11531154impl_common_runtime_apis!();11551156struct CheckInherents;11571158impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1159 fn check_inherents(1160 block: &Block,1161 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1162 ) -> sp_inherents::CheckInherentsResult {1163 let relay_chain_slot = relay_state_proof1164 .read_slot()1165 .expect("Could not read the relay chain slot from the proof");11661167 let inherent_data =1168 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1169 relay_chain_slot,1170 sp_std::time::Duration::from_secs(6),1171 )1172 .create_inherent_data()1173 .expect("Could not create the timestamp inherent data");11741175 inherent_data.check_extrinsics(block)1176 }1177}11781179cumulus_pallet_parachain_system::register_validate_block!(1180 Runtime = Runtime,1181 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1182 CheckInherents = CheckInherents,1183);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.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -290,7 +290,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;
@@ -805,9 +805,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;
@@ -869,6 +867,7 @@
type EvmTokenAddressMapping = EvmTokenAddressMapping;
type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;
+ type ContractAddress = EvmCollectionHelpersAddress;
}
impl pallet_structure::Config for Runtime {
@@ -905,7 +904,6 @@
type Event = Event;
type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;
type CommonWeightInfo = CommonWeights<Self>;
- type ContractAddress = EvmCollectionHelperAddress;
}
parameter_types! {
@@ -968,7 +966,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,
]);
}
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});
}
/**