Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

polkadot-like testnets should be 10 decimal places #5369

Merged
merged 6 commits into from
Apr 25, 2022
Merged

polkadot-like testnets should be 10 decimal places #5369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6843fe4
polkadot is 10 decimal places
gilescope Apr 21, 2022
2c9ea12
cargo fmt
gilescope Apr 21, 2022
cdd6039
Update node/service/src/chain_spec.rs
gilescope Apr 21, 2022
4092557
name change
gilescope Apr 21, 2022
93d4eec
update test also
gilescope Apr 22, 2022
65b3b29
Merge branch 'master' into giles-polkadot-10-decimals
gilescope Apr 25, 2022
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ futures = "0.3.21"
hex-literal = "0.3.4"
gum = { package = "tracing-gum", path = "../gum/" }
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.59"
thiserror = "1.0.30"
kvdb = "0.11.0"
kvdb-rocksdb = { version = "0.15.2", optional = true }
Expand Down
16 changes: 13 additions & 3 deletions node/service/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,16 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
}
}

/// Returns the properties for the [`PolkadotChainSpec`].
pub fn polkadot_chain_spec_properties() -> serde_json::map::Map<String, serde_json::Value> {
serde_json::json!({
"tokenDecimals": 10,
})
.as_object()
.expect("Map given; qed")
.clone()
}

/// Polkadot staging testnet config.
#[cfg(feature = "polkadot-native")]
pub fn polkadot_staging_testnet_config() -> Result<PolkadotChainSpec, String> {
Expand All @@ -1103,7 +1113,7 @@ pub fn polkadot_staging_testnet_config() -> Result<PolkadotChainSpec, String> {
),
Some(DEFAULT_PROTOCOL_ID),
None,
None,
Some(polkadot_chain_spec_properties()),
Default::default(),
))
}
Expand Down Expand Up @@ -1653,7 +1663,7 @@ pub fn polkadot_development_config() -> Result<PolkadotChainSpec, String> {
None,
Some(DEFAULT_PROTOCOL_ID),
None,
None,
Some(polkadot_chain_spec_properties()),
Default::default(),
))
}
Expand Down Expand Up @@ -1793,7 +1803,7 @@ pub fn polkadot_local_testnet_config() -> Result<PolkadotChainSpec, String> {
None,
Some(DEFAULT_PROTOCOL_ID),
None,
None,
Some(polkadot_chain_spec_properties()),
Default::default(),
))
}
Expand Down
6 changes: 4 additions & 2 deletions node/test/service/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ use babe_primitives::AuthorityId as BabeId;
use grandpa::AuthorityId as GrandpaId;
use pallet_staking::Forcing;
use polkadot_primitives::v2::{AccountId, AssignmentId, ValidatorId, MAX_CODE_SIZE, MAX_POV_SIZE};
use polkadot_service::chain_spec::{get_account_id_from_seed, get_from_seed, Extensions};
use polkadot_service::chain_spec::{
get_account_id_from_seed, get_from_seed, polkadot_chain_spec_properties, Extensions,
};
use polkadot_test_runtime::BABE_GENESIS_EPOCH_CONFIG;
use sc_chain_spec::{ChainSpec, ChainType};
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
Expand All @@ -45,7 +47,7 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec {
None,
Some(DEFAULT_PROTOCOL_ID),
None,
None,
Some(polkadot_chain_spec_properties()),
Default::default(),
)
}
Expand Down