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

difftreelog

Merge branch 'master' into release-v922000

kozyrevdev2022-06-03parents: #3d5365c #9bbb154.patch.diff
in: master

9 files changed

modifiedREADME.mddiffbeforeafterboth
62```62```
6363
645. Build:645. Build:
65
66Opal
67```bash
68cargo build --release
69```
70Quartz
71```bash
72cargo build --features=quartz-runtime --release
73```
74Unique
65```bash75```bash
66cargo build --features=unique-runtime,quartz-runtime --release76cargo build --features=unique-runtime --release
67```77```
6878
69## Building as Parachain locally79## Building as Parachain locally
155location:165location:
156 V0(X2(Parent, Parachain(PARA_ID)))166 V0(X2(Parent, Parachain(PARA_ID)))
157metadata:167metadata:
158 name OPL168 name QTZ
159 symbol OPL169 symbol QTZ
160 decimals 18170 decimals 18
161minimalBalance 1171minimalBalance 1
162```172```
163173
164### Next, we can send tokens from Opal to Karura:174### Next, we can send tokens from Quartz to Karura:
165```175```
166polkadotXcm -> reserveTransferAssets176polkadotXcm -> reserveTransferAssets
167dest:177dest:
179The result will be displayed in ChainState189The result will be displayed in ChainState
180tokens -> accounts190tokens -> accounts
181191
182### To send tokens from Karura to Opal:192### To send tokens from Karura to Quartz:
183```193```
184xtokens -> transfer194xtokens -> transfer
185195
modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17// Original License
17use std::sync::Arc;18use std::sync::Arc;
1819
19use codec::{Decode, Encode};20use codec::{Decode, Encode};
modifiednode/cli/src/service.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
16
17//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
1816
19// std17// std
20use std::sync::Arc;18use std::sync::Arc;
modifiedpallets/scheduler/src/lib.rsdiffbeforeafterboth
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
2// This file is part of Unique Network.
3
4// Unique Network is free software: you can redistribute it and/or modify
5// it under the terms of the GNU General Public License as published by
6// the Free Software Foundation, either version 3 of the License, or
7// (at your option) any later version.
8
9// Unique Network is distributed in the hope that it will be useful,
10// but WITHOUT ANY WARRANTY; without even the implied warranty of
11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12// GNU General Public License for more details.
13
14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
16
17// Original license:
1// This file is part of Substrate.18// This file is part of Substrate.
219
3// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.20// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
modifiedtests/flipper-src/lib.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17// Original license17// Original License
18// Copyright 2018-2020 Parity Technologies (UK) Ltd.18// Copyright 2018-2020 Parity Technologies (UK) Ltd.
19//19//
20// Licensed under the Apache License, Version 2.0 (the "License");20// Licensed under the Apache License, Version 2.0 (the "License");
modifiedtests/ink-types-node-runtime/src/calls.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17// Original license17// Original License
18// Copyright 2019 Parity Technologies (UK) Ltd.18// Copyright 2019 Parity Technologies (UK) Ltd.
19// This file is part of ink!.19// This file is part of ink!.
20//20//
modifiedtests/ink-types-node-runtime/src/lib.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17// Original license17// Original License
18// Copyright 2018-2019 Parity Technologies (UK) Ltd.18// Copyright 2018-2019 Parity Technologies (UK) Ltd.
19// This file is part of ink!.19// This file is part of ink!.
20//20//
modifiedtests/loadtester-src/lib.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17// Original License
17#![cfg_attr(not(feature = "std"), no_std)]18#![cfg_attr(not(feature = "std"), no_std)]
1819
19use ink_lang as ink;20use ink_lang as ink;
modifiedtests/src/xcmTransfer.test.tsdiffbeforeafterboth
33const KARURA_CHAIN = 2000;33const KARURA_CHAIN = 2000;
34const KARURA_PORT = '9946';34const KARURA_PORT = '9946';
3535
36describe('Integration test: Exchanging OPL with Karura', () => {36describe('Integration test: Exchanging QTZ with Karura', () => {
37 let alice: IKeyringPair;37 let alice: IKeyringPair;
38 38
39 before(async () => {39 before(async () => {
5959
60 const metadata =60 const metadata =
61 {61 {
62 name: 'OPL',62 name: 'QTZ',
63 symbol: 'OPL',63 symbol: 'QTZ',
64 decimals: 18,64 decimals: 18,
65 minimalBalance: 1,65 minimalBalance: 1,
66 };66 };
73 }, karuraApiOptions);73 }, karuraApiOptions);
74 });74 });
7575
76 it('Should connect and send OPL to Karura', async () => {76 it('Should connect and send QTZ to Karura', async () => {
77 let balanceOnKaruraBefore: bigint;77 let balanceOnKaruraBefore: bigint;
78 78
79 await usingApi(async (api) => {79 await usingApi(async (api) => {
140 }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});140 }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});
141 });141 });
142142
143 it('Should connect to Karura and send OPL back', async () => {143 it('Should connect to Karura and send QTZ back', async () => {
144 let balanceBefore: bigint;144 let balanceBefore: bigint;
145 145
146 await usingApi(async (api) => {146 await usingApi(async (api) => {