Merge pull request #1022 from Phala-Network/polkadot-v0.9.31

Upgrade to Polkadot v0.9.31

Author: jasl

Cargo.lock

@@ -82,6 +82,9 @@ members = [
 [patch.crates-io]
 rocket = { version = "0.5.0-rc.2", git = "https://github.com/SergioBenitez/Rocket" }
 
+# TODO.kevin: Move back to crates.io once it released 1.0
+derive_more = { version = "0.99.17", git = "https://github.com/JelteF/derive_more" }
+
 # For pink-extension-runtime, it will introduce Substrate from crates-io which usually different with polkadot-branch
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }

Cargo.toml

@@ -12,8 +12,8 @@ num-bigint  = "0.4.0"
 ring        = "0.16.20"
 rand        = "0.8"
 regex       = "1.5.5"
-bitcoin     = { version = "0.27.0", features = ["use-serde"]}
-bitcoin_hashes = { version = "0.10.0", default-features = false }
+bitcoin     = { version = "0.29.2", features = ["serde"]}
+bitcoin_hashes = { version = "0.11.0", default-features = false }
 
 serde = { version = "1.0", features = ["derive", "std", "rc"] }
 serde_json = "1.0"
@@ -34,10 +34,10 @@ phala-crypto = { path = "../phala-crypto", features = ["getrandom", "stream"] }
 prpc = { path = "../prpc" }
 pink = { path = "../pink" }
 
-sp-io                = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = ["disable_target_static_assertions"] }
-sp-runtime           = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-externalities     = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io                = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", features = ["disable_target_static_assertions"] }
+sp-runtime           = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-externalities     = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 parity-scale-codec   = { package = "parity-scale-codec", version = "3.1", default-features = false, features = ["derive", "full", "chain-error"] }
 scopeguard   = { version = "1.1", default-features = false }
 
@@ -53,11 +53,11 @@ derive_more = "0.99.0"
 hash-db = { version = "0.15.2", default-features = false }
 num = { package = "num-traits", version = "0.2", default-features = false }
 finality-grandpa = { version = "0.15", default-features = false, features = ["derive-codec"] }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 fixed = "1.9.0"
 fixed-sqrt = "0.2.4"
@@ -85,7 +85,7 @@ reqwest-env-proxy = { path = "../reqwest-env-proxy" }
 insta = "1.7.2"
 rmp-serde = "1"
 serde_path_to_error = "0.1.5"
-ron = "0.7.0"
+ron = "0.8.0"
 ciborium = "0.2.0"
 
 [features]

crates/phactory/Cargo.toml

@@ -9,9 +9,8 @@ parity-scale-codec   = { package = "parity-scale-codec", version = "3.1", defaul
 scale-info = { version = "2.1", default-features = false, features = ["derive"] }
 serde = { version = "1", features = ["derive"], default-features = false }
 base64 = { version = "0.13" }
-# TODO.kevin: Move back to crates.io once it released 1.0
-derive_more = { version = "0.99.17", git = "https://github.com/JelteF/derive_more" }
-prost = { version = "0.11.0", default-features = false }
+derive_more = { version = "0.99.17" }
+prost = { version = "0.9.0", default-features = false }
 
 phala-trie-storage = { path = "../../../crates/phala-trie-storage", default-features = false, features = ["serde"] }
 phala-types = { path = "../../../crates/phala-types", default-features = false, features = ["enable_serde", "sgx"] }
@@ -20,19 +19,19 @@ phala-crypto = { path = "../../../crates/phala-crypto" }
 phala-mq = { path = "../../../crates/phala-mq" }
 chain = { path = "../../../standalone/runtime", default-features = false, package = "phala-node-runtime" }
 
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false, features = ["full_crypto"] }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false, features = ["full_crypto"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false, features = ["full_crypto"] }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false, features = ["full_crypto"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
 # for pruntime_client
 async-trait = "0.1.57"
 anyhow = { version = "1.0.43", optional = true }
 log = { version = "0.4.14" }
 reqwest = { version = "0.11.4", optional = true }
 
-primitive-types = { version = "0.11.0", optional = true, default-features = false }
+primitive-types = { version = "0.12.1", optional = true, default-features = false }
 
 [dev-dependencies]
 insta = "1.13.0"

crates/phactory/api/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2018"
 resolver = "2"
 
 [dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
 ring = { version = "0.16.20", default-features = false, features = ["alloc"] }
 curve25519-dalek = { version = "2.0", default-features = false }

crates/phala-crypto/Cargo.toml

@@ -11,7 +11,7 @@ hex = { version =  "0.4.3", default-features = false, features = ['alloc'] }
 derive_more = { version = "0.99", default-features = false, features = ["display"] }
 parity-scale-codec = { version = "3.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 
 spin = { version = "0.9", default-features = false, features = ["mutex", "use_ticket_mutex"], optional = true }

crates/phala-mq/Cargo.toml

@@ -12,21 +12,21 @@ repository = "https://github.com/Phala-Network/phala-blockchain"
 serde = { version = "1.0.102", features = ["derive"] }
 thiserror = "1.0"
 jsonrpsee = { version = "0.15.1", features = ["server"] }
-impl-serde = "0.3.2"
+impl-serde = "0.4.0"
 log = { version = "0.4.14", default-features = false }
 hex = { version = "0.4.3", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.1" }
 scale-info = { version = "2.1", default-features = false }
 
 # primitives
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 # client dependencies
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 phala-mq = { path = "../../crates/phala-mq" }
 phala-pallets = { path = "../../pallets/phala" }

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

@@ -112,7 +112,7 @@ where
             let api = client.runtime_api();
             if (*header.number()).into() == 0u64 {
                 let state = backend
-                    .state_at(id)
+                    .state_at(&client.expect_block_hash_from_id(&id).expect("Should get the block hash"))
                     .map_err(|e| Error::invalid_block(id, e))?;
                 return Ok(StorageChanges {
                     main_storage_changes: state
@@ -140,7 +140,7 @@ where
                 .map_err(|e| Error::invalid_block(id, e))?;
 
             let state = backend
-                .state_at(parent_id)
+                .state_at(&client.expect_block_hash_from_id(&id).expect("Should get the block hash"))
                 .map_err(|e| Error::invalid_block(parent_id, e))?;
 
             let storage_changes = api

crates/phala-node-rpc-ext/src/storage_changes.rs

@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-impl-serde = "0.3.2"
+impl-serde = "0.4.0"
 scale-info = { version = "2.1", default-features = false }
 scale = { package = "parity-scale-codec", version = "3.1" }

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

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.130", default-features = false, features = ["derive", "alloc"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 scale = { package = "parity-scale-codec", version = "3.1", default-features = false }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }