Skip to content

Commit 33e5c6c

Browse files
jasljasl
committed
Upgrade to Polkadot 0.9.26
1 parent 98cc0a4 commit 33e5c6c

File tree

28 files changed

+2430
-2331
lines changed

28 files changed

+2430
-2331
lines changed

‎Cargo.lock‎

Lines changed: 1710 additions & 1611 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ exclude = [
2929
"crates/pink/examples",
3030
"crates/pink/sidevm/examples",
3131
"standalone/prouter",
32+
"standalone/replay",
3233
]
3334

3435
members = [
@@ -37,7 +38,7 @@ members = [
3738
"standalone/node",
3839
"standalone/runtime",
3940
"standalone/pherry",
40-
"standalone/replay",
41+
# "standalone/replay",
4142
"standalone/headers-cache",
4243
"crates/phala-trie-storage",
4344
"crates/phala-mq",
@@ -72,3 +73,6 @@ members = [
7273
"scripts/toml-upgrade-version",
7374
"scripts/debug-cli"
7475
]
76+
77+
[patch.crates-io]
78+
rocksdb = { version = "0.18", git = "https://github.com/rust-rocksdb/rust-rocksdb" } # Avoid zstd-sys conflicts

‎crates/phactory/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ phala-crypto = { path = "../phala-crypto", features = ["getrandom", "stream"] }
4040
prpc = { path = "../prpc" }
4141
pink = { path = "../pink" }
4242

43-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
44-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", features = ["disable_target_static_assertions"] }
45-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
46-
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
43+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
44+
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", features = ["disable_target_static_assertions"] }
45+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
46+
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
4747
parity-scale-codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive", "full", "chain-error"] }
4848
scopeguard = { version = "1.1", default-features = false }
4949

@@ -61,11 +61,11 @@ derive_more = "0.99.0"
6161
hash-db = { version = "0.15.2", default-features = false }
6262
num = { package = "num-traits", version = "0.2", default-features = false }
6363
finality-grandpa = { version = "0.15", default-features = false, features = ["derive-codec"] }
64-
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
65-
frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
66-
sp-finality-grandpa = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
67-
sp-application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
68-
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25"}
64+
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
65+
frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
66+
sp-finality-grandpa = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
67+
sp-application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
68+
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26"}
6969

7070
fixed = "1.9.0"
7171
fixed-sqrt = "0.2.4"

‎crates/phactory/api/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ phala-crypto = { path = "../../../crates/phala-crypto" }
1919
phala-mq = { path = "../../../crates/phala-mq" }
2020
chain = { path = "../../../standalone/runtime", default-features = false, package = "phala-node-runtime" }
2121

22-
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", package = "sp-finality-grandpa", default-features = false }
23-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", package = "frame-system", default-features = false }
24-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", package = "sp-core", default-features = false, features = ["full_crypto"] }
25-
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", package = "sp-application-crypto", default-features = false, features = ["full_crypto"] }
26-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false }
22+
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", package = "sp-finality-grandpa", default-features = false }
23+
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", package = "frame-system", default-features = false }
24+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", package = "sp-core", default-features = false, features = ["full_crypto"] }
25+
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", package = "sp-application-crypto", default-features = false, features = ["full_crypto"] }
26+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false }
2727

2828
# for pruntime_client
2929
async-trait = { version = "0.1.51", optional = true }

‎crates/phala-crypto/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ edition = "2018"
55
resolver = "2"
66

77
[dependencies]
8-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false }
9-
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false }
8+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false }
9+
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false }
1010

1111
ring = { version = "0.16.20", default-features = false, features = ["alloc"] }
1212
curve25519-dalek = { version = "2.0", default-features = false }

‎crates/phala-mq/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ hex = { version = "0.4.3", default-features = false, features = ['alloc'] }
1111
derive_more = { version = "0.99", default-features = false, features = ["display"] }
1212
parity-scale-codec = { version = "3.0", default-features = false, features = ["derive"] }
1313
scale-info = { version = "2.0", default-features = false, features = ["derive"] }
14-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false }
14+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false }
1515
serde = { version = "1.0", default-features = false, features = ["derive"] }
1616

1717
spin = { version = "0.9", default-features = false, features = ["mutex", "use_ticket_mutex"], optional = true }

‎crates/phala-node-rpc-ext/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ codec = { package = "parity-scale-codec", version = "3.0" }
1919
scale-info = { version = "2.0", default-features = false }
2020

2121
# primitives
22-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
23-
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
24-
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
22+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
23+
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
24+
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
2525

2626
# client dependencies
27-
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
28-
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
29-
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
27+
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
28+
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
29+
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
3030

3131
phala-mq = { path = "../../crates/phala-mq" }
3232
phala-pallets = { path = "../../pallets/phala" }

‎crates/phala-serde-more/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
serde = { version = "1.0.130", default-features = false, features = ["derive", "alloc"] }
8-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false }
8+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false }
99
scale = { package = "parity-scale-codec", version = "3.0", default-features = false }
1010
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
1111

‎crates/phala-trie-storage/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ repository = "https://github.com/Phala-Network/phala-blockchain"
1010
[dependencies]
1111
parity-scale-codec = { version = "3.0", default-features = false }
1212
scale-info = { version = "2.0", default-features = false, features = ["derive"] }
13-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", features = ["full_crypto"] }
14-
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
15-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
16-
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false }
13+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", features = ["full_crypto"] }
14+
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
15+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
16+
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false }
1717

1818
serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
1919
hash-db = "0.15.2"
@@ -22,8 +22,8 @@ im = { version = "15", features = ["serde"] }
2222
parity-util-mem = "0.11.0"
2323

2424
[dev-dependencies]
25-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" }
26-
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", features = ["full_crypto"] }
25+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" }
26+
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", features = ["full_crypto"] }
2727
hash256-std-hasher = { version = "0.15", default-features = false }
2828
hex = "0.4"
2929
serde_json = "1.0"

‎crates/phala-types/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ hex = { version = "0.4", default-features = false, features = ["alloc"] }
99
serde = { version = "1.0.101", default-features = false, optional = true }
1010
codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["full"] }
1111
scale-info = { version = "2.0", default-features = false, features = ["derive"] }
12-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false }
13-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25", default-features = false, optional = true }
12+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false }
13+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true }
1414

1515
phala-trie-storage = { path = "../../crates/phala-trie-storage", default-features = false, optional = true }
1616
phala-mq = { path = "../../crates/phala-mq", default-features = false }

0 commit comments

Comments
 (0)