Some more renamings

bin/strata-client/src/rpc_server.rs

@@ -24,7 +24,7 @@ use strata_primitives::{
     bridge::{OperatorIdx, PublickeyTable},
     buf::Buf32,
     hash,
-    l1::payload::{BlobDest, L1Payload, PayloadIntent},
+    l1::payload::{L1Payload, PayloadDest, PayloadIntent},
     params::Params,
 };
 use strata_rpc_api::{
@@ -736,7 +736,7 @@ impl StrataSequencerApiServer for SequencerServerImpl {
     async fn submit_da_blob(&self, blob: HexBytes) -> RpcResult<()> {
         let commitment = hash::raw(&blob.0);
         let payload = L1Payload::new_da(blob.0);
-        let blobintent = PayloadIntent::new(BlobDest::L1, commitment, payload);
+        let blobintent = PayloadIntent::new(PayloadDest::L1, commitment, payload);
         // NOTE: It would be nice to return reveal txid from the submit method. But creation of txs
         // is deferred to signer in the writer module
         if let Err(e) = self.envelope_handle.submit_intent_async(blobintent).await {

crates/btcio/src/writer/task.rs

@@ -7,7 +7,7 @@ use strata_db::{
     types::{L1TxStatus, PayloadEntry, PayloadL1Status},
 };
 use strata_primitives::{
-    l1::payload::{BlobDest, PayloadIntent},
+    l1::payload::{PayloadDest, PayloadIntent},
     params::Params,
 };
 use strata_status::StatusChannel;
@@ -35,7 +35,7 @@ impl EnvelopeHandle {
     }
 
     pub fn submit_intent(&self, intent: PayloadIntent) -> anyhow::Result<()> {
-        if intent.dest() != BlobDest::L1 {
+        if intent.dest() != PayloadDest::L1 {
             warn!(commitment = %intent.commitment(), "Received intent not meant for L1");
             return Ok(());
         }
@@ -57,7 +57,7 @@ impl EnvelopeHandle {
     }
 
     pub async fn submit_intent_async(&self, intent: PayloadIntent) -> anyhow::Result<()> {
-        if intent.dest() != BlobDest::L1 {
+        if intent.dest() != PayloadDest::L1 {
             warn!(commitment = %intent.commitment(), "Received intent not meant for L1");
             return Ok(());
         }

crates/config/src/btcio.rs

@@ -49,7 +49,7 @@ impl Default for WriterConfig {
 impl Default for ReaderConfig {
     fn default() -> Self {
         Self {
-            client_poll_dur_ms: 1_000,
+            client_poll_dur_ms: 200,
         }
     }
 }

crates/config/src/config.rs

@@ -104,8 +104,10 @@ mod test {
             rpc_url = "http://localhost:8551"
             secret = "1234567890abcdef"
 
-            [btcio]
+            [btcio.reader]
             client_poll_dur_ms = 200
+
+            [btcio.writer]
             write_poll_dur_ms = 200
             fee_policy = "smart"
             reveal_amount = 100
@@ -145,8 +147,10 @@ mod test {
             client_poll_dur_ms = 200
             client_checkpoint_interval = 10
 
-            [btcio]
+            [btcio.reader]
             client_poll_dur_ms = 200
+
+            [btcio.writer]
             write_poll_dur_ms = 200
             fee_policy = "smart"
             reveal_amount = 100

crates/consensus-logic/src/duty/worker.rs

@@ -12,7 +12,7 @@ use strata_db::traits::*;
 use strata_eectl::engine::ExecEngineCtl;
 use strata_primitives::{
     buf::{Buf32, Buf64},
-    l1::payload::{BlobDest, L1Payload, PayloadIntent},
+    l1::payload::{L1Payload, PayloadDest, PayloadIntent},
     params::Params,
 };
 use strata_state::{batch::SignedBatchCheckpoint, client_state::ClientState, prelude::*};
@@ -424,7 +424,7 @@ fn perform_duty<D: Database, E: ExecEngineCtl>(
             let payload_data =
                 borsh::to_vec(&signed_checkpoint).map_err(|e| Error::Other(e.to_string()))?;
             let payload = L1Payload::new_checkpoint(payload_data);
-            let blob_intent = PayloadIntent::new(BlobDest::L1, checkpoint_hash, payload);
+            let blob_intent = PayloadIntent::new(PayloadDest::L1, checkpoint_hash, payload);
 
             info!(signed_checkpoint = ?signed_checkpoint, "signed checkpoint");
             info!(blob_intent = ?blob_intent, "sending blob intent");

crates/primitives/src/l1/block.rs

@@ -175,29 +175,3 @@ impl From<Block> for L1BlockRecord {
         }
     }
 }
-
-#[derive(Debug, Clone, Serialize, Deserialize, Default, Arbitrary)]
-pub struct L1Status {
-    /// If the last time we tried to poll the client (as of `last_update`)
-    /// we were successful.
-    pub bitcoin_rpc_connected: bool,
-
-    /// The last error message we received when trying to poll the client, if
-    /// there was one.
-    pub last_rpc_error: Option<String>,
-
-    /// Current block height.
-    pub cur_height: u64,
-
-    /// Current tip block ID as string.
-    pub cur_tip_blkid: String,
-
-    /// Last published txid where L2 blob was present
-    pub last_published_txid: Option<Buf32>,
-
-    /// UNIX millis time of the last time we got a new update from the L1 connector.
-    pub last_update: u64,
-
-    /// Number of published reveal transactions.
-    pub published_reveal_txs_count: u64,
-}

crates/primitives/src/l1/mod.rs

@@ -2,7 +2,9 @@ mod block;
 mod btc;
 pub mod payload;
 mod proof;
+mod status;
 
 pub use block::*;
 pub use btc::*;
 pub use proof::*;
+pub use status::*;

crates/primitives/src/l1/payload.rs

@@ -8,6 +8,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use serde::{Deserialize, Serialize};
 
 use crate::{buf::Buf32, hash};
+
 /// DA destination identifier. This will eventually be used to enable
 /// storing payloads on alternative availability schemes.
 #[derive(
@@ -28,15 +29,15 @@ use crate::{buf::Buf32, hash};
 )]
 #[borsh(use_discriminant = true)]
 #[repr(u8)]
-pub enum BlobDest {
+pub enum PayloadDest {
     /// If we expect the DA to be on the L1 chain that we settle to. This is
     /// always the strongest DA layer we have access to.
     L1 = 0,
 }
 
 /// Manual `Arbitrary` impl so that we always generate L1 DA if we add future
 /// ones that would work in totally different ways.
-impl<'a> Arbitrary<'a> for BlobDest {
+impl<'a> Arbitrary<'a> for PayloadDest {
     fn arbitrary(_u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
         Ok(Self::L1)
     }
@@ -59,7 +60,7 @@ impl<'a> Arbitrary<'a> for BlobDest {
 )]
 pub struct BlobSpec {
     /// Target settlement layer we're expecting the DA on.
-    dest: BlobDest,
+    dest: PayloadDest,
 
     /// Commitment to the payload (probably just a hash or a
     /// merkle root) that we expect to see committed to DA.
@@ -68,7 +69,48 @@ pub struct BlobSpec {
 
 impl BlobSpec {
     /// The target we expect the DA payload to be stored on.
-    pub fn dest(&self) -> BlobDest {
+    pub fn dest(&self) -> PayloadDest {
+        self.dest
+    }
+
+    /// Commitment to the payload.
+    pub fn commitment(&self) -> &Buf32 {
+        &self.commitment
+    }
+
+    #[allow(dead_code)]
+    fn new(dest: PayloadDest, commitment: Buf32) -> Self {
+        Self { dest, commitment }
+    }
+}
+
+/// Summary of a DA payload to be included on a DA layer. Specifies the target and
+/// a commitment to the payload.
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    Hash,
+    Arbitrary,
+    BorshDeserialize,
+    BorshSerialize,
+    Serialize,
+    Deserialize,
+)]
+pub struct PayloadSpec {
+    /// Target settlement layer we're expecting the DA on.
+    dest: PayloadDest,
+
+    /// Commitment to the payload (probably just a hash or a
+    /// merkle root) that we expect to see committed to DA.
+    commitment: Buf32,
+}
+
+impl PayloadSpec {
+    /// The target we expect the DA payload to be stored on.
+    pub fn dest(&self) -> PayloadDest {
         self.dest
     }
 
@@ -77,7 +119,7 @@ impl BlobSpec {
         &self.commitment
     }
 
-    fn new(dest: BlobDest, commitment: Buf32) -> Self {
+    fn new(dest: PayloadDest, commitment: Buf32) -> Self {
         Self { dest, commitment }
     }
 }
@@ -131,7 +173,7 @@ pub enum L1PayloadType {
 #[derive(Clone, Debug, Eq, PartialEq, Arbitrary, BorshDeserialize, BorshSerialize)]
 pub struct PayloadIntent {
     /// The destination for this payload.
-    dest: BlobDest,
+    dest: PayloadDest,
 
     /// Commitment to the payload.
     commitment: Buf32,
@@ -141,7 +183,7 @@ pub struct PayloadIntent {
 }
 
 impl PayloadIntent {
-    pub fn new(dest: BlobDest, commitment: Buf32, payload: L1Payload) -> Self {
+    pub fn new(dest: PayloadDest, commitment: Buf32, payload: L1Payload) -> Self {
         Self {
             dest,
             commitment,
@@ -150,7 +192,7 @@ impl PayloadIntent {
     }
 
     /// The target we expect the DA payload to be stored on.
-    pub fn dest(&self) -> BlobDest {
+    pub fn dest(&self) -> PayloadDest {
         self.dest
     }
 
@@ -168,7 +210,7 @@ impl PayloadIntent {
 
     /// Generates the spec from the relevant parts of the payload intent that
     /// uniquely refers to the payload data.
-    pub fn to_spec(&self) -> BlobSpec {
-        BlobSpec::new(self.dest, self.commitment)
+    pub fn to_spec(&self) -> PayloadSpec {
+        PayloadSpec::new(self.dest, self.commitment)
     }
 }

crates/primitives/src/l1/status.rs

@@ -0,0 +1,31 @@
+use arbitrary::Arbitrary;
+use serde::{Deserialize, Serialize};
+
+use crate::buf::Buf32;
+
+/// Data that reflects what's happening around L1
+#[derive(Debug, Clone, Serialize, Deserialize, Default, Arbitrary)]
+pub struct L1Status {
+    /// If the last time we tried to poll the client (as of `last_update`)
+    /// we were successful.
+    pub bitcoin_rpc_connected: bool,
+
+    /// The last error message we received when trying to poll the client, if
+    /// there was one.
+    pub last_rpc_error: Option<String>,
+
+    /// Current block height.
+    pub cur_height: u64,
+
+    /// Current tip block ID as string.
+    pub cur_tip_blkid: String,
+
+    /// Last published txid where L2 blob was present
+    pub last_published_txid: Option<Buf32>,
+
+    /// UNIX millis time of the last time we got a new update from the L1 connector.
+    pub last_update: u64,
+
+    /// Number of published reveal transactions.
+    pub published_reveal_txs_count: u64,
+}

crates/rocksdb-store/src/sequencer/db.rs

@@ -28,19 +28,19 @@ impl RBSeqBlobDb {
 }
 
 impl L1PayloadDatabase for RBSeqBlobDb {
-    fn put_payload_entry(&self, blob_hash: Buf32, blob: PayloadEntry) -> DbResult<()> {
+    fn put_payload_entry(&self, payload_id: Buf32, entry: PayloadEntry) -> DbResult<()> {
         self.db
             .with_optimistic_txn(
                 rockbound::TransactionRetry::Count(self.ops.retry_count),
                 |tx| -> Result<(), DbError> {
                     // If new, increment idx
-                    if tx.get::<SeqBlobSchema>(&blob_hash)?.is_none() {
+                    if tx.get::<SeqBlobSchema>(&payload_id)?.is_none() {
                         let idx = get_next_id::<SeqBlobIdSchema, OptimisticTransactionDB>(tx)?;
 
-                        tx.put::<SeqBlobIdSchema>(&idx, &blob_hash)?;
+                        tx.put::<SeqBlobIdSchema>(&idx, &payload_id)?;
                     }
 
-                    tx.put::<SeqBlobSchema>(&blob_hash, &blob)?;
+                    tx.put::<SeqBlobSchema>(&payload_id, &entry)?;
 
                     Ok(())
                 },

example_config.toml

@@ -16,8 +16,10 @@ network = "regtest"
 l1_follow_distance = 6
 client_checkpoint_interval = 10
 
-[btcio]
+[btcio.reader]
 client_poll_dur_ms = 200
+
+[btcio.writer]
 write_poll_dur_ms = 200
 fee_policy = "smart"
 reveal_amount = 100