Skip to content

Commit

Permalink
Bump substrate to polkadot-v0.9.38 (#584)
Browse files Browse the repository at this point in the history 
* Change substrate dependency to polkadot-v0.9.38

* Apply Substrate: Remove uncles related code

* Apply Frontier: feat: contract deployment callback

* Apply Frontier: feat: provide a parameter for the runtime config to choose what to include in the PostLog

* Apply Substrate: grandpa: cleanup stale entries in set id session mapping

* Apply Substrate: Add WeightToFee and LengthToFee impls to transaction-payment Runtime API

* Apply Frontier: feat: add fc-storage

* Fix applying Substrate: Remove uncles related code

* Fix usage eth_overrides at service

* Fix benchmarking applying Substrate: Remove uncles related code

* Fix benchmarking clippy

* Apply Substrate: Selectable on-runtime-upgrade checks

* Apply Substrate: Only use substrate-wasm-builder when std feature is enabled

* Apply Substrate: frame-benchmarking: Macros should not force a particular env

* Apply Substrate: Make DispatchError impl MEL

* Update --help example output

* Box large enum BenchmarkCmd

* Use REPORT_LONGEVITY for MaxSetIdSessionEntries

* Return missed sp-keystore

* Update openssl to fix cargo deny

* Reset the lockfile to a version from master and a few hand-picked updates

* Drop unused Block use

---------

Co-authored-by: MOZGIII <[email protected]>
  • Loading branch information
@dmitrylavrenov @MOZGIII
dmitrylavrenov and MOZGIII authored Apr 8, 2023
1 parent eae1ffe commit 2554c8b
Show file tree
Hide file tree
Showing 44 changed files with 1,693 additions and 841 deletions.
1,751 changes: 1,306 additions & 445 deletions Cargo.lock
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,33 @@ inherits = "release"
lto = "thin"

[patch."https://github.com/paritytech/substrate"]
frame-benchmarking = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
frame-support = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
frame-system = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
pallet-balances = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
pallet-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-client-db = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-network = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-rpc = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-service = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-database = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-debug-derive = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-externalities = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-inherents = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-io = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-std = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-storage = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
substrate-prometheus-endpoint = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
frame-benchmarking = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
frame-support = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
frame-system = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
pallet-balances = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
pallet-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-client-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-client-db = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-consensus = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-network = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-rpc = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-service = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-block-builder = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-database = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-debug-derive = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-externalities = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-inherents = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-io = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-std = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-storage = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-timestamp = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-transaction-pool = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
substrate-prometheus-endpoint = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
6 changes: 3 additions & 3 deletions crates/author-ext-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ edition = "2021"
publish = false

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }

[features]
default = ["std"]
Expand Down
10 changes: 5 additions & 5 deletions crates/author-ext-rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ rpc-error-response = { path = "../rpc-error-response" }
rpc-validator-key-logic = { version = "0.1", path = "../rpc-validator-key-logic" }

jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
serde = "1"
sp-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
tracing = "0.1"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/bioauth-flow-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ edition = "2021"
publish = false

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-api = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 deletions crates/bioauth-flow-rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ rpc-validator-key-logic = { version = "0.1", path = "../rpc-validator-key-logic"
anyhow = "1"
async-trait = "0.1"
jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sc-transaction-pool-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
serde = "1"
serde_json = "1"
sp-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
thiserror = "1"
tokio = "1"
tracing = "0.1"
4 changes: 2 additions & 2 deletions crates/bioauth-keys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[dependencies]
sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-keystore = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-application-crypto = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-keystore = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
thiserror = "1"

[features]
Expand Down
8 changes: 4 additions & 4 deletions crates/crypto-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
publish = false

[dependencies]
pallet-im-online = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-consensus-babe = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-finality-grandpa = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
pallet-im-online = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-consensus-babe = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-finality-grandpa = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-runtime = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
6 changes: 3 additions & 3 deletions crates/eip191-crypto/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ publish = false
primitives-ethereum = { version = "0.1", path = "../primitives-ethereum", default-features = false }

numtoa = { version = "0.2", default-features = false }
sp-core-hashing-proc-macro = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-core-hashing-proc-macro = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }

[dev-dependencies]
hex = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion crates/eip191-token-claim/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
hex = { version = "0.4", default-features = false }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }

[dev-dependencies]
eip191-crypto = { version = "0.1", path = "../eip191-crypto" }
Expand Down
2 changes: 1 addition & 1 deletion crates/eip712-common-test-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ ethers = "2.0"
hex-literal = "0.3"
secp256k1 = { version = "0.24" }
serde_json = { version = "1" }
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
8 changes: 4 additions & 4 deletions crates/eip712-common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ publish = false
[dependencies]
primitives-ethereum = { version = "0.1", path = "../primitives-ethereum", default-features = false }

sp-core-hashing-proc-macro = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-core-hashing-proc-macro = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-io = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }

[dev-dependencies]
hex-literal = "0.3"
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.36" }
sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.38" }

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit 2554c8b

Please sign in to comment.