Skip to content

Commit

Permalink
Merge pull request #45 from DataHighway-DHX/sg/polkadot-0.9.29
Browse files Browse the repository at this point in the history 
Upgrade Polkadot & Substrate dependency to version 0.9.29
  • Loading branch information
@sudipghimire533
sudipghimire533 authored Nov 2, 2022
2 parents af0537c + f359c13 commit 57c8cad
Show file tree
Hide file tree
Showing 22 changed files with 1,796 additions and 2,144 deletions.
2,393 changes: 1,079 additions & 1,314 deletions Cargo.lock
View file

Large diffs are not rendered by default.

148 changes: 66 additions & 82 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = 'datahighway-collator'
version = '3.7.0'
version = '3.7.1'
authors = ['Anonymous']
description = 'DataHighway parachain collator FRAME-based Substrate Node based upon the Cumulus.'
license = 'Unlicense'
Expand All @@ -14,100 +14,84 @@ name = 'datahighway-collator'
path = 'src/main.rs'

[dependencies]
derive_more = '0.99.2'
log = '0.4.17'
codec = { version = '3.1.2', package = 'parity-scale-codec', default-features = false, features = ['derive', 'max-encoded-len'] }
clap = { version = '3.1.6', features = ['derive'] }
serde = { version = '1.0.136', features = ['derive'] }
clap = { version = "3.2.20", features = ["derive"] }
derive_more = "0.99.2"
log = "0.4.17"
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.144", features = ["derive"] }
serde_json = '1.0.74'
hex = { version = '0.4.3', default_features = false, features = ['alloc'] }
hex-literal = '0.3.4'

jsonrpc-core = '18.0.0'
jsonrpsee = { version = "0.13.0", features = ["server"] }
hex-literal = "0.3.4"
jsonrpsee = { version = "0.15.1", features = ["server"] }

# Local
datahighway-parachain-runtime = { path = '../runtime', version = '3.6.0' }
module-primitives = { version = '3.0.6', default-features = false, path = '../pallets/primitives' }
datahighway-parachain-runtime = { path = "../runtime" }
module-primitives = { default-features = false, path = '../pallets/primitives' }

# Substrate
frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
frame-try-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24', optional = true }

pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }

## Substrate Client Dependencies
sc-basic-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-chain-spec = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-cli = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24', features = ['wasmtime'] }
sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-consensus = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-executor = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24', features = ['wasmtime'] }
sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-network = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-service = { git = 'https://github.com/paritytech/substrate', features = ['wasmtime'], branch = 'polkadot-v0.9.24' }
sc-telemetry = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-tracing = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-transaction-pool-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sc-sysinfo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
substrate-prometheus-endpoint = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
try-runtime-cli = { git = 'https://github.com/paritytech/substrate', optional = true, branch = 'polkadot-v0.9.24' }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "polkadot-v0.9.29" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-executor = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "polkadot-v0.9.29" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "polkadot-v0.9.29" }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }

# Polkadot
polkadot-cli = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.24' }
polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.24' }
polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.24' }
polkadot-service = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.24' }
xcm = { git = 'https://github.com/paritytech/polkadot', default-features = false, branch = 'release-v0.9.24' }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.29" }

# Cumulus
cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-client-network = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-client-service = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-relay-chain-inprocess-interface = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-relay-chain-interface = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }
cumulus-relay-chain-rpc-interface = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.24' }

[dev-dependencies]
futures = { version = '0.3.19' }
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-client-collator = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.29" }

[build-dependencies]
substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24' }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }

