Merge branch 'feat/prague-hard-fork' of github.com:aurora-is-near/spu…

…tnikvm into feat/eip-7702

.github/workflows/rust.yml

@@ -21,9 +21,10 @@ jobs:
 
       - name: Clippy
         run: cargo clippy --workspace --all-targets -- -D clippy::all -D clippy::nursery
-
       - name: Clippy no_std
         run: cargo clippy --no-default-features -- -D clippy::all -D clippy::nursery
+      - name: Clippy with features
+        run: cargo clippy --features tracing,create-fixed -- -D clippy::all -D clippy::nursery
 
   build:
     runs-on: ubuntu-latest

Cargo.toml

@@ -9,10 +9,10 @@ keywords.workspace = true
 edition.workspace = true
 
 [workspace.dependencies]
-evm = { version = "0.46.0", path = "." }
-evm-core = { version = "0.46.0", path = "core", default-features = false }
-evm-gasometer = { version = "0.46.0", path = "gasometer", default-features = false }
-evm-runtime = { version = "0.46.0", path = "runtime", default-features = false }
+evm = { version = "0.46.1", path = "." }
+evm-core = { version = "0.46.1", path = "core", default-features = false }
+evm-gasometer = { version = "0.46.1", path = "gasometer", default-features = false }
+evm-runtime = { version = "0.46.1", path = "runtime", default-features = false }
 primitive-types = { version = "0.12", default-features = false }
 auto_impl = "1.0"
 sha3 = { version = "0.10", default-features = false }
@@ -88,7 +88,7 @@ create-fixed = []
 print-debug = ["evm-gasometer/print-debug"]
 
 [workspace.package]
-version = "0.46.0"
+version = "0.46.1"
 license = "Apache-2.0"
 authors = ["Aurora Labs <[email protected]>", "Wei Tang <[email protected]>", "Parity Technologies <[email protected]>"]
 description = "Portable Ethereum Virtual Machine implementation written in pure Rust."

gasometer/src/tracing.rs

@@ -9,7 +9,8 @@ pub trait EventListener {
 }
 
 impl Snapshot {
-	pub fn gas(&self) -> u64 {
+	#[must_use]
+	pub const fn gas(&self) -> u64 {
 		self.gas_limit - self.used_gas - self.memory_gas
 	}
 }

src/executor/stack/executor.rs

@@ -673,7 +673,7 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet>
 			Some(gas_limit),
 			false,
 		) {
-			Capture::Exit((s, _, v)) => emit_exit!(s, v),
+			Capture::Exit((s, v)) => emit_exit!(s, v),
 			Capture::Trap(rt) => {
 				let mut cs: SmallVec<[TaggedRuntime<'_>; DEFAULT_CALL_STACK_CAPACITY]> =
 					smallvec!(rt.0);
@@ -1369,7 +1369,7 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet> Interprete
 					position: &Ok(_pc),
 					stack: machine.stack(),
 					memory: machine.memory(),
-				})
+				});
 			});
 		}