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

polkadot v0.9.18 #1988

Merged
merged 29 commits into from
Apr 6, 2022
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
try remove ethereum as evm already has it
zqhxuyuan committed Apr 4, 2022
commit bd129b843a202823f4b0cd4746d41783eaf4709e
21 changes: 1 addition & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/earning/Cargo.toml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ edition = "2021"

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
scale-info = { version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.136", optional = true }

frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
2 changes: 0 additions & 2 deletions modules/evm-utility/Cargo.toml
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v
evm = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false, features = ["with-codec"] }
evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false }
evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false }
ethereum = { git = "https://github.com/rust-blockchain/ethereum", rev = "755dffaa4903fbec1269f50cde9863cf86269a14", default-features = false, features = ["with-codec"] }

[features]
default = ["std"]
@@ -23,7 +22,6 @@ std = [
"evm/with-serde",
"evm-runtime/std",
"evm-gasometer/std",
"ethereum/with-serde",
]
tracing = [
"evm/tracing",