Merge remote-tracking branch 'origin/develop' into merge_merge-v14.0.0

Author: yutianwu

crates/interpreter/src/function_stack.rs

@@ -51,9 +51,8 @@ impl FunctionStack {
 
     /// Pops a frame from the stack and sets current_code_idx to the popped frame's idx.
     pub fn pop(&mut self) -> Option<FunctionReturnFrame> {
-        self.return_stack.pop().map(|frame| {
+        self.return_stack.pop().inspect(|frame| {
             self.current_code_idx = frame.idx;
-            frame
         })
     }
 

crates/precompile/src/bls.rs

@@ -64,7 +64,7 @@ fn bls_signature_validation_run(input: &Bytes, gas_limit: u64) -> PrecompileResu
     if (pub_keys.len() == 1 && !bls::verify(&pub_keys[0], msg_hash, signature, &BLS_DST.to_vec()))
         || !bls::aggregate_verify(pub_keys, msg_hashes, signature, &BLS_DST.to_vec())
     {
-        output = Bytes::from(vec![0]);
+        output = Bytes::from(vec![]);
     }
 
     Ok(PrecompileOutput::new(cost, output))
@@ -118,7 +118,7 @@ mod tests {
         input.extend_from_slice(&signature);
         input.extend_from_slice(&pub_key);
 
-        let excepted_output = Bytes::from(vec![0]);
+        let excepted_output = Bytes::from(vec![]);
         let result = match bls_signature_validation_run(&Bytes::from(input.clone()), 100_000_000) {
             Ok(o) => o.bytes,
             Err(e) => panic!("BLS signature validation failed, {:?}", e),
@@ -187,7 +187,7 @@ mod tests {
         input.extend_from_slice(&pub_key1);
         input.extend_from_slice(&pub_key2);
         input.extend_from_slice(&pub_key3);
-        let excepted_output = Bytes::from(vec![0]);
+        let excepted_output = Bytes::from(vec![]);
         let result = match bls_signature_validation_run(&Bytes::from(input.clone()), 100_000_000) {
             Ok(o) => o.bytes,
             Err(e) => panic!("BLS signature validation failed, {:?}", e),
@@ -242,7 +242,7 @@ mod tests {
         input.extend_from_slice(&pub_key1);
         input.extend_from_slice(&pub_key2);
         input.extend_from_slice(&pub_key3);
-        let excepted_output = Bytes::from(vec![0]);
+        let excepted_output = Bytes::from(vec![]);
         let result = match bls_signature_validation_run(&Bytes::from(input.clone()), 100_000_000) {
             Ok(o) => o.bytes,
             Err(e) => panic!("BLS signature validation failed, {:?}", e),

crates/precompile/src/lib.rs

@@ -486,14 +486,18 @@ impl PrecompileSpecId {
             PRAGUE | PRAGUE_EOF => Self::PRAGUE,
             #[cfg(feature = "optimism")]
             BEDROCK | REGOLITH | CANYON => Self::BERLIN,
-            #[cfg(feature = "optimism")]
+            #[cfg(all(feature = "optimism", not(feature = "opbnb")))]
             ECOTONE | FJORD | GRANITE => Self::CANCUN,
+            #[cfg(all(feature = "optimism", feature = "opbnb"))]
+            ECOTONE | GRANITE => Self::CANCUN,
             #[cfg(feature = "opbnb")]
             FERMAT => Self::FERMAT,
             #[cfg(any(feature = "bsc", feature = "opbnb"))]
             HABER => Self::HABER,
             #[cfg(feature = "opbnb")]
             WRIGHT => Self::HABER,
+            #[cfg(all(feature = "optimism", feature = "opbnb"))]
+            FJORD => Self::HABER,
             #[cfg(feature = "bsc")]
             HABER_FIX | BOHR => Self::HABER,
             LATEST => Self::LATEST,

crates/revm/src/evm.rs

@@ -199,9 +199,8 @@ impl<EXT, DB: Database> Evm<'_, EXT, DB> {
             .handler
             .validation()
             .initial_tx_gas(&self.context.evm.env)
-            .map_err(|e| {
+            .inspect_err(|_| {
                 self.clear();
-                e
             })?;
         let output = self.transact_preverified_inner(initial_gas_spend);
         let output = self.handler.post_execution().end(&mut self.context, output);
@@ -228,9 +227,8 @@ impl<EXT, DB: Database> Evm<'_, EXT, DB> {
     /// This function will validate the transaction.
     #[inline]
     pub fn transact(&mut self) -> EVMResult<DB::Error> {
-        let initial_gas_spend = self.preverify_transaction_inner().map_err(|e| {
+        let initial_gas_spend = self.preverify_transaction_inner().inspect_err(|_| {
             self.clear();
-            e
         })?;
 
         let output = self.transact_preverified_inner(initial_gas_spend);

crates/revm/src/optimism/handler_register.rs

@@ -165,7 +165,7 @@ pub fn refund<SPEC: Spec, EXT, DB: Database>(
 pub fn load_precompiles<SPEC: Spec, EXT, DB: Database>() -> ContextPrecompiles<DB> {
     let mut precompiles = ContextPrecompiles::new(PrecompileSpecId::from_spec_id(SPEC::SPEC_ID));
 
-    if SPEC::enabled(SpecId::FJORD) {
+    if SPEC::enabled(SpecId::FJORD) || SPEC::enabled(SpecId::HABER) {
         precompiles.extend([
             // EIP-7212: secp256r1 P256verify
             secp256r1::P256VERIFY,