Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update client to Polkadot v1.7.2 #1844

Merged
merged 16 commits into from
May 30, 2024
Merged

feat: Update client to Polkadot v1.7.2 #1844

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dc2f646
wip: update client
wischli May 23, 2024
443a2b4
chore: update crate versions
wischli May 23, 2024
3eabadd
chore: update anchor rpc api
wischli May 24, 2024
31d9ba2
chore: remove rewards, pools rpc
wischli May 24, 2024
c3052e4
chore: compile with development runtime
wischli May 24, 2024
bede9cd
Merge remote-tracking branch 'origin/polkadot-v1.7.2' into wf/polkado…
wischli May 24, 2024
a62a4cd
fix: client for all runtimes
wischli May 24, 2024
f699c6b
fix: build spec
wischli May 24, 2024
e0dd656
feat: update relay docker images
wischli May 24, 2024
bb717fe
fix: apply deprecation of export genesis state to scripts
wischli May 24, 2024
4ac8cb6
fmt: taplo
wischli May 24, 2024
96195c3
refactor: use xcm v4 sugar
wischli May 27, 2024
e10f5e5
fix: revert tmp change in local para run
wischli May 27, 2024
69b73a1
Merge remote-tracking branch 'origin/polkadot-v1.7.2' into wf/polkado…
wischli May 27, 2024
8215e88
Merge remote-tracking branch 'origin/polkadot-v1.7.2' into wf/polkado…
wischli May 29, 2024
938f79a
refactor: simplify xcm v4 locations in chain spec
wischli May 27, 2024
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
1,976 changes: 1,874 additions & 102 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 24 additions & 20 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace]
resolver = "2"
members = [
#"node",
"node",
"libs/mocks",
"libs/primitives",
"libs/test-utils",
Expand Down Expand Up @@ -54,33 +54,34 @@ repository = "https://github.com/centrifuge/centrifuge-chain"
documentation = "https://reference.centrifuge.io/centrifuge_chain/index.html"

[workspace.dependencies]
hex-literal = { version = "0.3.4" }
hex-literal = { version = "0.4.1" }
hex = { version = "0.4.3", default-features = false }
smallvec = "1.6.1"
serde = { version = "1.0.119", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "3.2.2", default-features = false, features = ["derive"] }
scale-info = { version = "2.3.0", default-features = false, features = ["derive"] }
log = { version = "0.4", default-features = false }
smallvec = "1.11.0"
serde = { version = "1.0.195", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.111" }
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
log = { version = "0.4.20", default-features = false }
Comment on lines +59 to +64
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: As mentioned in the PR description, I have bumped all of these to the versions used in Polkadot SDK v1.7.2

getrandom = { version = "0.2", features = ["js"] }
static_assertions = "1.1.0"
lazy_static = "1.4.0"
thiserror = "1.0.30"
tokio = { version = "1.15", features = ["macros"] }
tracing-subscriber = "0.2"
tokio = { version = "1.32.0", features = ["macros"] }
tracing-subscriber = "0.2.25"
ethabi = { version = "18.0", default-features = false }
ethereum = { version = "0.15.0", default-features = false }
async-trait = "0.1"
clap = { version = "4.0.9", features = ["derive"] }
futures = "0.3.25"
jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
url = "2.2.2"
async-trait = "0.1.74"
clap = { version = "4.4.18", features = ["derive"] }
futures = "0.3.28"
jsonrpsee = { version = "0.20.3", features = ["server", "macros"] }
url = "2.4.0"
tempfile = "3.1.0"
strum = { version = "0.24", default-features = false, features = ["derive"] }
bitflags = { version = "1.3" }
strum = { version = "0.24.1", default-features = false, features = ["derive"] }
bitflags = { version = "1.3.2" }
rand = { version = "0.8.5", default-features = false }
rev_slice = { version = "0.1.5", default-features = false }
impl-trait-for-tuples = "0.2.1"
num-traits = { version = "0.2", default-features = false }
impl-trait-for-tuples = "0.2.2"
num-traits = { version = "0.2.17", default-features = false }
num_enum = { version = "0.5.3", default-features = false }

# Cumulus
Expand Down Expand Up @@ -150,6 +151,7 @@ sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", defaul
sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
sp-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
Expand Down Expand Up @@ -276,7 +278,9 @@ pallet-remarks = { git = "https://github.com/foss3/runtime-pallet-library", bran

# Moonbeam fork of polkadot-evm/frontier
fp-rpc = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2", features = ["serde"] }
fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2", features = [
"serde",
] }
pallet-base-fee = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2", features = [
"forbid-evm-reentrancy",
Expand All @@ -291,6 +295,7 @@ pallet-evm-precompile-dispatch = { git = "https://github.com/moonbeam-foundation
pallet-evm-precompile-modexp = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
pallet-evm-precompile-sha3fips = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
pallet-evm-precompile-simple = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
fc-api = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
fc-consensus = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
fc-db = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2", features = ["rocksdb"] }
fc-mapping-sync = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v1.7.2" }
Expand Down Expand Up @@ -380,4 +385,3 @@ polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk",
# Check issue: https://github.com/paritytech/arkworks-substrate/issues/9
[patch."https://github.com/paritytech/polkadot-sdk"]
sp-crypto-ec-utils = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.7.2" }

4 changes: 2 additions & 2 deletions docker/docker-compose-local-relay.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: '3.4'
services:
node_alice:
container_name: alice
image: "parity/polkadot:v1.0.0"
image: "parity/polkadot:v1.7.2"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: Tested and works.

platform: "linux/x86_64"
ports:
- "30333:30333"
Expand All @@ -30,7 +30,7 @@ services:

node_bob:
container_name: bob
image: "parity/polkadot:v1.0.0"
image: "parity/polkadot:v1.7.2"
platform: "linux/x86_64"
ports:
- "30344:30333"
Expand Down
3 changes: 3 additions & 0 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ jsonrpsee = { workspace = true, default-features = true }
log = { workspace = true, default-features = true }
parity-scale-codec = { default-features = true, workspace = true }
serde = { workspace = true, default-features = true }
serde_json = { workspace = true, default-features = true }
url = { workspace = true, default-features = true }

# client dependencies
pallet-transaction-payment-rpc = { workspace = true, default-features = true }
pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
sc-basic-authorship = { workspace = true, default-features = true }
sc-chain-spec = { workspace = true, default-features = true }
sc-cli = { workspace = true, default-features = true, features = ["rocksdb"] }
Expand Down Expand Up @@ -106,6 +108,7 @@ pallet-pool-system = { workspace = true, default-features = true }
runtime-common = { workspace = true, default-features = true }

# frontier
fc-api = { workspace = true, default-features = true }
fc-consensus = { workspace = true, default-features = true }
fc-db = { workspace = true, default-features = true, features = ["rocksdb"] }
fc-mapping-sync = { workspace = true, default-features = true }
Expand Down
Loading
Loading