Skip to content

Commit

Permalink
upgrade to polkadot-sdk-1.3.0 (#363)
Browse files Browse the repository at this point in the history
* bump deps to polkadot-sdk-1.3.0

* fix build

* bump major rev

* fix crates-io release

* enhance README

* cargo zepter

* clippy

* Fix toml format and add resolver = "2" (#364)

* run taplo fmt

* add resolver = "2" to workspace root

* fix duplicate deps

* zepter & taplo

* fix runtime-benchmarks build

* bump all crates to 3.0.1

* fixes in toml

* fix zepter bug

* fix more

* fix more

* some manualformatting, tiny fix and bump 3.0.2

* cosmetics

* taplo

---------

Co-authored-by: clangenb <[email protected]>
  • Loading branch information
brenzi and clangenb authored Jan 9, 2024
1 parent acc6577 commit f6e15ec
Show file tree
Hide file tree
Showing 31 changed files with 1,210 additions and 846 deletions.
1,218 changes: 704 additions & 514 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
'balances',
'balances-tx-payment',
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ We also apply substrate's standard of serializing with `camelCase`.

### Versioning

We bump crate versions separately and tag the repository with the highest crate version
Major version must increase for polkadot-sdk release upgrades as these are always breaking changes. For convenience, all crates in this repos shall have the same major version.

We bump minor crate versions separately and tag the repository with the highest crate version

motivation: git blame should show on crate directory level if there was a change. This way, browsing the repo on github really shows when a certain pallet or crate has been touched. Even if it's only adjustments for upstream upgrades, just bump crate versions to the newest, which will be tagged globally

Expand All @@ -67,7 +69,7 @@ cargo install cargo-release
cargo tree --workspace -i ep-core
# add --execute if you're sure
cargo release publish -p ep-core -p encointer-primitives -p test-utils -p pallet-encointer-scheduler -p pallet-encointer-balances -p pallet-encointer-communities
cargo release publish -p ep-core -p encointer-primitives -p pallet-encointer-scheduler -p pallet-encointer-balances -p pallet-encointer-communities
cargo release publish -p encointer-ceremonies-assignment -p encointer-meetup-validation -p pallet-encointer-ceremonies -p pallet-encointer-bazaar -p pallet-encointer-reputation-commitments -p pallet-encointer-faucet
cargo release publish -p encointer-rpc -p encointer-balances-tx-payment -p encointer-balances-tx-payment-rpc-runtime-api -p encointer-balances-tx-payment-rpc -p pallet-encointer-bazaar-rpc-runtime-api -p pallet-encointer-bazaar-rpc -p pallet-encointer-ceremonies-rpc-runtime-api -p pallet-encointer-ceremonies-rpc -p pallet-encointer-communities-rpc-runtime-api -p pallet-encointer-communities-rpc
```
Expand Down
44 changes: 26 additions & 18 deletions balances-tx-payment/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encointer-balances-tx-payment"
version = "2.0.0"
version = "3.0.2"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances tx payment for the Encointer blockchain runtime"
Expand All @@ -11,42 +11,50 @@ license = "GPL-3.0-or-later"
[dependencies]
log = { version = "0.4.20", default-features = false }

encointer-primitives = { path = "../primitives", default-features = false, version = "2.0.0" }
pallet-encointer-balances = { path = "../balances", default-features = false, version = "2.0.0" }
pallet-encointer-ceremonies = { path = "../ceremonies", default-features = false, version = "2.0.0" }
encointer-primitives = { path = "../primitives", default-features = false, version = "3.0.2" }
pallet-encointer-balances = { path = "../balances", default-features = false, version = "3.0.2" }
pallet-encointer-ceremonies = { path = "../ceremonies", default-features = false, version = "3.0.2" }

# substrate dependencies
frame-support = { default-features = false, version = "24.0.0" }
frame-system = { default-features = false, version = "24.0.0" }
pallet-asset-tx-payment = { default-features = false, version = "24.0.0" }
pallet-transaction-payment = { default-features = false, version = "24.0.0" }
sp-runtime = { default-features = false, version = "27.0.0" }
frame-support = { default-features = false, version = "25.0.0" }
frame-system = { default-features = false, version = "25.0.0" }
pallet-asset-tx-payment = { default-features = false, version = "25.0.0" }
pallet-transaction-payment = { default-features = false, version = "25.0.0" }
sp-runtime = { default-features = false, version = "28.0.0" }

[dev-dependencies]
codec = { package = "parity-scale-codec", version = "3.6.4", default-features = false, features = [
"derive",
] }
rstest = "0.12.0"
scale-info = { version = "2.9.0", default-features = false }
sp-io = "26.0.0"
scale-info = { version = "2.10.0", default-features = false }
sp-io = "27.0.0"
test-utils = { path = "../test-utils" }

[features]
default = ["std"]
std = [
"log/std",

# encointer deps
"pallet-encointer-balances/std",
"pallet-encointer-ceremonies/std",
"encointer-primitives/std",

# substrate deps
"frame-support/std",
"frame-system/std",
"log/std",
"pallet-asset-tx-payment/std",
# encointer deps
"pallet-encointer-balances/std",
"pallet-encointer-ceremonies/std",
"pallet-transaction-payment/std",
"sp-runtime/std",
]

try-runtime = ["frame-system/try-runtime"]
try-runtime = [
"frame-system/try-runtime",
"pallet-encointer-balances/try-runtime",
"pallet-encointer-ceremonies/try-runtime",
]
runtime-benchmarks = [
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"pallet-encointer-balances/runtime-benchmarks",
"pallet-encointer-ceremonies/runtime-benchmarks",
]
26 changes: 13 additions & 13 deletions balances-tx-payment/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encointer-balances-tx-payment-rpc"
version = "2.0.0"
version = "3.0.2"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances tx payment rpc for the Encointer blockchain runtime"
Expand All @@ -20,17 +20,17 @@ parking_lot = "0.12.0"
thiserror = "1.0.31"

# local deps
encointer-balances-tx-payment-rpc-runtime-api = { package = "encointer-balances-tx-payment-rpc-runtime-api", path = "runtime-api", version = "2.0.0" }
encointer-primitives = { path = "../../primitives", version = "2.0.0" }
encointer-rpc = { path = "../../rpc", version = "2.0.0" }
encointer-balances-tx-payment-rpc-runtime-api = { package = "encointer-balances-tx-payment-rpc-runtime-api", path = "runtime-api", version = "3.0.2" }
encointer-primitives = { path = "../../primitives", version = "3.0.2" }
encointer-rpc = { path = "../../rpc", version = "3.0.2" }

# substrate deps
pallet-transaction-payment = { default-features = false, version = "24.0.0" }
pallet-transaction-payment-rpc = { default-features = false, version = "26.0.0" }
sc-rpc = "25.0.0"
sc-rpc-api = "0.29.0"
sp-api = "22.0.0"
sp-blockchain = "24.0.0"
sp-core = "24.0.0"
sp-rpc = "22.0.0"
sp-runtime = "27.0.0"
pallet-transaction-payment = { version = "25.0.0" }
pallet-transaction-payment-rpc = { version = "27.0.0" }
sc-rpc = "26.0.0"
sc-rpc-api = "0.30.0"
sp-api = "23.0.0"
sp-blockchain = "25.0.0"
sp-core = "25.0.0"
sp-rpc = "23.0.0"
sp-runtime = "28.0.0"
18 changes: 9 additions & 9 deletions balances-tx-payment/rpc/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encointer-balances-tx-payment-rpc-runtime-api"
version = "2.0.0"
version = "3.0.2"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances tx payment rpc runtime api for the Encointer blockchain runtime"
Expand All @@ -10,24 +10,24 @@ license = "GPL-3.0-or-later"

[dependencies]
# local deps
encointer-primitives = { path = "../../../primitives", default-features = false, version = "2.0.0" }
encointer-primitives = { path = "../../../primitives", default-features = false, version = "3.0.2" }

# substrate deps
codec = { package = "parity-scale-codec", version = "3.6.4", default-features = false, features = [
"derive",
] }
frame-support = { default-features = false, version = "24.0.0" }
scale-info = { version = "2.9.0", default-features = false }
sp-api = { default-features = false, version = "22.0.0" }
sp-std = { default-features = false, version = "11.0.0" }
frame-support = { default-features = false, version = "25.0.0" }
scale-info = { version = "2.10.0", default-features = false }
sp-api = { default-features = false, version = "23.0.0" }
sp-std = { default-features = false, version = "12.0.0" }

[features]
default = ["std"]
std = [
"codec/std",
"scale-info/std",
"encointer-primitives/std",
"frame-support/std",
"sp-std/std",
"scale-info/std",
"sp-api/std",
"encointer-primitives/std",
"sp-std/std",
]
39 changes: 21 additions & 18 deletions balances/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-balances"
version = "2.0.0"
version = "3.0.2"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances pallet for the Encointer blockchain runtime"
Expand All @@ -14,42 +14,45 @@ codec = { package = "parity-scale-codec", version = "3.6.4", default-features =
"derive",
] }
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.9.0", default-features = false }
scale-info = { version = "2.10.0", default-features = false }

# local deps
encointer-primitives = { path = "../primitives", default-features = false, features = ["serde_derive"], version = "2.0.0" }
encointer-primitives = { path = "../primitives", default-features = false, features = ["serde_derive"], version = "3.0.2" }

# substrate deps
frame-benchmarking = { default-features = false, optional = true, version = "24.0.0" }
frame-support = { default-features = false, version = "24.0.0" }
frame-system = { default-features = false, version = "24.0.0" }
pallet-asset-tx-payment = { default-features = false, version = "24.0.0" }
pallet-transaction-payment = { default-features = false, version = "24.0.0" }
sp-runtime = { default-features = false, version = "27.0.0" }
sp-std = { default-features = false, version = "11.0.0" }
frame-benchmarking = { default-features = false, optional = true, version = "25.0.0" }
frame-support = { default-features = false, version = "25.0.0" }
frame-system = { default-features = false, version = "25.0.0" }
pallet-asset-tx-payment = { default-features = false, version = "25.0.0" }
pallet-transaction-payment = { default-features = false, version = "25.0.0" }
sp-runtime = { default-features = false, version = "28.0.0" }
sp-std = { default-features = false, version = "12.0.0" }

[dev-dependencies]
approx = "0.5.1"
sp-io = "26.0.0"
sp-io = "27.0.0"
test-utils = { path = "../test-utils" }

[features]
default = ["std"]
std = [
"codec/std",
"log/std",
"scale-info/std",
# local deps
"encointer-primitives/std",
# substrate deps
"frame-support/std",
"frame-system/std",
"sp-std/std",
"sp-runtime/std",
"log/std",
"pallet-asset-tx-payment/std",
"pallet-transaction-payment/std",
"scale-info/std",
"sp-runtime/std",
"sp-std/std",
]
runtime-benchmarks = [
"approx",
"frame-benchmarking",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
]

runtime-benchmarks = ["frame-benchmarking", "approx"]

try-runtime = ["frame-system/try-runtime"]
40 changes: 23 additions & 17 deletions bazaar/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-bazaar"
version = "2.0.0"
version = "3.0.2"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Bazaar pallet for the Encointer blockchain runtime"
Expand All @@ -13,41 +13,47 @@ codec = { package = "parity-scale-codec", version = "3.6.4", default-features =
"derive",
] }
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.9.0", default-features = false }
scale-info = { version = "2.10.0", default-features = false }

# local deps
encointer-communities = { package = "pallet-encointer-communities", path = "../communities", default-features = false, version = "2.0.0" }
encointer-primitives = { path = "../primitives", default-features = false, features = ["serde_derive"], version = "2.0.0" }
encointer-communities = { package = "pallet-encointer-communities", path = "../communities", default-features = false, version = "3.0.2" }
encointer-primitives = { path = "../primitives", default-features = false, features = ["serde_derive"], version = "3.0.2" }

# substrate deps
frame-benchmarking = { default-features = false, optional = true, version = "24.0.0" }
frame-support = { default-features = false, version = "24.0.0" }
frame-system = { default-features = false, version = "24.0.0" }
sp-core = { default-features = false, version = "24.0.0" }
sp-std = { default-features = false, version = "11.0.0" }
frame-benchmarking = { default-features = false, optional = true, version = "25.0.0" }
frame-support = { default-features = false, version = "25.0.0" }
frame-system = { default-features = false, version = "25.0.0" }
sp-core = { default-features = false, version = "25.0.0" }
sp-std = { default-features = false, version = "12.0.0" }

[dev-dependencies]
sp-io = "26.0.0"
sp-io = "27.0.0"
test-utils = { path = "../test-utils" }

[features]
default = ["std"]
std = [
"codec/std",
"log/std",
"scale-info/std",

# local deps
"encointer-communities/std",
"encointer-primitives/std",

# substrate deps
"frame-support/std",
"frame-system/std",
"sp-std/std",
"log/std",
"scale-info/std",
"sp-core/std",
"sp-std/std",
]

runtime-benchmarks = ["frame-benchmarking"]
runtime-benchmarks = [
"encointer-communities/runtime-benchmarks",
"frame-benchmarking",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
]

try-runtime = ["frame-system/try-runtime"]
try-runtime = [
"encointer-communities/try-runtime",
"frame-system/try-runtime",
]
18 changes: 9 additions & 9 deletions bazaar/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-bazaar-rpc"
version = "2.0.0"
version = "3.0.2"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Bazaar rpc for the Encointer blockchain runtime"
Expand All @@ -19,13 +19,13 @@ parking_lot = "0.12.0"
thiserror = "1.0.31"

# local deps
encointer-bazaar-rpc-runtime-api = { package = "pallet-encointer-bazaar-rpc-runtime-api", path = "runtime-api", version = "2.0.0" }
encointer-primitives = { path = "../../primitives", version = "2.0.0" }
encointer-rpc = { path = "../../rpc", version = "2.0.0" }
encointer-bazaar-rpc-runtime-api = { package = "pallet-encointer-bazaar-rpc-runtime-api", path = "runtime-api", version = "3.0.2" }
encointer-primitives = { path = "../../primitives", version = "3.0.2" }
encointer-rpc = { path = "../../rpc", version = "3.0.2" }

# substrate deps
sc-rpc = "25.0.0"
sc-rpc-api = "0.29.0"
sp-api = "22.0.0"
sp-blockchain = "24.0.0"
sp-runtime = "27.0.0"
sc-rpc = "26.0.0"
sc-rpc-api = "0.30.0"
sp-api = "23.0.0"
sp-blockchain = "25.0.0"
sp-runtime = "28.0.0"
14 changes: 7 additions & 7 deletions bazaar/rpc/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-bazaar-rpc-runtime-api"
version = "2.0.0"
version = "3.0.2"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Bazaar rpc runtime API for the Encointer blockchain runtime"
Expand All @@ -10,18 +10,18 @@ license = "GPL-3.0-or-later"

[dependencies]
# local deps
encointer-primitives = { path = "../../../primitives", default-features = false, version = "2.0.0" }
encointer-primitives = { path = "../../../primitives", default-features = false, version = "3.0.2" }

# substrate deps
frame-support = { default-features = false, version = "24.0.0" }
sp-api = { default-features = false, version = "22.0.0" }
sp-std = { default-features = false, version = "11.0.0" }
frame-support = { default-features = false, version = "25.0.0" }
sp-api = { default-features = false, version = "23.0.0" }
sp-std = { default-features = false, version = "12.0.0" }

[features]
default = ["std"]
std = [
"encointer-primitives/std",
"frame-support/std",
"sp-std/std",
"sp-api/std",
"encointer-primitives/std",
"sp-std/std",
]
Loading

0 comments on commit f6e15ec

Please sign in to comment.