Skip to content

Commit

Permalink
Gorka v0.9.4 dep update (#494)
Browse files Browse the repository at this point in the history 
* Updated branches and dependencies

* Updated cargo lock

* Democracy now requires generics in genesisConfig and proxy requires max-encoded-len

* New democracy config adapting

* Adapt to latest changes in node service

* Update toolchain because of wasmtime 0.27

* Adapt fork-chain test to be non-dependent on the block number at which a TX is re-inserted

* editorconfig

* try catching error

* Update spec template with new democracy

* Revert "try catching error"

This reverts commit 2ec0bc6.

* Bump runtime version

* Point to main for crowdloan-rewards
  • Loading branch information
@girazoki
girazoki authored Jun 9, 2021
1 parent c1536fe commit 1dd6d1b
Show file tree
Hide file tree
Showing 33 changed files with 929 additions and 805 deletions.
853 changes: 469 additions & 384 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/rpc-core/debug/Cargo.toml
View file
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
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
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
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
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
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
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

0 comments on commit 1dd6d1b

Please sign in to comment.