Skip to content

Commit

Permalink
Merge pull request #972 from Setheum-Labs/qingdao1
Browse files Browse the repository at this point in the history
Qingdao1
  • Loading branch information
balqaasem authored Feb 11, 2024
2 parents d285f96 + 0dd4478 commit cd60bb0
Show file tree
Hide file tree
Showing 252 changed files with 12,018 additions and 2,553 deletions.
28 changes: 8 additions & 20 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
[submodule "chassis/lib-sesl/predeploy-contracts"]
path = chassis/lib-sesl/predeploy-contracts
[submodule "highway/predeploy-contracts"]
path = highway/predeploy-contracts
url = https://github.com/Setheum-Labs/predeploy-contracts.git
[submodule "chassis/lib-sesl/Stem"]
path = chassis/lib-sesl/Stem
url = https://github.com/Setheum-Labs/Stem
[submodule "chassis/lib-sesl/Sial"]
path = chassis/lib-sesl/Sial
url = https://github.com/Setheum-Labs/Sial
[submodule "chassis/lib-sesl/khalifa-ecdp"]
path = chassis/lib-sesl/khalifa-ecdp
url = https://github.com/Khalifa-Blockchain/ECDP
[submodule "chassis/lib-sesl/khalifa-dex"]
path = chassis/lib-sesl/khalifa-dex
url = https://github.com/Khalifa-Blockchain/DEX
[submodule "chassis/lib-sesl/Dagestan"]
path = chassis/lib-sesl/Dagestan
url = https://github.com/Setheum-Labs/Dagestan
[submodule "chassis/lib-sesl/khalifa-liquid"]
path = chassis/lib-sesl/khalifa-liquid
url = https://github.com/Khalifa-Blockchain/liquid
[submodule "highway/EthicalDeFi"]
path = highway/EthicalDeFi
url = https://Setheum-Labs/EthicalDeFi.git
[submodule "highway/orml"]
path = highway/orml
url = https://github.com/Slixon-Technologies/open-runtime-module-library
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
// بِسْمِ اللَّهِ الرَّحْمَنِ الرَّحِيم

// This file is part of Setheum.

// Copyright (C) 2019-Present Setheum Labs.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0

// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

//! Autogenerated weights for {{pallet}}
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}

// Executed Command:
{{#each args as |arg|~}}
// {{arg}}
{{/each}}

#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
#![allow(clippy::unnecessary_cast)]

use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

/// Weight functions needed for {{pallet}}.
pub trait WeightInfo {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{c.name}}: u32, {{/each~}}
) -> Weight;
{{~/each}}
}

/// Weights for {{pallet}} using the Setheum node and recommended hardware.
pub struct SetheumWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SetheumWeight<T> {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
{{~/each}}
{{~#if (ne benchmark.base_writes "0")}}
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
}
{{~/each}}
}

// For backwards compatibility and tests
impl WeightInfo for () {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
{{~/each}}
{{~#if (ne benchmark.base_writes "0")}}
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
}
{{~/each}}
}
// بِسْمِ اللَّهِ الرَّحْمَنِ الرَّحِيم

// This file is part of Setheum.

// Copyright (C) 2019-Present Setheum Labs.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0

// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

//! Autogenerated weights for {{pallet}}
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}

// Executed Command:
{{#each args as |arg|~}}
// {{arg}}
{{/each}}

#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
#![allow(clippy::unnecessary_cast)]

use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

/// Weight functions needed for {{pallet}}.
pub trait WeightInfo {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{c.name}}: u32, {{/each~}}
) -> Weight;
{{~/each}}
}

/// Weights for {{pallet}} using the Setheum node and recommended hardware.
pub struct SetheumWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SetheumWeight<T> {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
{{~/each}}
{{~#if (ne benchmark.base_writes "0")}}
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
}
{{~/each}}
}

// For backwards compatibility and tests
impl WeightInfo for () {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
{{~/each}}
{{~#if (ne benchmark.base_writes "0")}}
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
}
{{~/each}}
}
File renamed without changes.
File renamed without changes.
61 changes: 30 additions & 31 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,38 @@ resolver = "2"

members = [
# Primary modules
'chassis/node',
'chassis/runtime',
"chassis/runtime/common",
'chassis/primitives',
'node',
'runtime',
"runtime/common",
'primitives',

# SERML Modules
"chassis/lib-serml/airdrop",
# "lib-serml/atomic-swap",
"chassis/lib-serml/idle-scheduler",
"chassis/lib-serml/dex-oracle",
"chassis/lib-serml/prices",
"chassis/lib-serml/currencies",
"chassis/lib-serml/nft",
"chassis/lib-serml/transaction-pause",
"chassis/lib-serml/transaction-payment",
"chassis/lib-serml/vesting",
"chassis/lib-serml//evm",
"chassis/lib-serml//evm/rpc",
"chassis/lib-serml//evm/rpc/runtime_api",
"chassis/lib-serml//evm-accounts",
"chassis/lib-serml//evm-bridge",
"chassis/lib-serml//evm-manager",
"modules/airdrop",
"modules/currencies",
"modules//evm",
"modules//evm/rpc",
"modules//evm/rpc/runtime_api",
"modules//evm-accounts",
"modules//evm-bridge",
"modules//evm-manager",
"modules/idle-scheduler",
"modules/nft",
"modules/prices",
"modules/transaction-pause",
"modules/transaction-payment",
"modules/vesting",

# ORML modules
"chassis/lib-orml/auction",
"chassis/lib-orml/authority",
"chassis/lib-orml/benchmarking",
"chassis/lib-orml/currencies",
"chassis/lib-orml/nft",
"chassis/lib-orml/oracle",
"chassis/lib-orml/oracle/rpc",
"chassis/lib-orml/oracle/rpc/runtime-api",
"chassis/lib-orml/tokens",
"chassis/lib-orml/traits",
"chassis/lib-orml/utilities",
"highway/orml/authority",
"highway/orml/benchmarking",
"highway/orml/currencies",
"highway/orml/nft",
"highway/orml/oracle",
"highway/orml/oracle/rpc",
"highway/orml/oracle/rpc/runtime-api",
"highway/orml/tokens",
"highway/orml/traits",
"highway/orml/utilities",
]
exclude = ['rpc']

Expand Down
File renamed without changes.
Loading

0 comments on commit cd60bb0

Please sign in to comment.