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.

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

v0.9.29 Dependency Update #1825

Merged
merged 71 commits into from
Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from 68 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
3310704
Point substrate, polkadot, and cumulus to moonbeam repo/branches
notlesh Sep 21, 2022
66e708d
Remove rust-toolchain file
notlesh Sep 21, 2022
c47f363
More moonbeam repos
notlesh Sep 21, 2022
17a86e4
parachain-staking weight refactor
notlesh Sep 21, 2022
aef0838
xcm-primitives weight refactor
notlesh Sep 21, 2022
ee8b5cf
Merge branch 'master' into moonbeam-polkadot-v0.9.29
notlesh Sep 22, 2022
e3c764e
Restore jsonrpsee overrides
notlesh Sep 22, 2022
574156b
asset-manager weight refactor
notlesh Sep 22, 2022
eea0484
author-mapping weight refactor
notlesh Sep 22, 2022
9192b71
ethereum-xcm weight refactor
notlesh Sep 22, 2022
be25b16
migrations weight refactor
notlesh Sep 22, 2022
4a0f291
moonbeam-orbiters weight refactor
notlesh Sep 22, 2022
e58f0a0
randomness weight refactor
notlesh Sep 22, 2022
40cb11b
xcm-transactor partial weight refactor
notlesh Sep 22, 2022
1a38d6e
finish xcm-transactor weight refactor
notlesh Sep 22, 2022
cc274ad
Bump crowdloan-rewards
notlesh Sep 22, 2022
45149a1
Fix evm dependencies
notlesh Sep 26, 2022
80e1f6a
More weight refactor
notlesh Sep 26, 2022
b508c3d
Bump ORML
notlesh Sep 26, 2022
c27accd
Removev CallDispatcher from config
notlesh Sep 26, 2022
ffd3021
Moonbase builds
notlesh Sep 27, 2022
d5688c1
Bump substrate commit
notlesh Sep 27, 2022
a8f92cd
Bump nimbus commit
notlesh Sep 27, 2022
e688822
Bump substrate commit
notlesh Sep 27, 2022
8de43eb
More weight refactor
notlesh Sep 27, 2022
2d1baee
Reflect minor upstream changes
notlesh Sep 27, 2022
782e0f6
Implement StaticLookup::Source conversion
notlesh Sep 27, 2022
10154be
Revert "Removev CallDispatcher from config"
notlesh Sep 28, 2022
3cd8fd9
Restore XCM CallDispatcher
notlesh Sep 28, 2022
4c263a7
Restore CallDispatcher for xcm tests
notlesh Sep 28, 2022
1f6d861
Remove AuthorFilterAPI
notlesh Sep 28, 2022
9bb779e
Restore and bump rust-toolchain
notlesh Sep 28, 2022
4ae37a1
Merge branch 'master' into moonbeam-polkadot-v0.9.29
notlesh Sep 28, 2022
dc4dfb5
fmt
notlesh Sep 28, 2022
70c26dd
"Fix" benchmarks
notlesh Sep 28, 2022
febb298
Update benchmarking template for weight 1.5
notlesh Sep 28, 2022
e6d2e92
Update pallet weights
notlesh Sep 29, 2022
dcc7b17
toml sort
notlesh Sep 29, 2022
7823703
Fix compiler warnings
notlesh Sep 29, 2022
e9f7b8d
fmt
notlesh Sep 29, 2022
64cac8e
Use single definition for OldWeight
notlesh Sep 29, 2022
22bee6a
Restore copyright notice :ok_hand:
notlesh Sep 29, 2022
e43f9f2
Fix staking benchmark assertions
notlesh Sep 29, 2022
18b3ebd
Second attempt at cleaning up OldWeights
notlesh Sep 29, 2022
6751963
Fix test compilation
notlesh Sep 29, 2022
dd09d52
Avoid deprecated AllPalletsReversedWithSystemFirst
notlesh Sep 29, 2022
7ad2693
toml sort
notlesh Sep 29, 2022
384caf0
fmt
notlesh Sep 29, 2022
6e04905
Update test gas constants to reflect benchmark changes
notlesh Sep 30, 2022
9797c04
More test weight constant updates
notlesh Sep 30, 2022
f46890f
Bump frontier
notlesh Sep 30, 2022
1fd6d84
Update expected macro stderr output
notlesh Sep 30, 2022
10d9fa8
Update Cargo.lock
notlesh Sep 30, 2022
877bb87
Revert "Avoid deprecated AllPalletsReversedWithSystemFirst"
notlesh Oct 3, 2022
c7977d7
Allow deprecated AllPalletsReversedWithSystemFirst
notlesh Oct 3, 2022
c0a875c
Enable feature "forbid evm reentrancy" (#1841)
librelois Oct 3, 2022
535cdb8
Merge branch 'master' into moonbeam-polkadot-v0.9.29
Oct 3, 2022
21d8888
adds test for paying fees
Oct 3, 2022
90f7320
Handle ethereum `pays_fee` return type as No
notlesh Oct 3, 2022
1149d2a
fix author mapping test
girazoki Oct 4, 2022
ac94573
update lock (#1844)
girazoki Oct 4, 2022
6d9a1cf
prettier
notlesh Oct 4, 2022
2108115
Bump frontier
notlesh Oct 4, 2022
ae93343
Bump frontier
notlesh Oct 4, 2022
9519823
Update Cargo.lock
notlesh Oct 4, 2022
ecdd418
Revert error message expectation
notlesh Oct 4, 2022
03c65ea
Expect eth txn to be paysFees = no
notlesh Oct 4, 2022
c58c9f2
Use custom jsonprsee branch @ v0.15.1
notlesh Oct 4, 2022
570da7d
set dev node genesis zero base_fee
tgmichel Oct 5, 2022
27df739
Remove resolved TODO comment
notlesh Oct 5, 2022
c6a332e
Bump web3.js to 1.8.0
notlesh Oct 6, 2022
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,449 changes: 735 additions & 714 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ members = [
]

[patch.crates-io]
jsonrpsee = { git = "https://github.com/PureStake/jsonrpsee", branch = "moonbeam-v0.14" }
jsonrpsee-core = { git = "https://github.com/PureStake/jsonrpsee", branch = "moonbeam-v0.14" }
jsonrpsee-types = { git = "https://github.com/PureStake/jsonrpsee", branch = "moonbeam-v0.14" }
jsonrpsee = { git = "https://github.com/PureStake/jsonrpsee", branch = "moonbeam-v0.15.1" }
jsonrpsee-core = { git = "https://github.com/PureStake/jsonrpsee", branch = "moonbeam-v0.15.1" }
jsonrpsee-types = { git = "https://github.com/PureStake/jsonrpsee", branch = "moonbeam-v0.15.1" }

librelois marked this conversation as resolved.
Show resolved Hide resolved
# make sure dev builds with backtrace do
# not slow us down
Expand Down
24 changes: 12 additions & 12 deletions benchmarking/frame-weight-template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
{{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
.saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
{{/each}}
{{#if (ne benchmark.base_reads "0")}}
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as u64))
{{/if}}
{{#each benchmark.component_reads as |cr|}}
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
{{/each}}
{{#if (ne benchmark.base_writes "0")}}
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as u64))
{{/if}}
{{#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
{{/each}}
}
{{/each}}
Expand All @@ -92,22 +92,22 @@ impl WeightInfo for () {
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
{{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
.saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
{{/each}}
{{#if (ne benchmark.base_reads "0")}}
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as u64))
{{/if}}
{{#each benchmark.component_reads as |cr|}}
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
{{/each}}
{{#if (ne benchmark.base_writes "0")}}
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as u64))
{{/if}}
{{#each benchmark.component_writes as |cw|}}
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
{{/each}}
}
{{/each}}
Expand Down
2 changes: 1 addition & 1 deletion client/evm-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug" }

# Substrate
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
4 changes: 2 additions & 2 deletions client/rpc-core/debug/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ version = "0.1.0"
[dependencies]
ethereum-types = "0.13.1"
futures = { version = "0.3", features = [ "compat" ] }
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
moonbeam-client-evm-tracing = { path = "../../evm-tracing" }
moonbeam-rpc-core-types = { path = "../types" }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"

sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
2 changes: 1 addition & 1 deletion client/rpc-core/trace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.6.0"
[dependencies]
ethereum-types = "0.13.1"
futures = { version = "0.3.1", features = [ "compat" ] }
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
moonbeam-client-evm-tracing = { path = "../../evm-tracing" }
moonbeam-rpc-core-types = { path = "../types" }
serde = { version = "1.0", features = [ "derive" ] }
Expand Down
4 changes: 2 additions & 2 deletions client/rpc-core/txpool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ version = "0.6.0"
[dependencies]
ethereum = { version = "0.12.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.13.1"
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"

fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
26 changes: 13 additions & 13 deletions client/rpc/debug/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.1.0"
[dependencies]
futures = { version = "0.3", features = [ "compat" ] }
hex-literal = "0.3.4"
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
tokio = { version = "1.10", features = [ "sync", "time" ] }

# Moonbeam
Expand All @@ -20,19 +20,19 @@ moonbeam-rpc-core-types = { path = "../../rpc-core/types" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Substrate
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }

# Frontier
ethereum = { version = "0.12.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.13.1"
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26", features = [ "rpc_binary_search_estimate" ] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "rpc_binary_search_estimate" ] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
14 changes: 7 additions & 7 deletions client/rpc/finality/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ version = "0.1.0"

[dependencies]
futures = { version = "0.3", features = [ "compat" ] }
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
parity-scale-codec = "3.0.0"
tokio = { version = "1.12.0", features = [ "sync", "time" ] }

fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
6 changes: 3 additions & 3 deletions client/rpc/manual-xcm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ version = "0.1.0"
flume = "0.10.9"
futures = { version = "0.3", features = [ "compat" ] }
hex-literal = "0.3.3"
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
parity-scale-codec = "3.0.0"
tokio = { version = "1.12.0", features = [ "sync", "time" ] }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.26", default-features = false }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29", default-features = false }

cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.26" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
30 changes: 15 additions & 15 deletions client/rpc/trace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version = "0.6.0"
ethereum = { version = "0.12.0", features = [ "with-codec" ] }
ethereum-types = "0.13.1"
futures = { version = "0.3" }
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
serde = { version = "1.0", features = [ "derive" ] }
sha3 = "0.9"
tokio = { version = "1.10", features = [ "sync", "time" ] }
Expand All @@ -24,19 +24,19 @@ moonbeam-rpc-core-types = { path = "../../rpc-core/types" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Substrate
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }

# Frontier
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
20 changes: 10 additions & 10 deletions client/rpc/txpool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.6.0"

[dependencies]
jsonrpsee = { version = "0.14.0", default-features = false, features = [ "macros", "server" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
rlp = "0.5"
serde = { version = "1.0", features = [ "derive" ] }
sha3 = "0.9"
Expand All @@ -18,15 +18,15 @@ moonbeam-rpc-core-txpool = { path = "../../rpc-core/txpool" }
moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" }

# Substrate
frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }

# Frontier
ethereum-types = "0.13.1"
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.26", features = [ "rpc_binary_search_estimate" ] }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "rpc_binary_search_estimate" ] }
16 changes: 8 additions & 8 deletions client/vrf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ version = "0.1.0"
[dependencies]
# Substrate
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-application-crypto = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26", default-features = false }
sp-consensus-vrf = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26", default-features = false }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26" }
sp-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26", default-features = false }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.26", default-features = false }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-application-crypto = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29", default-features = false }
sp-consensus-vrf = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29", default-features = false }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29" }
sp-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29", default-features = false }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.29", default-features = false }

# Moonbeam
session-keys-primitives = { path = "../../primitives/session-keys" }

# Nimbus
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.26" }
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.29" }

# Polkadot
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.26" }
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
Loading