Merge remote-tracking branch 'origin/main' into refactor_fatal_error

crates/revm/src/context.rs

@@ -246,7 +246,7 @@ impl<DB: Database> EvmContext<DB> {
         address: Address,
         index: U256,
         value: U256,
-    ) -> Result<(U256, U256, U256, bool), EVMError<DB::Error>> {
+    ) -> Result<SStoreResult, EVMError<DB::Error>> {
         self.journaled_state
             .sstore(address, index, value, &mut self.db)
     }

crates/revm/src/evm.rs

@@ -425,12 +425,7 @@ impl<EXT, DB: Database> Host for Evm<'_, EXT, DB> {
             .ok()
     }
 
-    fn sstore(
-        &mut self,
-        address: Address,
-        index: U256,
-        value: U256,
-    ) -> Option<(U256, U256, U256, bool)> {
+    fn sstore(&mut self, address: Address, index: U256, value: U256) -> Option<SStoreResult> {
         self.context
             .evm
             .sstore(address, index, value)

crates/revm/src/journaled_state.rs

@@ -656,7 +656,7 @@ impl JournaledState {
         key: U256,
         new: U256,
         db: &mut DB,
-    ) -> Result<(U256, U256, U256, bool), EVMError<DB::Error>> {
+    ) -> Result<SStoreResult, EVMError<DB::Error>> {
         // assume that acc exists and load the slot.
         let (present, is_cold) = self.sload(address, key, db)?;
         let acc = self.state.get_mut(&address).unwrap();