Update to zkVM v1.5.0

.gitignore

@@ -4,24 +4,25 @@
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-# MacOS
-/**/.DS_Store
-
-# IDE
-/.idea/
-/.vscode/
-
 # The LLVM framework source
 /llvm/
 
 # External compilers
 /solc-bin/*
+/solc-bin*/*
 /vyper-bin/*
 
-# The debug and trace artifacts
+# The debug, trace, benchmark artifacts
 /debug/
 /trace/
 
 # The dependency locks
 # /Cargo.lock
 # /LLVM.lock
+
+# IDE
+/.idea/
+/.vscode/
+
+# MacOS
+/**/.DS_Store

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "tests"]
 	path = tests
 	url = https://github.com/matter-labs/era-compiler-tests
-	branch = main
+	branch = v1.5.0
 [submodule "solidity"]
 	path = solidity
 	url = https://github.com/ethereum/solidity
 	branch = develop
 [submodule "era-contracts"]
 	path = era-contracts
 	url = https://github.com/matter-labs/era-contracts
-	branch = release-v20-1.4.1-short-term-fee-model
+	branch = az-benchmark-evm-interpreter

benchmark_analyzer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "benchmark-analyzer"
-version = "1.4.1"
+version = "1.5.0"
 authors = [
     "Oleksandr Zarudnyi <[email protected]>",
 ]

benchmark_analyzer/src/benchmark/group/element.rs

@@ -15,14 +15,21 @@ pub struct Element {
     /// The number of cycles.
     pub cycles: usize,
     /// The number of ergs.
-    pub ergs: u32,
+    pub ergs: u64,
+    /// The number of EVM gas.
+    pub gas: u64,
 }
 
 impl Element {
     ///
     /// A shortcut constructor.
     ///
-    pub fn new(size: Option<usize>, cycles: usize, ergs: u32) -> Self {
-        Self { size, cycles, ergs }
+    pub fn new(size: Option<usize>, cycles: usize, ergs: u64, gas: u64) -> Self {
+        Self {
+            size,
+            cycles,
+            ergs,
+            gas,
+        }
     }
 }