[features]
default = []
runtime-benchmarks = [
'datahighway-parachain-runtime/runtime-benchmarks',
'polkadot-cli/runtime-benchmarks',
]
# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
# in the near future.
try-runtime = [
'datahighway-parachain-runtime/try-runtime',
'try-runtime-cli',
"datahighway-parachain-runtime/runtime-benchmarks",
"polkadot-cli/runtime-benchmarks",
]
try-runtime = ["datahighway-parachain-runtime/try-runtime"]
49 changes: 28 additions & 21 deletions node/src/chain_spec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ use crate::fixtures::get_allocation;
use cumulus_primitives_core::ParaId;
use datahighway_parachain_runtime::{
AuraId,
AuraConfig,
BalancesConfig,
ParachainStaking,
CouncilConfig,
DemocracyConfig,
ElectionsConfig,
Expand All @@ -17,13 +15,9 @@ use datahighway_parachain_runtime::{
TechnicalCommitteeConfig,
TechnicalMembershipConfig,
TransactionPaymentConfig,
TreasuryConfig, ParachainStakingConfig, Perquintill,
TreasuryConfig, ParachainStakingConfig, TechnicalMaxMembers,
};
use module_primitives::{
constants::currency::{
DOLLARS,
EXISTENTIAL_DEPOSIT,
},
types::{
AccountId,
Balance,
Expand All @@ -32,8 +26,6 @@ use module_primitives::{
};
// required for AccountId::from_str
use std::str::FromStr;
use log::{error, info, debug, trace};
use hex as hex_runtime; // for runtime string parsing use hex_runtime::encode("...");
use hex_literal::{
hex, // for parsing string literal at compile time use hex!("...");
};
Expand All @@ -47,18 +39,13 @@ use serde::{
Deserialize,
Serialize,
};
use serde_json::map::Map;
use sp_core::{
crypto::{
UncheckedFrom,
UncheckedInto,
Wraps,
},
crypto::{ UncheckedInto},
sr25519,
Pair,
Public,
};
use sp_runtime::{AccountId32};
use sp_runtime::{AccountId32, BoundedVec};
use sp_runtime::traits::{
IdentifyAccount,
Verify,
Expand Down Expand Up @@ -1236,7 +1223,11 @@ fn spreehafen_testnet_genesis(
aura: Default::default(),
// pallet_membership_Instance1
technical_membership: TechnicalMembershipConfig {
members: vec![root_key.clone()],
members: {
let mut members = BoundedVec::with_bounded_capacity(TechnicalMaxMembers::get() as usize);
members.try_push(root_key.clone()).expect("Cannot insert root key in technical membership");
members
},
phantom: Default::default(),
},
assets: Default::default(),
Expand Down Expand Up @@ -1315,7 +1306,11 @@ fn testnet_genesis(
aura: Default::default(),
// pallet_membership_Instance1
technical_membership: TechnicalMembershipConfig {
members: vec![root_key.clone()],
members: {
let mut members = BoundedVec::with_bounded_capacity(TechnicalMaxMembers::get() as usize);
members.try_push(root_key.clone()).expect("Cannot insert root key in technical membership");
members
},
phantom: Default::default(),
},
assets: Default::default(),
Expand Down Expand Up @@ -1394,7 +1389,11 @@ fn dev_genesis(
aura: Default::default(),
// pallet_membership_Instance1
technical_membership: TechnicalMembershipConfig {
members: vec![root_key.clone()],
members: {
let mut members = BoundedVec::with_bounded_capacity(TechnicalMaxMembers::get() as usize);
members.try_push(root_key.clone()).expect("Cannot insert root key in technical membership");
members
},
phantom: Default::default(),
},
assets: Default::default(),
Expand Down Expand Up @@ -1484,7 +1483,11 @@ fn baikal_testnet_genesis(
aura: Default::default(),
// pallet_membership_Instance1
technical_membership: TechnicalMembershipConfig {
members: vec![root_key.clone()],
members: {
let mut members = BoundedVec::with_bounded_capacity(TechnicalMaxMembers::get() as usize);
members.try_push(root_key.clone()).expect("Cannot insert root key in technical membership");
members
},
phantom: Default::default(),
},
assets: Default::default(),
Expand Down Expand Up @@ -1563,7 +1566,11 @@ fn tanganika_testnet_genesis(
aura: Default::default(),
// pallet_membership_Instance1
technical_membership: TechnicalMembershipConfig {
members: vec![root_key.clone()],
members: {
let mut members = BoundedVec::with_bounded_capacity(TechnicalMaxMembers::get() as usize);
members.try_push(root_key.clone()).expect("Cannot insert root key in technical membership");
members
},
phantom: Default::default(),
},
assets: Default::default(),
Expand Down
Loading

0 comments on commit 57c8cad

Please sign in to comment.