Skip to content

Commit

Permalink
upgrade pallets to 6.1.0 (#216)
Browse files Browse the repository at this point in the history 
* bump deps to polkadot-sdk-v1.7.0

* bump version

* add tilde version to pallets. depend on encointer fork of runtimes

* bump pallets with patches

* lift patches

* bump version to 1.7.4

* taplo fmt
  • Loading branch information
@brenzi
brenzi authored Mar 20, 2024
1 parent 5c320a1 commit eaa544a
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 81 deletions.
80 changes: 40 additions & 40 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 23 additions & 40 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,27 @@ smallvec = "1.11.2"
tempfile = "3.8.1"

# encointer deps
encointer-balances-tx-payment = { default-features = false, version = "~6.0.0" }
encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
encointer-primitives = { default-features = false, version = "~6.0.2" }
pallet-encointer-balances = { default-features = false, version = "~6.0.0" }
pallet-encointer-bazaar = { default-features = false, version = "~6.0.0" }
pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
pallet-encointer-ceremonies = { default-features = false, version = "~6.0.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
pallet-encointer-communities = { default-features = false, version = "~6.0.0" }
pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
pallet-encointer-faucet = { default-features = false, version = "~6.0.0" }
pallet-encointer-reputation-commitments = { default-features = false, version = "~6.0.0" }
pallet-encointer-scheduler = { default-features = false, version = "~6.0.0" }
encointer-balances-tx-payment = { default-features = false, version = "~6.1.0" }
encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
encointer-primitives = { default-features = false, version = "~6.1.0" }
pallet-encointer-balances = { default-features = false, version = "~6.1.0" }
pallet-encointer-bazaar = { default-features = false, version = "~6.1.0" }
pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
pallet-encointer-ceremonies = { default-features = false, version = "~6.1.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
pallet-encointer-communities = { default-features = false, version = "~6.1.0" }
pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
pallet-encointer-faucet = { default-features = false, version = "~6.1.0" }
pallet-encointer-reputation-commitments = { default-features = false, version = "~6.1.0" }
pallet-encointer-scheduler = { default-features = false, version = "~6.1.0" }
# rpc [std]
pallet-encointer-bazaar-rpc = "~6.0.0"
pallet-encointer-ceremonies-rpc = "~6.0.0"
pallet-encointer-communities-rpc = "~6.0.0"
pallet-encointer-bazaar-rpc = "~6.1.0"
pallet-encointer-ceremonies-rpc = "~6.1.0"
pallet-encointer-communities-rpc = "~6.1.0"

# fellowship runtimes. do not depend on fellow-runtimes directly, so we can upgrade at our own pace
kusama-runtime-constants = { default-features = false, git = "https://github.com/encointer/runtimes.git", branch = "polkadot-v1.7.0" }
parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "polkadot-v1.7.0" }
kusama-runtime-constants = { default-features = false, git = "https://github.com/encointer/runtimes.git", branch = "ab/upgrade-encointer-to-6.1" }
parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "ab/upgrade-encointer-to-6.1" }

# polkadot-sdk [no_std]
cumulus-pallet-aura-ext = { default-features = false, version = "0.8.0" }
Expand Down Expand Up @@ -143,27 +143,11 @@ sp-timestamp = "27.0.0"
substrate-build-script-utils = "11.0.0"
substrate-prometheus-endpoint = "0.17.0"


#only while debugging/developping
#[patch."https://github.com/encointer/pallets"]
#encointer-balances-tx-payment = { path = "../pallets/balances-tx-payment" }
#encointer-balances-tx-payment-rpc = { path = "../pallets/balances-tx-payment/rpc" }
#encointer-balances-tx-payment-rpc-runtime-api = { path = "../pallets/balances-tx-payment/rpc/runtime-api" }
#encointer-ceremonies-assignment = { path = "../pallets/ceremonies/assignment" }
#encointer-primitives = { path = "../pallets/primitives" }
#pallet-encointer-ceremonies = { path = "../pallets/ceremonies" }
#pallet-encointer-ceremonies-rpc = { path = "../pallets/ceremonies/rpc" }
#pallet-encointer-ceremonies-rpc-runtime-api = { path = "../pallets/ceremonies/rpc/runtime-api" }
#pallet-encointer-communities = { path = "../pallets/communities" }
#pallet-encointer-communities-rpc = { path = "../pallets/communities/rpc" }
#pallet-encointer-communities-rpc-runtime-api = { path = "../pallets/communities/rpc/runtime-api" }
#pallet-encointer-balances = { path = "../pallets/balances" }
#pallet-encointer-scheduler = { path = "../pallets/scheduler" }
#pallet-encointer-bazaar = { path = "../pallets/bazaar" }
#pallet-encointer-bazaar-rpc = { path = "../pallets/bazaar/rpc" }
#pallet-encointer-bazaar-rpc-runtime-api = { path = "../pallets/bazaar/rpc/runtime-api" }

#only while debugging/developping
# ### only while debugging/developping
#[patch."https://github.com/encointer/runtimes"]
#kusama-runtime-constants = { path = "../runtimes/relay/kusama/constants" }
#parachain-runtime = { package = "encointer-kusama-runtime", path = "../runtimes/system-parachains/encointer" }
#
#[patch.crates-io]
#encointer-balances-tx-payment = { path = "../pallets/balances-tx-payment" }
#encointer-balances-tx-payment-rpc = { path = "../pallets/balances-tx-payment/rpc" }
Expand All @@ -183,4 +167,3 @@ substrate-prometheus-endpoint = "0.17.0"
#pallet-encointer-bazaar-rpc-runtime-api = { path = "../pallets/bazaar/rpc/runtime-api" }
#pallet-encointer-faucet = { path = "../pallets/faucet" }
#pallet-encointer-reputation-commitments = { path = "../pallets/reputation-commitments" }
#
2 changes: 1 addition & 1 deletion node/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "encointer-collator"
# align major.minor revision with the polkadot-sdk release. bump patch revision ad lib. make this the github release tag
version = "1.7.3"
version = "1.7.4"
authors = ["Encointer <[email protected]>"]
build = "build.rs"
edition = "2021"
Expand Down

0 comments on commit eaa544a

Please sign in to comment.