Skip to content

Upgrade Rust & Substrate #73

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade Rust & Substrate #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17a4964
Upgrade Rust to 1.63.0
Netherdrake Sep 8, 2022
04df8ca
Bump substrate to monthly-2022-09
Netherdrake Sep 8, 2022
1f5e8df
Upgrade evm and scale codec
Netherdrake Sep 8, 2022
1fa70a7
Add Rust toolchain spec
Netherdrake Sep 9, 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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.59.0 as build
FROM rust:1.63.0 as build

RUN rustup default nightly-2021-05-09
RUN apt-get update && apt-get install -y clang
Expand Down
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
.PHONY: configure-rust
configure-rust:
rustup install 1.59.0
rustup default 1.59.0
rustup toolchain install nightly-2022-04-02
rustup target add wasm32-unknown-unknown --toolchain nightly-2022-04-02
rustup install 1.63.0
rustup default 1.63.0
rustup toolchain install nightly-2022-09-02
rustup target add wasm32-unknown-unknown
rustup target add wasm32-unknown-unknown --toolchain nightly-2022-09-02
rustup component add clippy

.PHONY: init
Expand Down
20 changes: 10 additions & 10 deletions modules/currencies/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ edition = "2018"

[dependencies]
serde = { version = "1.0.111", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }

frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }

module-evm = { path = "../evm", default-features = false }
module-evm-bridge = { path = "../evm-bridge", default-features = false }
Expand All @@ -25,9 +25,9 @@ primitives = { package = "reef-primitives", path = "../../primitives", default-f
support = { package = "module-support", path = "../support", default-features = false }

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
pallet-balances = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
tokens = { package = "orml-tokens", path = "../../orml/tokens" }
module-evm = { path = "../evm" }

Expand Down
16 changes: 8 additions & 8 deletions modules/evm-accounts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ edition = "2018"

[dependencies]
serde = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
libsecp256k1 = { version = "0.3.4", default-features = false, features = ["hmac"] }

frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }

orml-traits = { path = "../../orml/traits", default-features = false }

primitives = { package = "reef-primitives", path = "../../primitives", default-features = false }
module-support = { path = "../support", default-features = false }

[dev-dependencies]
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
pallet-balances = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
orml-currencies = { path = "../../orml/currencies" }
orml-tokens = { path = "../../orml/tokens" }

Expand Down
20 changes: 10 additions & 10 deletions modules/evm-bridge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { version = "1.0.101", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
primitive-types = { version = "0.10", default-features = false, features = ["rlp", "byteorder"] }
sha3 = { version = "0.8", default-features = false }
impl-trait-for-tuples = "0.2.1"
ethereum-types = { version = "0.12.0", default-features = false }
ethereum-types = { version = "0.13.1", default-features = false }
primitives = { package = "reef-primitives", path = "../../primitives", default-features = false }
support = { package = "module-support", path = "../support", default-features = false }
module-evm = { path = "../evm", default-features = false }
hex-literal = { version = "0.3.1" }

[dev-dependencies]
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
pallet-balances = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }

[features]
default = ["std"]
Expand Down
24 changes: 12 additions & 12 deletions modules/evm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
impl-trait-for-tuples = "0.1"
primitive-types = { version = "0.10", default-features = false, features = ["rlp", "byteorder"] }
ripemd160 = { version = "0.9", default-features = false }
Expand All @@ -18,19 +18,19 @@ sha3 = { version = "0.8", default-features = false }
tiny-keccak = { version = "2.0", features = ["fips202"] }
log = { version = "0.4.14", default-features = false }

evm = { version = "0.30.1", default-features = false, features = ["with-codec"] }
evm-gasometer = { version = "0.30.0", default-features = false }
evm-runtime = { version = "0.30.0", default-features = false }
evm = { version = "0.35.0", default-features = false, features = ["with-codec"] }
evm-gasometer = { version = "0.35.0", default-features = false }
evm-runtime = { version = "0.35.0", default-features = false }

frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }

sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
orml-traits = { path = "../../orml/traits", default-features = false }

support = { package = "module-support", path = "../support", default-features = false }
Expand Down
30 changes: 15 additions & 15 deletions modules/evm/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ edition = "2018"
[dependencies]
jsonrpc-core = "15.0.0"
jsonrpc-derive = "15.0.0"
ethereum-types = "0.12.0"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
ethereum-types = "0.13.1"
sp-api = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-core = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-io = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-rpc = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-runtime = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-storage = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sc-service = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sc-client-api = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sc-rpc = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sc-network = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
rustc-hex = "2.1.0"
serde = { version = "1.0", features = ["derive"] }
module-evm-rpc-runtime-api = { path = "runtime_api" }
module-evm = { path = ".." }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
frame-support = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
log = { version = "0.4.14", default-features = false }

[dev-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions modules/evm/rpc/runtime_api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ authors = ["Reef Developers"]
edition = "2018"

[dependencies]
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
ethereum-types = { version = "0.12.0", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
ethereum-types = { version = "0.13.1", default-features = false }
primitives = { package = "reef-primitives", path = "../../../../primitives", default-features = false }

[features]
Expand Down
12 changes: 6 additions & 6 deletions modules/example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ edition = "2018"

[dependencies]
serde = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-io = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }

[features]
default = ["std"]
Expand Down
20 changes: 10 additions & 10 deletions modules/poc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ edition = "2018"

[dependencies]
serde = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }

frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" , optional = true }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" , optional = true }

pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.10" }
pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , tag = "monthly-2022-09" }

primitives = { package = "reef-primitives", path = "../../primitives", default-features = false }

[dev-dependencies]
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" }
pallet-balances = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-core = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }
sp-io = { git = "https://github.com/paritytech/substrate", tag = "monthly-2022-09" }

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