From beedc64f4f1c831725627ab6e15a6c19f6faa433 Mon Sep 17 00:00:00 2001 From: Sean Billig Date: Thu, 16 Dec 2021 18:05:57 -0800 Subject: [PATCH] Update solc to 0.8.7 --- Cargo.lock | 114 +---------------------------------- crates/test-utils/Cargo.toml | 2 +- crates/yulc/Cargo.toml | 2 +- crates/yulc/src/lib.rs | 4 +- 4 files changed, 7 insertions(+), 115 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b9fa641ac6..1a46fd673a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,29 +73,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "474a626a67200bd107d44179bb3d4fc61891172d11696609264589be6a0e6a43" -[[package]] -name = "bindgen" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "clap", - "env_logger", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "which", -] - [[package]] name = "bitflags" version = "1.2.1" @@ -208,15 +185,6 @@ version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" -[[package]] -name = "cexpr" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -229,17 +197,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "clang-sys" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "2.33.3" @@ -472,19 +429,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -[[package]] -name = "env_logger" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "ethabi" version = "14.0.0" @@ -932,12 +876,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "if_chain" version = "1.0.2" @@ -1071,28 +1009,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" -[[package]] -name = "libloading" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - [[package]] name = "linked-hash-map" version = "0.5.4" @@ -1162,16 +1084,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "num-bigint" version = "0.3.2" @@ -1307,12 +1219,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "petgraph" version = "0.6.0" @@ -1809,12 +1715,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - [[package]] name = "similar" version = "1.3.0" @@ -1839,9 +1739,8 @@ dependencies = [ [[package]] name = "solc" version = "0.1.0" -source = "git+https://github.com/g-r-a-n-t/solc-rust?rev=fcb9105#fcb910596c2b22d607970b2ba64229fe02e98e54" +source = "git+https://github.com/g-r-a-n-t/solc-rust?rev=da554b3#da554b3ba7cb8e63083440eecb77f637c92c40e8" dependencies = [ - "bindgen", "cmake", "lazy_static", ] @@ -2180,15 +2079,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2238,7 +2128,7 @@ dependencies = [ [[package]] name = "yultsur" version = "0.1.0" -source = "git+https://github.com/g-r-a-n-t/yultsur#ae854702e90b2c70e5c19961167f2b6f2aff32d2" +source = "git+https://github.com/g-r-a-n-t/yultsur?rev=ae85470#ae854702e90b2c70e5c19961167f2b6f2aff32d2" dependencies = [ "indenter", ] diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index a5542b0925..874f533a2e 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -19,7 +19,7 @@ test-files = {path = "../test-files", package = "fe-test-files" } hex = "0.4" primitive-types = {version = "0.9", default-features = false, features = ["rlp"]} serde_json = "1.0.64" -solc = {git = "https://github.com/g-r-a-n-t/solc-rust", rev = "fcb9105", optional = true} +solc = {git = "https://github.com/g-r-a-n-t/solc-rust", rev = "da554b3", optional = true} yultsur = {git = "https://github.com/g-r-a-n-t/yultsur", rev = "ae85470"} # used by ethabi, we need to force the js feature for wasm support diff --git a/crates/yulc/Cargo.toml b/crates/yulc/Cargo.toml index 63598ba2ec..9b0123fdeb 100644 --- a/crates/yulc/Cargo.toml +++ b/crates/yulc/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/ethereum/fe" [dependencies] fe-yulgen = {path = "../yulgen", version = "^0.11.0-alpha"} # This fork supports concurrent compilation, which is required for Rust tests. -solc = { git = "https://github.com/g-r-a-n-t/solc-rust", rev = "fcb9105", optional = true} +solc = { git = "https://github.com/g-r-a-n-t/solc-rust", rev = "da554b3", optional = true} serde_json = "1.0" indexmap = "1.6.2" diff --git a/crates/yulc/src/lib.rs b/crates/yulc/src/lib.rs index de49d3ee92..127636992d 100644 --- a/crates/yulc/src/lib.rs +++ b/crates/yulc/src/lib.rs @@ -72,5 +72,7 @@ fn test_solc_sanity() { .to_string() .replace("\"", ""); - assert_eq!(bytecode, "6000600055", "incorrect bytecode",); + // solc 0.8.4: push1 0; push1 0; sstore "6000600055" + // solc 0.8.7: push1 0; dup1; sstore "60008055" + assert_eq!(bytecode, "60008055", "incorrect bytecode",); }