Skip to content

Commit

Permalink
upgrade polkadot v1.8.0 (#379)
Browse files Browse the repository at this point in the history
* bump to polkadot-v1.8.0

* bump crate versions

* publish democracy as well

* readme

* clippy
  • Loading branch information
brenzi authored May 6, 2024
1 parent c7aa9b4 commit 7b59e07
Show file tree
Hide file tree
Showing 28 changed files with 298 additions and 277 deletions.
426 changes: 232 additions & 194 deletions Cargo.lock

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ members = [

[workspace.dependencies]
# local pin
encointer-ceremonies-assignment = { path = "ceremonies/assignment", default-features = false, version = "6.1.0" }
encointer-meetup-validation = { path = "ceremonies/meetup-validation", default-features = false, version = "6.1.0" }
encointer-primitives = { path = "primitives", default-features = false, features = ["serde_derive"], version = "6.1.0" }
encointer-rpc = { path = "rpc", version = "6.1.0" }
ep-core = { path = "primitives/core", default-features = false, version = "6.0.0" }
pallet-encointer-balances = { path = "balances", default-features = false, version = "6.1.0" }
pallet-encointer-ceremonies = { path = "ceremonies", default-features = false, version = "6.1.0" }
pallet-encointer-communities = { path = "communities", default-features = false, version = "6.1.0" }
pallet-encointer-reputation-commitments = { path = "reputation-commitments", default-features = false, version = "6.1.0" }
pallet-encointer-scheduler = { path = "scheduler", default-features = false, version = "6.1.0" }
encointer-ceremonies-assignment = { path = "ceremonies/assignment", default-features = false, version = "7.1.0" }
encointer-meetup-validation = { path = "ceremonies/meetup-validation", default-features = false, version = "7.1.0" }
encointer-primitives = { path = "primitives", default-features = false, features = ["serde_derive"], version = "7.1.0" }
encointer-rpc = { path = "rpc", version = "7.1.0" }
ep-core = { path = "primitives/core", default-features = false, version = "7.0.0" }
pallet-encointer-balances = { path = "balances", default-features = false, version = "7.1.0" }
pallet-encointer-ceremonies = { path = "ceremonies", default-features = false, version = "7.1.0" }
pallet-encointer-communities = { path = "communities", default-features = false, version = "7.1.0" }
pallet-encointer-reputation-commitments = { path = "reputation-commitments", default-features = false, version = "7.1.0" }
pallet-encointer-scheduler = { path = "scheduler", default-features = false, version = "7.1.0" }
test-utils = { path = "test-utils" }
# rpc apis
encointer-balances-tx-payment-rpc-runtime-api = { path = "balances-tx-payment/rpc/runtime-api", version = "6.1.0" }
pallet-encointer-bazaar-rpc-runtime-api = { path = "bazaar/rpc/runtime-api", version = "6.1.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { path = "ceremonies/rpc/runtime-api", version = "6.1.0" }
pallet-encointer-communities-rpc-runtime-api = { path = "communities/rpc/runtime-api", version = "6.1.0" }
encointer-balances-tx-payment-rpc-runtime-api = { path = "balances-tx-payment/rpc/runtime-api", version = "7.1.0" }
pallet-encointer-bazaar-rpc-runtime-api = { path = "bazaar/rpc/runtime-api", version = "7.1.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { path = "ceremonies/rpc/runtime-api", version = "7.1.0" }
pallet-encointer-communities-rpc-runtime-api = { path = "communities/rpc/runtime-api", version = "7.1.0" }

# various
array-bytes = "6.1.0"
Expand All @@ -57,44 +57,44 @@ log = { version = "0.4.20", default-features = false }
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive", "max-encoded-len"] }
parking_lot = "0.12.1"
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.195", default-features = false, features = ["derive", "alloc"] }
serde = { version = "1.0.197", default-features = false, features = ["derive", "alloc"] }
thiserror = "1.0.50"

# polkadot-sdk [no_std]
frame-benchmarking = { default-features = false, version = "29.0.0" }
frame-support = { default-features = false, version = "29.0.0" }
frame-system = { default-features = false, version = "29.0.0" }
pallet-asset-tx-payment = { default-features = false, version = "29.0.0" }
pallet-balances = { default-features = false, version = "29.0.0" }
pallet-timestamp = { default-features = false, version = "28.0.0" }
pallet-transaction-payment = { default-features = false, version = "29.0.0" }
pallet-treasury = { default-features = false, version = "28.0.0" }
sp-api = { default-features = false, version = "27.0.0" }
sp-application-crypto = { default-features = false, version = "31.0.0" }
sp-arithmetic = { default-features = false, version = "24.0.0" }
sp-core = { default-features = false, version = "29.0.0" }
sp-io = { default-features = false, version = "31.0.0" }
sp-runtime = { default-features = false, version = "32.0.0" }
frame-benchmarking = { default-features = false, version = "30.0.0" }
frame-support = { default-features = false, version = "30.0.0" }
frame-system = { default-features = false, version = "30.0.0" }
pallet-asset-tx-payment = { default-features = false, version = "30.0.0" }
pallet-balances = { default-features = false, version = "30.0.0" }
pallet-timestamp = { default-features = false, version = "29.0.0" }
pallet-transaction-payment = { default-features = false, version = "30.0.0" }
pallet-treasury = { default-features = false, version = "29.0.0" }
sp-api = { default-features = false, version = "28.0.0" }
sp-application-crypto = { default-features = false, version = "32.0.0" }
sp-arithmetic = { default-features = false, version = "25.0.0" }
sp-core = { default-features = false, version = "30.0.0" }
sp-io = { default-features = false, version = "32.0.0" }
sp-runtime = { default-features = false, version = "33.0.0" }
sp-std = { default-features = false, version = "14.0.0" }

# rpc stuff [std]
jsonrpsee = { version = "0.20.3", features = ["client-core", "server", "macros"] }
jsonrpsee-core = { version = "0.20.3" }
jsonrpsee-types = { version = "0.20.3" }
pallet-transaction-payment-rpc = { version = "31.0.0" }
sc-rpc = "30.0.0"
sc-rpc-api = "0.34.0"
sp-blockchain = "29.0.0"
sp-rpc = "27.0.0"
jsonrpsee = { version = "0.22.0", features = ["client-core", "server", "macros"] }
jsonrpsee-core = { version = "0.22.0" }
jsonrpsee-types = { version = "0.22.0" }
pallet-transaction-payment-rpc = { version = "32.0.0" }
sc-rpc = "31.0.0"
sc-rpc-api = "0.35.0"
sp-blockchain = "30.0.0"
sp-rpc = "28.0.0"

# dev deps
approx = "0.5.1"
itertools = "0.10.5"
rstest = "0.12.0"
serde_json = "1.0.111"
sp-inherents = "27.0.0"
sp-keyring = "32.0.0"
sp-keystore = "0.35.0"
serde_json = "1.0.114"
sp-inherents = "28.0.0"
sp-keyring = "33.0.0"
sp-keystore = "0.36.0"

#[patch."https://github.com/encointer/substrate-fixed"]
#substrate-fixed = { path = "../substrate-fixed"}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ cargo tree --workspace -i ep-core
# add --execute if you're sure
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-ceremonies-assignment -p encointer-meetup-validation -p pallet-encointer-ceremonies -p pallet-encointer-bazaar -p pallet-encointer-reputation-commitments -p pallet-encointer-faucet -p pallet-encointer-democracy
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
```

2 changes: 1 addition & 1 deletion 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 = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances tx payment for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion 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 = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances tx payment rpc for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion 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 = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances tx payment rpc runtime api for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion balances/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-balances"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Balances pallet for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion bazaar/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-bazaar"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Bazaar pallet for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion 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 = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Bazaar rpc for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion 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 = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Bazaar rpc runtime API for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion ceremonies/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-ceremonies"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Ceremonies pallet for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion ceremonies/assignment/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encointer-ceremonies-assignment"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Ceremonies assignments for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion ceremonies/meetup-validation/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encointer-meetup-validation"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Meetup validation for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion ceremonies/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-ceremonies-rpc"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Ceremonies rpc for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion ceremonies/rpc/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-ceremonies-rpc-runtime-api"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Ceremonies rpc runtime API for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion communities/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-communities"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Communities pallet for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion communities/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-communities-rpc"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Communities rpc for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion communities/rpc/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-communities-rpc-runtime-api"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Communities rpc runtime api for the Encointer blockchain runtime"
Expand Down
16 changes: 0 additions & 16 deletions communities/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,12 @@ mod v0 {
use super::*;
use encointer_primitives::{common::BoundedIpfsCid, communities::CommunityRules};

pub trait AsByteOrNoop {
fn as_bytes_or_noop(&self) -> &[u8];
}

#[cfg(not(feature = "std"))]
pub type UnboundedPalletString = Vec<u8>;

#[cfg(feature = "std")]
pub type UnboundedPalletString = String;

impl AsByteOrNoop for UnboundedPalletString {
#[cfg(feature = "std")]
fn as_bytes_or_noop(&self) -> &[u8] {
self.as_bytes()
}

#[cfg(not(feature = "std"))]
fn as_bytes_or_noop(&self) -> &[u8] {
self
}
}

pub type IpfsCid = UnboundedPalletString;

#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
Expand Down
3 changes: 1 addition & 2 deletions democracy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[package]
name = "pallet-encointer-democracy"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Democracy pallet for the Encointer blockchain runtime"
homepage = "https://encointer.org"
repository = "https://github.com/encointer/pallets"
license = "GPL-3.0-or-later"
publish = false

[dependencies]
log = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion faucet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-faucet"
version = "6.2.0"
version = "7.2.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Faucet pallet for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encointer-primitives"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Primitives for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion primitives/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ep-core"
version = "6.0.0"
version = "7.0.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Core primitives for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion reputation-commitments/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-reputation-commitments"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Reputation commitments pallet for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encointer-rpc"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "RPC for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion scheduler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-scheduler"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Scheduler pallet for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion test-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test-utils"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Test utils for the Encointer blockchain runtime"
Expand Down
2 changes: 1 addition & 1 deletion vouches/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-encointer-vouches"
version = "6.1.0"
version = "7.1.0"
authors = ["Encointer Association <[email protected]>"]
edition = "2021"
description = "Vouches pallet for the Encointer blockchain runtime"
Expand Down

0 comments on commit 7b59e07

Please sign in to comment.