writer: Add retries with exponential backoff when signing fails (#452)

Co-authored-by: Bibek Pandey <[email protected]>

Author: bewakes

crates/btcio/src/writer/builder.rs

@@ -33,6 +33,7 @@ use tracing::trace;
 
 use crate::{
     rpc::{
+        error::ClientError,
         traits::{Reader, Signer, Wallet},
         types::ListUnspent,
     },
@@ -51,6 +52,9 @@ pub enum InscriptionError {
     #[error("Error building taproot")]
     Taproot(#[from] TaprootBuilderError),
 
+    #[error("Sign error: {0}")]
+    SigningFailed(#[from] ClientError),
+
     #[error("{0}")]
     Other(#[from] anyhow::Error),
 }

crates/btcio/src/writer/signer.rs

@@ -33,13 +33,8 @@ pub async fn create_and_sign_blob_inscriptions(
 
     let ctxid = commit.compute_txid();
     debug!(commit_txid = ?ctxid, "Signing commit transaction");
-    let signed_commit = client
-        .sign_raw_transaction_with_wallet(&commit)
-        .await
-        .expect("could not sign commit tx")
-        .hex;
-
-    let signed_commit: Transaction = consensus::encode::deserialize_hex(&signed_commit)
+    let signed_tx_raw = client.sign_raw_transaction_with_wallet(&commit).await?.hex;
+    let signed_commit: Transaction = consensus::encode::deserialize_hex(&signed_tx_raw)
         .expect("could not deserialize transaction");
     let cid: Buf32 = signed_commit.compute_txid().into();
     let rid: Buf32 = reveal.compute_txid().into();

crates/btcio/src/writer/task.rs

@@ -4,6 +4,7 @@ use strata_db::{
     traits::SequencerDatabase,
     types::{BlobEntry, BlobL1Status, L1TxStatus},
 };
+use strata_primitives::buf::Buf32;
 use strata_state::da_blob::{BlobDest, BlobIntent};
 use strata_status::StatusTx;
 use strata_storage::ops::inscription::{Context, InscriptionDataOps};
@@ -18,6 +19,9 @@ use crate::{
     writer::{builder::InscriptionError, signer::create_and_sign_blob_inscriptions},
 };
 
+const SIGN_MAX_RETRIES: u8 = 3;
+const BASE_SIGN_DELAY: u64 = 3; // Seconds
+
 /// A handle to the Inscription task.
 pub struct InscriptionHandle {
     ops: Arc<InscriptionDataOps>,
@@ -130,8 +134,10 @@ fn get_next_blobidx_to_watch(insc_ops: &InscriptionDataOps) -> anyhow::Result<u6
 }
 
 /// Watches for inscription transactions status in bitcoin. Note that this watches for each
-/// inscription until it is confirmed
-/// Watches for inscription transactions status in the Bitcoin blockchain.
+/// inscription until it is confirmed.
+/// Watches for inscription transactions status in the Bitcoin blockchain. The current design is to
+/// watch for inscriptions serially i.e. next inscription is not processed unless the current one is
+/// confirmed to bitcoin.
 ///
 /// # Note
 ///
@@ -159,7 +165,7 @@ pub async fn watcher_task(
                 // entry
                 BlobL1Status::Unsigned | BlobL1Status::NeedsResign => {
                     debug!(?blobentry.status, %curr_blobidx, "Processing unsigned blobentry");
-                    match create_and_sign_blob_inscriptions(
+                    match create_and_sign_blob_inscriptions_with_retries(
                         &blobentry,
                         &broadcast_handle,
                         bitcoin_client.clone(),
@@ -233,6 +239,33 @@ pub async fn watcher_task(
     }
 }
 
+async fn create_and_sign_blob_inscriptions_with_retries(
+    blobentry: &BlobEntry,
+    broadcast_handle: &L1BroadcastHandle,
+    client: Arc<impl Reader + Wallet + Signer>,
+    config: &WriterConfig,
+) -> Result<(Buf32, Buf32), InscriptionError> {
+    let mut retries = 0;
+    let mut delay = BASE_SIGN_DELAY;
+    while retries <= SIGN_MAX_RETRIES {
+        match create_and_sign_blob_inscriptions(blobentry, broadcast_handle, client.clone(), config)
+            .await
+        {
+            Ok(d) => return Ok(d),
+            Err(err) => {
+                warn!(%err, commit_txid = %blobentry.commit_txid, "Error creating and signing blob, retrying");
+            }
+        }
+        retries += 1;
+        tokio::time::sleep(Duration::new(delay, 0)).await;
+        delay <<= 1;
+    }
+    error!(commit_txid = %blobentry.commit_txid, "Max retries exceeded while creating and signing blob");
+    Err(InscriptionError::Other(anyhow::anyhow!(
+        "Max retries exceeded while creating and signing blob"
+    )))
+}
+
 async fn update_l1_status(
     blobentry: &BlobEntry,
     new_status: &BlobL1Status,

provers/sp1/Cargo.toml

@@ -38,5 +38,5 @@ tracing.workspace = true
 
 [features]
 default = ["prover"]
-prover = ["dep:strata-sp1-adapter"]
 docker-build = []
+prover = ["dep:strata-sp1-adapter"]

provers/sp1/guest-checkpoint/Cargo.toml

@@ -22,5 +22,5 @@ strata-zkvm = { path = "../../../crates/zkvm/zkvm" }
 substrate-bn = { git = "https://github.com/sp1-patches/bn", branch = "patch-v0.7.0" }
 
 [patch.crates-io]
-sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }
 secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.1" }
+sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }

provers/sp1/guest-evm-ee-stf/Cargo.toml

@@ -11,8 +11,8 @@ sp1-zkvm = "2.0.0"
 strata-proofimpl-evm-ee-stf = { path = "../../../crates/proof-impl/evm-ee-stf" }
 
 [patch.crates-io]
-secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.1" }
-tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" }
-sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }
 revm = { git = "https://github.com/sp1-patches/revm-new", branch = "john/update-for-v1" }
 revm-primitives = { git = "https://github.com/sp1-patches/revm-new", branch = "john/update-for-v1" }
+secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.1" }
+sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }
+tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" }

provers/sp1/guest-l1-batch/Cargo.toml

@@ -18,5 +18,5 @@ strata-state = { path = "../../../crates/state" }
 strata-tx-parser = { path = "../../../crates/tx-parser" }
 
 [patch.crates-io]
-sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }
 secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.1" }
+sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }