prune more unused functions and JSON fields

hedgar2017 · hedgar2017 · commit a94a22b5b2bd · 2024-10-26T17:14:39.000+08:00
diff --git a/era-compiler-solidity/src/solc/codegen.rs b/era-compiler-solidity/src/solc/codegen.rs
@@ -10,7 +10,7 @@ use crate::solc::Compiler as SolcCompiler;
 ///
 /// The Solidity compiler codegen.
 ///
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum Codegen {
     /// The Yul IR.
@@ -40,7 +40,7 @@ impl FromStr for Codegen {
             "yul" => Ok(Self::Yul),
             "evmla" => Ok(Self::EVMLA),
             string => anyhow::bail!(
-                "Invalid codegen: {string}. Available options: {}",
+                "Invalid codegen: `{string}`. Available options: {}.",
                 [Self::EVMLA, Self::Yul]
                     .into_iter()
                     .map(|codegen| codegen.to_string())
diff --git a/era-compiler-solidity/src/solc/mod.rs b/era-compiler-solidity/src/solc/mod.rs
@@ -290,13 +290,6 @@ impl Compiler {
         libraries: BTreeMap<String, BTreeMap<String, String>>,
         messages: &mut Vec<StandardJsonOutputError>,
     ) -> anyhow::Result<StandardJsonOutput> {
-        if self.version.default != Self::LAST_SUPPORTED_VERSION {
-            anyhow::bail!(
-                "Yul validation is only supported with the latest supported version of the Solidity compiler: {}",
-                Self::LAST_SUPPORTED_VERSION,
-            );
-        }
-
         let mut solc_input = StandardJsonInput::from_yul_paths(
             paths,
             libraries.clone(),
diff --git a/era-compiler-solidity/src/solc/standard_json/input/settings/optimizer.rs b/era-compiler-solidity/src/solc/standard_json/input/settings/optimizer.rs
@@ -23,12 +23,7 @@ pub struct Optimizer {
 
 impl Default for Optimizer {
     fn default() -> Self {
-        Self {
-            mode: Self::default_mode(),
-            fallback_to_optimizing_for_size: false,
-
-            enabled: Self::default_enabled(),
-        }
+        Self::new(Self::default_mode(), false)
     }
 }
 
diff --git a/era-compiler-solidity/src/solc/version.rs b/era-compiler-solidity/src/solc/version.rs
@@ -30,15 +30,4 @@ impl Version {
             l2_revision,
         }
     }
-
-    ///
-    /// A shortcut constructor for a simple version.
-    ///
-    pub fn new_simple(version: semver::Version) -> Self {
-        Self {
-            long: version.to_string(),
-            default: version,
-            l2_revision: None,
-        }
-    }
 }
diff --git a/era-compiler-solidity/tests/cli/codegen.rs b/era-compiler-solidity/tests/cli/codegen.rs
@@ -110,3 +110,22 @@ fn with_codegen_standard_json_mode(codegen: SolcCodegen) -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn with_codegen_invalid() -> anyhow::Result<()> {
+    common::setup()?;
+
+    let args = &[
+        "--codegen",
+        "invalid",
+        "--bin",
+        cli::TEST_SOLIDITY_CONTRACT_PATH,
+    ];
+
+    let result = cli::execute_zksolc(args)?;
+    result
+        .failure()
+        .stderr(predicate::str::contains("Invalid value for \'--codegen <codegen>\': Invalid codegen: `invalid`. Available options: evmla, yul"));
+
+    Ok(())
+}
diff --git a/era-compiler-solidity/tests/data/standard_json_input/eravm_assembly_urls.json b/era-compiler-solidity/tests/data/standard_json_input/eravm_assembly_urls.json
@@ -22,6 +22,9 @@
           ]
         }
       },
+      "metadata": {
+        "hashType": "ipfs"
+      },
       "libraries": {}
     }
   }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/eravm_assembly_urls_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/eravm_assembly_urls_invalid.json
@@ -22,6 +22,9 @@
           ]
         }
       },
+      "metadata": {
+        "hashType": "ipfs"
+      },
       "libraries": {}
     }
   }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/eravm_assembly_urls_missing_file.json b/era-compiler-solidity/tests/data/standard_json_input/eravm_assembly_urls_missing_file.json
@@ -22,6 +22,9 @@
           ]
         }
       },
+      "metadata": {
+        "hashType": "ipfs"
+      },
       "libraries": {}
     }
   }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/llvm_ir_urls.json b/era-compiler-solidity/tests/data/standard_json_input/llvm_ir_urls.json
@@ -22,6 +22,9 @@
           ]
         }
       },
+      "metadata": {
+        "hashType": "ipfs"
+      },
       "libraries": {}
     }
   }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/llvm_ir_urls_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/llvm_ir_urls_invalid.json
@@ -22,6 +22,9 @@
           ]
         }
       },
+      "metadata": {
+        "hashType": "ipfs"
+      },
       "libraries": {}
     }
   }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/llvm_ir_urls_missing_file.json b/era-compiler-solidity/tests/data/standard_json_input/llvm_ir_urls_missing_file.json
@@ -22,6 +22,9 @@
           ]
         }
       },
+      "metadata": {
+        "hashType": "ipfs"
+      },
       "libraries": {}
     }
   }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/solidity_solc.json b/era-compiler-solidity/tests/data/standard_json_input/solidity_solc.json
@@ -9,7 +9,6 @@
   },
   "settings": {
     "optimizer": {
-      "enabled": true,
       "runs": 200,
       "details": {
         "peephole": true,
@@ -19,6 +18,9 @@
         "cse": true,
         "constantOptimizer": true
       }
+    },
+    "metadata": {
+      "useLiteralContent": true
     }
   }
 }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/solidity_solc_empty_sources.json b/era-compiler-solidity/tests/data/standard_json_input/solidity_solc_empty_sources.json
@@ -5,6 +5,9 @@
     "optimizer": {
       "enabled": true,
       "runs": 200
+    },
+    "metadata": {
+      "useLiteralContent": true
     }
   }
 }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/solidity_solc_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/solidity_solc_invalid.json
@@ -11,6 +11,9 @@
     "optimizer": {
       "enabled": true,
       "runs": 200
+    },
+    "metadata": {
+      "useLiteralContent": true
     }
   }
 }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/solidity_solc_missing_sources.json b/era-compiler-solidity/tests/data/standard_json_input/solidity_solc_missing_sources.json
@@ -4,6 +4,9 @@
     "optimizer": {
       "enabled": true,
       "runs": 200
+    },
+    "metadata": {
+      "useLiteralContent": true
     }
   }
 }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/solidity_zksolc_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/solidity_zksolc_invalid.json
@@ -9,11 +9,8 @@
   },
   "settings": {
     "optimizer": {
-      "enabled": true,
       "mode": "3",
-      "details": null,
-      "fallbackToOptimizingForSize": false,
-      "disableSystemRequestMemoization": true
+      "fallbackToOptimizingForSize": false
     },
     "outputSelection": {
       "*": {
@@ -26,9 +23,11 @@
         ]
       }
     },
+    "metadata": {
+      "hashType": "ipfs"
+    },
     "libraries": {},
-    "isSystem": false,
-    "forceEvmla": true,
-    "areLibrariesMissing": false
+    "enableEraVMExtensions": true,
+    "forceEVMLA": true
   }
 }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/solidity_zksolc_recursion.json b/era-compiler-solidity/tests/data/standard_json_input/solidity_zksolc_recursion.json
@@ -11,11 +11,8 @@
   },
   "settings": {
     "optimizer": {
-      "enabled": true,
       "mode": "3",
-      "details": null,
-      "fallbackToOptimizingForSize": false,
-      "disableSystemRequestMemoization": true
+      "fallbackToOptimizingForSize": true
     },
     "outputSelection": {
       "*": {
@@ -28,9 +25,11 @@
         ]
       }
     },
+    "metadata": {
+      "hashType": "ipfs"
+    },
     "libraries": {},
-    "isSystem": false,
-    "forceEvmla": true,
-    "areLibrariesMissing": false
+    "enableEraVMExtensions": true,
+    "forceEVMLA": true
   }
 }
diff --git a/era-compiler-solidity/tests/data/standard_json_input/suppressed_errors_and_warnings.json b/era-compiler-solidity/tests/data/standard_json_input/suppressed_errors_and_warnings.json
@@ -7,9 +7,28 @@
   },
   "settings": {
     "optimizer": {
-      "enabled": true,
-      "runs": 200
-    }
+      "mode": "3",
+      "fallbackToOptimizingForSize": false
+    },
+    "outputSelection": {
+      "*": {
+        "": [
+          "metadata"
+        ],
+        "*": [
+          "abi",
+          "evm.methodIdentifiers"
+        ]
+      }
+    },
+    "metadata": {
+      "hashType": "ipfs"
+    },
+    "libraries": {},
+    "enableEraVMExtensions": true,
+    "forceEVMLA": false,
+    "suppressedErrors": ["sendtransfer"],
+    "suppressedWarnings": ["txorigin"]
   },
   "suppressedErrors": ["sendtransfer"],
   "suppressedWarnings": ["txorigin"]
diff --git a/era-compiler-solidity/tests/data/standard_json_input/suppressed_errors_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/suppressed_errors_invalid.json
@@ -7,9 +7,28 @@
   },
   "settings": {
     "optimizer": {
-      "enabled": true,
-      "runs": 200
-    }
+      "mode": "3",
+      "fallbackToOptimizingForSize": false
+    },
+    "outputSelection": {
+      "*": {
+        "": [
+          "metadata"
+        ],
+        "*": [
+          "abi",
+          "evm.methodIdentifiers"
+        ]
+      }
+    },
+    "metadata": {
+      "hashType": "ipfs"
+    },
+    "libraries": {},
+    "enableEraVMExtensions": true,
+    "forceEVMLA": false,
+    "suppressedErrors": ["INVALID_SUPPRESSED_ERROR_TYPE"],
+    "suppressedWarnings": ["txorigin"]
   },
   "suppressedErrors": ["INVALID_SUPPRESSED_ERROR_TYPE"],
   "suppressedWarnings": ["txorigin"]
diff --git a/era-compiler-solidity/tests/data/standard_json_input/suppressed_warnings_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/suppressed_warnings_invalid.json
@@ -7,9 +7,28 @@
   },
   "settings": {
     "optimizer": {
-      "enabled": true,
-      "runs": 200
-    }
+      "mode": "3",
+      "fallbackToOptimizingForSize": false
+    },
+    "outputSelection": {
+      "*": {
+        "": [
+          "metadata"
+        ],
+        "*": [
+          "abi",
+          "evm.methodIdentifiers"
+        ]
+      }
+    },
+    "metadata": {
+      "hashType": "ipfs"
+    },
+    "libraries": {},
+    "enableEraVMExtensions": true,
+    "forceEVMLA": false,
+    "suppressedErrors": ["sendtransfer"],
+    "suppressedWarnings": ["INVALID_SUPPRESSED_WARNING_TYPE"]
   },
   "suppressedErrors": ["sendtransfer"],
   "suppressedWarnings": ["INVALID_SUPPRESSED_WARNING_TYPE"]
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_solc.json b/era-compiler-solidity/tests/data/standard_json_input/yul_solc.json
@@ -9,6 +9,9 @@
       "optimizer": {
         "enabled": true
       },
+      "metadata": {
+        "useLiteralContent": true
+      },
       "outputSelection": {
         "*": {
           "": [
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_solc_urls.json b/era-compiler-solidity/tests/data/standard_json_input/yul_solc_urls.json
@@ -11,6 +11,9 @@
       "optimizer": {
         "enabled": true
       },
+      "metadata": {
+        "useLiteralContent": true
+      },
       "outputSelection": {
         "*": {
           "": [
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_solc_urls_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/yul_solc_urls_invalid.json
@@ -11,6 +11,9 @@
       "optimizer": {
         "enabled": true
       },
+      "metadata": {
+        "useLiteralContent": true
+      },
       "outputSelection": {
         "*": {
           "": [
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc.json b/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc.json
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_both_urls_and_content.json b/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_both_urls_and_content.json
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_neither_urls_nor_content.json b/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_neither_urls_nor_content.json
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_urls.json b/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_urls.json
diff --git a/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_urls_invalid.json b/era-compiler-solidity/tests/data/standard_json_input/yul_zksolc_urls_invalid.json

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,7 @@ pub struct Optimizer {`
`23`	`23`
`24`	`24`	`impl Default for Optimizer {`
`25`	`25`	`fn default() -> Self {`
`26`		`- Self {`
`27`		`- mode: Self::default_mode(),`
`28`		`- fallback_to_optimizing_for_size: false,`
`29`		`-`
`30`		`- enabled: Self::default_enabled(),`
`31`		`- }`
	`26`	`+ Self::new(Self::default_mode(), false)`
`32`	`27`	`}`
`33`	`28`	`}`
`34`	`29`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,4 @@ impl Version {`
`30`	`30`	`l2_revision,`
`31`	`31`	`}`
`32`	`32`	`}`
`33`		`-`
`34`		`- ///`
`35`		`- /// A shortcut constructor for a simple version.`
`36`		`- ///`
`37`		`- pub fn new_simple(version: semver::Version) -> Self {`
`38`		`- Self {`
`39`		`- long: version.to_string(),`
`40`		`- default: version,`
`41`		`- l2_revision: None,`
`42`		`- }`
`43`		`- }`
`44`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`]`
`23`	`23`	`}`
`24`	`24`	`},`
	`25`	`+ "metadata": {`
	`26`	`+ "hashType": "ipfs"`
	`27`	`+ },`
`25`	`28`	`"libraries": {}`
`26`	`29`	`}`
`27`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`},`
`10`	`10`	`"settings": {`
`11`	`11`	`"optimizer": {`
`12`		`- "enabled": true,`
`13`	`12`	`"runs": 200,`
`14`	`13`	`"details": {`
`15`	`14`	`"peephole": true,`
`@@ -19,6 +18,9 @@`
`19`	`18`	`"cse": true,`
`20`	`19`	`"constantOptimizer": true`
`21`	`20`	`}`
	`21`	`+ },`
	`22`	`+ "metadata": {`
	`23`	`+ "useLiteralContent": true`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`"optimizer": {`
`6`	`6`	`"enabled": true,`
`7`	`7`	`"runs": 200`
	`8`	`+ },`
	`9`	`+ "metadata": {`
	`10`	`+ "useLiteralContent": true`
`8`	`11`	`}`
`9`	`12`	`}`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`"optimizer": {`
`12`	`12`	`"enabled": true,`
`13`	`13`	`"runs": 200`
	`14`	`+ },`
	`15`	`+ "metadata": {`
	`16`	`+ "useLiteralContent": true`
`14`	`17`	`}`
`15`	`18`	`}`
`16`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`	`"optimizer": {`
`5`	`5`	`"enabled": true,`
`6`	`6`	`"runs": 200`
	`7`	`+ },`
	`8`	`+ "metadata": {`
	`9`	`+ "useLiteralContent": true`
`7`	`10`	`}`
`8`	`11`	`}`
`9`	`12`	`}`