difftreelog
Merge branch 'develop' into feature/contract-sponsoring-modes
in: master
34 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -382,9 +382,9 @@
[[package]]
name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
@@ -634,9 +634,9 @@
[[package]]
name = "block-buffer"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03588e54c62ae6d763e2a80090d50353b785795361b4ff5b3bf0a5097fc31c0b"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
dependencies = [
"generic-array 0.14.5",
]
@@ -1097,9 +1097,9 @@
[[package]]
name = "core-foundation"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1229,9 +1229,9 @@
[[package]]
name = "crc32fast"
-version = "1.3.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
dependencies = [
"cfg-if 1.0.0",
]
@@ -1288,9 +1288,9 @@
[[package]]
name = "crypto-common"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0"
+checksum = "a4600d695eb3f6ce1cd44e6e291adceb2cc3ab12f20a33777ecd0bf6eba34e06"
dependencies = [
"generic-array 0.14.5",
]
@@ -1898,13 +1898,12 @@
[[package]]
name = "digest"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b"
+checksum = "8cb780dce4f9a8f5c087362b3a4595936b2019e7c8b30f2c3e9a7e94e6ae9837"
dependencies = [
- "block-buffer 0.10.1",
+ "block-buffer 0.10.2",
"crypto-common",
- "generic-array 0.14.5",
]
[[package]]
@@ -3241,9 +3240,9 @@
[[package]]
name = "httparse"
-version = "1.5.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
[[package]]
name = "httpdate"
@@ -4664,9 +4663,9 @@
[[package]]
name = "memmap2"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe3179b85e1fd8b14447cbebadb75e45a1002f541b925f0bfec366d56a81c56d"
+checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f"
dependencies = [
"libc",
]
@@ -8805,7 +8804,7 @@
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.16#4aeb95f7f38fcd519e2628f32f79044a8fef99d5"
dependencies = [
"impl-trait-for-tuples",
- "memmap2 0.5.2",
+ "memmap2 0.5.3",
"parity-scale-codec",
"sc-chain-spec-derive",
"sc-network",
@@ -9912,7 +9911,7 @@
dependencies = [
"cfg-if 1.0.0",
"cpufeatures 0.2.1",
- "digest 0.10.1",
+ "digest 0.10.2",
]
[[package]]
@@ -11644,7 +11643,7 @@
[[package]]
name = "unique-node"
-version = "0.9.14"
+version = "0.9.16"
dependencies = [
"cumulus-client-cli",
"cumulus-client-collator",
Dockerfile-parachaindiffbeforeafterboth--- a/Dockerfile-parachain
+++ b/Dockerfile-parachain
@@ -90,7 +90,7 @@
nvm install v15.5.0 && \
nvm use v15.5.0
-RUN git clone https://github.com/PureStake/polkadot-launch -b jlm-use-para-id-in-specs
+RUN git clone https://github.com/paritytech/polkadot-launch
RUN export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
README.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -29,26 +29,11 @@
Please see our [walk-thorugh instructions](doc/hackusama_walk_through.md) to try everything out!
-## Hackusama Update
-
-During the Kusama Hackaphon the following changes were made:
-
-- Enabled Smart Contracts Pallet
-- Enabled integration between Smart Contracts and Unique Pallet (required special edition of RC4 Substrate version)
-- Fixed misc. bugs in Unique Pallet
-- Deployed Unique TestNet. Public node available at wss://unique.usetech.com, custom UI types - see below in this README.
-- New Features:
- - Re-Fungible Token Mode
- - Off-Chain Schema to store token image URLs
- - Alternative economic model
- - Allow Lists and Public Mint Permission
-- Use example: [SubstraPunks Game](https://github.com/usetech-llc/substrapunks), fully hosted on IPFS and Unique Testnet
- Blockchain.
-
## Application Development
If you are building an application that operates NFT tokens, use [this document](doc/application_development.md).
+
## Building
Building Unique chain requires special versions of Rust and toolchain. We don't use the most recent versions of everything
@@ -57,8 +42,8 @@
1. Install Rust:
```bash
+sudo apt-get install git curl libssl-dev llvm pkg-config libclang-dev clang
curl https://sh.rustup.rs -sSf | sh
-sudo apt-get install libssl-dev pkg-config libclang-dev clang
```
2. Remove all installed toolchains with `rustup toolchain list` and `rustup toolchain uninstall <toolchain>`.
@@ -86,111 +71,52 @@
cargo build --release
```
-## Run
-
-You can start a development chain with:
-
-```bash
-cargo run -- --dev
-```
-
-Detailed logs may be shown by running the node with the following environment variables set:
-`RUST_LOG=debug RUST_BACKTRACE=1 cargo run -- --dev`.
+## Building as Parachain locally
-If you want to see the multi-node consensus algorithm in action locally, then you can create a local testnet with two
-validator nodes for Alice and Bob, who are the initial authorities of the genesis chain that have been endowed with
-testnet units. Give each node a name and expose them so they are listed on the Polkadot
-[telemetry site](https://telemetry.polkadot.io/#/Local%20Testnet). You'll need two terminal windows open.
+Note: checkout this project and all related projects (see below) in the sibling folders (both under the same folder)
-We'll start Alice's substrate node first on default TCP port 30333 with her chain database stored locally at
-`/tmp/alice`. The bootnode ID of her node is `QmQZ8TjTqeDj3ciwr93EJ95hxfDsb9pEYDizUAbWpigtQN`, which is generated from
-the `--node-key` value that we specify below:
+### Polkadot launch utility
-```bash
-cargo run -- \
- --base-path /tmp/alice \
- --chain=local \
- --alice \
- --node-key 0000000000000000000000000000000000000000000000000000000000000001 \
- --telemetry-url ws://telemetry.polkadot.io:1024 \
- --validator
```
-
-In the second terminal, we'll start Bob's substrate node on a different TCP port of 30334, and with his chain database
-stored locally at `/tmp/bob`. We'll specify a value for the `--bootnodes` option that will connect his node to Alice's
-bootnode ID on TCP port 30333:
-
-```bash
-cargo run -- \
- --base-path /tmp/bob \
- --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/QmQZ8TjTqeDj3ciwr93EJ95hxfDsb9pEYDizUAbWpigtQN \
- --chain=local \
- --bob \
- --port 30334 \
- --telemetry-url ws://telemetry.polkadot.io:1024 \
- --validator
+git clone https://github.com/paritytech/polkadot-launch
```
-
-Additional CLI usage options are available and may be shown by running `cargo run -- --help`.
-
-## Building and Running as Parachain locally
-
-Rust toolchain: nightly-2021-11-11
-Note: checkout this project and polkadot project (see below) in the sibling folders (both under the same folder)
### Build relay
```
git clone https://github.com/paritytech/polkadot.git
cd polkadot
-git checkout release-v0.9.9
+git checkout release-v0.9.16
cargo build --release
```
-### Build parachain
+### Build Unique parachain
Run in the root of this project:
```
-cargo --build
+cargo build --release
```
-### Run 4-node Relay
-
-1. Download `rococo-custom-4.json` chain spec here: https://substrate.dev/cumulus-workshop/shared/chainspecs/rococo-custom-4.json
-2. Use these instructions to launch 4 nodes: https://substrate.dev/cumulus-workshop/#/en/2-relay-chain/1-launch
+### Build Acala parachain (optional, full config only)
-Example (Run in polkadot folder. Replace `12D3KooWNLAmKcyee3oqSgTMthaQVXaAcXeo8RrGCzMfMVA3B5on` with output from Alice node):
```
-./target/release/polkadot --alice --validator --base-path ./cumulus_relay0 --chain rococo-custom-4.json --port 50555 --ws-port 9944
-./target/release/polkadot --bob --validator --base-path ./cumulus_relay1 --chain rococo-custom-4.json --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/12D3KooWNLAmKcyee3oqSgTMthaQVXaAcXeo8RrGCzMfMVA3B5on --port 50556 --ws-port 9945
-./target/release/polkadot --charlie --validator --base-path ./cumulus_relay1 --chain rococo-custom-4.json --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/12D3KooWNLAmKcyee3oqSgTMthaQVXaAcXeo8RrGCzMfMVA3B5on --port 50557 --ws-port 9946
-./target/release/polkadot --dave --validator --base-path ./cumulus_relay1 --chain rococo-custom-4.json --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/12D3KooWNLAmKcyee3oqSgTMthaQVXaAcXeo8RrGCzMfMVA3B5on --port 50558 --ws-port 9947
-
+git clone https://github.com/AcalaNetwork/Acala
+cd Acala
+git checkout 54db3acd409a0b787f116f20e163a3b24101ce38
+make build-release
```
-3. Export genesis state and runtime wasm from Unique parachain:
+## Running as Parachain locally
-Run from this project root:
```
-./target/release/unique-collator export-genesis-state --parachain-id 2000 > ./resources/para-2000-genesis
-./target/release/unique-collator export-genesis-wasm > ./resources/para-2000-wasm
+./launch-testnet.sh
```
-4. Run two parachain nodes:
-
-Replace `12D3KooWN1ah2bFQSysEFnwZqcmcVpDDR8UedXyo6xfzV1zDNMNg` with Alice or Bob relay ID
-
-Run from this project root:
+Optional, full setup with Acala and Statemint
```
-./target/release/unique-collator --alice --collator --force-authoring --base-path ./tmp/parachain-alice --parachain-id 2000 --port 40333 --ws-port 9844 -- --execution wasm --chain ../polkadot/rococo-custom-4.json --port 30343 --ws-port 9977
-./target/release/unique-collator --bob --collator --force-authoring --parachain-id 2000 --base-path ./tmp/parachain/bob --port 40334 --ws-port 9845 -- --execution wasm --chain ../polkadot/rococo-custom-4.json --port 30344 --ws-port 9978 --bootnodes /ip4/127.0.0.1/tcp/50556/p2p/12D3KooWN1ah2bFQSysEFnwZqcmcVpDDR8UedXyo6xfzV1zDNMNg
+./launch-testnet-full.sh
```
-
-4. Reserve parachain ID as described here: https://substrate.dev/cumulus-workshop/#/en/2-relay-chain/2-reserve
-5. Register parachain in relay as described here: https://substrate.dev/cumulus-workshop/#/en/3-parachains/2-register
-
-
## Run Integration Tests
1. Install all needed dependecies
@@ -202,40 +128,11 @@
2. Run tests
```
yarn test
-```
-
-## Benchmarks
-
-First of all, add rust toolchain and make it default.
-```bash
-rustup target add wasm32-unknown-unknown --toolchain nightly-2021-11-11
-```
-
-Then in "/node/src" run build command below
-```bash
-cargo +nightly-2021-11-11 build --release --features runtime-benchmarks
-```
-
-Run benchmark
-```bash
-target/release/unique-collator benchmark --chain dev --pallet "pallet_unique" --extrinsic "*" --repeat 1
```
-
-## UI custom types
-
-Moved to [runtime_types.json](./runtime_types.json).
-
-## Running Integration Tests
-See [tests/README.md](./tests/README.md).
## Code Formatting
-### Get formatter and linter settings into your branch (if you forked before they were introduced)
-```bash
-git cherry-pick -n 8ff77c21b0d30b2a4648fa35dbf61dfa9d3948a7
-```
-
### Apply formatting and clippy fixes
```bash
cargo clippy
@@ -252,84 +149,57 @@
cd tests && yarn eslint --ext .ts,.js src/
```
-## Re-Enabling Ink! Contracts
-Uncomment following lies:
-1. In node/rpc/Cargo.toml
-```
-# pallet-contracts-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' }
-```
+## Karura token transfer
-2. In node/rpc/src/lib.rs
-```
-// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,
-...
-// use pallet_contracts_rpc::{Contracts, ContractsApi};
-...
-// io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));
+To get started, you need to open inbound and outbound hrmp channels.
+### Next, we need to register our asset at Karura.
```
+assetRegistry -> registerForeignAsset(location, metadata)
+location:
+ V0(X2(Parent, Parachain(PARA_ID)))
+metadata:
+ name OPL
+ symbol OPL
+ decimals 18
+minimalBalance 1
+```
-3. In runtime/Cargo.toml
+### Next, we can send tokens from Opal to Karura:
```
- # 'pallet-contracts/std',
- # 'pallet-contracts-primitives/std',
- # 'pallet-contracts-rpc-runtime-api/std',
- # 'pallet-contract-helpers/std',
-...
- # [dependencies.pallet-contracts]
- # git = 'https://github.com/paritytech/substrate.git'
- # default-features = false
- # branch = 'polkadot-v0.9.9'
- # version = '3.0.0'
+polkadotXcm -> reserveTransferAssets
+dest:
+ V0(X2(Parent, Parachain(<KARURA_PARA_ID>)))
+beneficiary:
+ X1(AccountId(Any, <ACCOUNT>))
+assets:
+ V1(Concrete(0,Here), Fungible(<AMOUNT>))
+feeAssetItem:
+ 0
+weightLimit:
+ <LIMIT>
+```
- # [dependencies.pallet-contracts-primitives]
- # git = 'https://github.com/paritytech/substrate.git'
- # default-features = false
- # branch = 'polkadot-v0.9.9'
- # version = '3.0.0'
+The result will be displayed in ChainState
+tokens -> accounts
- # [dependencies.pallet-contracts-rpc-runtime-api]
- # git = 'https://github.com/paritytech/substrate.git'
- # default-features = false
- # branch = 'polkadot-v0.9.9'
- # version = '3.0.0'
-...
- # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
+### To send tokens from Karura to Opal:
```
+xtokens -> transfer
-4. runtime/src/lib.rs
-```
-// use pallet_contracts::weights::WeightInfo;
-...
-// pub use pallet_timestamp::Call as TimestampCall;
-...
-// mod chain_extension;
-// use crate::chain_extension::{NFTExtension, Imbalance};
-...
-/*
-parameter_types! {
- pub TombstoneDeposit: Balance = deposit(
- ...
-}
-*/
-...
-//pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,
-...
-// impl pallet_contract_helpers::Config for Runtime {}
-...
-// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
-...
-// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage},
-...
-//pallet_contract_helpers::ContractHelpersExtension<Runtime>,
-...
-/*
- impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>
- for Runtime
- {
- ...
- }
-*/
+currencyId:
+ ForeingAsset
+ <TOKEN_ID>
-```
+amount:
+ <AMOUNT>
+dest:
+ V1
+ (
+ Parents:1,
+ X2(Parachain(<KARURA_PARA_ID>), AccountId(Any, <ACCOUNT>)
+ )
+destWeight:
+ <WEIGHT>
+```
\ No newline at end of file
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -4,7 +4,7 @@
use jsonrpc_core::{Error as RpcError, ErrorCode, Result};
use jsonrpc_derive::rpc;
use up_data_structs::{Collection, CollectionId, CollectionStats, TokenId};
-use sp_api::{BlockId, BlockT, ProvideRuntimeApi};
+use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};
use sp_blockchain::HeaderBackend;
use up_rpc::UniqueApi as UniqueRuntimeApi;
@@ -132,7 +132,10 @@
}
macro_rules! pass_method {
- ($method_name:ident($($name:ident: $ty:ty),* $(,)?) -> $result:ty $(=> $mapper:expr)?) => {
+ (
+ $method_name:ident($($name:ident: $ty:ty),* $(,)?) -> $result:ty $(=> $mapper:expr)?
+ $(; changed_in $ver:expr, $changed_method_name:ident ($($changed_name:expr), * $(,)?) => $fixer:expr)*
+ ) => {
fn $method_name(
&self,
$(
@@ -142,8 +145,25 @@
) -> Result<$result> {
let api = self.client.runtime_api();
let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+ let _api_version = if let Ok(Some(api_version)) =
+ api.api_version::<dyn UniqueRuntimeApi<Block, CrossAccountId, AccountId>>(&at)
+ {
+ api_version
+ } else {
+ // unreachable for our runtime
+ return Err(RpcError {
+ code: ErrorCode::InvalidParams,
+ message: "Api is not available".into(),
+ data: None,
+ })
+ };
- let result = api.$method_name(&at, $($name),*).map_err(|e| RpcError {
+ let result = $(if _api_version < $ver {
+ api.$changed_method_name(&at, $($changed_name),*).map(|r| r.map($fixer))
+ } else)*
+ { api.$method_name(&at, $($name),*) };
+
+ let result = result.map_err(|e| RpcError {
code: ErrorCode::ServerError(Error::RuntimeError.into()),
message: "Unable to query".into(),
data: Some(format!("{:?}", e).into()),
@@ -168,7 +188,10 @@
{
pass_method!(account_tokens(collection: CollectionId, account: CrossAccountId) -> Vec<TokenId>);
pass_method!(token_exists(collection: CollectionId, token: TokenId) -> bool);
- pass_method!(token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>);
+ pass_method!(
+ token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>;
+ changed_in 2, token_owner_before_version_2(collection, token) => |u| Some(u)
+ );
pass_method!(const_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);
pass_method!(variable_metadata(collection: CollectionId, token: TokenId) -> Vec<u8>);
pass_method!(collection_tokens(collection: CollectionId) -> u32);
doc/hackusama_update.mddiffbeforeafterboth--- /dev/null
+++ b/doc/hackusama_update.md
@@ -0,0 +1,15 @@
+## Hackusama Update
+
+During the Kusama Hackaphon the following changes were made:
+
+- Enabled Smart Contracts Pallet
+- Enabled integration between Smart Contracts and Unique Pallet (required special edition of RC4 Substrate version)
+- Fixed misc. bugs in Unique Pallet
+- Deployed Unique TestNet. Public node available at wss://unique.usetech.com, custom UI types - see below in this README.
+- New Features:
+ - Re-Fungible Token Mode
+ - Off-Chain Schema to store token image URLs
+ - Alternative economic model
+ - Allow Lists and Public Mint Permission
+- Use example: [SubstraPunks Game](https://github.com/usetech-llc/substrapunks), fully hosted on IPFS and Unique Testnet
+ Blockchain.
\ No newline at end of file
doc/re-enable_ink_contracts.mddiffbeforeafterboth--- /dev/null
+++ b/doc/re-enable_ink_contracts.md
@@ -0,0 +1,81 @@
+## Re-Enabling Ink! Contracts
+
+Uncomment following lies:
+1. In node/rpc/Cargo.toml
+```
+# pallet-contracts-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' }
+```
+
+2. In node/rpc/src/lib.rs
+```
+// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,
+...
+// use pallet_contracts_rpc::{Contracts, ContractsApi};
+...
+// io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));
+
+```
+
+3. In runtime/Cargo.toml
+```
+ # 'pallet-contracts/std',
+ # 'pallet-contracts-primitives/std',
+ # 'pallet-contracts-rpc-runtime-api/std',
+ # 'pallet-contract-helpers/std',
+...
+ # [dependencies.pallet-contracts]
+ # git = 'https://github.com/paritytech/substrate.git'
+ # default-features = false
+ # branch = 'polkadot-v0.9.9'
+ # version = '3.0.0'
+
+ # [dependencies.pallet-contracts-primitives]
+ # git = 'https://github.com/paritytech/substrate.git'
+ # default-features = false
+ # branch = 'polkadot-v0.9.9'
+ # version = '3.0.0'
+
+ # [dependencies.pallet-contracts-rpc-runtime-api]
+ # git = 'https://github.com/paritytech/substrate.git'
+ # default-features = false
+ # branch = 'polkadot-v0.9.9'
+ # version = '3.0.0'
+...
+ # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
+```
+
+4. runtime/src/lib.rs
+```
+// use pallet_contracts::weights::WeightInfo;
+...
+// pub use pallet_timestamp::Call as TimestampCall;
+...
+// mod chain_extension;
+// use crate::chain_extension::{NFTExtension, Imbalance};
+...
+/*
+parameter_types! {
+ pub TombstoneDeposit: Balance = deposit(
+ ...
+}
+*/
+...
+//pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,
+...
+// impl pallet_contract_helpers::Config for Runtime {}
+...
+// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
+...
+// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage},
+...
+//pallet_contract_helpers::ContractHelpersExtension<Runtime>,
+...
+/*
+ impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>
+ for Runtime
+ {
+ ...
+ }
+*/
+
+```
\ No newline at end of file
launch-config-full.jsondiffbeforeafterboth--- /dev/null
+++ b/launch-config-full.json
@@ -0,0 +1,135 @@
+{
+ "relaychain": {
+ "bin": "../polkadot/target/release/polkadot",
+ "chain": "rococo-local",
+ "nodes": [
+ {
+ "name": "alice",
+ "wsPort": 9844,
+ "rpcPort": 9843,
+ "port": 30444,
+ "flags": [
+ "-lparachain::candidate_validation=debug",
+ "-lxcm=trace"
+ ]
+ },
+ {
+ "name": "bob",
+ "wsPort": 9855,
+ "rpcPort": 9854,
+ "port": 30555,
+ "flags": [
+ "-lparachain::candidate_validation=debug",
+ "-lxcm=trace"
+ ]
+ },
+ {
+ "name": "charlie",
+ "wsPort": 9866,
+ "rpcPort": 9865,
+ "port": 30666,
+ "flags": [
+ "-lparachain::candidate_validation=debug"
+ ]
+ },
+ {
+ "name": "dave",
+ "wsPort": 9877,
+ "rpcPort": 9876,
+ "port": 30777,
+ "flags": [
+ "-lparachain::candidate_validation=debug"
+ ]
+ },
+ {
+ "name": "eve",
+ "wsPort": 9888,
+ "rpcPort": 9887,
+ "port": 30888,
+ "flags": [
+ "-lparachain::candidate_validation=debug"
+ ]
+ }
+ ],
+ "genesis": {
+ "runtime": {
+ "runtime_genesis_config": {
+ "parachainsConfiguration": {
+ "config": {
+ "validation_upgrade_frequency": 1,
+ "validation_upgrade_delay": 1
+ }
+ }
+ }
+ }
+ }
+ },
+ "parachains": [
+ {
+ "bin": "../unique-chain/target/release/unique-collator",
+ "id": "1000",
+ "balance": "1000000000000000000000000",
+ "nodes": [
+ {
+ "port": 31200,
+ "wsPort": 9944,
+ "rpcPort": 9933,
+ "name": "alice",
+ "flags": [
+ "--rpc-cors=all",
+ "--unsafe-rpc-external",
+ "--unsafe-ws-external",
+ "-lxcm=trace"
+ ]
+ },
+ {
+ "port": 31201,
+ "wsPort": 9945,
+ "rpcPort": 9934,
+ "name": "bob",
+ "flags": [
+ "--rpc-cors=all",
+ "--unsafe-rpc-external",
+ "--unsafe-ws-external",
+ "-lxcm=trace"
+ ]
+ }
+ ]
+ },
+ {
+ "bin": "../Acala/target/release/acala",
+ "id": "2000",
+ "chain": "karura-dev",
+ "balance": "1000000000000000000000",
+ "nodes": [
+ {
+ "wsPort": 9946,
+ "port": 31202,
+ "name": "alice",
+ "flags": [
+ "--rpc-cors=all",
+ "--unsafe-rpc-external",
+ "--unsafe-ws-external",
+ "-lxcm=trace"
+ ]
+ }
+ ]
+ }
+ ],
+ "simpleParachains": [],
+ "hrmpChannels": [
+ {
+ "sender": 2000,
+ "recipient": 1000,
+ "maxCapacity": 8,
+ "maxMessageSize": 512
+ },
+ {
+ "sender": 1000,
+ "recipient": 2000,
+ "maxCapacity": 8,
+ "maxMessageSize": 512
+ }
+ ],
+ "finalization": false
+}
launch-config-westend.jsondiffbeforeafterboth--- a/launch-config-westend.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
- "relaychain": {
- "bin": "../polkadot/target/release/polkadot",
- "chain": "westend-local",
- "nodes": [
- {
- "name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
- "port": 30444,
- "flags": [
- "-lparachain::candidate_validation=debug"
- ]
- },
- {
- "name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
- "port": 30555,
- "flags": [
- "-lparachain::candidate_validation=debug"
- ]
- },
- {
- "name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
- "port": 30666,
- "flags": [
- "-lparachain::candidate_validation=debug"
- ]
- },
- {
- "name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
- "port": 30777,
- "flags": [
- "-lparachain::candidate_validation=debug"
- ]
- },
- {
- "name": "eve",
- "wsPort": 9888,
- "rpcPort": 9886,
- "port": 30888,
- "flags": [
- "-lparachain::candidate_validation=debug"
- ]
- },
- {
- "name": "ferdie",
- "wsPort": 9897,
- "rpcPort": 9896,
- "port": 30999,
- "flags": [
- "-lparachain::candidate_validation=debug"
- ]
- }
- ],
- "genesis": {
- "runtime": {
- "runtime_genesis_config": {
- "parachainsConfiguration": {
- "config": {
- "validation_upgrade_frequency": 1,
- "validation_upgrade_delay": 1
- }
- }
- }
- }
- }
- },
- "parachains": [
- {
- "bin": "../unique-chain/target/release/unique-collator",
- "chain": "westend-local",
- "balance": "1000000000000000000000000",
- "nodes": [
- {
- "port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
- "name": "alice",
- "flags": [
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "port": 31201,
- "wsPort": 9945,
- "rpcPort": 9934,
- "name": "bob",
- "flags": [
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "port": 31202,
- "wsPort": 9946,
- "rpcPort": 9935,
- "name": "charlie",
- "flags": [
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "port": 31203,
- "wsPort": 9947,
- "rpcPort": 9936,
- "name": "dave",
- "flags": [
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "port": 31204,
- "wsPort": 9948,
- "rpcPort": 9937,
- "name": "eve",
- "flags": [
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- }
- ]
- }
- ],
- "simpleParachains": [],
- "hrmpChannels": [],
- "finalization": false
-}
launch-config.jsondiffbeforeafterboth--- a/launch-config.json
+++ b/launch-config.json
@@ -9,7 +9,8 @@
"rpcPort": 9843,
"port": 30444,
"flags": [
- "-lparachain::candidate_validation=debug"
+ "-lparachain::candidate_validation=debug",
+ "-lxcm=trace"
]
},
{
@@ -18,7 +19,8 @@
"rpcPort": 9854,
"port": 30555,
"flags": [
- "-lparachain::candidate_validation=debug"
+ "-lparachain::candidate_validation=debug",
+ "-lxcm=trace"
]
},
{
@@ -38,6 +40,15 @@
"flags": [
"-lparachain::candidate_validation=debug"
]
+ },
+ {
+ "name": "eve",
+ "wsPort": 9888,
+ "rpcPort": 9887,
+ "port": 30888,
+ "flags": [
+ "-lparachain::candidate_validation=debug"
+ ]
}
],
"genesis": {
@@ -67,7 +78,8 @@
"flags": [
"--rpc-cors=all",
"--unsafe-rpc-external",
- "--unsafe-ws-external"
+ "--unsafe-ws-external",
+ "-lxcm=trace"
]
},
{
@@ -78,7 +90,8 @@
"flags": [
"--rpc-cors=all",
"--unsafe-rpc-external",
- "--unsafe-ws-external"
+ "--unsafe-ws-external",
+ "-lxcm=trace"
]
}
]
launch-test-env.shdiffbeforeafterboth--- a/launch-test-env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-cp launch-config.json ../polkadot-launch/launch-config.json
-
-cd ../polkadot-launch
-yarn install
-yarn build
-yarn start launch-config.json
launch-testnet-full.shdiffbeforeafterboth--- /dev/null
+++ b/launch-testnet-full.sh
@@ -0,0 +1,6 @@
+cp launch-config-full.json ../polkadot-launch/launch-config-full.json
+
+cd ../polkadot-launch
+yarn install
+yarn build
+yarn start launch-config-full.json
launch-testnet.shdiffbeforeafterboth--- /dev/null
+++ b/launch-testnet.sh
@@ -0,0 +1,6 @@
+cp launch-config.json ../polkadot-launch/launch-config.json
+
+cd ../polkadot-launch
+yarn install
+yarn build
+yarn start launch-config.json
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -257,7 +257,7 @@
license = 'All Rights Reserved'
name = 'unique-node'
repository = 'https://github.com/UniqueNetwork/unique-chain'
-version = '0.9.14'
+version = '0.9.16'
[[bin]]
name = 'unique-collator'
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -14,7 +14,10 @@
use up_data_structs::{
COLLECTION_NUMBER_LIMIT, Collection, CollectionId, CreateItemData, ExistenceRequirement,
MAX_TOKEN_PREFIX_LENGTH, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, Pays, PostDispatchInfo,
- TokenId, Weight, WithdrawReasons, CollectionStats, CustomDataLimit,
+ TokenId, Weight, WithdrawReasons, CollectionStats, MAX_TOKEN_OWNERSHIP, CollectionMode,
+ NFT_SPONSOR_TRANSFER_TIMEOUT, FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
+ REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT, CUSTOM_DATA_LIMIT, CollectionLimits,
+ CustomDataLimit, CreateCollectionData, SponsorshipState,
};
pub use pallet::*;
use sp_core::H160;
@@ -285,6 +288,10 @@
TokenVariableDataLimitExceeded,
/// Exceeded max admin count
CollectionAdminCountExceeded,
+ /// Collection limit bounds per collection exceeded
+ CollectionLimitBoundsExceeded,
+ /// Tried to enable permissions which are only permitted to be disabled
+ OwnerPermissionsCantBeReverted,
/// Collection settings not allowing items transferring
TransferNotAllowed,
@@ -300,7 +307,7 @@
/// Item balance not enough.
TokenValueTooLow,
/// Requested value more than approved.
- TokenValueNotEnough,
+ ApprovedValueTooLow,
/// Tried to approve more than owned
CantApproveMoreThanOwned,
@@ -395,7 +402,10 @@
}
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
+ pub fn init_collection(
+ owner: T::AccountId,
+ data: CreateCollectionData<T::AccountId>,
+ ) -> Result<CollectionId, DispatchError> {
{
ensure!(
data.token_prefix.len() <= MAX_TOKEN_PREFIX_LENGTH as usize,
@@ -418,6 +428,29 @@
// =========
+ let collection = Collection {
+ owner: owner.clone(),
+ name: data.name,
+ mode: data.mode.clone(),
+ mint_mode: false,
+ access: data.access.unwrap_or_default(),
+ description: data.description,
+ token_prefix: data.token_prefix,
+ offchain_schema: data.offchain_schema,
+ schema_version: data.schema_version.unwrap_or_default(),
+ sponsorship: data
+ .pending_sponsor
+ .map(SponsorshipState::Unconfirmed)
+ .unwrap_or_default(),
+ variable_on_chain_schema: data.variable_on_chain_schema,
+ const_on_chain_schema: data.const_on_chain_schema,
+ limits: data
+ .limits
+ .map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))
+ .unwrap_or_else(|| Ok(CollectionLimits::default()))?,
+ meta_update_permission: data.meta_update_permission.unwrap_or_default(),
+ };
+
// Take a (non-refundable) deposit of collection creation
{
let mut imbalance =
@@ -429,7 +462,7 @@
),
);
<T as Config>::Currency::settle(
- &data.owner,
+ &owner,
imbalance,
WithdrawReasons::TRANSFER,
ExistenceRequirement::KeepAlive,
@@ -438,12 +471,8 @@
}
<CreatedCollectionCount<T>>::put(created_count);
- <Pallet<T>>::deposit_event(Event::CollectionCreated(
- id,
- data.mode.id(),
- data.owner.clone(),
- ));
- <CollectionById<T>>::insert(id, data);
+ <Pallet<T>>::deposit_event(Event::CollectionCreated(id, data.mode.id(), owner.clone()));
+ <CollectionById<T>>::insert(id, collection);
Ok(id)
}
@@ -527,6 +556,61 @@
Ok(())
}
+
+ pub fn clamp_limits(
+ mode: CollectionMode,
+ old_limit: &CollectionLimits,
+ mut new_limit: CollectionLimits,
+ ) -> Result<CollectionLimits, DispatchError> {
+ macro_rules! limit_default {
+ ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{
+ $(
+ if let Some($new) = $new.$field {
+ let $old = $old.$field($($arg)?);
+ let _ = $new;
+ let _ = $old;
+ $check
+ } else {
+ $new.$field = $old.$field
+ }
+ )*
+ }};
+ }
+
+ limit_default!(old_limit, new_limit,
+ account_token_ownership_limit => ensure!(
+ new_limit <= MAX_TOKEN_OWNERSHIP,
+ <Error<T>>::CollectionLimitBoundsExceeded,
+ ),
+ sponsor_transfer_timeout(match mode {
+ CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,
+ CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
+ CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
+ }) => ensure!(
+ new_limit <= MAX_SPONSOR_TIMEOUT,
+ <Error<T>>::CollectionLimitBoundsExceeded,
+ ),
+ sponsored_data_size => ensure!(
+ new_limit <= CUSTOM_DATA_LIMIT,
+ <Error<T>>::CollectionLimitBoundsExceeded,
+ ),
+ token_limit => ensure!(
+ old_limit >= new_limit && new_limit > 0,
+ <Error<T>>::CollectionTokenLimitExceeded
+ ),
+ owner_can_transfer => ensure!(
+ old_limit || !new_limit,
+ <Error<T>>::OwnerPermissionsCantBeReverted,
+ ),
+ owner_can_destroy => ensure!(
+ old_limit || !new_limit,
+ <Error<T>>::OwnerPermissionsCantBeReverted,
+ ),
+ sponsored_data_rate_limit => {},
+ transfers_enabled => {},
+ );
+ Ok(new_limit)
+ }
}
#[macro_export]
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -2,7 +2,7 @@
use core::ops::Deref;
use frame_support::{ensure};
-use up_data_structs::{AccessMode, Collection, CollectionId, TokenId};
+use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};
use pallet_common::{
Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,
};
@@ -100,8 +100,11 @@
}
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(data)
+ pub fn init_collection(
+ owner: T::AccountId,
+ data: CreateCollectionData<T::AccountId>,
+ ) -> Result<CollectionId, DispatchError> {
+ <PalletCommon<T>>::init_collection(owner, data)
}
pub fn destroy_collection(
collection: FungibleHandle<T>,
@@ -343,7 +346,7 @@
if allowance.is_none() {
ensure!(
collection.ignores_allowance(spender),
- <CommonError<T>>::TokenValueNotEnough
+ <CommonError<T>>::ApprovedValueTooLow
);
}
@@ -374,7 +377,7 @@
if allowance.is_none() {
ensure!(
collection.ignores_allowance(spender),
- <CommonError<T>>::TokenValueNotEnough
+ <CommonError<T>>::ApprovedValueTooLow
);
}
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -2,7 +2,7 @@
use erc::ERC721Events;
use frame_support::{BoundedVec, ensure};
-use up_data_structs::{AccessMode, Collection, CollectionId, CustomDataLimit, TokenId};
+use up_data_structs::{AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData};
use pallet_common::{
Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, account::CrossAccountId,
};
@@ -140,8 +140,11 @@
// unchecked calls skips any permission checks
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(data)
+ pub fn init_collection(
+ owner: T::AccountId,
+ data: CreateCollectionData<T::AccountId>,
+ ) -> Result<CollectionId, DispatchError> {
+ <PalletCommon<T>>::init_collection(owner, data)
}
pub fn destroy_collection(
collection: NonfungibleHandle<T>,
@@ -492,7 +495,7 @@
if <Allowance<T>>::get((collection.id, token)).as_ref() != Some(spender) {
ensure!(
collection.ignores_allowance(spender),
- <CommonError<T>>::TokenValueNotEnough
+ <CommonError<T>>::ApprovedValueTooLow
);
}
@@ -520,7 +523,7 @@
if <Allowance<T>>::get((collection.id, token)).as_ref() != Some(spender) {
ensure!(
collection.ignores_allowance(spender),
- <CommonError<T>>::TokenValueNotEnough
+ <CommonError<T>>::ApprovedValueTooLow
);
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -2,7 +2,7 @@
use frame_support::{ensure, BoundedVec};
use up_data_structs::{
- AccessMode, Collection, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,
+ AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId, CreateCollectionData,
};
use pallet_common::{
Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,
@@ -155,8 +155,11 @@
// unchecked calls skips any permission checks
impl<T: Config> Pallet<T> {
- pub fn init_collection(data: Collection<T::AccountId>) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(data)
+ pub fn init_collection(
+ owner: T::AccountId,
+ data: CreateCollectionData<T::AccountId>,
+ ) -> Result<CollectionId, DispatchError> {
+ <PalletCommon<T>>::init_collection(owner, data)
}
pub fn destroy_collection(
collection: RefungibleHandle<T>,
@@ -528,7 +531,7 @@
if allowance.is_none() {
ensure!(
collection.ignores_allowance(spender),
- <CommonError<T>>::TokenValueNotEnough
+ <CommonError<T>>::ApprovedValueTooLow
);
}
@@ -561,7 +564,7 @@
if allowance.is_none() {
ensure!(
collection.ignores_allowance(spender),
- <CommonError<T>>::TokenValueNotEnough
+ <CommonError<T>>::ApprovedValueTooLow
);
}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -36,13 +36,11 @@
use frame_system::{self as system, ensure_signed};
use sp_runtime::{sp_std::prelude::Vec};
use up_data_structs::{
- MAX_DECIMAL_POINTS, MAX_SPONSOR_TIMEOUT, MAX_TOKEN_OWNERSHIP, CUSTOM_DATA_LIMIT,
- VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT, OFFCHAIN_SCHEMA_LIMIT,
- FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
- NFT_SPONSOR_TRANSFER_TIMEOUT, MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH,
- MAX_TOKEN_PREFIX_LENGTH, AccessMode, Collection, CreateItemData, CollectionLimits,
- CollectionId, CollectionMode, TokenId, SchemaVersion, SponsorshipState, MetaUpdatePermission,
- CustomDataLimit,
+ MAX_DECIMAL_POINTS, VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT,
+ OFFCHAIN_SCHEMA_LIMIT, MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH,
+ MAX_TOKEN_PREFIX_LENGTH, AccessMode, CreateItemData, CollectionLimits, CollectionId,
+ CollectionMode, TokenId, SchemaVersion, SponsorshipState, MetaUpdatePermission,
+ CreateCollectionData, CustomDataLimit,
};
use pallet_common::{
account::CrossAccountId, CollectionHandle, Pallet as PalletCommon, Error as CommonError,
@@ -84,10 +82,6 @@
ConfirmUnsetSponsorFail,
/// Length of items properties must be greater than 0.
EmptyArgument,
- /// Collection limit bounds per collection exceeded
- CollectionLimitBoundsExceeded,
- /// Tried to enable permissions which are only permitted to be disabled
- OwnerPermissionsCantBeReverted,
}
}
@@ -321,42 +315,39 @@
// returns collection ID
#[weight = <SelfWeightOf<T>>::create_collection()]
#[transactional]
+ #[deprecated]
pub fn create_collection(origin,
collection_name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,
collection_description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,
token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,
- mode: CollectionMode) -> DispatchResult {
-
- // Anyone can create a collection
- let who = ensure_signed(origin)?;
-
- // Create new collection
- let new_collection = Collection {
- owner: who,
+ mode: CollectionMode) -> DispatchResult {
+ let data: CreateCollectionData<T::AccountId> = CreateCollectionData {
name: collection_name,
- mode: mode.clone(),
- mint_mode: false,
- access: AccessMode::Normal,
description: collection_description,
token_prefix,
- offchain_schema: BoundedVec::default(),
- schema_version: SchemaVersion::ImageURL,
- sponsorship: SponsorshipState::Disabled,
- variable_on_chain_schema: BoundedVec::default(),
- const_on_chain_schema: BoundedVec::default(),
- limits: Default::default(),
- meta_update_permission: Default::default(),
+ mode,
+ ..Default::default()
};
+ Self::create_collection_ex(origin, data)
+ }
- let _id = match mode {
- CollectionMode::NFT => {<PalletNonfungible<T>>::init_collection(new_collection)?},
+ /// This method creates a collection
+ ///
+ /// Prefer it to deprecated [`created_collection`] method
+ #[weight = <SelfWeightOf<T>>::create_collection()]
+ #[transactional]
+ pub fn create_collection_ex(origin, data: CreateCollectionData<T::AccountId>) -> DispatchResult {
+ let owner = ensure_signed(origin)?;
+
+ let _id = match data.mode {
+ CollectionMode::NFT => {<PalletNonfungible<T>>::init_collection(owner, data)?},
CollectionMode::Fungible(decimal_points) => {
// check params
ensure!(decimal_points <= MAX_DECIMAL_POINTS, Error::<T>::CollectionDecimalPointLimitExceeded);
- <PalletFungible<T>>::init_collection(new_collection)?
+ <PalletFungible<T>>::init_collection(owner, data)?
}
CollectionMode::ReFungible => {
- <PalletRefungible<T>>::init_collection(new_collection)?
+ <PalletRefungible<T>>::init_collection(owner, data)?
}
};
@@ -1093,61 +1084,12 @@
collection_id: CollectionId,
new_limit: CollectionLimits,
) -> DispatchResult {
- let mut new_limit = new_limit;
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
target_collection.check_is_owner(&sender)?;
let old_limit = &target_collection.limits;
- macro_rules! limit_default {
- ($old:ident, $new:ident, $($field:ident $(($arg:expr))? => $check:expr),* $(,)?) => {{
- $(
- if let Some($new) = $new.$field {
- let $old = $old.$field($($arg)?);
- let _ = $new;
- let _ = $old;
- $check
- } else {
- $new.$field = $old.$field
- }
- )*
- }};
- }
-
- limit_default!(old_limit, new_limit,
- account_token_ownership_limit => ensure!(
- new_limit <= MAX_TOKEN_OWNERSHIP,
- <Error<T>>::CollectionLimitBoundsExceeded,
- ),
- sponsor_transfer_timeout(match target_collection.mode {
- CollectionMode::NFT => NFT_SPONSOR_TRANSFER_TIMEOUT,
- CollectionMode::Fungible(_) => FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
- CollectionMode::ReFungible => REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
- }) => ensure!(
- new_limit <= MAX_SPONSOR_TIMEOUT,
- <Error<T>>::CollectionLimitBoundsExceeded,
- ),
- sponsored_data_size => ensure!(
- new_limit <= CUSTOM_DATA_LIMIT,
- <Error<T>>::CollectionLimitBoundsExceeded,
- ),
- token_limit => ensure!(
- old_limit >= new_limit && new_limit > 0,
- <CommonError<T>>::CollectionTokenLimitExceeded
- ),
- owner_can_transfer => ensure!(
- old_limit || !new_limit,
- <Error<T>>::OwnerPermissionsCantBeReverted,
- ),
- owner_can_destroy => ensure!(
- old_limit || !new_limit,
- <Error<T>>::OwnerPermissionsCantBeReverted,
- ),
- sponsored_data_rate_limit => {},
- transfers_enabled => {},
- );
-
- target_collection.limits = new_limit;
+ target_collection.limits = <PalletCommon<T>>::clamp_limits(target_collection.mode.clone(), &old_limit, new_limit)?;
<Pallet<T>>::deposit_event(Event::<T>::CollectionLimitSet(
collection_id
pallets/unique/src/tests.rsdiffbeforeafterboth--- a/pallets/unique/src/tests.rs
+++ b/pallets/unique/src/tests.rs
@@ -5,7 +5,7 @@
use up_data_structs::{
COLLECTION_NUMBER_LIMIT, CollectionId, CreateItemData, CreateFungibleData, CreateNftData,
CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, MetaUpdatePermission,
- TokenId,
+ TokenId, MAX_TOKEN_OWNERSHIP,
};
use frame_support::{assert_noop, assert_ok};
use sp_std::convert::TryInto;
@@ -601,7 +601,7 @@
1
)
.map_err(|e| e.error),
- CommonError::<Test>::TokenValueNotEnough
+ CommonError::<Test>::ApprovedValueTooLow
);
// do approve
@@ -916,7 +916,7 @@
4
)
.map_err(|e| e.error),
- CommonError::<Test>::TokenValueNotEnough
+ CommonError::<Test>::ApprovedValueTooLow
);
});
}
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -263,6 +263,31 @@
pub meta_update_permission: MetaUpdatePermission,
}
+#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, Debug, Derivative, MaxEncodedLen)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+#[derivative(Default(bound = ""))]
+pub struct CreateCollectionData<AccountId> {
+ #[derivative(Default(value = "CollectionMode::NFT"))]
+ pub mode: CollectionMode,
+ pub access: Option<AccessMode>,
+ #[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
+ pub name: BoundedVec<u16, ConstU32<MAX_COLLECTION_NAME_LENGTH>>,
+ #[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
+ pub description: BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>,
+ #[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
+ pub token_prefix: BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>,
+ #[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
+ pub offchain_schema: BoundedVec<u8, ConstU32<OFFCHAIN_SCHEMA_LIMIT>>,
+ pub schema_version: Option<SchemaVersion>,
+ pub pending_sponsor: Option<AccountId>,
+ pub limits: Option<CollectionLimits>,
+ #[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
+ pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,
+ #[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
+ pub const_on_chain_schema: BoundedVec<u8, ConstU32<CONST_ON_CHAIN_SCHEMA_LIMIT>>,
+ pub meta_update_permission: Option<MetaUpdatePermission>,
+}
+
#[derive(Encode, Decode, Debug, Clone, PartialEq, TypeInfo)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
pub struct NftItemType<AccountId> {
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -9,10 +9,14 @@
type Result<T> = core::result::Result<T, DispatchError>;
sp_api::decl_runtime_apis! {
+ #[api_version(2)]
pub trait UniqueApi<CrossAccountId, AccountId> where
AccountId: Decode,
CrossAccountId: pallet_common::account::CrossAccountId<AccountId>,
{
+ #[changed_in(2)]
+ fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;
+
fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;
fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool>;
runtime/src/lib.rsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.78#![cfg_attr(not(feature = "std"), no_std)]9// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.10#![recursion_limit = "1024"]11#![allow(clippy::from_over_into, clippy::identity_op)]12#![allow(clippy::fn_to_numeric_cast_with_truncation)]13// Make the WASM binary available.14#[cfg(feature = "std")]15include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1617use sp_api::impl_runtime_apis;18use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};19use sp_runtime::DispatchError;20// #[cfg(any(feature = "std", test))]21// pub use sp_runtime::BuildStorage;2223use sp_runtime::{24 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,25 traits::{26 AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify, AccountIdConversion,27 },28 transaction_validity::{TransactionSource, TransactionValidity},29 ApplyExtrinsicResult, MultiSignature, RuntimeAppPublic,30};3132use sp_std::prelude::*;3334#[cfg(feature = "std")]35use sp_version::NativeVersion;36use sp_version::RuntimeVersion;37pub use pallet_transaction_payment::{38 Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,39};40// A few exports that help ease life for downstream crates.41pub use pallet_balances::Call as BalancesCall;42pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};43pub use frame_support::{44 construct_runtime, match_type,45 dispatch::DispatchResult,46 PalletId, parameter_types, StorageValue, ConsensusEngineId,47 traits::{48 Everything, Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem,49 LockIdentifier, OnUnbalanced, Randomness, FindAuthor,50 },51 weights::{52 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},53 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,54 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,55 },56};57use up_data_structs::*;58// use pallet_contracts::weights::WeightInfo;59// #[cfg(any(feature = "std", test))]60use frame_system::{61 self as frame_system, EnsureRoot, EnsureSigned,62 limits::{BlockWeights, BlockLength},63};64use sp_arithmetic::{65 traits::{BaseArithmetic, Unsigned},66};67use smallvec::smallvec;68use codec::{Encode, Decode};69use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, OnMethodCall};70use fp_rpc::TransactionStatus;71use sp_runtime::{72 traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf},73 transaction_validity::TransactionValidityError,74};7576// pub use pallet_timestamp::Call as TimestampCall;77pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;7879// Polkadot imports80use pallet_xcm::XcmPassthrough;81use polkadot_parachain::primitives::Sibling;82use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};83use xcm_builder::{84 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,85 EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,86 ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative,87 SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,88 SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,89};90use xcm_executor::{Config, XcmExecutor};9192// mod chain_extension;93// use crate::chain_extension::{NFTExtension, Imbalance};9495/// An index to a block.96pub type BlockNumber = u32;9798/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.99pub type Signature = MultiSignature;100101/// Some way of identifying an account on the chain. We intentionally make it equivalent102/// to the public key of our transaction signing scheme.103pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;104105pub type CrossAccountId = pallet_common::account::BasicCrossAccountId<Runtime>;106107/// The type for looking up accounts. We don't expect more than 4 billion of them, but you108/// never know...109pub type AccountIndex = u32;110111/// Balance of an account.112pub type Balance = u128;113114/// Index of a transaction in the chain.115pub type Index = u32;116117/// A hash of some data used by the chain.118pub type Hash = sp_core::H256;119120/// Digest item type.121pub type DigestItem = generic::DigestItem;122123/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know124/// the specifics of the runtime. They can then be made to be agnostic over specific formats125/// of data like extrinsics, allowing for them to continue syncing the network through upgrades126/// to even the core data structures.127pub mod opaque {128 use super::*;129130 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;131132 /// Opaque block type.133 pub type Block = generic::Block<Header, UncheckedExtrinsic>;134135 pub type SessionHandlers = ();136137 impl_opaque_keys! {138 pub struct SessionKeys {139 pub aura: Aura,140 }141 }142}143144/// This runtime version.145pub const VERSION: RuntimeVersion = RuntimeVersion {146 spec_name: create_runtime_str!("opal"),147 impl_name: create_runtime_str!("opal"),148 authoring_version: 1,149 spec_version: 914000,150 impl_version: 1,151 apis: RUNTIME_API_VERSIONS,152 transaction_version: 0,153 state_version: 0,154};155156pub const MILLISECS_PER_BLOCK: u64 = 12000;157158pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;159160// These time units are defined in number of blocks.161pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);162pub const HOURS: BlockNumber = MINUTES * 60;163pub const DAYS: BlockNumber = HOURS * 24;164165parameter_types! {166 pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;167}168169#[derive(codec::Encode, codec::Decode)]170pub enum XCMPMessage<XAccountId, XBalance> {171 /// Transfer tokens to the given account from the Parachain account.172 TransferToken(XAccountId, XBalance),173}174175/// The version information used to identify this runtime when compiled natively.176#[cfg(feature = "std")]177pub fn native_version() -> NativeVersion {178 NativeVersion {179 runtime_version: VERSION,180 can_author_with: Default::default(),181 }182}183184type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;185186pub struct DealWithFees;187impl OnUnbalanced<NegativeImbalance> for DealWithFees {188 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {189 if let Some(fees) = fees_then_tips.next() {190 // for fees, 100% to treasury191 let mut split = fees.ration(100, 0);192 if let Some(tips) = fees_then_tips.next() {193 // for tips, if any, 100% to treasury194 tips.ration_merge_into(100, 0, &mut split);195 }196 Treasury::on_unbalanced(split.0);197 // Author::on_unbalanced(split.1);198 }199 }200}201202/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.203/// This is used to limit the maximal weight of a single extrinsic.204const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);205/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used206/// by Operational extrinsics.207const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);208/// We allow for 2 seconds of compute with a 6 second average block time.209const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;210211parameter_types! {212 pub const BlockHashCount: BlockNumber = 2400;213 pub RuntimeBlockLength: BlockLength =214 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);215 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);216 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;217 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()218 .base_block(BlockExecutionWeight::get())219 .for_class(DispatchClass::all(), |weights| {220 weights.base_extrinsic = ExtrinsicBaseWeight::get();221 })222 .for_class(DispatchClass::Normal, |weights| {223 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);224 })225 .for_class(DispatchClass::Operational, |weights| {226 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);227 // Operational transactions have some extra reserved space, so that they228 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.229 weights.reserved = Some(230 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT231 );232 })233 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)234 .build_or_panic();235 pub const Version: RuntimeVersion = VERSION;236 pub const SS58Prefix: u8 = 42;237}238239parameter_types! {240 pub const ChainId: u64 = 8888;241}242243pub struct FixedFee;244impl FeeCalculator for FixedFee {245 fn min_gas_price() -> U256 {246 // Targeting 0.15 UNQ per transfer247 1_024_947_215_000u64.into()248 }249}250251// Assuming slowest ethereum opcode is SSTORE, with gas price of 20000 as our worst case252// (contract, which only writes a lot of data),253// approximating on top of our real store write weight254parameter_types! {255 pub const WritesPerSecond: u64 = WEIGHT_PER_SECOND / <Runtime as frame_system::Config>::DbWeight::get().write;256 pub const GasPerSecond: u64 = WritesPerSecond::get() * 20000;257 pub const WeightPerGas: u64 = WEIGHT_PER_SECOND / GasPerSecond::get();258}259260/// Limiting EVM execution to 50% of block for substrate users and management tasks261/// EVM transaction consumes more weight than substrate's, so we can't rely on them being262/// scheduled fairly263const EVM_DISPATCH_RATIO: Perbill = Perbill::from_percent(50);264parameter_types! {265 pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * EVM_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WeightPerGas::get());266}267268pub enum FixedGasWeightMapping {}269impl GasWeightMapping for FixedGasWeightMapping {270 fn gas_to_weight(gas: u64) -> Weight {271 gas.saturating_mul(WeightPerGas::get())272 }273 fn weight_to_gas(weight: Weight) -> u64 {274 weight / WeightPerGas::get()275 }276}277278impl pallet_evm::Config for Runtime {279 type BlockGasLimit = BlockGasLimit;280 type FeeCalculator = FixedFee;281 type GasWeightMapping = FixedGasWeightMapping;282 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;283 type CallOrigin = EnsureAddressTruncated;284 type WithdrawOrigin = EnsureAddressTruncated;285 type AddressMapping = HashedAddressMapping<Self::Hashing>;286 type PrecompilesType = ();287 type PrecompilesValue = ();288 type Currency = Balances;289 type Event = Event;290 type OnMethodCall = (291 pallet_evm_migration::OnMethodCall<Self>,292 pallet_unique::UniqueErcSupport<Self>,293 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,294 );295 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;296 type ChainId = ChainId;297 type Runner = pallet_evm::runner::stack::Runner<Self>;298 type OnChargeTransaction = pallet_evm_transaction_payment::OnChargeTransaction<Self>;299 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;300 type FindAuthor = EthereumFindAuthor<Aura>;301}302303impl pallet_evm_migration::Config for Runtime {304 type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;305}306307pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);308impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {309 fn find_author<'a, I>(digests: I) -> Option<H160>310 where311 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,312 {313 if let Some(author_index) = F::find_author(digests) {314 let authority_id = Aura::authorities()[author_index as usize].clone();315 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));316 }317 None318 }319}320321impl pallet_ethereum::Config for Runtime {322 type Event = Event;323 type StateRoot = pallet_ethereum::IntermediateStateRoot;324}325326impl pallet_randomness_collective_flip::Config for Runtime {}327328impl frame_system::Config for Runtime {329 /// The data to be stored in an account.330 type AccountData = pallet_balances::AccountData<Balance>;331 /// The identifier used to distinguish between accounts.332 type AccountId = AccountId;333 /// The basic call filter to use in dispatchable.334 type BaseCallFilter = Everything;335 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).336 type BlockHashCount = BlockHashCount;337 /// The maximum length of a block (in bytes).338 type BlockLength = RuntimeBlockLength;339 /// The index type for blocks.340 type BlockNumber = BlockNumber;341 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.342 type BlockWeights = RuntimeBlockWeights;343 /// The aggregated dispatch type that is available for extrinsics.344 type Call = Call;345 /// The weight of database operations that the runtime can invoke.346 type DbWeight = RocksDbWeight;347 /// The ubiquitous event type.348 type Event = Event;349 /// The type for hashing blocks and tries.350 type Hash = Hash;351 /// The hashing algorithm used.352 type Hashing = BlakeTwo256;353 /// The header type.354 type Header = generic::Header<BlockNumber, BlakeTwo256>;355 /// The index type for storing how many extrinsics an account has signed.356 type Index = Index;357 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.358 type Lookup = AccountIdLookup<AccountId, ()>;359 /// What to do if an account is fully reaped from the system.360 type OnKilledAccount = ();361 /// What to do if a new account is created.362 type OnNewAccount = ();363 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;364 /// The ubiquitous origin type.365 type Origin = Origin;366 /// This type is being generated by `construct_runtime!`.367 type PalletInfo = PalletInfo;368 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.369 type SS58Prefix = SS58Prefix;370 /// Weight information for the extrinsics of this pallet.371 type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;372 /// Version of the runtime.373 type Version = Version;374 type MaxConsumers = ConstU32<16>;375}376377parameter_types! {378 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;379}380381impl pallet_timestamp::Config for Runtime {382 /// A timestamp: milliseconds since the unix epoch.383 type Moment = u64;384 type OnTimestampSet = ();385 type MinimumPeriod = MinimumPeriod;386 type WeightInfo = ();387}388389parameter_types! {390 // pub const ExistentialDeposit: u128 = 500;391 pub const ExistentialDeposit: u128 = 0;392 pub const MaxLocks: u32 = 50;393}394395impl pallet_balances::Config for Runtime {396 type MaxLocks = MaxLocks;397 type MaxReserves = ();398 type ReserveIdentifier = [u8; 8];399 /// The type for recording an account's balance.400 type Balance = Balance;401 /// The ubiquitous event type.402 type Event = Event;403 type DustRemoval = Treasury;404 type ExistentialDeposit = ExistentialDeposit;405 type AccountStore = System;406 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;407}408409pub const MICROUNIQUE: Balance = 1_000_000_000_000;410pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;411pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;412pub const UNIQUE: Balance = 100 * CENTIUNIQUE;413414pub const fn deposit(items: u32, bytes: u32) -> Balance {415 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE416}417418/*419parameter_types! {420 pub TombstoneDeposit: Balance = deposit(421 1,422 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,423 );424 pub DepositPerContract: Balance = TombstoneDeposit::get();425 pub const DepositPerStorageByte: Balance = deposit(0, 1);426 pub const DepositPerStorageItem: Balance = deposit(1, 0);427 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);428 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;429 pub const SignedClaimHandicap: u32 = 2;430 pub const MaxDepth: u32 = 32;431 pub const MaxValueSize: u32 = 16 * 1024;432 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb433 // The lazy deletion runs inside on_initialize.434 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *435 RuntimeBlockWeights::get().max_block;436 // The weight needed for decoding the queue should be less or equal than a fifth437 // of the overall weight dedicated to the lazy deletion.438 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (439 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -440 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)441 )) / 5) as u32;442 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();443}444445impl pallet_contracts::Config for Runtime {446 type Time = Timestamp;447 type Randomness = RandomnessCollectiveFlip;448 type Currency = Balances;449 type Event = Event;450 type RentPayment = ();451 type SignedClaimHandicap = SignedClaimHandicap;452 type TombstoneDeposit = TombstoneDeposit;453 type DepositPerContract = DepositPerContract;454 type DepositPerStorageByte = DepositPerStorageByte;455 type DepositPerStorageItem = DepositPerStorageItem;456 type RentFraction = RentFraction;457 type SurchargeReward = SurchargeReward;458 type WeightPrice = pallet_transaction_payment::Pallet<Self>;459 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;460 type ChainExtension = NFTExtension;461 type DeletionQueueDepth = DeletionQueueDepth;462 type DeletionWeightLimit = DeletionWeightLimit;463 type Schedule = Schedule;464 type CallStack = [pallet_contracts::Frame<Self>; 31];465}466*/467468parameter_types! {469 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer470 /// This value increases the priority of `Operational` transactions by adding471 /// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.472 pub const OperationalFeeMultiplier: u8 = 5;473}474475/// Linear implementor of `WeightToFeePolynomial`476pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);477478impl<T> WeightToFeePolynomial for LinearFee<T>479where480 T: BaseArithmetic + From<u32> + Copy + Unsigned,481{482 type Balance = T;483484 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {485 smallvec!(WeightToFeeCoefficient {486 // Targeting 0.1 Unique per NFT transfer487 coeff_integer: 142_688_000u32.into(),488 coeff_frac: Perbill::zero(),489 negative: false,490 degree: 1,491 })492 }493}494495impl pallet_transaction_payment::Config for Runtime {496 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;497 type TransactionByteFee = TransactionByteFee;498 type OperationalFeeMultiplier = OperationalFeeMultiplier;499 type WeightToFee = LinearFee<Balance>;500 type FeeMultiplierUpdate = ();501}502503parameter_types! {504 pub const ProposalBond: Permill = Permill::from_percent(5);505 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;506 pub const ProposalBondMaximum: Balance = 1000 * UNIQUE;507 pub const SpendPeriod: BlockNumber = 5 * MINUTES;508 pub const Burn: Permill = Permill::from_percent(0);509 pub const TipCountdown: BlockNumber = 1 * DAYS;510 pub const TipFindersFee: Percent = Percent::from_percent(20);511 pub const TipReportDepositBase: Balance = 1 * UNIQUE;512 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;513 pub const BountyDepositBase: Balance = 1 * UNIQUE;514 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;515 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");516 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;517 pub const MaximumReasonLength: u32 = 16384;518 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);519 pub const BountyValueMinimum: Balance = 5 * UNIQUE;520 pub const MaxApprovals: u32 = 100;521}522523impl pallet_treasury::Config for Runtime {524 type PalletId = TreasuryModuleId;525 type Currency = Balances;526 type ApproveOrigin = EnsureRoot<AccountId>;527 type RejectOrigin = EnsureRoot<AccountId>;528 type Event = Event;529 type OnSlash = ();530 type ProposalBond = ProposalBond;531 type ProposalBondMinimum = ProposalBondMinimum;532 type ProposalBondMaximum = ProposalBondMaximum;533 type SpendPeriod = SpendPeriod;534 type Burn = Burn;535 type BurnDestination = ();536 type SpendFunds = ();537 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;538 type MaxApprovals = MaxApprovals;539}540541impl pallet_sudo::Config for Runtime {542 type Event = Event;543 type Call = Call;544}545546pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);547548impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider549 for RelayChainBlockNumberProvider<T>550{551 type BlockNumber = BlockNumber;552553 fn current_block_number() -> Self::BlockNumber {554 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()555 .map(|d| d.relay_parent_number)556 .unwrap_or_default()557 }558}559560parameter_types! {561 pub const MinVestedTransfer: Balance = 10 * UNIQUE;562 pub const MaxVestingSchedules: u32 = 28;563}564565impl orml_vesting::Config for Runtime {566 type Event = Event;567 type Currency = pallet_balances::Pallet<Runtime>;568 type MinVestedTransfer = MinVestedTransfer;569 type VestedTransferOrigin = EnsureSigned<AccountId>;570 type WeightInfo = ();571 type MaxVestingSchedules = MaxVestingSchedules;572 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;573}574575parameter_types! {576 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;577 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;578}579580impl cumulus_pallet_parachain_system::Config for Runtime {581 type Event = Event;582 type SelfParaId = parachain_info::Pallet<Self>;583 type OnSystemEvent = ();584 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<585 // MaxDownwardMessageWeight,586 // XcmExecutor<XcmConfig>,587 // Call,588 // >;589 type OutboundXcmpMessageSource = XcmpQueue;590 type DmpMessageHandler = DmpQueue;591 type ReservedDmpWeight = ReservedDmpWeight;592 type ReservedXcmpWeight = ReservedXcmpWeight;593 type XcmpMessageHandler = XcmpQueue;594}595596impl parachain_info::Config for Runtime {}597598impl cumulus_pallet_aura_ext::Config for Runtime {}599600parameter_types! {601 pub const RelayLocation: MultiLocation = MultiLocation::parent();602 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;603 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();604 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();605}606607/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used608/// when determining ownership of accounts for asset transacting and when attempting to use XCM609/// `Transact` in order to determine the dispatch Origin.610pub type LocationToAccountId = (611 // The parent (Relay-chain) origin converts to the default `AccountId`.612 ParentIsDefault<AccountId>,613 // Sibling parachain origins convert to AccountId via the `ParaId::into`.614 SiblingParachainConvertsVia<Sibling, AccountId>,615 // Straight up local `AccountId32` origins just alias directly to `AccountId`.616 AccountId32Aliases<RelayNetwork, AccountId>,617);618619/// Means for transacting assets on this chain.620pub type LocalAssetTransactor = CurrencyAdapter<621 // Use this currency:622 Balances,623 // Use this currency when it is a fungible asset matching the given location or name:624 IsConcrete<RelayLocation>,625 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:626 LocationToAccountId,627 // Our chain's account ID type (we can't get away without mentioning it explicitly):628 AccountId,629 // We don't track any teleports.630 (),631>;632633/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,634/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can635/// biases the kind of local `Origin` it will become.636pub type XcmOriginToTransactDispatchOrigin = (637 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location638 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for639 // foreign chains who want to have a local sovereign account on this chain which they control.640 SovereignSignedViaLocation<LocationToAccountId, Origin>,641 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when642 // recognised.643 RelayChainAsNative<RelayOrigin, Origin>,644 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when645 // recognised.646 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,647 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a648 // transaction from the Root origin.649 ParentAsSuperuser<Origin>,650 // Native signed account converter; this just converts an `AccountId32` origin into a normal651 // `Origin::Signed` origin of the same 32-byte value.652 SignedAccountId32AsNative<RelayNetwork, Origin>,653 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.654 XcmPassthrough<Origin>,655);656657parameter_types! {658 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.659 pub UnitWeightCost: Weight = 1_000_000;660 // 1200 UNIQUEs buy 1 second of weight.661 pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_200 * UNIQUE);662 pub const MaxInstructions: u32 = 100;663 pub const MaxAuthorities: u32 = 100_000;664}665666match_type! {667 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {668 MultiLocation { parents: 1, interior: Here } |669 MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }670 };671}672673pub type Barrier = (674 TakeWeightCredit,675 AllowTopLevelPaidExecutionFrom<Everything>,676 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,677 // ^^^ Parent & its unit plurality gets free execution678);679680pub struct XcmConfig;681impl Config for XcmConfig {682 type Call = Call;683 type XcmSender = XcmRouter;684 // How to withdraw and deposit an asset.685 type AssetTransactor = LocalAssetTransactor;686 type OriginConverter = XcmOriginToTransactDispatchOrigin;687 type IsReserve = NativeAsset;688 type IsTeleporter = (); // Teleportation is disabled689 type LocationInverter = LocationInverter<Ancestry>;690 type Barrier = Barrier;691 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;692 type Trader = UsingComponents<IdentityFee<Balance>, RelayLocation, AccountId, Balances, ()>;693 type ResponseHandler = (); // Don't handle responses for now.694 type SubscriptionService = PolkadotXcm;695696 type AssetTrap = PolkadotXcm;697 type AssetClaims = PolkadotXcm;698}699700// parameter_types! {701// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;702// }703704/// No local origins on this chain are allowed to dispatch XCM sends/executions.705pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);706707/// The means for routing XCM messages which are not for local execution into the right message708/// queues.709pub type XcmRouter = (710 // Two routers - use UMP to communicate with the relay chain:711 cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,712 // ..and XCMP to communicate with the sibling chains.713 XcmpQueue,714);715716impl pallet_evm_coder_substrate::Config for Runtime {717 type EthereumTransactionSender = pallet_ethereum::Pallet<Self>;718 type GasWeightMapping = FixedGasWeightMapping;719}720721impl pallet_xcm::Config for Runtime {722 type Event = Event;723 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;724 type XcmRouter = XcmRouter;725 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;726 type XcmExecuteFilter = Everything;727 type XcmExecutor = XcmExecutor<XcmConfig>;728 type XcmTeleportFilter = Everything;729 type XcmReserveTransferFilter = Everything;730 type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;731 type LocationInverter = LocationInverter<Ancestry>;732 type Origin = Origin;733 type Call = Call;734 const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;735 type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;736}737738impl cumulus_pallet_xcm::Config for Runtime {739 type Event = Event;740 type XcmExecutor = XcmExecutor<XcmConfig>;741}742743impl cumulus_pallet_xcmp_queue::Config for Runtime {744 type Event = Event;745 type XcmExecutor = XcmExecutor<XcmConfig>;746 type ChannelInfo = ParachainSystem;747 type VersionWrapper = ();748 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;749}750751impl cumulus_pallet_dmp_queue::Config for Runtime {752 type Event = Event;753 type XcmExecutor = XcmExecutor<XcmConfig>;754 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;755}756757impl pallet_aura::Config for Runtime {758 type AuthorityId = AuraId;759 type DisabledValidators = ();760 type MaxAuthorities = MaxAuthorities;761}762763parameter_types! {764 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();765 pub const CollectionCreationPrice: Balance = 100 * UNIQUE;766}767768impl pallet_common::Config for Runtime {769 type Event = Event;770 type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;771 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;772 type CrossAccountId = pallet_common::account::BasicCrossAccountId<Self>;773774 type Currency = Balances;775 type CollectionCreationPrice = CollectionCreationPrice;776 type TreasuryAccountId = TreasuryAccountId;777}778779impl pallet_fungible::Config for Runtime {780 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;781}782impl pallet_refungible::Config for Runtime {783 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;784}785impl pallet_nonfungible::Config for Runtime {786 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;787}788789impl pallet_unique::Config for Runtime {790 type Event = Event;791 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;792}793794parameter_types! {795 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied796}797798/// Used for the pallet inflation799impl pallet_inflation::Config for Runtime {800 type Currency = Balances;801 type TreasuryAccountId = TreasuryAccountId;802 type InflationBlockInterval = InflationBlockInterval;803 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;804}805806// parameter_types! {807// pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *808// RuntimeBlockWeights::get().max_block;809// pub const MaxScheduledPerBlock: u32 = 50;810// }811812type EvmSponsorshipHandler = (813 pallet_unique::UniqueEthSponsorshipHandler<Runtime>,814 pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,815);816type SponsorshipHandler = (817 pallet_unique::UniqueSponsorshipHandler<Runtime>,818 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,819 pallet_evm_transaction_payment::BridgeSponsorshipHandler<Runtime>,820);821822// impl pallet_unq_scheduler::Config for Runtime {823// type Event = Event;824// type Origin = Origin;825// type PalletsOrigin = OriginCaller;826// type Call = Call;827// type MaximumWeight = MaximumSchedulerWeight;828// type ScheduleOrigin = EnsureSigned<AccountId>;829// type MaxScheduledPerBlock = MaxScheduledPerBlock;830// type SponsorshipHandler = SponsorshipHandler;831// type WeightInfo = ();832// }833834impl pallet_evm_transaction_payment::Config for Runtime {835 type EvmSponsorshipHandler = EvmSponsorshipHandler;836 type Currency = Balances;837 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;838 type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;839}840841impl pallet_charge_transaction::Config for Runtime {842 type SponsorshipHandler = SponsorshipHandler;843}844845// impl pallet_contract_helpers::Config for Runtime {846// type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;847// }848849parameter_types! {850 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049851 pub const HelpersContractAddress: H160 = H160([852 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,853 ]);854}855856impl pallet_evm_contract_helpers::Config for Runtime {857 type ContractAddress = HelpersContractAddress;858 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;859}860861construct_runtime!(862 pub enum Runtime where863 Block = Block,864 NodeBlock = opaque::Block,865 UncheckedExtrinsic = UncheckedExtrinsic866 {867 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,868 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,869870 Aura: pallet_aura::{Pallet, Config<T>} = 22,871 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,872873 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,874 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,875 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,876 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,877 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,878 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,879 System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,880 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,881 // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,882 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,883884 // XCM helpers.885 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,886 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,887 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,888 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,889890 // Unique Pallets891 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,892 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,893 // Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,894 // free = 63895 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,896 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,897 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,898 Fungible: pallet_fungible::{Pallet, Storage} = 67,899 Refungible: pallet_refungible::{Pallet, Storage} = 68,900 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,901902 // Frontier903 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,904 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,905906 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,907 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,908 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,909 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,910 }911);912913pub struct TransactionConverter;914915impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {916 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {917 UncheckedExtrinsic::new_unsigned(918 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),919 )920 }921}922923impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {924 fn convert_transaction(925 &self,926 transaction: pallet_ethereum::Transaction,927 ) -> opaque::UncheckedExtrinsic {928 let extrinsic = UncheckedExtrinsic::new_unsigned(929 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),930 );931 let encoded = extrinsic.encode();932 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])933 .expect("Encoded extrinsic is always valid")934 }935}936937/// The address format for describing accounts.938pub type Address = sp_runtime::MultiAddress<AccountId, ()>;939/// Block header type as expected by this runtime.940pub type Header = generic::Header<BlockNumber, BlakeTwo256>;941/// Block type as expected by this runtime.942pub type Block = generic::Block<Header, UncheckedExtrinsic>;943/// A Block signed with a Justification944pub type SignedBlock = generic::SignedBlock<Block>;945/// BlockId type as expected by this runtime.946pub type BlockId = generic::BlockId<Block>;947/// The SignedExtension to the basic transaction logic.948pub type SignedExtra = (949 frame_system::CheckSpecVersion<Runtime>,950 // system::CheckTxVersion<Runtime>,951 frame_system::CheckGenesis<Runtime>,952 frame_system::CheckEra<Runtime>,953 frame_system::CheckNonce<Runtime>,954 frame_system::CheckWeight<Runtime>,955 pallet_charge_transaction::ChargeTransactionPayment<Runtime>,956 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,957);958/// Unchecked extrinsic type as expected by this runtime.959pub type UncheckedExtrinsic =960 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;961/// Extrinsic type that has already been checked.962pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;963/// Executive: handles dispatch to the various modules.964pub type Executive = frame_executive::Executive<965 Runtime,966 Block,967 frame_system::ChainContext<Runtime>,968 Runtime,969 AllPalletsReversedWithSystemFirst,970>;971972impl_opaque_keys! {973 pub struct SessionKeys {974 pub aura: Aura,975 }976}977978impl fp_self_contained::SelfContainedCall for Call {979 type SignedInfo = H160;980981 fn is_self_contained(&self) -> bool {982 match self {983 Call::Ethereum(call) => call.is_self_contained(),984 _ => false,985 }986 }987988 fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>> {989 match self {990 Call::Ethereum(call) => call.check_self_contained(),991 _ => None,992 }993 }994995 fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {996 match self {997 Call::Ethereum(call) => call.validate_self_contained(info),998 _ => None,999 }1000 }10011002 fn pre_dispatch_self_contained(1003 &self,1004 info: &Self::SignedInfo,1005 ) -> Option<Result<(), TransactionValidityError>> {1006 match self {1007 Call::Ethereum(call) => call.pre_dispatch_self_contained(info),1008 _ => None,1009 }1010 }10111012 fn apply_self_contained(1013 self,1014 info: Self::SignedInfo,1015 ) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {1016 match self {1017 call @ Call::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(call.dispatch(1018 Origin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info)),1019 )),1020 _ => None,1021 }1022 }1023}10241025macro_rules! dispatch_unique_runtime {1026 ($collection:ident.$method:ident($($name:ident),*)) => {{1027 use pallet_unique::dispatch::Dispatched;10281029 let collection = Dispatched::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);1030 let dispatch = collection.as_dyn();10311032 Ok(dispatch.$method($($name),*))1033 }};1034}1035impl_runtime_apis! {1036 impl up_rpc::UniqueApi<Block, CrossAccountId, AccountId>1037 for Runtime1038 {1039 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {1040 dispatch_unique_runtime!(collection.account_tokens(account))1041 }1042 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {1043 dispatch_unique_runtime!(collection.token_exists(token))1044 }10451046 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {1047 dispatch_unique_runtime!(collection.token_owner(token))1048 }1049 fn const_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {1050 dispatch_unique_runtime!(collection.const_metadata(token))1051 }1052 fn variable_metadata(collection: CollectionId, token: TokenId) -> Result<Vec<u8>, DispatchError> {1053 dispatch_unique_runtime!(collection.variable_metadata(token))1054 }10551056 fn collection_tokens(collection: CollectionId) -> Result<u32, DispatchError> {1057 dispatch_unique_runtime!(collection.collection_tokens())1058 }1059 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {1060 dispatch_unique_runtime!(collection.account_balance(account))1061 }1062 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128, DispatchError> {1063 dispatch_unique_runtime!(collection.balance(account, token))1064 }1065 fn allowance(1066 collection: CollectionId,1067 sender: CrossAccountId,1068 spender: CrossAccountId,1069 token: TokenId,1070 ) -> Result<u128, DispatchError> {1071 dispatch_unique_runtime!(collection.allowance(sender, spender, token))1072 }10731074 fn eth_contract_code(account: H160) -> Option<Vec<u8>> {1075 <pallet_unique::UniqueErcSupport<Runtime>>::get_code(&account)1076 .or_else(|| <pallet_evm_migration::OnMethodCall<Runtime>>::get_code(&account))1077 .or_else(|| <pallet_evm_contract_helpers::HelpersOnMethodCall<Self>>::get_code(&account))1078 }1079 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {1080 Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))1081 }1082 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {1083 Ok(<pallet_common::Pallet<Runtime>>::allowlist(collection))1084 }1085 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool, DispatchError> {1086 Ok(<pallet_common::Pallet<Runtime>>::allowed(collection, user))1087 }1088 fn last_token_id(collection: CollectionId) -> Result<TokenId, DispatchError> {1089 dispatch_unique_runtime!(collection.last_token_id())1090 }1091 fn collection_by_id(collection: CollectionId) -> Result<Option<Collection<AccountId>>, DispatchError> {1092 Ok(<pallet_common::CollectionById<Runtime>>::get(collection))1093 }1094 fn collection_stats() -> Result<CollectionStats, DispatchError> {1095 Ok(<pallet_common::Pallet<Runtime>>::collection_stats())1096 }1097 }10981099 impl sp_api::Core<Block> for Runtime {1100 fn version() -> RuntimeVersion {1101 VERSION1102 }11031104 fn execute_block(block: Block) {1105 Executive::execute_block(block)1106 }11071108 fn initialize_block(header: &<Block as BlockT>::Header) {1109 Executive::initialize_block(header)1110 }1111 }11121113 impl sp_api::Metadata<Block> for Runtime {1114 fn metadata() -> OpaqueMetadata {1115 OpaqueMetadata::new(Runtime::metadata().into())1116 }1117 }11181119 impl sp_block_builder::BlockBuilder<Block> for Runtime {1120 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {1121 Executive::apply_extrinsic(extrinsic)1122 }11231124 fn finalize_block() -> <Block as BlockT>::Header {1125 Executive::finalize_block()1126 }11271128 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {1129 data.create_extrinsics()1130 }11311132 fn check_inherents(1133 block: Block,1134 data: sp_inherents::InherentData,1135 ) -> sp_inherents::CheckInherentsResult {1136 data.check_extrinsics(&block)1137 }11381139 // fn random_seed() -> <Block as BlockT>::Hash {1140 // RandomnessCollectiveFlip::random_seed().01141 // }1142 }11431144 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {1145 fn validate_transaction(1146 source: TransactionSource,1147 tx: <Block as BlockT>::Extrinsic,1148 hash: <Block as BlockT>::Hash,1149 ) -> TransactionValidity {1150 Executive::validate_transaction(source, tx, hash)1151 }1152 }11531154 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {1155 fn offchain_worker(header: &<Block as BlockT>::Header) {1156 Executive::offchain_worker(header)1157 }1158 }11591160 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {1161 fn chain_id() -> u64 {1162 <Runtime as pallet_evm::Config>::ChainId::get()1163 }11641165 fn account_basic(address: H160) -> EVMAccount {1166 EVM::account_basic(&address)1167 }11681169 fn gas_price() -> U256 {1170 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()1171 }11721173 fn account_code_at(address: H160) -> Vec<u8> {1174 EVM::account_codes(address)1175 }11761177 fn author() -> H160 {1178 <pallet_evm::Pallet<Runtime>>::find_author()1179 }11801181 fn storage_at(address: H160, index: U256) -> H256 {1182 let mut tmp = [0u8; 32];1183 index.to_big_endian(&mut tmp);1184 EVM::account_storages(address, H256::from_slice(&tmp[..]))1185 }11861187 #[allow(clippy::redundant_closure)]1188 fn call(1189 from: H160,1190 to: H160,1191 data: Vec<u8>,1192 value: U256,1193 gas_limit: U256,1194 max_fee_per_gas: Option<U256>,1195 max_priority_fee_per_gas: Option<U256>,1196 nonce: Option<U256>,1197 estimate: bool,1198 access_list: Option<Vec<(H160, Vec<H256>)>>,1199 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {1200 let config = if estimate {1201 let mut config = <Runtime as pallet_evm::Config>::config().clone();1202 config.estimate = true;1203 Some(config)1204 } else {1205 None1206 };12071208 <Runtime as pallet_evm::Config>::Runner::call(1209 from,1210 to,1211 data,1212 value,1213 gas_limit.low_u64(),1214 max_fee_per_gas,1215 max_priority_fee_per_gas,1216 nonce,1217 access_list.unwrap_or_default(),1218 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1219 ).map_err(|err| err.into())1220 }12211222 #[allow(clippy::redundant_closure)]1223 fn create(1224 from: H160,1225 data: Vec<u8>,1226 value: U256,1227 gas_limit: U256,1228 max_fee_per_gas: Option<U256>,1229 max_priority_fee_per_gas: Option<U256>,1230 nonce: Option<U256>,1231 estimate: bool,1232 access_list: Option<Vec<(H160, Vec<H256>)>>,1233 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {1234 let config = if estimate {1235 let mut config = <Runtime as pallet_evm::Config>::config().clone();1236 config.estimate = true;1237 Some(config)1238 } else {1239 None1240 };12411242 <Runtime as pallet_evm::Config>::Runner::create(1243 from,1244 data,1245 value,1246 gas_limit.low_u64(),1247 max_fee_per_gas,1248 max_priority_fee_per_gas,1249 nonce,1250 access_list.unwrap_or_default(),1251 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1252 ).map_err(|err| err.into())1253 }12541255 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {1256 Ethereum::current_transaction_statuses()1257 }12581259 fn current_block() -> Option<pallet_ethereum::Block> {1260 Ethereum::current_block()1261 }12621263 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {1264 Ethereum::current_receipts()1265 }12661267 fn current_all() -> (1268 Option<pallet_ethereum::Block>,1269 Option<Vec<pallet_ethereum::Receipt>>,1270 Option<Vec<TransactionStatus>>1271 ) {1272 (1273 Ethereum::current_block(),1274 Ethereum::current_receipts(),1275 Ethereum::current_transaction_statuses()1276 )1277 }12781279 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {1280 xts.into_iter().filter_map(|xt| match xt.0.function {1281 Call::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),1282 _ => None1283 }).collect()1284 }12851286 fn elasticity() -> Option<Permill> {1287 None1288 }1289 }12901291 impl sp_session::SessionKeys<Block> for Runtime {1292 fn decode_session_keys(1293 encoded: Vec<u8>,1294 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {1295 SessionKeys::decode_into_raw_public_keys(&encoded)1296 }12971298 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {1299 SessionKeys::generate(seed)1300 }1301 }13021303 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {1304 fn slot_duration() -> sp_consensus_aura::SlotDuration {1305 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())1306 }13071308 fn authorities() -> Vec<AuraId> {1309 Aura::authorities().to_vec()1310 }1311 }13121313 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {1314 fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {1315 ParachainSystem::collect_collation_info(header)1316 }1317 }13181319 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {1320 fn account_nonce(account: AccountId) -> Index {1321 System::account_nonce(account)1322 }1323 }13241325 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {1326 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {1327 TransactionPayment::query_info(uxt, len)1328 }1329 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {1330 TransactionPayment::query_fee_details(uxt, len)1331 }1332 }13331334 /*1335 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>1336 for Runtime1337 {1338 fn call(1339 origin: AccountId,1340 dest: AccountId,1341 value: Balance,1342 gas_limit: u64,1343 input_data: Vec<u8>,1344 ) -> pallet_contracts_primitives::ContractExecResult {1345 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)1346 }13471348 fn instantiate(1349 origin: AccountId,1350 endowment: Balance,1351 gas_limit: u64,1352 code: pallet_contracts_primitives::Code<Hash>,1353 data: Vec<u8>,1354 salt: Vec<u8>,1355 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>1356 {1357 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)1358 }13591360 fn get_storage(1361 address: AccountId,1362 key: [u8; 32],1363 ) -> pallet_contracts_primitives::GetStorageResult {1364 Contracts::get_storage(address, key)1365 }13661367 fn rent_projection(1368 address: AccountId,1369 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {1370 Contracts::rent_projection(address)1371 }1372 }1373 */13741375 #[cfg(feature = "runtime-benchmarks")]1376 impl frame_benchmarking::Benchmark<Block> for Runtime {1377 fn benchmark_metadata(extra: bool) -> (1378 Vec<frame_benchmarking::BenchmarkList>,1379 Vec<frame_support::traits::StorageInfo>,1380 ) {1381 use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};1382 use frame_support::traits::StorageInfoTrait;13831384 let mut list = Vec::<BenchmarkList>::new();13851386 list_benchmark!(list, extra, pallet_evm_migration, EvmMigration);1387 list_benchmark!(list, extra, pallet_unique, Unique);1388 list_benchmark!(list, extra, pallet_inflation, Inflation);1389 list_benchmark!(list, extra, pallet_fungible, Fungible);1390 list_benchmark!(list, extra, pallet_refungible, Refungible);1391 list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);1392 // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);13931394 let storage_info = AllPalletsReversedWithSystemFirst::storage_info();13951396 return (list, storage_info)1397 }13981399 fn dispatch_benchmark(1400 config: frame_benchmarking::BenchmarkConfig1401 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {1402 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};14031404 let allowlist: Vec<TrackedStorageKey> = vec![1405 // Block Number1406 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),1407 // Total Issuance1408 hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),1409 // Execution Phase1410 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),1411 // Event Count1412 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),1413 // System Events1414 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),1415 ];14161417 let mut batches = Vec::<BenchmarkBatch>::new();1418 let params = (&config, &allowlist);14191420 add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);1421 add_benchmark!(params, batches, pallet_unique, Unique);1422 add_benchmark!(params, batches, pallet_inflation, Inflation);1423 add_benchmark!(params, batches, pallet_fungible, Fungible);1424 add_benchmark!(params, batches, pallet_refungible, Refungible);1425 add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);1426 // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);14271428 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }1429 Ok(batches)1430 }1431 }1432}14331434struct CheckInherents;14351436impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1437 fn check_inherents(1438 block: &Block,1439 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1440 ) -> sp_inherents::CheckInherentsResult {1441 let relay_chain_slot = relay_state_proof1442 .read_slot()1443 .expect("Could not read the relay chain slot from the proof");14441445 let inherent_data =1446 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1447 relay_chain_slot,1448 sp_std::time::Duration::from_secs(6),1449 )1450 .create_inherent_data()1451 .expect("Could not create the timestamp inherent data");14521453 inherent_data.check_extrinsics(block)1454 }1455}14561457cumulus_pallet_parachain_system::register_validate_block!(1458 Runtime = Runtime,1459 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1460 CheckInherents = CheckInherents,1461);tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -64,12 +64,14 @@
"testOverflow": "mocha --timeout 9999999 -r ts-node/register ./**/overflow.test.ts",
"testSetVariableMetadataSponsoringRateLimit": "mocha --timeout 9999999 -r ts-node/register ./**/setVariableMetadataSponsoringRateLimit.test.ts",
"testInflation": "mocha --timeout 9999999 -r ts-node/register ./**/inflation.test.ts",
+ "testXcmTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransfer.test.ts",
"testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",
"testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",
"testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",
+ "polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json",
"polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --input src/interfaces/ --package .",
- "polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint ws://localhost:9944 --output src/interfaces/ --package .",
- "polkadot-types": "yarn polkadot-types-from-defs && yarn polkadot-types-from-chain"
+ "polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",
+ "polkadot-types": "yarn polkadot-types-fetch-metadata && yarn polkadot-types-from-defs && yarn polkadot-types-from-chain"
},
"author": "",
"license": "SEE LICENSE IN ../LICENSE",
tests/src/check-event/createCollectionEvent.test.tsdiffbeforeafterboth--- a/tests/src/check-event/createCollectionEvent.test.ts
+++ b/tests/src/check-event/createCollectionEvent.test.ts
@@ -27,7 +27,7 @@
});
it('Check event from createCollection(): ', async () => {
await usingApi(async (api: ApiPromise) => {
- const tx = api.tx.unique.createCollection([0x31], [0x32], '0x33', 'NFT');
+ const tx = api.tx.unique.createCollectionEx({name: [0x31], description: [0x32], tokenPrefix: '0x33', mode: 'NFT'});
const events = await submitTransactionAsync(alice, tx);
const msg = JSON.stringify(uniqueEventMessage(events));
expect(msg).to.be.contain(checkSection);
tests/src/createCollection.test.tsdiffbeforeafterboth--- a/tests/src/createCollection.test.ts
+++ b/tests/src/createCollection.test.ts
@@ -3,12 +3,11 @@
// file 'LICENSE', which is part of this source code package.
//
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
-import {createCollectionExpectFailure, createCollectionExpectSuccess} from './util/helpers';
+import {expect} from 'chai';
+import privateKey from './substrate/privateKey';
+import usingApi, {executeTransaction, submitTransactionAsync} from './substrate/substrate-api';
+import {createCollectionExpectFailure, createCollectionExpectSuccess, getCreateCollectionResult, getDetailedCollectionInfo} from './util/helpers';
-chai.use(chaiAsPromised);
-
describe('integration test: ext. createCollection():', () => {
it('Create new NFT collection', async () => {
await createCollectionExpectSuccess({name: 'A', description: 'B', tokenPrefix: 'C', mode: {type: 'NFT'}});
@@ -28,6 +27,45 @@
it('Create new ReFungible collection', async () => {
await createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
});
+ it('Create new collection with extra fields', async () => {
+ await usingApi(async api => {
+ const alice = privateKey('//Alice');
+ const bob = privateKey('//Bob');
+ const tx = api.tx.unique.createCollectionEx({
+ mode: {Fungible: 8},
+ access: 'AllowList',
+ name: [1],
+ description: [2],
+ tokenPrefix: '0x000000',
+ offchainSchema: '0x111111',
+ schemaVersion: 'Unique',
+ pendingSponsor: bob.address,
+ limits: {
+ accountTokenOwnershipLimit: 3,
+ },
+ variableOnChainSchema: '0x222222',
+ constOnChainSchema: '0x333333',
+ metaUpdatePermission: 'Admin',
+ });
+ const events = await submitTransactionAsync(alice, tx);
+ const result = getCreateCollectionResult(events);
+
+ const collection = (await getDetailedCollectionInfo(api, result.collectionId))!;
+ expect(collection.owner.toString()).to.equal(alice.address);
+ expect(collection.mode.asFungible.toNumber()).to.equal(8);
+ expect(collection.access.isAllowList).to.be.true;
+ expect(collection.name.map(v => v.toNumber())).to.deep.equal([1]);
+ expect(collection.description.map(v => v.toNumber())).to.deep.equal([2]);
+ expect(collection.tokenPrefix.toString()).to.equal('0x000000');
+ expect(collection.offchainSchema.toString()).to.equal('0x111111');
+ expect(collection.schemaVersion.isUnique).to.be.true;
+ expect(collection.sponsorship.asUnconfirmed.toString()).to.equal(bob.address);
+ expect(collection.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.equal(3);
+ expect(collection.variableOnChainSchema.toString()).to.equal('0x222222');
+ expect(collection.constOnChainSchema.toString()).to.equal('0x333333');
+ expect(collection.metaUpdatePermission.isAdmin).to.be.true;
+ });
+ });
});
describe('(!negative test!) integration test: ext. createCollection():', () => {
@@ -40,4 +78,11 @@
it('(!negative test!) create new NFT collection whith incorrect data (token_prefix)', async () => {
await createCollectionExpectFailure({tokenPrefix: 'A'.repeat(17), mode: {type: 'NFT'}});
});
+ it('fails when bad limits are set', async () => {
+ await usingApi(async api => {
+ const alice = privateKey('//Alice');
+ const tx = api.tx.unique.createCollectionEx({mode: 'NFT', limits: {tokenLimit: 0}});
+ await expect(executeTransaction(api, alice, tx)).to.be.rejectedWith(/^common.CollectionTokenLimitExceeded$/);
+ });
+ });
});
tests/src/interfaces/.gitignorediffbeforeafterboth--- /dev/null
+++ b/tests/src/interfaces/.gitignore
@@ -0,0 +1 @@
+metadata.json
tests/src/interfaces/augment-api-errors.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-errors.ts
+++ b/tests/src/interfaces/augment-api-errors.ts
@@ -69,6 +69,10 @@
**/
CollectionDescriptionLimitExceeded: AugmentedError<ApiType>;
/**
+ * Collection limit bounds per collection exceeded
+ **/
+ CollectionLimitBoundsExceeded: AugmentedError<ApiType>;
+ /**
* Collection name can not be longer than 63 char.
**/
CollectionNameLimitExceeded: AugmentedError<ApiType>;
@@ -97,6 +101,10 @@
**/
NoPermission: AugmentedError<ApiType>;
/**
+ * Tried to enable permissions which are only permitted to be disabled
+ **/
+ OwnerPermissionsCantBeReverted: AugmentedError<ApiType>;
+ /**
* Collection is not in mint mode.
**/
PublicMintingNotAllowed: AugmentedError<ApiType>;
@@ -107,7 +115,7 @@
/**
* Requested value more than approved.
**/
- TokenValueNotEnough: AugmentedError<ApiType>;
+ ApprovedValueTooLow: AugmentedError<ApiType>;
/**
* Item balance not enough.
**/
@@ -436,10 +444,6 @@
* Decimal_points parameter must be lower than MAX_DECIMAL_POINTS constant, currently it is 30.
**/
CollectionDecimalPointLimitExceeded: AugmentedError<ApiType>;
- /**
- * Collection limit bounds per collection exceeded
- **/
- CollectionLimitBoundsExceeded: AugmentedError<ApiType>;
/**
* This address is not set as sponsor, use setCollectionSponsor first.
**/
@@ -448,10 +452,6 @@
* Length of items properties must be greater than 0.
**/
EmptyArgument: AugmentedError<ApiType>;
- /**
- * Tried to enable permissions which are only permitted to be disabled
- **/
- OwnerPermissionsCantBeReverted: AugmentedError<ApiType>;
/**
* Generic error
**/
tests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -2,7 +2,7 @@
/* eslint-disable */
import type { CumulusPrimitivesParachainInherentParachainInherentData } from './polkadot';
-import type { PalletCommonAccountBasicCrossAccountIdRepr, UpDataStructsAccessMode, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCreateItemData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion } from './unique';
+import type { PalletCommonAccountBasicCrossAccountIdRepr, UpDataStructsAccessMode, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion } from './unique';
import type { ApiTypes, SubmittableExtrinsic } from '@polkadot/api/types';
import type { Bytes, Compact, Option, U256, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types';
import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';
@@ -671,6 +671,12 @@
**/
createCollection: AugmentedSubmittable<(collectionName: Vec<u16> | (u16 | AnyNumber | Uint8Array)[], collectionDescription: Vec<u16> | (u16 | AnyNumber | Uint8Array)[], tokenPrefix: Bytes | string | Uint8Array, mode: UpDataStructsCollectionMode | { NFT: any } | { Fungible: any } | { ReFungible: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [Vec<u16>, Vec<u16>, Bytes, UpDataStructsCollectionMode]>;
/**
+ * This method creates a collection
+ *
+ * Prefer it to deprecated [`created_collection`] method
+ **/
+ createCollectionEx: AugmentedSubmittable<(data: UpDataStructsCreateCollectionData | { mode?: any; access?: any; name?: any; description?: any; tokenPrefix?: any; offchainSchema?: any; schemaVersion?: any; pendingSponsor?: any; limits?: any; variableOnChainSchema?: any; constOnChainSchema?: any; metaUpdatePermission?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [UpDataStructsCreateCollectionData]>;
+ /**
* This method creates a concrete instance of NFT Collection created with CreateCollection method.
*
* # Permissions
tests/src/interfaces/augment-types.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -3,7 +3,7 @@
import type { EthereumBlock, EthereumLog, EthereumReceipt, EthereumTransactionLegacyTransaction, EvmCoreErrorExitReason, FpRpcTransactionStatus } from './ethereum';
import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundStatus, CumulusPalletXcmpQueueOutboundStatus, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV1AbridgedHostConfiguration, PolkadotPrimitivesV1PersistedValidationData } from './polkadot';
-import type { PalletCommonAccountBasicCrossAccountIdRepr, PalletNonfungibleItemData, PalletRefungibleItemData, PalletUnqSchedulerCallSpec, PalletUnqSchedulerReleases, PalletUnqSchedulerScheduledV2, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionId, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionStats, UpDataStructsCreateItemData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion, UpDataStructsSponsorshipState, UpDataStructsTokenId } from './unique';
+import type { PalletCommonAccountBasicCrossAccountIdRepr, PalletNonfungibleItemData, PalletRefungibleItemData, PalletUnqSchedulerCallSpec, PalletUnqSchedulerReleases, PalletUnqSchedulerScheduledV2, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionId, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsMetaUpdatePermission, UpDataStructsSchemaVersion, UpDataStructsSponsorshipState, UpDataStructsTokenId } from './unique';
import type { BitVec, Bool, Bytes, Data, I128, I16, I256, I32, I64, I8, Json, Null, Raw, StorageKey, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types';
import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';
import type { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations';
@@ -1021,6 +1021,7 @@
UpDataStructsCollectionLimits: UpDataStructsCollectionLimits;
UpDataStructsCollectionMode: UpDataStructsCollectionMode;
UpDataStructsCollectionStats: UpDataStructsCollectionStats;
+ UpDataStructsCreateCollectionData: UpDataStructsCreateCollectionData;
UpDataStructsCreateItemData: UpDataStructsCreateItemData;
UpDataStructsMetaUpdatePermission: UpDataStructsMetaUpdatePermission;
UpDataStructsSchemaVersion: UpDataStructsSchemaVersion;
tests/src/interfaces/unique/definitions.tsdiffbeforeafterboth--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -67,6 +67,20 @@
constOnChainSchema: 'Vec<u8>',
metaUpdatePermission: 'UpDataStructsMetaUpdatePermission',
},
+ UpDataStructsCreateCollectionData: {
+ mode: 'UpDataStructsCollectionMode',
+ access: 'Option<UpDataStructsAccessMode>',
+ name: 'Vec<u16>',
+ description: 'Vec<u16>',
+ tokenPrefix: 'Vec<u8>',
+ offchainSchema: 'Vec<u8>',
+ schemaVersion: 'Option<UpDataStructsSchemaVersion>',
+ pendingSponsor: 'Option<AccountId>',
+ limits: 'Option<UpDataStructsCollectionLimits>',
+ variableOnChainSchema: 'Vec<u8>',
+ constOnChainSchema: 'Vec<u8>',
+ metaUpdatePermission: 'Option<UpDataStructsMetaUpdatePermission>',
+ },
UpDataStructsCollectionStats: {
created: 'u32',
destroyed: 'u32',
@@ -76,7 +90,13 @@
UpDataStructsTokenId: 'u32',
PalletNonfungibleItemData: mkDummy('NftItemData'),
PalletRefungibleItemData: mkDummy('RftItemData'),
- UpDataStructsCollectionMode: mkDummy('CollectionMode'),
+ UpDataStructsCollectionMode: {
+ _enum: {
+ NFT: null,
+ Fungible: 'u32',
+ ReFungible: null,
+ },
+ },
UpDataStructsCreateItemData: mkDummy('CreateItemData'),
UpDataStructsCollectionLimits: {
accountTokenOwnershipLimit: 'Option<u32>',
@@ -101,7 +121,9 @@
UpDataStructsAccessMode: {
_enum: ['Normal', 'AllowList'],
},
- UpDataStructsSchemaVersion: mkDummy('SchemaVersion'),
+ UpDataStructsSchemaVersion: {
+ _enum: ['ImageURL', 'Unique'],
+ },
PalletUnqSchedulerScheduledV2: mkDummy('ScheduledV2'),
PalletUnqSchedulerCallSpec: mkDummy('CallSpec'),
tests/src/interfaces/unique/types.tsdiffbeforeafterboth--- a/tests/src/interfaces/unique/types.ts
+++ b/tests/src/interfaces/unique/types.ts
@@ -77,8 +77,11 @@
}
/** @name UpDataStructsCollectionMode */
-export interface UpDataStructsCollectionMode extends Struct {
- readonly dummyCollectionMode: u32;
+export interface UpDataStructsCollectionMode extends Enum {
+ readonly isNft: boolean;
+ readonly isFungible: boolean;
+ readonly asFungible: u32;
+ readonly isReFungible: boolean;
}
/** @name UpDataStructsCollectionStats */
@@ -88,6 +91,22 @@
readonly alive: u32;
}
+/** @name UpDataStructsCreateCollectionData */
+export interface UpDataStructsCreateCollectionData extends Struct {
+ readonly mode: UpDataStructsCollectionMode;
+ readonly access: Option<UpDataStructsAccessMode>;
+ readonly name: Vec<u16>;
+ readonly description: Vec<u16>;
+ readonly tokenPrefix: Bytes;
+ readonly offchainSchema: Bytes;
+ readonly schemaVersion: Option<UpDataStructsSchemaVersion>;
+ readonly pendingSponsor: Option<AccountId>;
+ readonly limits: Option<UpDataStructsCollectionLimits>;
+ readonly variableOnChainSchema: Bytes;
+ readonly constOnChainSchema: Bytes;
+ readonly metaUpdatePermission: Option<UpDataStructsMetaUpdatePermission>;
+}
+
/** @name UpDataStructsCreateItemData */
export interface UpDataStructsCreateItemData extends Struct {
readonly dummyCreateItemData: u32;
@@ -101,8 +120,9 @@
}
/** @name UpDataStructsSchemaVersion */
-export interface UpDataStructsSchemaVersion extends Struct {
- readonly dummySchemaVersion: u32;
+export interface UpDataStructsSchemaVersion extends Enum {
+ readonly isImageUrl: boolean;
+ readonly isUnique: boolean;
}
/** @name UpDataStructsSponsorshipState */
tests/src/substrate/substrate-api.tsdiffbeforeafterboth--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -95,6 +95,32 @@
return TransactionStatus.Fail;
}
+export function executeTransaction(api: ApiPromise, sender: IKeyringPair, transaction: SubmittableExtrinsic<'promise'>): Promise<EventRecord[]> {
+ return new Promise(async (res, rej) => {
+ try {
+ await transaction.signAndSend(sender, ({events, status}) => {
+ if (!status.isInBlock && !status.isFinalized) return;
+ for (const {event} of events) {
+ if (api.events.system.ExtrinsicSuccess.is(event)) {
+ res(events);
+ } else if (api.events.system.ExtrinsicFailed.is(event)) {
+ const {data: [error]} = event;
+ if (error.isModule) {
+ const decoded = api.registry.findMetaError(error.asModule);
+ const {method, section} = decoded;
+ rej(new Error(`${section}.${method}`));
+ } else {
+ rej(new Error(error.toString()));
+ }
+ }
+ }
+ });
+ } catch (e) {
+ rej(e);
+ }
+ });
+}
+
export function
submitTransactionAsync(sender: IKeyringPair, transaction: SubmittableExtrinsic<ApiTypes>): Promise<EventRecord[]> {
/* eslint no-async-promise-executor: "off" */
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -49,7 +49,7 @@
};
} else if ('Substrate' in input) {
return input;
- }else if ('substrate' in input) {
+ } else if ('substrate' in input) {
return {
Substrate: (input as any).substrate,
};
@@ -116,15 +116,15 @@
export interface IChainLimits {
collectionNumbersLimit: number;
- accountTokenOwnershipLimit: number;
- collectionsAdminsLimit: number;
- customDataLimit: number;
- nftSponsorTransferTimeout: number;
- fungibleSponsorTransferTimeout: number;
- refungibleSponsorTransferTimeout: number;
- offchainSchemaLimit: number;
- variableOnChainSchemaLimit: number;
- constOnChainSchemaLimit: number;
+ accountTokenOwnershipLimit: number;
+ collectionsAdminsLimit: number;
+ customDataLimit: number;
+ nftSponsorTransferTimeout: number;
+ fungibleSponsorTransferTimeout: number;
+ refungibleSponsorTransferTimeout: number;
+ offchainSchemaLimit: number;
+ variableOnChainSchemaLimit: number;
+ constOnChainSchemaLimit: number;
}
export interface IReFungibleTokenDataType {
@@ -283,7 +283,7 @@
modeprm = {refungible: null};
}
- const tx = api.tx.unique.createCollection(strToUTF16(name), strToUTF16(description), strToUTF16(tokenPrefix), modeprm as any);
+ const tx = api.tx.unique.createCollectionEx({name: strToUTF16(name), description: strToUTF16(description), tokenPrefix: strToUTF16(tokenPrefix), mode: modeprm as any});
const events = await submitTransactionAsync(alicePrivateKey, tx);
const result = getCreateCollectionResult(events);
@@ -329,7 +329,7 @@
// Run the CreateCollection transaction
const alicePrivateKey = privateKey('//Alice');
- const tx = api.tx.unique.createCollection(strToUTF16(name), strToUTF16(description), strToUTF16(tokenPrefix), modeprm as any);
+ const tx = api.tx.unique.createCollectionEx({name: strToUTF16(name), description: strToUTF16(description), tokenPrefix: strToUTF16(tokenPrefix), mode: modeprm as any});
const events = await expect(submitTransactionExpectFailAsync(alicePrivateKey, tx)).to.be.rejected;
const result = getCreateCollectionResult(events);
@@ -557,7 +557,7 @@
await usingApi(async (api) => {
- const tx = api.tx.unique.setTransfersEnabledFlag (collectionId, enabled);
+ const tx = api.tx.unique.setTransfersEnabledFlag(collectionId, enabled);
const events = await submitTransactionAsync(sender, tx);
const result = getGenericResult(events);
@@ -569,7 +569,7 @@
await usingApi(async (api) => {
- const tx = api.tx.unique.setTransfersEnabledFlag (collectionId, enabled);
+ const tx = api.tx.unique.setTransfersEnabledFlag(collectionId, enabled);
const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
const result = getGenericResult(events);
@@ -811,8 +811,7 @@
}
export async function
-getFreeBalance(account: IKeyringPair) : Promise<bigint>
-{
+getFreeBalance(account: IKeyringPair): Promise<bigint> {
let balance = 0n;
await usingApi(async (api) => {
balance = BigInt((await api.query.system.account(account.address)).data.free.toString());
tests/src/xcmTransfer.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/xcmTransfer.test.ts
@@ -0,0 +1,178 @@
+//
+// This file is subject to the terms and conditions defined in
+// file 'LICENSE', which is part of this source code package.
+//
+
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+
+import {WsProvider} from '@polkadot/api';
+import {ApiOptions} from '@polkadot/api/types';
+import {IKeyringPair} from '@polkadot/types/types';
+import privateKey from './substrate/privateKey';
+import usingApi, {submitTransactionAsync} from './substrate/substrate-api';
+import {getGenericResult} from './util/helpers';
+import waitNewBlocks from './substrate/wait-new-blocks';
+import getBalance from './substrate/get-balance';
+import {alicesPublicKey} from './accounts';
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+
+const UNIQUE_CHAIN = 1000;
+const KARURA_CHAIN = 2000;
+const KARURA_PORT = '9946';
+
+describe('Integration test: Exchanging OPL with Karura', () => {
+ let alice: IKeyringPair;
+
+ before(async () => {
+ await usingApi(async () => {
+ alice = privateKey('//Alice');
+ });
+
+ const karuraApiOptions: ApiOptions = {
+ provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT),
+ };
+
+ await usingApi(async (api) => {
+ const destination = {
+ V0: {
+ X2: [
+ 'Parent',
+ {
+ Parachain: UNIQUE_CHAIN,
+ },
+ ],
+ },
+ };
+
+ const metadata =
+ {
+ name: 'OPL',
+ symbol: 'OPL',
+ decimals: 18,
+ minimalBalance: 1,
+ };
+
+ const tx = api.tx.assetRegistry.registerForeignAsset(destination, metadata);
+ const sudoTx = api.tx.sudo.sudo(tx as any);
+ const events = await submitTransactionAsync(alice, sudoTx);
+ const result = getGenericResult(events);
+ expect(result.success).to.be.true;
+ }, karuraApiOptions);
+ });
+
+ it('Should connect and send OPL to Karura', async () => {
+ let balanceOnKaruraBefore: bigint;
+
+ await usingApi(async (api) => {
+ const {free} = (await api.query.tokens.accounts(alice.addressRaw, {ForeignAsset: 0})).toJSON() as any;
+ balanceOnKaruraBefore = free;
+ }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});
+
+ await usingApi(async (api) => {
+ const destination = {
+ V0: {
+ X2: [
+ 'Parent',
+ {
+ Parachain: KARURA_CHAIN,
+ },
+ ],
+ },
+ };
+
+ const beneficiary = {
+ V0: {
+ X1: {
+ AccountId32: {
+ network: 'Any',
+ id: alice.addressRaw,
+ },
+ },
+ },
+ };
+
+ const assets = {
+ V1: [
+ {
+ id: {
+ Concrete: {
+ parents: 0,
+ interior: 'Here',
+ },
+ },
+ fun: {
+ Fungible: 5000000000,
+ },
+ },
+ ],
+ };
+
+ const feeAssetItem = 0;
+
+ const weightLimit = {
+ Limited: 5000000000,
+ };
+
+ const tx = api.tx.polkadotXcm.limitedReserveTransferAssets(destination, beneficiary, assets, feeAssetItem, weightLimit);
+ const events = await submitTransactionAsync(alice, tx);
+ const result = getGenericResult(events);
+ expect(result.success).to.be.true;
+ });
+
+ await usingApi(async (api) => {
+ // todo do something about instant sealing, where there might not be any new blocks
+ await waitNewBlocks(api, 3);
+ const {free} = (await api.query.tokens.accounts(alice.addressRaw, {ForeignAsset: 0})).toJSON() as any;
+ expect(free > balanceOnKaruraBefore).to.be.true;
+ }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});
+ });
+
+ it('Should connect to Karura and send OPL back', async () => {
+ let balanceBefore: bigint;
+
+ await usingApi(async (api) => {
+ [balanceBefore] = await getBalance(api, [alicesPublicKey]);
+ });
+
+ await usingApi(async (api) => {
+ const destination = {
+ V0: {
+ X3: [
+ 'Parent',
+ {
+ Parachain: UNIQUE_CHAIN,
+ },
+ {
+ AccountId32: {
+ network: 'Any',
+ id: alice.addressRaw,
+ },
+ },
+ ],
+ },
+ };
+
+ const id = {
+ ForeignAsset: 0,
+ };
+
+ const amount = 5000000000;
+ const destWeight = 50000000;
+
+ const tx = api.tx.xTokens.transfer(id, amount, destination, destWeight);
+ const events = await submitTransactionAsync(alice, tx);
+ const result = getGenericResult(events);
+ expect(result.success).to.be.true;
+ }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});
+
+ await usingApi(async (api) => {
+ // todo do something about instant sealing, where there might not be any new blocks
+ await waitNewBlocks(api, 3);
+ const [balanceAfter] = await getBalance(api, [alicesPublicKey]);
+ expect(balanceAfter > balanceBefore).to.be.true;
+ });
+ });
+});
\ No newline at end of file