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
--- a/tests/flipper-src/lib.rs
+++ b/tests/flipper-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-2020 Parity Technologies (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
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
before · tests/ink-types-node-runtime/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-2019 Parity Technologies (UK) Ltd.19// This file is part of ink!.20//21// ink! is free software: you can redistribute it and/or modify22// it under the terms of the GNU General Public License as published by23// the Free Software Foundation, either version 3 of the License, or24// (at your option) any later version.25//26// ink! is distributed in the hope that it will be useful,27// but WITHOUT ANY WARRANTY; without even the implied warranty of28// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the29// GNU General Public License for more details.30//31// You should have received a copy of the GNU General Public License32// along with ink!.  If not, see <http://www.gnu.org/licenses/>.3334//! Definitions for environment types for contracts targeted at a35//! substrate chain with the default `node-runtime` configuration.3637#![cfg_attr(not(feature = "std"), no_std)]3839use core::{array::TryFromSliceError, convert::TryFrom};40use ink_core::env::Clear;41use scale::{Decode, Encode};42use sp_core::crypto::AccountId32;43#[cfg(feature = "ink-generate-abi")]44use type_metadata::{HasTypeId, HasTypeDef, Metadata, MetaType, TypeId, TypeDef, TypeIdArray};4546pub mod calls;4748/// Contract environment types defined in substrate node-runtime49#[cfg_attr(feature = "ink-generate-abi", derive(Metadata))]50#[derive(Clone, Debug, PartialEq, Eq)]51pub enum NodeRuntimeTypes {}5253#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode)]54pub struct AccountId (AccountId32);5556impl From<AccountId32> for AccountId {57    fn from(account: AccountId32) -> Self {58        AccountId(account)59    }60}6162#[cfg(feature = "ink-generate-abi")]63impl HasTypeId for AccountId {64    fn type_id() -> TypeId {65        TypeIdArray::new(32, MetaType::new::<u8>()).into()66    }67}6869#[cfg(feature = "ink-generate-abi")]70impl HasTypeDef for AccountId {71    fn type_def() -> TypeDef {72        TypeDef::builtin()73    }74}7576/// The default SRML balance type.77pub type Balance = u128;7879/// The default SRML hash type.80#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Encode, Decode)]81pub struct Hash([u8; 32]);8283impl From<[u8; 32]> for Hash {84    fn from(hash: [u8; 32]) -> Hash {85        Hash(hash)86    }87}8889impl<'a> TryFrom<&'a [u8]> for Hash {90    type Error = TryFromSliceError;9192    fn try_from(bytes: &'a [u8]) -> Result<Hash, TryFromSliceError> {93        let hash = <[u8; 32]>::try_from(bytes)?;94        Ok(Hash(hash))95    }96}9798impl AsRef<[u8]> for Hash {99    fn as_ref(&self) -> &[u8] {100        &self.0[..]101    }102}103104impl AsMut<[u8]> for Hash {105    fn as_mut(&mut self) -> &mut [u8] {106        &mut self.0[..]107    }108}109110impl Clear for Hash {111    fn is_clear(&self) -> bool {112        self.as_ref().iter().all(|&byte| byte == 0x00)113    }114115    fn clear() -> Self {116        Self([0x00; 32])117    }118}119120/// The default SRML moment type.121pub type Moment = u64;122123/// The default SRML blocknumber type.124pub type BlockNumber = u64;125126/// The default SRML AccountIndex type.127pub type AccountIndex = u32;128129/// The default timestamp type.130pub type Timestamp = u64;131132impl ink_core::env::EnvTypes for NodeRuntimeTypes {133    type AccountId = AccountId;134    type Balance = Balance;135    type Hash = Hash;136    type Timestamp = Timestamp;137    type BlockNumber = BlockNumber;138    type Call = calls::Call;139}
after · tests/ink-types-node-runtime/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-2019 Parity Technologies (UK) Ltd.19// This file is part of ink!.20//21// ink! is free software: you can redistribute it and/or modify22// it under the terms of the GNU General Public License as published by23// the Free Software Foundation, either version 3 of the License, or24// (at your option) any later version.25//26// ink! is distributed in the hope that it will be useful,27// but WITHOUT ANY WARRANTY; without even the implied warranty of28// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the29// GNU General Public License for more details.30//31// You should have received a copy of the GNU General Public License32// along with ink!.  If not, see <http://www.gnu.org/licenses/>.3334//! Definitions for environment types for contracts targeted at a35//! substrate chain with the default `node-runtime` configuration.3637#![cfg_attr(not(feature = "std"), no_std)]3839use core::{array::TryFromSliceError, convert::TryFrom};40use ink_core::env::Clear;41use scale::{Decode, Encode};42use sp_core::crypto::AccountId32;43#[cfg(feature = "ink-generate-abi")]44use type_metadata::{HasTypeId, HasTypeDef, Metadata, MetaType, TypeId, TypeDef, TypeIdArray};4546pub mod calls;4748/// Contract environment types defined in substrate node-runtime49#[cfg_attr(feature = "ink-generate-abi", derive(Metadata))]50#[derive(Clone, Debug, PartialEq, Eq)]51pub enum NodeRuntimeTypes {}5253#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode)]54pub struct AccountId (AccountId32);5556impl From<AccountId32> for AccountId {57    fn from(account: AccountId32) -> Self {58        AccountId(account)59    }60}6162#[cfg(feature = "ink-generate-abi")]63impl HasTypeId for AccountId {64    fn type_id() -> TypeId {65        TypeIdArray::new(32, MetaType::new::<u8>()).into()66    }67}6869#[cfg(feature = "ink-generate-abi")]70impl HasTypeDef for AccountId {71    fn type_def() -> TypeDef {72        TypeDef::builtin()73    }74}7576/// The default SRML balance type.77pub type Balance = u128;7879/// The default SRML hash type.80#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Encode, Decode)]81pub struct Hash([u8; 32]);8283impl From<[u8; 32]> for Hash {84    fn from(hash: [u8; 32]) -> Hash {85        Hash(hash)86    }87}8889impl<'a> TryFrom<&'a [u8]> for Hash {90    type Error = TryFromSliceError;9192    fn try_from(bytes: &'a [u8]) -> Result<Hash, TryFromSliceError> {93        let hash = <[u8; 32]>::try_from(bytes)?;94        Ok(Hash(hash))95    }96}9798impl AsRef<[u8]> for Hash {99    fn as_ref(&self) -> &[u8] {100        &self.0[..]101    }102}103104impl AsMut<[u8]> for Hash {105    fn as_mut(&mut self) -> &mut [u8] {106        &mut self.0[..]107    }108}109110impl Clear for Hash {111    fn is_clear(&self) -> bool {112        self.as_ref().iter().all(|&byte| byte == 0x00)113    }114115    fn clear() -> Self {116        Self([0x00; 32])117    }118}119120/// The default SRML moment type.121pub type Moment = u64;122123/// The default SRML blocknumber type.124pub type BlockNumber = u64;125126/// The default SRML AccountIndex type.127pub type AccountIndex = u32;128129/// The default timestamp type.130pub type Timestamp = u64;131132impl ink_core::env::EnvTypes for NodeRuntimeTypes {133    type AccountId = AccountId;134    type Balance = Balance;135    type Hash = Hash;136    type Timestamp = Timestamp;137    type BlockNumber = BlockNumber;138    type Call = calls::Call;139}
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) => {