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
--- a/README.md
+++ b/README.md
@@ -155,13 +155,13 @@
 location:
 	V0(X2(Parent, Parachain(PARA_ID)))
 metadata:
-	name         OPL
-	symbol       OPL
+	name         QTZ
+	symbol       QTZ
 	decimals     18
 minimalBalance	 1
 ```
 
-### Next, we can send tokens from Opal to Karura:
+### Next, we can send tokens from Quartz to Karura:
 ```
 polkadotXcm -> reserveTransferAssets
 dest:
@@ -179,7 +179,7 @@
 The result will be displayed in ChainState
 tokens -> accounts
 
-### To send tokens from Karura to Opal:
+### To send tokens from Karura to Quartz:
 ```
 xtokens -> transfer
modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
+// Original License
 use std::sync::Arc;
 
 use codec::Decode;
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
-
 // std
 use std::sync::Arc;
 use std::sync::Mutex;
modifiedpallets/scheduler/src/lib.rsdiffbeforeafterboth
--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-// Original license
+// Original license:
 // This file is part of Substrate.
 
 // Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -216,11 +216,15 @@
 		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
 		.build_or_panic();
 	pub const Version: RuntimeVersion = VERSION;
-	pub const SS58Prefix: u8 = 42;
+	/*
+	255 - Quartz
+	42 - Opal
+	*/
+	pub const SS58Prefix: u8 = 255;
 }
 
 parameter_types! {
-	pub const ChainId: u64 = 8882;
+	pub const ChainId: u64 = 8881;
 }
 
 pub struct FixedFee;
modifiedtests/flipper-src/lib.rsdiffbeforeafterboth
before · tests/flipper-src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license18// Copyright 2018-2020 Parity Technologies (UK) Ltd.19//20// Licensed under the Apache License, Version 2.0 (the "License");21// you may not use this file except in compliance with the License.22// You may obtain a copy of the License at23//24//     http://www.apache.org/licenses/LICENSE-2.025//26// Unless required by applicable law or agreed to in writing, software27// distributed under the License is distributed on an "AS IS" BASIS,28// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.29// See the License for the specific language governing permissions and30// limitations under the License.3132#![cfg_attr(not(feature = "std"), no_std)]3334use ink_lang as ink;3536#[ink::contract]37pub mod flipper {38    #[ink(storage)]39    pub struct Flipper {40        value: bool,41    }4243    impl Flipper {44        /// Creates a new flipper smart contract initialized with the given value.45        #[ink(constructor)]46        pub fn new(init_value: bool) -> Self {47            Self { value: init_value }48        }4950        /// Creates a new flipper smart contract initialized to `false`.51        #[ink(constructor)]52        pub fn default() -> Self {53            Self::new(Default::default())54        }5556        /// Flips the current value of the Flipper's bool.57        #[ink(message)]58        pub fn flip(&mut self) {59            self.value = !self.value;60        }6162        /// Returns the current value of the Flipper's bool.63        #[ink(message)]64        pub fn get(&self) -> bool {65            self.value66        }67    }6869    #[cfg(test)]70    mod tests {71        use super::*;7273        #[test]74        fn default_works() {75            let flipper = Flipper::default();76            assert_eq!(flipper.get(), false);77        }7879        #[test]80        fn it_works() {81            let mut flipper = Flipper::new(false);82            assert_eq!(flipper.get(), false);83            flipper.flip();84            assert_eq!(flipper.get(), true);85        }86    }87}
after · tests/flipper-src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original License18// Copyright 2018-2020 Parity Technologies (UK) Ltd.19//20// Licensed under the Apache License, Version 2.0 (the "License");21// you may not use this file except in compliance with the License.22// You may obtain a copy of the License at23//24//     http://www.apache.org/licenses/LICENSE-2.025//26// Unless required by applicable law or agreed to in writing, software27// distributed under the License is distributed on an "AS IS" BASIS,28// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.29// See the License for the specific language governing permissions and30// limitations under the License.3132#![cfg_attr(not(feature = "std"), no_std)]3334use ink_lang as ink;3536#[ink::contract]37pub mod flipper {38    #[ink(storage)]39    pub struct Flipper {40        value: bool,41    }4243    impl Flipper {44        /// Creates a new flipper smart contract initialized with the given value.45        #[ink(constructor)]46        pub fn new(init_value: bool) -> Self {47            Self { value: init_value }48        }4950        /// Creates a new flipper smart contract initialized to `false`.51        #[ink(constructor)]52        pub fn default() -> Self {53            Self::new(Default::default())54        }5556        /// Flips the current value of the Flipper's bool.57        #[ink(message)]58        pub fn flip(&mut self) {59            self.value = !self.value;60        }6162        /// Returns the current value of the Flipper's bool.63        #[ink(message)]64        pub fn get(&self) -> bool {65            self.value66        }67    }6869    #[cfg(test)]70    mod tests {71        use super::*;7273        #[test]74        fn default_works() {75            let flipper = Flipper::default();76            assert_eq!(flipper.get(), false);77        }7879        #[test]80        fn it_works() {81            let mut flipper = Flipper::new(false);82            assert_eq!(flipper.get(), false);83            flipper.flip();84            assert_eq!(flipper.get(), true);85        }86    }87}
modifiedtests/ink-types-node-runtime/src/calls.rsdiffbeforeafterboth
--- a/tests/ink-types-node-runtime/src/calls.rs
+++ b/tests/ink-types-node-runtime/src/calls.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-// Original license
+// Original License
 // Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of ink!.
 //
modifiedtests/ink-types-node-runtime/src/lib.rsdiffbeforeafterboth
--- a/tests/ink-types-node-runtime/src/lib.rs
+++ b/tests/ink-types-node-runtime/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-// Original license
+// Original License
 // Copyright 2018-2019 Parity Technologies (UK) Ltd.
 // This file is part of ink!.
 //
modifiedtests/loadtester-src/lib.rsdiffbeforeafterboth
--- a/tests/loadtester-src/lib.rs
+++ b/tests/loadtester-src/lib.rs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
+// Original License
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use ink_lang as ink;
modifiedtests/src/xcmTransfer.test.tsdiffbeforeafterboth
--- a/tests/src/xcmTransfer.test.ts
+++ b/tests/src/xcmTransfer.test.ts
@@ -34,7 +34,7 @@
 const KARURA_CHAIN = 2000;
 const KARURA_PORT = '9946';
 
-describe('Integration test: Exchanging OPL with Karura', () => {
+describe('Integration test: Exchanging QTZ with Karura', () => {
   let alice: IKeyringPair;
   
   before(async () => {
@@ -60,8 +60,8 @@
 
       const metadata =
       {
-        name: 'OPL',
-        symbol: 'OPL',
+        name: 'QTZ',
+        symbol: 'QTZ',
         decimals: 18,
         minimalBalance: 1,
       };
@@ -74,7 +74,7 @@
     }, karuraApiOptions);
   });
 
-  it('Should connect and send OPL to Karura', async () => {
+  it('Should connect and send QTZ to Karura', async () => {
     let balanceOnKaruraBefore: bigint;
     
     await usingApi(async (api) => {
@@ -141,7 +141,7 @@
     }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});
   });
 
-  it('Should connect to Karura and send OPL back', async () => {
+  it('Should connect to Karura and send QTZ back', async () => {
     let balanceBefore: bigint;
     
     await usingApi(async (api) => {