Fix clippy, update old dependencies

processor/ethereum/Cargo.toml

@@ -26,6 +26,7 @@ scale = { package = "parity-scale-codec", version = "3", default-features = fals
 borsh = { version = "1", default-features = false, features = ["std", "derive", "de_strict_order"] }
 
 ciphersuite = { path = "../../crypto/ciphersuite", default-features = false, features = ["std"] }
+ciphersuite-kp256 = { path = "../../crypto/ciphersuite/kp256", default-features = false, features = ["std"] }
 dkg = { package = "dkg-evrf", path = "../../crypto/dkg/evrf", default-features = false, features = ["std", "secp256k1"] }
 frost = { package = "modular-frost", path = "../../crypto/frost", default-features = false, features = ["secp256k1"] }
 
@@ -34,11 +35,11 @@ k256 = { version = "^0.13.1", default-features = false, features = ["std"] }
 alloy-core = { version = "1", default-features = false }
 alloy-rlp  = { version = "0.3", default-features = false }
 
-alloy-rpc-types-eth = { version = "0.14", default-features = false }
-alloy-transport = { version = "0.14", default-features = false }
+alloy-rpc-types-eth = { version = "1", default-features = false }
+alloy-transport = { version = "1", default-features = false }
 alloy-simple-request-transport = { path = "../../networks/ethereum/alloy-simple-request-transport", default-features = false }
-alloy-rpc-client = { version = "0.14", default-features = false }
-alloy-provider = { version = "0.14", default-features = false }
+alloy-rpc-client = { version = "1", default-features = false }
+alloy-provider = { version = "1", default-features = false }
 
 serai-client = { path = "../../substrate/client", default-features = false, features = ["ethereum"] }
 

processor/ethereum/TODO/old_processor.rs

@@ -1,164 +0,0 @@
-TODO
-
-  async fn publish_completion(
-    &self,
-    completion: &<Self::Eventuality as EventualityTrait>::Completion,
-  ) -> Result<(), NetworkError> {
-    // Publish this to the dedicated TX server for a solver to actually publish
-    #[cfg(not(test))]
-    {
-    }
-
-    // Publish this using a dummy account we fund with magic RPC commands
-    #[cfg(test)]
-    {
-      let router = self.router().await;
-      let router = router.as_ref().unwrap();
-
-      let mut tx = match completion.command() {
-        RouterCommand::UpdateSeraiKey { key, .. } => {
-          router.update_serai_key(key, completion.signature())
-        }
-        RouterCommand::Execute { outs, .. } => router.execute(
-          &outs.iter().cloned().map(Into::into).collect::<Vec<_>>(),
-          completion.signature(),
-        ),
-      };
-      tx.gas_limit = 1_000_000u64.into();
-      tx.gas_price = 1_000_000_000u64.into();
-      let tx = ethereum_serai::crypto::deterministically_sign(tx);
-
-      if self.provider.get_transaction_by_hash(*tx.hash()).await.unwrap().is_none() {
-        self
-          .provider
-          .raw_request::<_, ()>(
-            "anvil_setBalance".into(),
-            [
-              tx.recover_signer().unwrap().to_string(),
-              (U256::from(tx.tx().gas_limit) * U256::from(tx.tx().gas_price)).to_string(),
-            ],
-          )
-          .await
-          .unwrap();
-
-        let (tx, sig, _) = tx.into_parts();
-        let mut bytes = vec![];
-        tx.encode_with_signature_fields(&sig, &mut bytes);
-        let pending_tx = self.provider.send_raw_transaction(&bytes).await.unwrap();
-        self.mine_block().await;
-        assert!(pending_tx.get_receipt().await.unwrap().status());
-      }
-
-      Ok(())
-    }
-  }
-
-  #[cfg(test)]
-  async fn get_transaction_by_eventuality(
-    &self,
-    block: usize,
-    eventuality: &Self::Eventuality,
-  ) -> Self::Transaction {
-    // We mine 96 blocks to ensure the 32 blocks relevant are finalized
-    // Back-check the prior two epochs in response to this
-    // TODO: Review why this is sub(3) and not sub(2)
-    for block in block.saturating_sub(3) ..= block {
-      match eventuality.1 {
-        RouterCommand::UpdateSeraiKey { nonce, .. } | RouterCommand::Execute { nonce, .. } => {
-          let router = self.router().await;
-          let router = router.as_ref().unwrap();
-
-          let block = u64::try_from(block).unwrap();
-          let filter = router
-            .key_updated_filter()
-            .from_block(block * 32)
-            .to_block(((block + 1) * 32) - 1)
-            .topic1(nonce);
-          let logs = self.provider.get_logs(&filter).await.unwrap();
-          if let Some(log) = logs.first() {
-            return self
-              .provider
-              .get_transaction_by_hash(log.clone().transaction_hash.unwrap())
-              .await
-              .unwrap()
-              .unwrap();
-          };
-
-          let filter = router
-            .executed_filter()
-            .from_block(block * 32)
-            .to_block(((block + 1) * 32) - 1)
-            .topic1(nonce);
-          let logs = self.provider.get_logs(&filter).await.unwrap();
-          if logs.is_empty() {
-            continue;
-          }
-          return self
-            .provider
-            .get_transaction_by_hash(logs[0].transaction_hash.unwrap())
-            .await
-            .unwrap()
-            .unwrap();
-        }
-      }
-    }
-    panic!("couldn't find completion in any three of checked blocks");
-  }
-
-  #[cfg(test)]
-  async fn mine_block(&self) {
-    self.provider.raw_request::<_, ()>("anvil_mine".into(), [96]).await.unwrap();
-  }
-
-  #[cfg(test)]
-  async fn test_send(&self, send_to: Self::Address) -> Self::Block {
-    use rand_core::OsRng;
-    use ciphersuite::group::ff::Field;
-    use ethereum_serai::alloy::sol_types::SolCall;
-
-    let key = <Secp256k1 as Ciphersuite>::F::random(&mut OsRng);
-    let address = ethereum_serai::crypto::address(&(Secp256k1::generator() * key));
-
-    // Set a 1.1 ETH balance
-    self
-      .provider
-      .raw_request::<_, ()>(
-        "anvil_setBalance".into(),
-        [Address(address).to_string(), "1100000000000000000".into()],
-      )
-      .await
-      .unwrap();
-
-    let value = U256::from_str_radix("1000000000000000000", 10).unwrap();
-    let tx = ethereum_serai::alloy::consensus::TxLegacy {
-      chain_id: None,
-      nonce: 0,
-      gas_price: 1_000_000_000u128,
-      gas_limit: 200_000u128,
-      to: ethereum_serai::alloy::primitives::TxKind::Call(send_to.0.into()),
-      // 1 ETH
-      value,
-      input: ethereum_serai::router::abi::inInstructionCall::new((
-        [0; 20].into(),
-        value,
-        vec![].into(),
-      ))
-      .abi_encode()
-      .into(),
-    };
-
-    use ethereum_serai::alloy::{primitives::Signature, consensus::SignableTransaction};
-    let sig = k256::ecdsa::SigningKey::from(k256::elliptic_curve::NonZeroScalar::new(key).unwrap())
-      .sign_prehash_recoverable(tx.signature_hash().as_ref())
-      .unwrap();
-
-    let mut bytes = vec![];
-    tx.encode_with_signature_fields(&Signature::from(sig), &mut bytes);
-    let pending_tx = self.provider.send_raw_transaction(&bytes).await.ok().unwrap();
-
-    // Mine an epoch containing this TX
-    self.mine_block().await;
-    assert!(pending_tx.get_receipt().await.unwrap().status());
-    // Yield the freshly mined block
-    self.get_block(self.get_latest_block_number().await.unwrap()).await.unwrap()
-  }

processor/ethereum/TODO/tests/crypto.rs

@@ -1,31 +0,0 @@
-// TODO
-
-use rand_core::OsRng;
-
-use group::ff::{Field, PrimeField};
-use k256::{
-  ecdsa::{
-    self, hazmat::SignPrimitive, signature::hazmat::PrehashVerifier, SigningKey, VerifyingKey,
-  },
-  Scalar, ProjectivePoint,
-};
-
-use frost::{
-  curve::{Ciphersuite, Secp256k1},
-  algorithm::{Hram, IetfSchnorr},
-  tests::{algorithm_machines, sign},
-};
-
-use crate::{crypto::*, tests::key_gen};
-
-// Run the sign test with the EthereumHram
-#[test]
-fn test_signing() {
-  let (keys, _) = key_gen();
-
-  const MESSAGE: &[u8] = b"Hello, World!";
-
-  let algo = IetfSchnorr::<Secp256k1, EthereumHram>::ietf();
-  let _sig =
-    sign(&mut OsRng, &algo, keys.clone(), algorithm_machines(&mut OsRng, &algo, &keys), MESSAGE);
-}

processor/ethereum/TODO/tests/mod.rs

@@ -1,45 +0,0 @@
-// TODO
-
-use std::{sync::Arc, collections::HashMap};
-
-use rand_core::OsRng;
-
-use k256::{Scalar, ProjectivePoint};
-use frost::{curve::Secp256k1, Participant, ThresholdKeys, tests::key_gen as frost_key_gen};
-
-use alloy_core::{
-  primitives::{Address, U256, Bytes, Signature, TxKind},
-  hex::FromHex,
-};
-use alloy_consensus::{SignableTransaction, TxLegacy};
-
-use alloy_rpc_types_eth::TransactionReceipt;
-use alloy_simple_request_transport::SimpleRequest;
-use alloy_provider::{Provider, RootProvider};
-
-use crate::crypto::{address, deterministically_sign, PublicKey};
-
-#[cfg(test)]
-mod crypto;
-
-#[cfg(test)]
-use contracts::tests as abi;
-#[cfg(test)]
-mod router;
-
-pub fn key_gen() -> (HashMap<Participant, ThresholdKeys<Secp256k1>>, PublicKey) {
-  let mut keys = frost_key_gen::<_, Secp256k1>(&mut OsRng);
-  let mut group_key = keys[&Participant::new(1).unwrap()].group_key();
-
-  let mut offset = Scalar::ZERO;
-  while PublicKey::new(group_key).is_none() {
-    offset += Scalar::ONE;
-    group_key += ProjectivePoint::GENERATOR;
-  }
-  for keys in keys.values_mut() {
-    *keys = keys.offset(offset);
-  }
-  let public_key = PublicKey::new(group_key).unwrap();
-
-  (keys, public_key)
-}

processor/ethereum/deployer/Cargo.toml

@@ -22,11 +22,11 @@ alloy-core = { version = "1", default-features = false }
 alloy-sol-types = { version = "1", default-features = false }
 alloy-sol-macro = { version = "1", default-features = false }
 
-alloy-consensus = { version = "0.14", default-features = false }
+alloy-consensus = { version = "1", default-features = false }
 
-alloy-rpc-types-eth = { version = "0.14", default-features = false }
-alloy-transport = { version = "0.14", default-features = false }
-alloy-provider = { version = "0.14", default-features = false }
+alloy-rpc-types-eth = { version = "1", default-features = false }
+alloy-transport = { version = "1", default-features = false }
+alloy-provider = { version = "1", default-features = false }
 
 ethereum-primitives = { package = "serai-processor-ethereum-primitives", path = "../primitives", default-features = false }
 
@@ -35,9 +35,9 @@ build-solidity-contracts = { path = "../../../networks/ethereum/build-contracts"
 
 [dev-dependencies]
 alloy-simple-request-transport = { path = "../../../networks/ethereum/alloy-simple-request-transport", default-features = false }
-alloy-rpc-client = { version = "0.14", default-features = false }
-alloy-node-bindings = { version = "0.14", default-features = false }
+alloy-rpc-client = { version = "1", default-features = false }
+alloy-node-bindings = { version = "1", default-features = false }
 
-tokio = { version = "1.0", default-features = false, features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "macros"] }
 
 ethereum-test-primitives = { package = "serai-ethereum-test-primitives", path = "../test-primitives" }

processor/ethereum/erc20/Cargo.toml

@@ -22,9 +22,9 @@ alloy-core = { version = "1", default-features = false }
 alloy-sol-types = { version = "1", default-features = false }
 alloy-sol-macro = { version = "1", default-features = false }
 
-alloy-rpc-types-eth = { version = "0.14", default-features = false }
-alloy-transport = { version = "0.14", default-features = false }
-alloy-provider = { version = "0.14", default-features = false }
+alloy-rpc-types-eth = { version = "1", default-features = false }
+alloy-transport = { version = "1", default-features = false }
+alloy-provider = { version = "1", default-features = false }
 
 ethereum-primitives = { package = "serai-processor-ethereum-primitives", path = "../primitives", default-features = false }
 

processor/ethereum/primitives/Cargo.toml

@@ -23,4 +23,4 @@ group = { version = "0.13", default-features = false }
 k256 = { version = "^0.13.1", default-features = false, features = ["std", "arithmetic"] }
 
 alloy-primitives = { version = "1", default-features = false }
-alloy-consensus = { version = "0.14", default-features = false, features = ["k256"] }
+alloy-consensus = { version = "1", default-features = false, features = ["k256"] }

processor/ethereum/router/Cargo.toml

@@ -27,13 +27,13 @@ alloy-core = { version = "1", default-features = false }
 alloy-sol-types = { version = "1", default-features = false }
 alloy-sol-macro = { version = "1", default-features = false }
 
-alloy-consensus = { version = "0.14", default-features = false }
+alloy-consensus = { version = "1", default-features = false }
 
-alloy-rpc-types-eth = { version = "0.14", default-features = false }
-alloy-transport = { version = "0.14", default-features = false }
-alloy-provider = { version = "0.14", default-features = false }
+alloy-rpc-types-eth = { version = "1", default-features = false }
+alloy-transport = { version = "1", default-features = false }
+alloy-provider = { version = "1", default-features = false }
 
-revm = { version = "22", default-features = false, features = ["std"] }
+revm = { version = "29", default-features = false, features = ["std"] }
 
 ethereum-schnorr = { package = "ethereum-schnorr-contract", path = "../../../networks/ethereum/schnorr", default-features = false }
 
@@ -61,10 +61,10 @@ rand_core = { version = "0.6", default-features = false, features = ["std"] }
 k256 = { version = "0.13", default-features = false, features = ["std"] }
 
 alloy-simple-request-transport = { path = "../../../networks/ethereum/alloy-simple-request-transport", default-features = false }
-alloy-provider = { version = "0.14", default-features = false, features = ["debug-api", "trace-api"] }
-alloy-rpc-client = { version = "0.14", default-features = false }
-alloy-node-bindings = { version = "0.14", default-features = false }
+alloy-provider = { version = "1", default-features = false, features = ["debug-api", "trace-api"] }
+alloy-rpc-client = { version = "1", default-features = false }
+alloy-node-bindings = { version = "1", default-features = false }
 
-tokio = { version = "1.0", default-features = false, features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "macros"] }
 
 ethereum-test-primitives = { package = "serai-ethereum-test-primitives", path = "../test-primitives" }

