chore: release

Author: github-actions[bot]

Cargo.lock

@@ -6,11 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+<<<<<<< Updated upstream
 ## [3.5.0](https://github.com/bluealloy/revm/compare/revm-interpreter-v3.4.0...revm-interpreter-v3.5.0) - 2024-03-25
+=======
+## [4.0.0](https://github.com/bluealloy/revm/compare/revm-interpreter-v3.4.0...revm-interpreter-v4.0.0) - 2024-03-25
+>>>>>>> Stashed changes
 
 ### Added
 - *(interpreter)* expose mutable access methods on stack and memory ([#1219](https://github.com/bluealloy/revm/pull/1219))
 
+<<<<<<< Updated upstream
+=======
+### Other
+- *(interpreter)* keep track of remaining gas rather than spent ([#1221](https://github.com/bluealloy/revm/pull/1221))
+- *(interpreter)* don't run signextend with 31 too ([#1222](https://github.com/bluealloy/revm/pull/1222))
+
+>>>>>>> Stashed changes
 ## [3.4.0](https://github.com/bluealloy/revm/compare/revm-interpreter-v3.3.0...revm-interpreter-v3.4.0) - 2024-03-19
 
 ### Added

crates/interpreter/CHANGELOG.md

@@ -6,7 +6,11 @@ keywords = ["no_std", "ethereum", "evm", "revm", "interpreter"]
 license = "MIT"
 name = "revm-interpreter"
 repository = "https://github.com/bluealloy/revm"
+<<<<<<< Updated upstream
 version = "3.5.0"
+=======
+version = "4.0.0"
+>>>>>>> Stashed changes
 readme = "../../README.md"
 
 [package.metadata.docs.rs]

crates/interpreter/Cargo.toml

@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix eip3155 summary gas_used bug and add fork name ([#1216](https://github.com/bluealloy/revm/pull/1216))
 
 ### Other
+<<<<<<< Updated upstream
+=======
+- *(primitives)* kzg intro ([#1209](https://github.com/bluealloy/revm/pull/1209))
+- *(interpreter)* keep track of remaining gas rather than spent ([#1221](https://github.com/bluealloy/revm/pull/1221))
+>>>>>>> Stashed changes
 - Improve `EthersDB` ([#1208](https://github.com/bluealloy/revm/pull/1208))
 
 ## [7.2.0](https://github.com/bluealloy/revm/compare/revm-v7.1.0...revm-v7.2.0) - 2024-03-19

crates/revm/CHANGELOG.md

@@ -15,7 +15,11 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 # revm
+<<<<<<< Updated upstream
 revm-interpreter = { path = "../interpreter", version = "3.5.0", default-features = false }
+=======
+revm-interpreter = { path = "../interpreter", version = "4.0.0", default-features = false }
+>>>>>>> Stashed changes
 revm-precompile = { path = "../precompile", version = "5.1.1", default-features = false }
 
 # misc