compilage

It compiles

builder/src/non_permissioned.rs

@@ -10,8 +10,8 @@ use async_compatibility_layer::{
 };
 use async_std::sync::{Arc, RwLock};
 use espresso_types::{
-    eth_signature_key::EthKeyPair, ChainConfig, FeeAmount, L1Client, NodeState, Payload, SeqTypes,
-    ValidatedState,
+    eth_signature_key::EthKeyPair, v0_3::ChainConfig, FeeAmount, L1Client, NodeState, Payload,
+    SeqTypes, ValidatedState,
 };
 use ethers::{
     core::k256::ecdsa::SigningKey,

sequencer/src/api.rs

@@ -8,7 +8,7 @@ use committable::Commitment;
 use data_source::{CatchupDataSource, SubmitDataSource};
 use derivative::Derivative;
 use espresso_types::{
-    v0::traits::SequencerPersistence, AccountQueryData, BlockMerkleTree, ChainConfig,
+    v0::traits::SequencerPersistence, v0_3::ChainConfig, AccountQueryData, BlockMerkleTree,
     FeeAccountProof, NodeState, PubKey, Transaction,
 };
 use ethers::prelude::Address;

sequencer/src/api/data_source.rs

@@ -5,7 +5,8 @@ use async_trait::async_trait;
 use committable::Commitment;
 use espresso_types::{
     v0::traits::{PersistenceOptions, SequencerPersistence},
-    ChainConfig, PubKey, Transaction,
+    v0_3::ChainConfig,
+    PubKey, Transaction,
 };
 use ethers::prelude::Address;
 use futures::future::Future;

sequencer/src/api/sql.rs

@@ -1,7 +1,7 @@
 use anyhow::{bail, Context};
 use async_trait::async_trait;
 use committable::Commitment;
-use espresso_types::{BlockMerkleTree, ChainConfig, FeeAccountProof, FeeMerkleTree};
+use espresso_types::{v0_3::ChainConfig, BlockMerkleTree, FeeAccountProof, FeeMerkleTree};
 use ethers::prelude::Address;
 use futures::FutureExt;
 use hotshot_query_service::{

sequencer/src/bin/nasty-client.rs

@@ -31,7 +31,7 @@ use clap::Parser;
 use committable::Committable;
 use derivative::Derivative;
 use es_version::{SequencerVersion, SEQUENCER_VERSION};
-use espresso_types::{BlockMerkleTree, FeeMerkleTree, Header, SeqTypes};
+use espresso_types::{v0_3::IterableFeeInfo, BlockMerkleTree, FeeMerkleTree, Header, SeqTypes};
 use futures::{
     future::{FutureExt, TryFuture, TryFutureExt},
     stream::{Peekable, StreamExt},
@@ -929,7 +929,10 @@ impl ResourceManager<Header> {
                     .await
             })
             .await?;
-        let builder_address = builder_header.fee_info().account();
+
+        // Since we have multiple fee accounts, we need to select one.
+        let accounts = builder_header.fee_info().accounts();
+        let builder_address = accounts.first().unwrap();
 
         // Get the header of the state snapshot we're going to query so we can later verify our
         // results.

sequencer/src/catchup.rs

@@ -6,7 +6,8 @@ use async_trait::async_trait;
 use committable::Commitment;
 use espresso_types::{
     v0::traits::{PersistenceOptions, StateCatchup},
-    AccountQueryData, BackoffParams, BlockMerkleTree, ChainConfig, FeeAccount, FeeMerkleCommitment,
+    v0_3::ChainConfig,
+    AccountQueryData, BackoffParams, BlockMerkleTree, FeeAccount, FeeMerkleCommitment,
 };
 use futures::future::FutureExt;
 use hotshot_orchestrator::config::NetworkConfig;

sequencer/src/genesis.rs

@@ -5,7 +5,7 @@ use std::{
 
 use anyhow::Context;
 use espresso_types::{
-    ChainConfig, FeeAccount, FeeAmount, GenesisHeader, L1BlockInfo, Upgrade, UpgradeType,
+    v0_3::ChainConfig, FeeAccount, FeeAmount, GenesisHeader, L1BlockInfo, Upgrade, UpgradeType,
 };
 use serde::{Deserialize, Serialize};
 use vbs::version::Version;
@@ -265,7 +265,8 @@ mod test {
                 max_block_size: 30000.into(),
                 base_fee: 1.into(),
                 fee_recipient: FeeAccount::default(),
-                fee_contract: Some(Address::default())
+                fee_contract: Some(Address::default()),
+                bid_recipient: None
             }
         );
         assert_eq!(
@@ -329,6 +330,7 @@ mod test {
                 max_block_size: 30000.into(),
                 base_fee: 1.into(),
                 fee_recipient: FeeAccount::default(),
+                bid_recipient: None,
                 fee_contract: None,
             }
         );

sequencer/src/persistence.rs

@@ -10,7 +10,7 @@
 
 use async_trait::async_trait;
 use committable::Commitment;
-use espresso_types::ChainConfig;
+use espresso_types::v0_3::ChainConfig;
 
 pub mod fs;
 pub mod no_storage;

sequencer/src/state.rs

@@ -4,7 +4,7 @@ use std::{sync::Arc, time::Duration};
 use anyhow::{bail, ensure, Context};
 use async_std::{stream::StreamExt, sync::RwLock};
 use espresso_types::{
-    BlockMerkleTree, ChainConfig, Delta, FeeAccount, FeeMerkleTree, ValidatedState,
+    v0_3::ChainConfig, BlockMerkleTree, Delta, FeeAccount, FeeMerkleTree, ValidatedState,
 };
 use futures::future::Future;
 use hotshot::traits::ValidatedState as HotShotState;

types/src/v0/impls/state.rs

@@ -20,7 +20,7 @@ use jf_merkle_tree::{
 use jf_vid::VidScheme;
 use num_traits::CheckedSub;
 use serde::{Deserialize, Serialize};
-use std::{borrow::Borrow, ops::Add};
+use std::ops::Add;
 use thiserror::Error;
 use vbs::version::Version;
 

types/src/v0/mod.rs

@@ -147,7 +147,7 @@ pub type PrivKey = <PubKey as SignatureKey>::PrivateKey;
 
 pub type NetworkConfig = hotshot_orchestrator::config::NetworkConfig<PubKey>;
 
-use self::impls::{NodeState, ValidatedState};
+pub use self::impls::{NodeState, ValidatedState};
 pub use crate::v0_1::{
     BLOCK_MERKLE_TREE_HEIGHT, FEE_MERKLE_TREE_HEIGHT, NS_ID_BYTE_LEN, NS_OFFSET_BYTE_LEN,
     NUM_NSS_BYTE_LEN, NUM_TXS_BYTE_LEN, TX_OFFSET_BYTE_LEN,