Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cd2f325
patch `evm-core`
aurexav May 18, 2021
33a606b
update dependencies
aurexav May 18, 2021
34f5bf4
anchor `darwinia-v0.11.0`
aurexav May 18, 2021
94926f5
update dependencies
aurexav May 18, 2021
ad80e42
migrate balances instances
aurexav May 18, 2021
2ff2022
migrate collective instances
aurexav May 18, 2021
e936e2e
migrate membership instance
aurexav May 19, 2021
0662d8c
migrate relayer-game & relay-authorities instance
aurexav May 19, 2021
e3525a6
update genesis fileds
aurexav May 19, 2021
5101059
migrate elections-phragmen
aurexav May 19, 2021
7626f80
new `spec_version`
aurexav May 19, 2021
f550c7f
correct name
aurexav May 19, 2021
0d15331
config treasury
aurexav May 19, 2021
7e2ebaa
config system
aurexav May 19, 2021
588d9c4
correct name
aurexav May 19, 2021
d45dd50
update balances event
aurexav May 19, 2021
cb17c45
correct instance's index
aurexav May 19, 2021
659d845
`ModuleId` to `PalletId`
aurexav May 19, 2021
05890d3
config election-provider-multi-phase
aurexav May 19, 2021
9e98160
correct name
aurexav May 19, 2021
b0d88fe
update staking weights
aurexav May 19, 2021
7294b17
correct weights
aurexav May 19, 2021
d84c2b0
update treasury weights
aurexav May 19, 2021
0edda5f
config membership
aurexav May 19, 2021
60e6e03
remove crab-issuing event
aurexav May 19, 2021
1042bb6
remove `WithdrawOrigin`
aurexav May 19, 2021
471183b
correct name
aurexav May 19, 2021
1e5e05a
correct name
aurexav May 19, 2021
f898158
add `IssuingHandler`
aurexav May 19, 2021
378c3e3
correct index
aurexav May 19, 2021
9c9561a
companion for #substrate-8643
aurexav May 19, 2021
94590bb
update format
aurexav May 21, 2021
ada889f
add dev config
aurexav May 21, 2021
7e358b1
add darwinia-vesting to Crab
aurexav Jun 1, 2021
307480d
remove unused cfg
aurexav Jun 4, 2021
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,419 changes: 702 additions & 717 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" }