processor/ethereum/router/src/gas.rs

@@ -21,8 +21,8 @@ use revm::{
   },
   context::{
     result::{EVMError, InvalidTransaction, ExecutionResult},
-    evm::{EvmData, Evm},
     context::Context,
+    evm::Evm,
     *,
   },
   inspector::{Inspector, InspectorHandler},
@@ -124,6 +124,7 @@ pub(crate) type GasEstimator = Evm<
   WorstCaseCallInspector,
   EthInstructions<EthInterpreter, RevmContext>,
   EthPrecompiles,
+  EthFrame,
 >;
 
 impl Router {
@@ -218,26 +219,24 @@ impl Router {
       db
     };
 
-    Evm {
-      data: EvmData {
-        ctx: RevmContext::new(db, SPEC_ID)
-          .modify_cfg_chained(|cfg| {
-            cfg.chain_id = CHAIN_ID.try_into().unwrap();
-          })
-          .modify_tx_chained(|tx: &mut TxEnv| {
-            tx.gas_limit = u64::MAX;
-            tx.kind = self.address.into();
-          }),
-        inspector: WorstCaseCallInspector {
-          erc20,
-          call_depth: 0,
-          unused_gas: 0,
-          override_immediate_call_return_value: false,
-        },
+    Evm::new_with_inspector(
+      RevmContext::new(db, SPEC_ID)
+        .modify_cfg_chained(|cfg| {
+          cfg.chain_id = CHAIN_ID.try_into().unwrap();
+        })
+        .modify_tx_chained(|tx: &mut TxEnv| {
+          tx.gas_limit = u64::MAX;
+          tx.kind = self.address.into();
+        }),
+      WorstCaseCallInspector {
+        erc20,
+        call_depth: 0,
+        unused_gas: 0,
+        override_immediate_call_return_value: false,
       },
-      instruction: EthInstructions::default(),
-      precompiles: precompiles(),
-    }
+      EthInstructions::default(),
+      precompiles(),
+    )
   }
 
   /// The worst-case gas cost for a legacy transaction which executes this batch.
@@ -262,7 +261,7 @@ impl Router {
         let fee = if fee_per_gas == U256::ZERO { U256::ZERO } else { U256::ONE };
 
         // Set a balance of the amount sent out to ensure we don't error on that premise
-        gas_estimator.data.ctx.modify_db(|db| {
+        gas_estimator.ctx.modify_db(|db| {
           let account = db.load_account(self.address).unwrap();
           account.info.balance = fee + outs.0.iter().map(|out| out.amount).sum::<U256>();
         });
@@ -290,7 +289,7 @@ impl Router {
       consistent use of nonce #1 shows storage read/writes aren't being persisted. They're solely
       returned upon execution in a `state` field we ignore.
     */
-    gas_estimator.data.ctx.modify_tx(|tx| {
+    gas_estimator.ctx.modify_tx(|tx| {
       tx.caller = Address::from({
         /*
           We assume the transaction sender is not the destination of any `OutInstruction`, making
@@ -317,21 +316,17 @@ impl Router {
     });
 
     // Execute the transaction
-    let mut gas = match MainnetHandler::<
-      _,
-      EVMError<Infallible, InvalidTransaction>,
-      EthFrame<_, _, _>,
-    >::default()
-    .inspect_run(&mut gas_estimator)
-    .unwrap()
-    .result
-    {
-      ExecutionResult::Success { gas_used, gas_refunded, .. } => {
-        assert_eq!(gas_refunded, 0);
-        gas_used
-      }
-      res => panic!("estimated execute transaction failed: {res:?}"),
-    };
+    let mut gas =
+      match MainnetHandler::<_, EVMError<Infallible, InvalidTransaction>, EthFrame<_>>::default()
+        .inspect_run(&mut gas_estimator)
+        .unwrap()
+      {
+        ExecutionResult::Success { gas_used, gas_refunded, .. } => {
+          assert_eq!(gas_refunded, 0);
+          gas_used
+        }
+        res => panic!("estimated execute transaction failed: {res:?}"),
+      };
     gas += gas_estimator.into_inspector().unused_gas;
 
     /*

processor/ethereum/src/key_gen.rs

@@ -1,5 +1,5 @@
-use ciphersuite::{Ciphersuite, Secp256k1};
-use dkg::ThresholdKeys;
+use ciphersuite::Ciphersuite;
+use dkg::{ThresholdKeys, Curves, Secp256k1};
 
 use ethereum_schnorr::PublicKey;
 
@@ -9,17 +9,23 @@ impl key_gen::KeyGenParams for KeyGenParams {
 
   type ExternalNetworkCiphersuite = Secp256k1;
 
-  fn tweak_keys(keys: &mut ThresholdKeys<Self::ExternalNetworkCiphersuite>) {
+  fn tweak_keys(
+    keys: &mut ThresholdKeys<<Self::ExternalNetworkCiphersuite as Curves>::ToweringCurve>,
+  ) {
     while PublicKey::new(keys.group_key()).is_none() {
-      *keys = keys.offset(<Secp256k1 as Ciphersuite>::F::ONE);
+      *keys = keys.clone().offset(<<Secp256k1 as Curves>::ToweringCurve as Ciphersuite>::F::ONE);
     }
   }
 
-  fn encode_key(key: <Self::ExternalNetworkCiphersuite as Ciphersuite>::G) -> Vec<u8> {
+  fn encode_key(
+    key: <<Self::ExternalNetworkCiphersuite as Curves>::ToweringCurve as Ciphersuite>::G,
+  ) -> Vec<u8> {
     PublicKey::new(key).unwrap().eth_repr().to_vec()
   }
 
-  fn decode_key(key: &[u8]) -> Option<<Self::ExternalNetworkCiphersuite as Ciphersuite>::G> {
+  fn decode_key(
+    key: &[u8],
+  ) -> Option<<<Self::ExternalNetworkCiphersuite as Curves>::ToweringCurve as Ciphersuite>::G> {
     PublicKey::from_eth_repr(key.try_into().ok()?).map(|key| key.point())
   }
 }

processor/ethereum/src/primitives/block.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
-use ciphersuite::{Ciphersuite, Secp256k1};
+use ciphersuite::Ciphersuite;
+use ciphersuite_kp256::Secp256k1;
 
 use serai_client::networks::ethereum::Address;
 

processor/ethereum/src/primitives/machine.rs

@@ -2,7 +2,8 @@ use std::{io, collections::HashMap};
 
 use rand_core::{RngCore, CryptoRng};
 
-use ciphersuite::{Ciphersuite, Secp256k1};
+use ciphersuite::Ciphersuite;
+use ciphersuite_kp256::Secp256k1;
 use frost::{
   dkg::{Participant, ThresholdKeys},
   FrostError,

processor/ethereum/src/primitives/output.rs

@@ -1,6 +1,7 @@
 use std::io;
 
-use ciphersuite::{group::GroupEncoding, Ciphersuite, Secp256k1};
+use ciphersuite::{group::GroupEncoding, Ciphersuite};
+use ciphersuite_kp256::Secp256k1;
 
 use alloy_core::primitives::U256;
 

processor/ethereum/src/primitives/transaction.rs

@@ -1,6 +1,6 @@
 use std::io;
 
-use ciphersuite::Secp256k1;
+use ciphersuite_kp256::Secp256k1;
 use frost::dkg::ThresholdKeys;
 
 use alloy_core::primitives::{U256, Address as EthereumAddress};

processor/ethereum/test-primitives/Cargo.toml

@@ -20,9 +20,9 @@ workspace = true
 k256 = { version = "0.13", default-features = false, features = ["std"] }
 
 alloy-core = { version = "1", default-features = false }
-alloy-consensus = { version = "0.14", default-features = false, features = ["std"] }
+alloy-consensus = { version = "1", default-features = false, features = ["std"] }
 
-alloy-rpc-types-eth = { version = "0.14", default-features = false }
-alloy-provider = { version = "0.14", default-features = false }
+alloy-rpc-types-eth = { version = "1", default-features = false }
+alloy-provider = { version = "1", default-features = false }
 
 ethereum-primitives = { package = "serai-processor-ethereum-primitives", path = "../primitives", default-features = false }