Merge branch 'main' into gprusak-must-complete

.github/workflows/load_testing.yaml

@@ -26,7 +26,7 @@ env:
 
 jobs:
   run_load_tests:
-    runs-on: ["self-hosted", "deployer-sandbox", "infra"]
+    runs-on: ["matterlabs-deployer-sandbox-infra"]
     steps:
       - name: Fail-fast on incorrect inputs
         run: |
@@ -113,7 +113,7 @@ jobs:
       - name: Build executor binary
         working-directory: node
         run: |
-          build_output=$(cargo build --release -p executor --bin executor --message-format=json) || exit 1
+          build_output=$(cargo build --release -p tools --bin executor --message-format=json) || exit 1
           echo "$build_output" | jq -r 'select(.executable != null) | .executable' \
           | while read binary; do
             cp "$binary" artifacts/binaries/

.gitignore

@@ -2,15 +2,9 @@
 # will have compiled files and executables
 target/
 
-# These are backup files generated by rustfmt
-/*.rs.bk
-
 # Debug logs
 logs/
 
-# Config files
-config/
-
 # Local load test leftovers
 .terraform
 .ssh

docker/compose.Dockerfile

@@ -28,4 +28,4 @@ WORKDIR /usr/src/myapp/artifacts/$node/
 RUN mkdir /usr/src/myapp/artifacts/$node/logs/
 
 # You can ignore this command. In docker-compose.yml file we have specified the different command
-CMD ["./executor", "0"]
+CMD ["./executor", "0"]

docker/localenv.Dockerfile

@@ -22,7 +22,7 @@ RUN cargo run -p tools --bin localnet_config -- --nodes=$nodes
 
 # Build binary file in release mode and create a main release binary
 WORKDIR /usr/src/myapp/node
-RUN cargo build -p executor --release
+RUN cargo build -p tools --bin executor --release
 
 # Create the artifacts directory
 WORKDIR /usr/src/myapp/node/

node/Cargo.toml

@@ -58,8 +58,8 @@ time = "0.3.23"
 tokio = { version = "1.28.1", features = ["full"] }
 tracing = { version = "0.1.37", features = ["attributes"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter", "fmt"] }
-vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "8322ddc4bb115a7d11127626730b94f93b804cbe" }
-vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "8322ddc4bb115a7d11127626730b94f93b804cbe" }
+vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
+vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
 
 # Note that "bench" profile inherits from "release" profile and
 # "test" profile inherits from "dev" profile.

node/actors/consensus/src/lib.rs

@@ -20,8 +20,7 @@ use anyhow::Context as _;
 use concurrency::ctx;
 use inner::ConsensusInner;
 use roles::validator;
-use std::sync::Arc;
-use storage::ReplicaStateStore;
+use storage::FallbackReplicaStateStore;
 use tracing::{info, instrument};
 use utils::pipe::ActorPipe;
 
@@ -54,7 +53,7 @@ impl Consensus {
         pipe: ActorPipe<InputMessage, OutputMessage>,
         secret_key: validator::SecretKey,
         validator_set: validator::ValidatorSet,
-        storage: Arc<dyn ReplicaStateStore>,
+        storage: FallbackReplicaStateStore,
     ) -> anyhow::Result<Self> {
         Ok(Consensus {
             inner: ConsensusInner {

node/actors/consensus/src/replica/state_machine.rs

@@ -2,11 +2,8 @@ use crate::{metrics, ConsensusInner};
 use anyhow::Context as _;
 use concurrency::{ctx, metrics::LatencyHistogramExt as _, scope, time};
 use roles::validator;
-use std::{
-    collections::{BTreeMap, HashMap},
-    sync::Arc,
-};
-use storage::{ReplicaStateStore, StorageError};
+use std::collections::{BTreeMap, HashMap};
+use storage::{FallbackReplicaStateStore, StorageError};
 use tracing::instrument;
 
 /// The StateMachine struct contains the state of the replica. This is the most complex state machine and is responsible
@@ -27,47 +24,33 @@ pub(crate) struct StateMachine {
     /// The deadline to receive an input message.
     pub(crate) timeout_deadline: time::Deadline,
     /// A reference to the storage module. We use it to backup the replica state.
-    pub(crate) storage: Arc<dyn ReplicaStateStore>,
+    pub(crate) storage: FallbackReplicaStateStore,
 }
 
 impl StateMachine {
     /// Creates a new StateMachine struct. We try to recover a past state from the storage module,
     /// otherwise we initialize the state machine with whatever head block we have.
     pub(crate) async fn new(
         ctx: &ctx::Ctx,
-        storage: Arc<dyn ReplicaStateStore>,
+        storage: FallbackReplicaStateStore,
     ) -> anyhow::Result<Self> {
-        Ok(match storage.replica_state(ctx).await? {
-            Some(backup) => {
-                let mut block_proposal_cache: BTreeMap<_, HashMap<_, _>> = BTreeMap::new();
-                for p in backup.proposals {
-                    block_proposal_cache
-                        .entry(p.number)
-                        .or_default()
-                        .insert(p.payload.hash(), p.payload);
-                }
-                Self {
-                    view: backup.view,
-                    phase: backup.phase,
-                    high_vote: backup.high_vote,
-                    high_qc: backup.high_qc,
-                    block_proposal_cache,
-                    timeout_deadline: time::Deadline::Infinite,
-                    storage,
-                }
-            }
-            None => {
-                let head = storage.head_block(ctx).await?;
-                Self {
-                    view: head.justification.message.view,
-                    phase: validator::Phase::Prepare,
-                    high_vote: head.justification.message,
-                    high_qc: head.justification,
-                    block_proposal_cache: BTreeMap::new(),
-                    timeout_deadline: time::Deadline::Infinite,
-                    storage,
-                }
-            }
+        let backup = storage.replica_state(ctx).await?;
+        let mut block_proposal_cache: BTreeMap<_, HashMap<_, _>> = BTreeMap::new();
+        for proposal in backup.proposals {
+            block_proposal_cache
+                .entry(proposal.number)
+                .or_default()
+                .insert(proposal.payload.hash(), proposal.payload);
+        }
+
+        Ok(Self {
+            view: backup.view,
+            phase: backup.phase,
+            high_vote: backup.high_vote,
+            high_qc: backup.high_qc,
+            block_proposal_cache,
+            timeout_deadline: time::Deadline::Infinite,
+            storage,
         })
     }
 

node/actors/consensus/src/testonly/make.rs

@@ -7,7 +7,7 @@ use crate::{
 use concurrency::ctx;
 use roles::validator;
 use std::sync::Arc;
-use storage::RocksdbStorage;
+use storage::{FallbackReplicaStateStore, RocksdbStorage};
 use tempfile::tempdir;
 use utils::pipe::{self, DispatcherPipe};
 
@@ -33,7 +33,7 @@ pub async fn make_consensus(
         consensus_pipe,
         key.clone(),
         validator_set.clone(),
-        Arc::new(storage),
+        FallbackReplicaStateStore::from_store(Arc::new(storage)),
     );
     let consensus = consensus
         .await

node/actors/consensus/src/testonly/node.rs

@@ -43,7 +43,7 @@ impl Node {
         network_pipe: DispatcherPipe<network::io::InputMessage, network::io::OutputMessage>,
         metrics: channel::UnboundedSender<Metrics>,
     ) -> anyhow::Result<()> {
-        let key = self.net.state().cfg().consensus.key.public();
+        let key = self.net.consensus_config().key.public();
         let rng = &mut ctx.rng();
         let mut net_recv = network_pipe.recv;
         let net_send = network_pipe.send;