Merge pull request #613 from sbillig/solc-0.8.7

Update solc to 0.8.7
ethereum · Dec 17, 2021 · a07d9a9 · a07d9a9
2 parents 2e25589 + beedc64
commit a07d9a9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 115 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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",);
 }