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

Migrate pallet-treasury to the new pallet attribute macro #9197

Merged
9 commits merged into from
Jul 13, 2021
Merged

Migrate pallet-treasury to the new pallet attribute macro #9197

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a018b7
Migrate pallet-treasury to the new pallet attribute macro
koushiro Jun 24, 2021
c882531
Fix bounties/tips tests
koushiro Jun 24, 2021
6a8b7c5
fix
koushiro Jun 24, 2021
c4b03d6
Merge remote-tracking branch 'upstream/master' into migrate-pallet-tr…
koushiro Jun 28, 2021
04697f3
Merge remote-tracking branch 'origin/master' into migrate-pallet-trea…
gui1117 Jul 12, 2021
dbbe606
Update frame/treasury/src/lib.rs
shawntabrizi Jul 12, 2021
9919c95
Update frame/treasury/src/lib.rs
shawntabrizi Jul 12, 2021
11bfb66
use `GenesisBuild`
shawntabrizi Jul 13, 2021
5f644dc
fix imports
shawntabrizi Jul 13, 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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into migrate-pallet-trea… 
…sury
  • Loading branch information
@gui1117
gui1117 committed Jul 12, 2021
commit 04697f3cc1d434bc561dbed3097e80dfab7137dc
13 changes: 7 additions & 6 deletions frame/treasury/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
serde = { version = "1.0.101", features = ["derive"], optional = true }
impl-trait-for-tuples = "0.2.1"

sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }

frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../balances" }

frame-benchmarking = { version = "3.1.0", default-features = false, path = "../benchmarking", optional = true }
frame-support = { version = "3.0.0", default-features = false, path = "../support" }
frame-system = { version = "3.0.0", default-features = false, path = "../system" }
pallet-balances = { version = "3.0.0", default-features = false, path = "../balances" }

[dev-dependencies]
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.