[dependencies]
# crates
futures = { version = "0.3.13" }
futures = { version = "0.3.15" }
parity-util-mem = { version = "0.9.0", default-features = false, features = ["jemalloc-global"] }
# darwinia
darwinia-cli = { path = "cli" }
Expand Down
26 changes: 13 additions & 13 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
# crates
log = { version = "0.4.14" }
serde = { version = "1.0.125", optional = true }
serde = { version = "1.0.126", optional = true }
structopt = { version = "0.3.21" }
tokio = { version = "0.3.7", optional = true, features = ["rt-multi-thread"] }
# darwinia client
darwinia-cli = { optional = true, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
darwinia-cli = { optional = true, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
# darwinia service
darwinia-service = { default-features = false, path = "../node/service" }
# substrate client
sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-network = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-tracing = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-network = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-tracing = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
# substrate primitives
sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
# this crate is used only to enable `trie-memory-tracker` feature
# see https://github.com/paritytech/substrate/pull/6745
sp-trie = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-trie = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
substrate-build-script-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }

[features]
default = [
Expand Down
90 changes: 45 additions & 45 deletions node/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ version = "0.10.0"
[dependencies]
# crates
array-bytes = { version = "1.1.0" }
codec = { package = "parity-scale-codec", version = "2.0.1", features = ["derive"] }
futures = { version = "0.3.13" }
codec = { package = "parity-scale-codec", version = "2.1.1", features = ["derive"] }
futures = { version = "0.3.15" }
log = { version = "0.4.14" }
serde = { version = "1.0.125", features = ["derive"] }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.64" }
# darwinia frame
darwinia-balances-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
darwinia-header-mmr-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
darwinia-staking-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
darwinia-balances-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
darwinia-header-mmr-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
darwinia-staking-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
# dvm
darwinia-evm = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
dc-db = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
dc-mapping-sync = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
dc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
dp-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
dvm-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" }
darwinia-evm = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
dc-db = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
dc-mapping-sync = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
dc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
dp-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
dvm-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" }
# darwinia primitives
darwinia-primitives = { path = "../../primitives" }
# darwinia rpc
Expand All @@ -35,41 +35,41 @@ darwinia-rpc = { path = "../../rpc" }
crab-runtime = { path = "../../runtime/crab" }
darwinia-runtime = { path = "../../runtime/darwinia" }
# substrate client
sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-client-db = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-client-db = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
# substrate frame
frame-system-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
substrate-prometheus-endpoint = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
frame-system-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
substrate-prometheus-endpoint = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
# substrate primitives
sc-consensus-slots = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-offchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
sc-consensus-slots = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-offchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }
sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" }

[features]
default = ["db", "full-node"]
Expand Down
18 changes: 10 additions & 8 deletions node/service/src/chain_spec/crab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ pub fn crab_build_spec_genesis() -> GenesisConfig {
epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
},
pallet_indices: Default::default(),
darwinia_balances_Instance0: BalancesConfig {
darwinia_balances_Instance1: BalancesConfig {
balances: endowed_accounts
.iter()
.cloned()
Expand All @@ -150,7 +150,7 @@ pub fn crab_build_spec_genesis() -> GenesisConfig {
)
.collect(),
},
darwinia_balances_Instance1: KtonConfig {
darwinia_balances_Instance2: KtonConfig {
balances: endowed_accounts
.iter()
.cloned()
Expand Down Expand Up @@ -187,17 +187,18 @@ pub fn crab_build_spec_genesis() -> GenesisConfig {
pallet_im_online: Default::default(),
pallet_authority_discovery: Default::default(),
darwinia_democracy: Default::default(),
pallet_collective_Instance0: Default::default(),
pallet_collective_Instance2: Default::default(),
pallet_collective_Instance1: Default::default(),
darwinia_elections_phragmen: Default::default(),
pallet_membership_Instance0: Default::default(),
pallet_membership_Instance1: Default::default(),
darwinia_claims: ClaimsConfig {
claims_list: ClaimsList::from_file(
"node/service/res/crab/claims-list.json",
"CLAIMS_LIST_PATH",
),
},
pallet_sudo: SudoConfig { key: root },
darwinia_vesting: Default::default(),
darwinia_crab_issuing: CrabIssuingConfig {
total_mapped_ring: 40_000_000 * COIN,
},
Expand Down Expand Up @@ -256,14 +257,14 @@ pub fn crab_testnet_genesis(
epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
},
pallet_indices: Default::default(),
darwinia_balances_Instance0: BalancesConfig {
darwinia_balances_Instance1: BalancesConfig {
balances: endowed_accounts
.iter()
.cloned()
.map(|k| (k, 1 << 56))
.collect(),
},
darwinia_balances_Instance1: KtonConfig {
darwinia_balances_Instance2: KtonConfig {
balances: endowed_accounts
.iter()
.cloned()
Expand Down Expand Up @@ -295,17 +296,18 @@ pub fn crab_testnet_genesis(
pallet_im_online: Default::default(),
pallet_authority_discovery: Default::default(),
darwinia_democracy: Default::default(),
pallet_collective_Instance0: Default::default(),
pallet_collective_Instance2: Default::default(),
pallet_collective_Instance1: Default::default(),
darwinia_elections_phragmen: Default::default(),
pallet_membership_Instance0: Default::default(),
pallet_membership_Instance1: Default::default(),
darwinia_claims: ClaimsConfig {
claims_list: ClaimsList::from_file(
"node/service/res/crab/claims-list.json",
"CLAIMS_LIST_PATH",
),
},
pallet_sudo: SudoConfig { key: root },
darwinia_vesting: Default::default(),
darwinia_crab_issuing: CrabIssuingConfig {
total_mapped_ring: 1 << 56,
},
Expand Down
Loading