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.

Sign up for GitHub

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

Gorka v0.9.4 dep update #494

Merged
merged 15 commits into from
Jun 9, 2021
Merged

Gorka v0.9.4 dep update #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
855cf92
Updated branches and dependencies
girazoki Jun 8, 2021
f7b2ba3
Updated cargo lock
girazoki Jun 8, 2021
7ab7adb
Democracy now requires generics in genesisConfig and proxy requires m…
girazoki Jun 8, 2021
696428c
New democracy config adapting
girazoki Jun 8, 2021
14fea87
Adapt to latest changes in node service
girazoki Jun 8, 2021
6b855fc
Update toolchain because of wasmtime 0.27
girazoki Jun 8, 2021
ad84d6b
Adapt fork-chain test to be non-dependent on the block number at whic…
girazoki Jun 9, 2021
7238b29
editorconfig
girazoki Jun 9, 2021
2ec0bc6
try catching error
girazoki Jun 9, 2021
86eedd2
Update spec template with new democracy
girazoki Jun 9, 2021
fc5f484
Revert "try catching error"
girazoki Jun 9, 2021
82d363a
Merge remote-tracking branch 'upstream/master' into gorka_v0.9.4_dep_…
girazoki Jun 9, 2021
341ad40
Bump runtime version
girazoki Jun 9, 2021
c100c4b
Point to main for crowdloan-rewards
girazoki Jun 9, 2021
e60c20f
Merge remote-tracking branch 'upstream/master' into gorka_v0.9.4_dep_…
girazoki Jun 9, 2021
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
853 changes: 469 additions & 384 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/rpc-core/debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jsonrpc-core-client = "14.0.3"
jsonrpc-derive = "14.0.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }
#evm = { version = "0.20.0", default-features = false, features = ["with-codec"] }
2 changes: 1 addition & 1 deletion client/rpc-core/txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jsonrpc-derive = "14.0.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
24 changes: 12 additions & 12 deletions client/rpc/debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jsonrpc-core = "15.0.0"

ethereum = { version = "0.7.1", default-features = false, features = ["with-codec"] }
ethereum-types = "0.11.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }

moonbeam-rpc-core-debug = { path = "../../rpc-core/debug" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
30 changes: 15 additions & 15 deletions client/rpc/trace/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ futures = { version = "0.3", features = ["compat"] }
tracing = "0.1.25"

# Primitives
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Client and RPC
jsonrpc-core = "15.0.0"
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
moonbeam-rpc-core-trace = { path = "../../rpc-core/trace" }
18 changes: 9 additions & 9 deletions client/rpc/txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jsonrpc-core = "15.0.0"
ethereum-types = "0.11.0"
ethereum = { version = "0.7.1", default-features = false, features = ["with-codec"] }
moonbeam-rpc-core-txpool = { path = "../../rpc-core/txpool" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
serde = { version = "1.0", features = ["derive"] }

moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.1" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-v0.8.2" }
4 changes: 2 additions & 2 deletions core-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ repository = 'https://github.com/PureStake/moonbeam/'
version = '0.1.1'

[dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4", default-features = false }
account = { path = "../primitives/account", default-features = false }

[features]
Expand Down
34 changes: 17 additions & 17 deletions node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ log = "0.4.8"
structopt = "0.3.8"
parity-scale-codec = '2.0.0'

sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }

cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v9.3" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v9.3" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v9.3" }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v9.3" }
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v0.9.4" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v0.9.4" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v0.9.4" }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "nimbus-polkadot-v0.9.4" }

polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.3" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.4" }

service = { package = "moonbeam-service", path = "../service", default-features = false }
cli-opt = { package = "moonbeam-cli-opt", path = "../cli-opt", default-features = false }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.3" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.4" }

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