Route top-level transfers through to the processor

coins/ethereum/src/erc20.rs

@@ -22,8 +22,8 @@ pub struct TopLevelErc20Transfer {
 
 /// A view for an ERC20 contract.
 #[derive(Clone, Debug)]
-pub struct ERC20(Arc<RootProvider<SimpleRequest>>, Address);
+pub struct Erc20(Arc<RootProvider<SimpleRequest>>, Address);
-impl ERC20 {
+impl Erc20 {
   /// Construct a new view of the specified ERC20 contract.
   ///
   /// This checks a contract is deployed at that address yet does not check the contract is

coins/ethereum/src/router.rs

@@ -229,30 +229,32 @@ impl Router {
     }
   }
 
+  pub async fn key_at_end_of_block(&self, block: u64) -> Result<ProjectivePoint, Error> {
+    let filter = Filter::new().from_block(0).to_block(block).address(self.1);
+    let filter = filter.event_signature(SeraiKeyUpdated::SIGNATURE_HASH);
+    let all_keys = self.0.get_logs(&filter).await.map_err(|_| Error::ConnectionError)?;
+
+    let last_key_x_coordinate_log = all_keys.last().ok_or(Error::ConnectionError)?;
+    let last_key_x_coordinate = last_key_x_coordinate_log
+      .log_decode::<SeraiKeyUpdated>()
+      .map_err(|_| Error::ConnectionError)?
+      .inner
+      .data
+      .key;
+
+    let mut compressed_point = <ProjectivePoint as GroupEncoding>::Repr::default();
+    compressed_point[0] = u8::from(sec1::Tag::CompressedEvenY);
+    compressed_point[1 ..].copy_from_slice(last_key_x_coordinate.as_slice());
+
+    Option::from(ProjectivePoint::from_bytes(&compressed_point)).ok_or(Error::ConnectionError)
+  }
+
   pub async fn in_instructions(
     &self,
     block: u64,
     allowed_tokens: &HashSet<[u8; 20]>,
   ) -> Result<Vec<InInstruction>, Error> {
-    let key_at_end_of_block = {
+    let key_at_end_of_block = self.key_at_end_of_block(block).await?;
-      let filter = Filter::new().from_block(0).to_block(block).address(self.1);
-      let filter = filter.event_signature(SeraiKeyUpdated::SIGNATURE_HASH);
-      let all_keys = self.0.get_logs(&filter).await.map_err(|_| Error::ConnectionError)?;
-
-      let last_key_x_coordinate_log = all_keys.last().ok_or(Error::ConnectionError)?;
-      let last_key_x_coordinate = last_key_x_coordinate_log
-        .log_decode::<SeraiKeyUpdated>()
-        .map_err(|_| Error::ConnectionError)?
-        .inner
-        .data
-        .key;
-
-      let mut compressed_point = <ProjectivePoint as GroupEncoding>::Repr::default();
-      compressed_point[0] = u8::from(sec1::Tag::CompressedEvenY);
-      compressed_point[1 ..].copy_from_slice(last_key_x_coordinate.as_slice());
-
-      ProjectivePoint::from_bytes(&compressed_point).expect("router's last key wasn't a valid key")
-    };
 
     let filter = Filter::new().from_block(block).to_block(block).address(self.1);
     let filter = filter.event_signature(InInstructionEvent::SIGNATURE_HASH);

processor/src/networks/ethereum.rs

@@ -17,6 +17,7 @@ use ethereum_serai::{
   alloy_rpc_client::ClientBuilder,
   alloy_provider::{Provider, RootProvider},
   crypto::{PublicKey, Signature},
+  erc20::Erc20,
   deployer::Deployer,
   router::{Router, Coin as EthereumCoin, InInstruction as EthereumInInstruction},
   machine::*,
@@ -475,10 +476,59 @@ impl<D: fmt::Debug + Db> Network for Ethereum<D> {
   ) -> Vec<Self::Output> {
     let router = self.router().await;
     let router = router.as_ref().unwrap();
-
+    // Grab the key at the end of the epoch
-    // TODO: Top-level transfers
+    let key_at_end_of_block = loop {
+      match router.key_at_end_of_block(block.start + 31).await {
+        Ok(key) => break key,
+        Err(e) => {
+          log::error!("couldn't connect to router for the key at the end of the block: {e:?}");
+          sleep(Duration::from_secs(5)).await;
+          continue;
+        }
+      }
+    };
 
     let mut all_events = vec![];
+    let mut top_level_txids = HashSet::new();
+    for erc20_addr in [DAI] {
+      let erc20 = loop {
+        let Ok(Some(erc20)) = Erc20::new(self.provider.clone(), erc20_addr).await else {
+          log::error!(
+            "couldn't connect to Ethereum node for an ERC20: {}",
+            hex::encode(erc20_addr)
+          );
+          sleep(Duration::from_secs(5)).await;
+          continue;
+        };
+        break erc20;
+      };
+
+      for block in block.start .. (block.start + 32) {
+        let transfers = loop {
+          match erc20.top_level_transfers(block, router.address()).await {
+            Ok(transfers) => break transfers,
+            Err(e) => {
+              log::error!("couldn't connect to Ethereum node for the top-level transfers: {e:?}");
+              sleep(Duration::from_secs(5)).await;
+              continue;
+            }
+          }
+        };
+
+        for transfer in transfers {
+          top_level_txids.insert(transfer.id);
+          all_events.push(EthereumInInstruction {
+            id: (transfer.id, 0),
+            from: transfer.from,
+            coin: EthereumCoin::Erc20(erc20_addr),
+            amount: transfer.amount,
+            data: transfer.data,
+            key_at_end_of_block,
+          });
+        }
+      }
+    }
+
     for block in block.start .. (block.start + 32) {
       let mut events = router.in_instructions(block, &HashSet::from([DAI])).await;
       while let Err(e) = events {
@@ -486,7 +536,16 @@ impl<D: fmt::Debug + Db> Network for Ethereum<D> {
         sleep(Duration::from_secs(5)).await;
         events = router.in_instructions(block, &HashSet::from([DAI])).await;
       }
-      all_events.extend(events.unwrap());
+      let mut events = events.unwrap();
+      for event in &mut events {
+        // A transaction should either be a top-level transfer or a Router InInstruction
+        if top_level_txids.contains(&event.id.0) {
+          panic!("top-level transfer had {} and router had {:?}", hex::encode(event.id.0), event);
+        }
+        // Overwrite the key at end of block to key at end of epoch
+        event.key_at_end_of_block = key_at_end_of_block;
+      }
+      all_events.extend(events);
     }
 
     for event in &all_events {