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

Use Parity Treasury & Tips #759

Merged
merged 16 commits into from
Aug 19, 2021
Merged

Use Parity Treasury & Tips #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
02044af
update format
Aug 18, 2021
6d38c8f
drop bounty
Aug 18, 2021
3e7d13c
add migration part.1
Aug 18, 2021
64b6c40
drop `darwinia-treasury`
Aug 18, 2021
0fb4f00
suppress warning
Aug 18, 2021
89ae56c
add `Treasury`, `KtonTresury`, `Tips`, `Bounties`
Aug 18, 2021
b1750f6
update `transaction_version`
Aug 18, 2021
d5c4909
add migration part.2
Aug 18, 2021
967574c
correct prefix
Aug 18, 2021
1912f9e
downgrade `jsonrpsee`
Aug 18, 2021
8d30ad7
correct struct type
Aug 18, 2021
0c37ad6
Merge commit '207c47078ba2e03a20d7e75541e4fa40f9c0fa56' into xavier-t…
Aug 18, 2021
6e429b5
use `Ring`
Aug 19, 2021
1962120
remove outdated content
Aug 19, 2021
39b74e8
add missing filter
Aug 19, 2021
1d0f768
remove outdated type
Aug 19, 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
146 changes: 52 additions & 94 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: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ members = [
"frame/staking/rpc",
"frame/staking/rpc/runtime-api",
"frame/support",
"frame/treasury",
"frame/vesting",
"primitives/asset",
"primitives/chain-bsc",
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ The Darwinia Runtime Module Library (DRML) is a darwinia.network maintained coll
- Desc.
- [darwinia-support](./frame/support)
- Desc.
- [darwinia-treasury](./frame/treasury)
- Desc.
- [darwinia-vesting](./frame/vesting)
- Desc.

Expand Down
6 changes: 6 additions & 0 deletions bin/node/cli/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ pub fn pangolin_build_spec_config() -> PangolinChainSpec {
phantom: PhantomData::<pangolin_runtime::TechnicalMembershipInstance>,
members: collective_members.clone(),
},
pallet_treasury: Default::default(),
pallet_treasury_Instance2: Default::default(),
darwinia_claims: Default::default(),
darwinia_vesting: Default::default(),
pallet_sudo: pangolin_runtime::SudoConfig { key: root.clone() },
Expand Down Expand Up @@ -549,6 +551,8 @@ pub fn pangolin_development_config() -> PangolinChainSpec {
phantom: PhantomData::<pangolin_runtime::TechnicalMembershipInstance>,
members: collective_members.clone(),
},
pallet_treasury: Default::default(),
pallet_treasury_Instance2: Default::default(),
darwinia_claims: pangolin_runtime::ClaimsConfig {
claims_list: ClaimsList::from_file(
"bin/res/claims-list.json",
Expand Down Expand Up @@ -770,6 +774,8 @@ pub fn pangolin_local_testnet_config() -> PangolinChainSpec {
phantom: PhantomData::<pangolin_runtime::TechnicalMembershipInstance>,
members: collective_members.clone(),
},
pallet_treasury: Default::default(),
aurexav marked this conversation as resolved.
Show resolved Hide resolved
pallet_treasury_Instance2: Default::default(),
darwinia_claims: pangolin_runtime::ClaimsConfig {
claims_list: ClaimsList::from_file(
"bin/res/claims-list.json",
Expand Down
8 changes: 6 additions & 2 deletions bin/node/runtime/pangolin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ darwinia-s2s-issuing = { default-features = false, path = "../../
darwinia-staking = { default-features = false, path = "../../../../frame/staking" }
darwinia-staking-rpc-runtime-api = { default-features = false, path = "../../../../frame/staking/rpc/runtime-api" }
darwinia-support = { default-features = false, path = "../../../../frame/support" }
darwinia-treasury = { default-features = false, path = "../../../../frame/treasury" }
darwinia-tron-backing = { default-features = false, path = "../../../../frame/bridge/tron/backing" }
darwinia-vesting = { default-features = false, path = "../../../../frame/vesting" }
dp-asset = { default-features = false, path = "../../../../primitives/asset" }
Expand Down Expand Up @@ -73,6 +72,7 @@ frame-try-runtime = { default-features = false, optiona
pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-bounties = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/parity-bridges-common", branch = "main" }
pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/parity-bridges-common", branch = "main" }
pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/parity-bridges-common", branch = "main" }
Expand All @@ -92,8 +92,10 @@ pallet-session = { default-features = false, git = "
pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-tips = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-treasury = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
sp-application-crypto = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "main" }
Expand Down Expand Up @@ -150,7 +152,6 @@ std = [
"darwinia-staking/std",
"darwinia-staking-rpc-runtime-api/std",
"darwinia-support/std",
"darwinia-treasury/std",
"darwinia-tron-backing/std",
"darwinia-vesting/std",
"dp-asset/std",
Expand Down Expand Up @@ -179,6 +180,7 @@ std = [
"pallet-authority-discovery/std",
"pallet-authorship/std",
"pallet-babe/std",
"pallet-bounties/std",
"pallet-bridge-dispatch/std",
"pallet-bridge-grandpa/std",
"pallet-bridge-messages/std",
Expand All @@ -198,8 +200,10 @@ std = [
"pallet-society/std",
"pallet-sudo/std",
"pallet-timestamp/std",
"pallet-tips/std",
"pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-treasury/std",
"pallet-utility/std",
"sp-api/std",
"sp-application-crypto/std",
Expand Down
9 changes: 0 additions & 9 deletions bin/node/runtime/pangolin/polkadot-compatible-types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,6 @@
"reporters": "Vec<AccountId>",
"payout": "RKT"
},
"__[pallet.treasury]__": {},
"TreasuryProposal": {
"proposer": "AccountId",
"beneficiary": "AccountId",
"ring_value": "Balance",
"kton_value": "Balance",
"ring_bond": "Balance",
"kton_bond": "Balance"
},
"__[pallet.bridge.crab]__": {},
"MappedRing": "u128",
"__[pallet.bridge.eth]__": {},
Expand Down
Loading