Skip to content

Commit 5e15f68

Browse files
jasljasl
committed
wip
1 parent d834041 commit 5e15f68

File tree

46 files changed

+1132
-1236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1132
-1236
lines changed

‎Cargo.lock‎

Lines changed: 707 additions & 820 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ members = [
8282
[patch.crates-io]
8383
rocket = { version = "0.5.0-rc.2", git = "https://github.com/SergioBenitez/Rocket" }
8484

85+
# TODO.kevin: Move back to crates.io once it released 1.0
86+
derive_more = { version = "0.99.17", git = "https://github.com/JelteF/derive_more" }
87+
8588
# For pink-extension-runtime, it will introduce Substrate from crates-io which usually different with polkadot-branch
86-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
87-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
89+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
90+
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }

‎crates/phactory/Cargo.toml‎

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

37-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
38-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = ["disable_target_static_assertions"] }
39-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
40-
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
37+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
38+
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", features = ["disable_target_static_assertions"] }
39+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
40+
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
4141
parity-scale-codec = { package = "parity-scale-codec", version = "3.1", default-features = false, features = ["derive", "full", "chain-error"] }
4242
scopeguard = { version = "1.1", default-features = false }
4343

@@ -53,11 +53,11 @@ derive_more = "0.99.0"
5353
hash-db = { version = "0.15.2", default-features = false }
5454
num = { package = "num-traits", version = "0.2", default-features = false }
5555
finality-grandpa = { version = "0.15", default-features = false, features = ["derive-codec"] }
56-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
57-
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
58-
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
59-
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
60-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
56+
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
57+
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
58+
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
59+
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
60+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
6161

6262
fixed = "1.9.0"
6363
fixed-sqrt = "0.2.4"

‎crates/phactory/api/Cargo.toml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ parity-scale-codec = { package = "parity-scale-codec", version = "3.1", defaul
99
scale-info = { version = "2.1", default-features = false, features = ["derive"] }
1010
serde = { version = "1", features = ["derive"], default-features = false }
1111
base64 = { version = "0.13" }
12-
# TODO.kevin: Move back to crates.io once it released 1.0
13-
derive_more = { version = "0.99.17", git = "https://github.com/JelteF/derive_more" }
12+
derive_more = { version = "0.99.17" }
1413
prost = { version = "0.11.0", default-features = false }
1514

1615
phala-trie-storage = { path = "../../../crates/phala-trie-storage", default-features = false, features = ["serde"] }
@@ -20,19 +19,19 @@ phala-crypto = { path = "../../../crates/phala-crypto" }
2019
phala-mq = { path = "../../../crates/phala-mq" }
2120
chain = { path = "../../../standalone/runtime", default-features = false, package = "phala-node-runtime" }
2221

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

2928
# for pruntime_client
3029
async-trait = "0.1.57"
3130
anyhow = { version = "1.0.43", optional = true }
3231
log = { version = "0.4.14" }
3332
reqwest = { version = "0.11.4", optional = true }
3433

35-
primitive-types = { version = "0.11.0", optional = true, default-features = false }
34+
primitive-types = { version = "0.12.1", optional = true, default-features = false }
3635

3736
[dev-dependencies]
3837
insta = "1.13.0"

‎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.30", default-features = false }
9-
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
8+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
9+
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", 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.30", default-features = false }
14+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", 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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ repository = "https://github.com/Phala-Network/phala-blockchain"
1212
serde = { version = "1.0.102", features = ["derive"] }
1313
thiserror = "1.0"
1414
jsonrpsee = { version = "0.15.1", features = ["server"] }
15-
impl-serde = "0.3.2"
15+
impl-serde = "0.4.0"
1616
log = { version = "0.4.14", default-features = false }
1717
hex = { version = "0.4.3", default-features = false }
1818
codec = { package = "parity-scale-codec", version = "3.1" }
1919
scale-info = { version = "2.1", default-features = false }
2020

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

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

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

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

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

66
[dependencies]
77
serde = { version = "1.0", features = ["derive"] }
8-
impl-serde = "0.3.2"
8+
impl-serde = "0.4.0"
99
scale-info = { version = "2.1", default-features = false }
1010
scale = { package = "parity-scale-codec", version = "3.1" }

‎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.30", default-features = false }
8+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
99
scale = { package = "parity-scale-codec", version = "3.1", default-features = false }
1010
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
1111

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ 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.30", features = ["full_crypto"] }
14-
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
15-
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
13+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", features = ["full_crypto"] }
14+
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
15+
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
1616

1717
serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
1818
hash-db = "0.15.2"
1919
trie-db = "0.24.0"
2020
im = { version = "15", features = ["serde"] }
21-
parity-util-mem = "0.11.0"
21+
parity-util-mem = "0.12.0"
2222

2323
[dev-dependencies]
24-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
25-
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = ["full_crypto"] }
24+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
25+
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", features = ["full_crypto"] }
2626
hash256-std-hasher = { version = "0.15", default-features = false }
2727
hex = "0.4"
2828
serde_json = "1.0"
29-
impl-serde = "0.3.2"
29+
impl-serde = "0.4.0"
3030
keccak-hasher = "0.15.3"
3131

3232
[features]

0 commit comments

Comments
 (0)