Merge branch 'develop' into chore/update-docs_1721318026

Author: saralab

CHANGELOG.md

@@ -7,7 +7,12 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## [Unreleased]
 
-- Added support for Clarity 3
+## [3.0.0.0.0]
+
+### Added
+
+- **Nakamoto consensus rules, activating in epoch 3.0 at block 867,867** (see [SIP-021](https://github.com/stacksgov/sips/blob/main/sips/sip-021/sip-021-nakamoto.md) for details)
+- Clarity 3, activating with epoch 3.0
   - Keywords / variable
     - `tenure-height` added
     - `stacks-block-height` added
@@ -16,10 +21,29 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
     - `get-stacks-block-info?` added
     - `get-tenure-info?` added
     - `get-block-info?` removed
-- Added `/v3/signer/{signer_pubkey}/{reward_cycle}` endpoint
-- Added `tenure_height` to `/v2/info` endpoint
-- Added optional `timeout_ms` to `events_observer` configuration
-- Added support for re-sending events to event observers across restarts
+- New RPC endpoints
+  - `/v3/blocks/:block_id`
+  - `/v3/blocks/upload/`
+  - `/v3/signer/:signer_pubkey/:cycle_num`
+  - `/v3/sortitions`
+  - `/v3/stacker_set/:cycle_num`
+  - `/v3/tenures/:block_id`
+  - `/v3/tenures/fork_info/:start/:stop`
+  - `/v3/tenures/info`
+  - `/v3/tenures/tip/:consensus_hash`
+- Re-send events to event observers across restarts
+- Support custom chain-ids for testing
+- Add `replay-block` command to CLI
+
+### Changed
+
+- Strict config file validation (unknown fields will cause the node to fail to start)
+- Add optional `timeout_ms` to `events_observer` configuration
+- Modified RPC endpoints
+  - Include `tenure_height` in `/v2/info` endpoint
+  - Include `block_time` and `tenure_height` in `/new/block` event payload
+- Various improvements to logging, reducing log spam and improving log messages
+- Various improvements and bugfixes
 
 ## [2.5.0.0.7]
 

stacks-signer/CHANGELOG.md

@@ -11,6 +11,24 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ### Changed
 
+## [3.0.0.0.0]
+
+### Added
+
+- Improved StackerDB message structures
+- Improved mock signing during epoch 2.5
+- Include the `stacks-signer` binary version in startup logging and StackerDB messages
+- Added a `monitor-signers` CLI command for better visibility into other signers on the network
+- Support custom Chain ID in signer configuration
+- Refresh the signer's sortition view when it sees a block proposal for a new tenure
+- Fixed a race condition where a signer would try to update before StackerDB configuration was set
+
+### Changed
+
+- Migrate to new Stacks Node RPC endpoint `/v3/tenures/fork_info/:start/:stop`
+- Improved chainstate storage for handling of forks and other state
+- Updated prometheus metric labels to reduce high cardinality
+
 ## [2.5.0.0.5.3]
 
 ### Added

testnet/stacks-node/src/event_dispatcher.rs

@@ -355,6 +355,42 @@ impl EventObserver {
         Ok(())
     }
 
+    /// Insert a payload into the database, retrying on failure.
+    fn insert_payload_with_retry(
+        conn: &Connection,
+        url: &str,
+        payload: &serde_json::Value,
+        timeout: Duration,
+    ) {
+        let mut attempts = 0i64;
+        let mut backoff = Duration::from_millis(100); // Initial backoff duration
+        let max_backoff = Duration::from_secs(5); // Cap the backoff duration
+
+        loop {
+            match Self::insert_payload(conn, url, payload, timeout) {
+                Ok(_) => {
+                    // Successful insert, break the loop
+                    return;
+                }
+                Err(err) => {
+                    // Log the error, then retry after a delay
+                    warn!("Failed to insert payload into event observer database: {:?}", err;
+                        "backoff" => ?backoff,
+                        "attempts" => attempts
+                    );
+
+                    // Wait for the backoff duration
+                    sleep(backoff);
+
+                    // Increase the backoff duration (with exponential backoff)
+                    backoff = std::cmp::min(backoff.saturating_mul(2), max_backoff);
+
+                    attempts = attempts.saturating_add(1);
+                }
+            }
+        }
+    }
+
     fn get_pending_payloads(
         conn: &Connection,
     ) -> Result<Vec<(i64, String, serde_json::Value, u64)>, db_error> {
@@ -524,8 +560,7 @@ impl EventObserver {
                 Connection::open(db_path).expect("Failed to open database for event observer");
 
             // Insert the new payload into the database
-            Self::insert_payload(&conn, &full_url, payload, self.timeout)
-                .expect("Failed to insert payload into event observer database");
+            Self::insert_payload_with_retry(&conn, &full_url, payload, self.timeout);
 
             // Process all pending payloads
             Self::process_pending_payloads(&conn);