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

difftreelog

merge master

Igor Kozyrev2022-03-30parents: #c21a15c #17c0e89.patch.diff
in: master

10 files changed

modifiedREADME.mddiffbeforeafterboth
155location:155location:
156 V0(X2(Parent, Parachain(PARA_ID)))156 V0(X2(Parent, Parachain(PARA_ID)))
157metadata:157metadata:
158 name OPL158 name QTZ
159 symbol OPL159 symbol QTZ
160 decimals 18160 decimals 18
161minimalBalance 1161minimalBalance 1
162```162```
163163
164### Next, we can send tokens from Opal to Karura:164### Next, we can send tokens from Quartz to Karura:
165```165```
166polkadotXcm -> reserveTransferAssets166polkadotXcm -> reserveTransferAssets
167dest:167dest:
179The result will be displayed in ChainState179The result will be displayed in ChainState
180tokens -> accounts180tokens -> accounts
181181
182### To send tokens from Karura to Opal:182### To send tokens from Karura to Quartz:
183```183```
184xtokens -> transfer184xtokens -> transfer
185185
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;20use codec::Decode;
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
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// This file is part of Substrate.18// This file is part of Substrate.
1919
20// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.20// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
216 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)216 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
217 .build_or_panic();217 .build_or_panic();
218 pub const Version: RuntimeVersion = VERSION;218 pub const Version: RuntimeVersion = VERSION;
219 /*
220 255 - Quartz
221 42 - Opal
222 */
219 pub const SS58Prefix: u8 = 42;223 pub const SS58Prefix: u8 = 255;
220}224}
221225
222parameter_types! {226parameter_types! {
223 pub const ChainId: u64 = 8882;227 pub const ChainId: u64 = 8881;
224}228}
225229
226pub struct FixedFee;230pub struct FixedFee;
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
34const KARURA_CHAIN = 2000;34const KARURA_CHAIN = 2000;
35const KARURA_PORT = '9946';35const KARURA_PORT = '9946';
3636
37describe('Integration test: Exchanging OPL with Karura', () => {37describe('Integration test: Exchanging QTZ with Karura', () => {
38 let alice: IKeyringPair;38 let alice: IKeyringPair;
39 39
40 before(async () => {40 before(async () => {
6060
61 const metadata =61 const metadata =
62 {62 {
63 name: 'OPL',63 name: 'QTZ',
64 symbol: 'OPL',64 symbol: 'QTZ',
65 decimals: 18,65 decimals: 18,
66 minimalBalance: 1,66 minimalBalance: 1,
67 };67 };
74 }, karuraApiOptions);74 }, karuraApiOptions);
75 });75 });
7676
77 it('Should connect and send OPL to Karura', async () => {77 it('Should connect and send QTZ to Karura', async () => {
78 let balanceOnKaruraBefore: bigint;78 let balanceOnKaruraBefore: bigint;
79 79
80 await usingApi(async (api) => {80 await usingApi(async (api) => {
141 }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});141 }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});
142 });142 });
143143
144 it('Should connect to Karura and send OPL back', async () => {144 it('Should connect to Karura and send QTZ back', async () => {
145 let balanceBefore: bigint;145 let balanceBefore: bigint;
146 146
147 await usingApi(async (api) => {147 await usingApi(async (api) => {