Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to stable2407 #14

Merged
merged 7 commits into from
Nov 8, 2024
Merged

chore: upgrade to stable2407 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a170a3
chore: update to v1.10.0
AlexD10S Oct 17, 2024
64b7361
fix: upgrade to stable2407-1
AlexD10S Nov 4, 2024
9d8c8bc
refactor: clean warnings
AlexD10S Nov 4, 2024
c0bc848
refactor: imports from https://github.com/polkadot-evm/frontier
AlexD10S Nov 4, 2024
1bad274
refactor: compare changes with base-parachain
AlexD10S Nov 4, 2024
85ddca8
fix: ci
AlexD10S Nov 4, 2024
5833c17
fix: imports
AlexD10S Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,347 changes: 2,215 additions & 2,132 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

225 changes: 117 additions & 108 deletions Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ publish = false

[dependencies]
clap = { workspace = true }
docify = { workspace = true }
log = { workspace = true }
codec = { workspace = true }
serde = { workspace = true }
jsonrpsee = { workspace = true }
parity-scale-codec = { workspace = true }
serde = { workspace = true, features = [ "derive" ] }
jsonrpsee = { workspace = true, features = [ "server" ] }
futures = { workspace = true }
serde_json = { workspace = true }
color-print = { workspace = true }
Expand All @@ -35,6 +36,7 @@ sc-cli = { workspace = true }
sc-client-api = { workspace = true }
sc-offchain = { workspace = true }
sc-consensus = { workspace = true }
sc-consensus-aura = { workspace = true }
sc-executor = { workspace = true }
sc-network = { workspace = true }
sc-network-sync = { workspace = true }
Expand Down Expand Up @@ -78,12 +80,12 @@ cumulus-relay-chain-interface = { workspace = true }
fc-api = { workspace = true }
fc-cli = { workspace = true }
fc-consensus = { workspace = true }
fc-db = { workspace = true }
fc-mapping-sync = { workspace = true }
fc-db = { workspace = true, features = [ "rocksdb" ] }
fc-mapping-sync = { workspace = true, features = [ "sql" ] }
fc-rpc = { workspace = true }
fc-rpc-core = { workspace = true }
fc-storage = { workspace = true }
fp-dynamic-fee = { workspace = true }
fp-dynamic-fee = { workspace = true, features = [ "std" ] }
fp-evm = { workspace = true }
fp-rpc = { workspace = true }

Expand Down
29 changes: 27 additions & 2 deletions node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};
use std::{collections::BTreeMap, str::FromStr};

/// Specialized `ChainSpec` for the normal parachain runtime.
pub type ChainSpec = sc_service::GenericChainSpec<(), Extensions>;
pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;

/// The default XCM version to set in genesis config.
const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
Expand All @@ -24,11 +24,12 @@ pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Pu

/// The extensions for the [`ChainSpec`].
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
#[serde(deny_unknown_fields)]
pub struct Extensions {
/// The relay chain of the Parachain.
#[serde(alias = "relayChain", alias = "RelayChain")]
pub relay_chain: String,
/// The id of the Parachain.
#[serde(alias = "paraId", alias = "ParaId")]
pub para_id: u32,
}

Expand Down Expand Up @@ -192,6 +193,30 @@ fn testnet_genesis(
storage: Default::default(),
},
);
// Alith
map.insert(
H160::from_str("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac")
.expect("internal H160 is valid; qed"),
fp_evm::GenesisAccount {
balance: U256::from_str("0xffffffffffffffffffffffffffffffff")
.expect("internal U256 is valid; qed"),
code: Default::default(),
nonce: Default::default(),
storage: Default::default(),
},
);
// Baltathar
map.insert(
H160::from_str("3Cd0A705a2DC65e5b1E1205896BaA2be8A07c6e0")
.expect("internal H160 is valid; qed"),
fp_evm::GenesisAccount {
balance: U256::from_str("0xffffffffffffffffffffffffffffffff")
.expect("internal U256 is valid; qed"),
code: Default::default(),
nonce: Default::default(),
storage: Default::default(),
},
);
map.insert(
// H160 address of CI test runner account
H160::from_str("6be02d1d3665660d22ff9624b7be0551ee1ac91b")
Expand Down
4 changes: 0 additions & 4 deletions node/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ pub enum Subcommand {
#[command(subcommand)]
Benchmark(frame_benchmarking_cli::BenchmarkCmd),

/// Try-runtime has migrated to a standalone
/// [CLI](<https://github.com/paritytech/try-runtime-cli>). The subcommand exists as a stub and
/// deprecation notice. It will be removed entirely some time after January 2024.
TryRuntime,
/// Db meta columns information.
FrontierDb(fc_cli::FrontierDbCmd),
}
Expand Down
Loading
Loading