Merge branch 'main' into Pravdyvy/hardcoded-initial-state

.dockerignore

@@ -26,11 +26,20 @@ Thumbs.db
 ci_scripts/
 
 # Documentation
+docs/
 *.md
 !README.md
 
-# Configs (copy selectively if needed)
+# Non-build project files
+completions/
 configs/
-
-# License
+Justfile
+clippy.toml
+rustfmt.toml
+flake.nix
+flake.lock
 LICENSE
+
+# Docker compose files (not needed inside build)
+docker-compose*.yml
+**/docker-compose*.yml

common/src/transaction.rs

@@ -1,6 +1,6 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 use log::warn;
-use nssa::{AccountId, V02State};
+use nssa::{AccountId, V03State};
 use serde::{Deserialize, Serialize};
 
 use crate::HashType;
@@ -67,7 +67,7 @@ impl NSSATransaction {
 
     pub fn execute_check_on_state(
         self,
-        state: &mut V02State,
+        state: &mut V03State,
     ) -> Result<Self, nssa::error::NssaError> {
         match &self {
             Self::Public(tx) => state.transition_from_public_transaction(tx),

docker-compose.override.yml

@@ -11,17 +11,17 @@ services:
     depends_on:
       - logos-blockchain-node-0
       - indexer_service
-    volumes: !override
-      - ./configs/docker-all-in-one/sequencer:/etc/sequencer_service
+    volumes:
+      - ./configs/docker-all-in-one/sequencer_config.json:/etc/sequencer_service/sequencer_config.json
 
   indexer_service:
     depends_on:
       - logos-blockchain-node-0
     volumes:
-      - ./configs/docker-all-in-one/indexer/indexer_config.json:/etc/indexer_service/indexer_config.json
+      - ./configs/docker-all-in-one/indexer_config.json:/etc/indexer_service/indexer_config.json
 
   explorer_service:
     depends_on:
       - indexer_service
     environment:
-      - INDEXER_RPC_URL=http://indexer_service:8779
+      - INDEXER_RPC_URL=http://indexer_service:8779

explorer_service/Dockerfile

@@ -22,7 +22,13 @@ WORKDIR /explorer_service
 COPY . .
 
 # Build the app
-RUN cargo leptos build --release -vv
+RUN --mount=type=cache,target=/usr/local/cargo/registry/index \
+    --mount=type=cache,target=/usr/local/cargo/registry/cache \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/explorer_service/target \
+    cargo leptos build --release -vv \
+    && cp /explorer_service/target/release/explorer_service /usr/local/bin/explorer_service \
+    && cp -r /explorer_service/target/site /explorer_service/site_output
 
 FROM debian:trixie-slim AS runtime
 WORKDIR /explorer_service
@@ -33,10 +39,10 @@ RUN apt-get update -y \
   && rm -rf /var/lib/apt/lists/*
 
 # Copy the server binary to the /explorer_service directory
-COPY --from=builder /explorer_service/target/release/explorer_service /explorer_service/
+COPY --from=builder /usr/local/bin/explorer_service /explorer_service/
 
 # /target/site contains our JS/WASM/CSS, etc.
-COPY --from=builder /explorer_service/target/site /explorer_service/site
+COPY --from=builder /explorer_service/site_output /explorer_service/site
 
 # Copy Cargo.toml as it’s needed at runtime
 COPY --from=builder /explorer_service/Cargo.toml /explorer_service/

indexer/core/src/block_store.rs

@@ -6,14 +6,14 @@ use common::{
     block::{BedrockStatus, Block, BlockId},
     transaction::NSSATransaction,
 };
-use nssa::{Account, AccountId, V02State};
+use nssa::{Account, AccountId, V03State};
 use storage::indexer::RocksDBIO;
 use tokio::sync::RwLock;
 
 #[derive(Clone)]
 pub struct IndexerStore {
     dbio: Arc<RocksDBIO>,
-    current_state: Arc<RwLock<V02State>>,
+    current_state: Arc<RwLock<V03State>>,
 }
 
 impl IndexerStore {
@@ -24,7 +24,7 @@ impl IndexerStore {
     pub fn open_db_with_genesis(
         location: &Path,
         genesis_block: &Block,
-        initial_state: &V02State,
+        initial_state: &V03State,
     ) -> Result<Self> {
         let dbio = RocksDBIO::open_or_create(location, genesis_block, initial_state)?;
         let current_state = dbio.final_state()?;
@@ -98,14 +98,14 @@ impl IndexerStore {
             .expect("Must be set at the DB startup")
     }
 
-    pub fn get_state_at_block(&self, block_id: u64) -> Result<V02State> {
+    pub fn get_state_at_block(&self, block_id: u64) -> Result<V03State> {
         Ok(self.dbio.calculate_state_for_id(block_id)?)
     }
 
     /// Recalculation of final state directly from DB.
     ///
     /// Used for indexer healthcheck.
-    pub fn recalculate_final_state(&self) -> Result<V02State> {
+    pub fn recalculate_final_state(&self) -> Result<V03State> {
         Ok(self.dbio.final_state()?)
     }
 
@@ -172,7 +172,7 @@ mod tests {
         let storage = IndexerStore::open_db_with_genesis(
             home.as_ref(),
             &genesis_block(),
-            &nssa::V02State::new_with_genesis_accounts(&[(acc1(), 10000), (acc2(), 20000)], &[]),
+            &nssa::V03State::new_with_genesis_accounts(&[(acc1(), 10000), (acc2(), 20000)], &[]),
         )
         .unwrap();
 
@@ -190,7 +190,7 @@ mod tests {
         let storage = IndexerStore::open_db_with_genesis(
             home.as_ref(),
             &genesis_block(),
-            &nssa::V02State::new_with_genesis_accounts(&[(acc1(), 10000), (acc2(), 20000)], &[]),
+            &nssa::V03State::new_with_genesis_accounts(&[(acc1(), 10000), (acc2(), 20000)], &[]),
         )
         .unwrap();
 

indexer/core/src/lib.rs

@@ -11,7 +11,7 @@ use logos_blockchain_core::mantle::{
     Op, SignedMantleTx,
     ops::channel::{ChannelId, inscribe::InscriptionOp},
 };
-use nssa::V02State;
+use nssa::V03State;
 use testnet_initial_state::initial_state_testnet;
 
 use crate::{block_store::IndexerStore, config::IndexerConfig};
@@ -89,7 +89,7 @@ impl IndexerCore {
         // If initial commitments or accounts are present in config, need to construct state from
         // them
         let state = if initial_commitments.is_some() || init_accs.is_some() {
-            let mut state = V02State::new_with_genesis_accounts(
+            let mut state = V03State::new_with_genesis_accounts(
                 &init_accs.unwrap_or_default(),
                 &initial_commitments.unwrap_or_default(),
             );

indexer/service/Dockerfile

@@ -51,32 +51,34 @@ RUN cargo chef prepare --bin indexer_service --recipe-path recipe.json
 FROM chef AS builder
 COPY --from=planner /indexer_service/recipe.json recipe.json
 # Build dependencies only (this layer will be cached)
-RUN cargo chef cook --bin indexer_service --release --recipe-path recipe.json
+RUN --mount=type=cache,target=/usr/local/cargo/registry/index \
+    --mount=type=cache,target=/usr/local/cargo/registry/cache \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/indexer_service/target \
+    cargo chef cook --bin indexer_service --release --recipe-path recipe.json
 
 # Copy source code
 COPY . .
 
-# Build the actual application
-RUN cargo build --release --bin indexer_service
-
-# Strip debug symbols to reduce binary size
-RUN strip /indexer_service/target/release/indexer_service
+# Build the actual application and copy the binary out of the cache mount
+RUN --mount=type=cache,target=/usr/local/cargo/registry/index \
+    --mount=type=cache,target=/usr/local/cargo/registry/cache \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/indexer_service/target \
+    cargo build --release --bin indexer_service \
+    && strip /indexer_service/target/release/indexer_service \
+    && cp /indexer_service/target/release/indexer_service /usr/local/bin/indexer_service
 
 # Runtime stage - minimal image
 FROM debian:trixie-slim
 
-# Install runtime dependencies
-RUN apt-get update \
- && apt-get install -y gosu jq \
- && rm -rf /var/lib/apt/lists/*
-
 # Create non-root user for security
 RUN useradd -m -u 1000 -s /bin/bash indexer_service_user && \
-    mkdir -p /indexer_service /etc/indexer_service && \
-    chown -R indexer_service_user:indexer_service_user /indexer_service /etc/indexer_service
+    mkdir -p /indexer_service /etc/indexer_service /var/lib/indexer_service && \
+    chown -R indexer_service_user:indexer_service_user /indexer_service /etc/indexer_service /var/lib/indexer_service
 
 # Copy binary from builder
-COPY --from=builder --chown=indexer_service_user:indexer_service_user /indexer_service/target/release/indexer_service /usr/local/bin/indexer_service
+COPY --from=builder --chown=indexer_service_user:indexer_service_user /usr/local/bin/indexer_service /usr/local/bin/indexer_service
 
 # Copy r0vm binary from builder
 COPY --from=builder --chown=indexer_service_user:indexer_service_user /usr/local/bin/r0vm /usr/local/bin/r0vm
@@ -84,9 +86,7 @@ COPY --from=builder --chown=indexer_service_user:indexer_service_user /usr/local
 # Copy logos blockchain circuits from builder
 COPY --from=builder --chown=indexer_service_user:indexer_service_user /root/.logos-blockchain-circuits /home/indexer_service_user/.logos-blockchain-circuits
 
-# Copy entrypoint script
-COPY indexer/service/docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+VOLUME /var/lib/indexer_service
 
 # Expose default port
 EXPOSE 8779
@@ -105,9 +105,7 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
 # Run the application
 ENV RUST_LOG=info
 
-USER root
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
+USER indexer_service_user
 
 WORKDIR /indexer_service
 CMD ["indexer_service", "/etc/indexer_service/indexer_config.json"]

indexer/service/docker-compose.yml

@@ -10,5 +10,8 @@ services:
     volumes:
       # Mount configuration
       - ./configs/indexer_config.json:/etc/indexer_service/indexer_config.json
-      # Mount data folder
-      - ./data:/var/lib/indexer_service
+      # Mount data volume
+      - indexer_data:/var/lib/indexer_service
+
+volumes:
+  indexer_data:

indexer/service/docker-entrypoint.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# This is an entrypoint script for the indexer_service Docker container,
-# it's not meant to be executed outside of the container.
-
-set -e
-
-CONFIG="/etc/indexer_service/indexer_config.json"
-
-# Check config file exists
-if [ ! -f "$CONFIG" ]; then
-  echo "Config file not found: $CONFIG" >&2
-  exit 1
-fi
-
-# Parse home dir
-HOME_DIR=$(jq -r '.home' "$CONFIG")
-
-if [ -z "$HOME_DIR" ] || [ "$HOME_DIR" = "null" ]; then
-  echo "'home' key missing in config" >&2
-  exit 1
-fi
-
-# Give permissions to the data directory and switch to non-root user
-if [ "$(id -u)" = "0" ]; then
-  mkdir -p "$HOME_DIR"
-  chown -R indexer_service_user:indexer_service_user "$HOME_DIR"
-  exec gosu indexer_service_user "$@"
-fi

nssa/core/src/commitment.rs

@@ -12,8 +12,8 @@ use crate::{NullifierPublicKey, account::Account};
 /// DUMMY_COMMITMENT = hasher.digest()
 /// ```
 pub const DUMMY_COMMITMENT: Commitment = Commitment([
-    130, 75, 48, 230, 171, 101, 121, 141, 159, 118, 21, 74, 135, 248, 16, 255, 238, 156, 61, 24,
-    165, 33, 34, 172, 227, 30, 215, 20, 85, 47, 230, 29,
+    55, 228, 215, 207, 112, 221, 239, 49, 238, 79, 71, 135, 155, 15, 184, 45, 104, 74, 51, 211,
+    238, 42, 160, 243, 15, 124, 253, 62, 3, 229, 90, 27,
 ]);
 
 /// The hash of the dummy commitment.
@@ -24,8 +24,8 @@ pub const DUMMY_COMMITMENT: Commitment = Commitment([
 /// DUMMY_COMMITMENT_HASH = hasher.digest()
 /// ```
 pub const DUMMY_COMMITMENT_HASH: [u8; 32] = [
-    170, 10, 217, 228, 20, 35, 189, 177, 238, 235, 97, 129, 132, 89, 96, 247, 86, 91, 222, 214, 38,
-    194, 216, 67, 56, 251, 208, 226, 0, 117, 149, 39,
+    250, 237, 192, 113, 155, 101, 119, 30, 235, 183, 20, 84, 26, 32, 196, 229, 154, 74, 254, 249,
+    129, 241, 118, 39, 41, 253, 141, 171, 184, 71, 8, 41,
 ];
 
 #[derive(Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
@@ -50,10 +50,14 @@ impl std::fmt::Debug for Commitment {
 
 impl Commitment {
     /// Generates the commitment to a private account owned by user for npk:
-    /// SHA256(npk || `program_owner` || balance || nonce || SHA256(data)).
+    /// SHA256( `Comm_DS` || npk || `program_owner` || balance || nonce || SHA256(data)).
     #[must_use]
     pub fn new(npk: &NullifierPublicKey, account: &Account) -> Self {
+        const COMMITMENT_PREFIX: &[u8; 32] =
+            b"/LEE/v0.3/Commitment/\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+
         let mut bytes = Vec::new();
+        bytes.extend_from_slice(COMMITMENT_PREFIX);
         bytes.extend_from_slice(&npk.to_byte_array());
         let account_bytes_with_hashed_data = {
             let mut this = Vec::new();

nssa/core/src/nullifier.rs

@@ -76,7 +76,7 @@ impl Nullifier {
     /// Computes a nullifier for an account update.
     #[must_use]
     pub fn for_account_update(commitment: &Commitment, nsk: &NullifierSecretKey) -> Self {
-        const UPDATE_PREFIX: &[u8; 32] = b"/NSSA/v0.2/Nullifier/Update/\x00\x00\x00\x00";
+        const UPDATE_PREFIX: &[u8; 32] = b"/LEE/v0.3/Nullifier/Update/\x00\x00\x00\x00\x00";
         let mut bytes = UPDATE_PREFIX.to_vec();
         bytes.extend_from_slice(&commitment.to_byte_array());
         bytes.extend_from_slice(nsk);
@@ -86,7 +86,7 @@ impl Nullifier {
     /// Computes a nullifier for an account initialization.
     #[must_use]
     pub fn for_account_initialization(npk: &NullifierPublicKey) -> Self {
-        const INIT_PREFIX: &[u8; 32] = b"/NSSA/v0.2/Nullifier/Initialize/";
+        const INIT_PREFIX: &[u8; 32] = b"/LEE/v0.3/Nullifier/Initialize/\x00";
         let mut bytes = INIT_PREFIX.to_vec();
         bytes.extend_from_slice(&npk.to_byte_array());
         Self(Impl::hash_bytes(&bytes).as_bytes().try_into().unwrap())
@@ -102,8 +102,8 @@ mod tests {
         let commitment = Commitment((0..32_u8).collect::<Vec<_>>().try_into().unwrap());
         let nsk = [0x42; 32];
         let expected_nullifier = Nullifier([
-            148, 243, 116, 209, 140, 231, 211, 61, 35, 62, 114, 110, 143, 224, 82, 201, 221, 34,
-            53, 80, 185, 48, 174, 28, 203, 43, 94, 187, 85, 199, 115, 81,
+            70, 162, 122, 15, 33, 237, 244, 216, 89, 223, 90, 50, 94, 184, 210, 144, 174, 64, 189,
+            254, 62, 255, 5, 1, 139, 227, 194, 185, 16, 30, 55, 48,
         ]);
         let nullifier = Nullifier::for_account_update(&commitment, &nsk);
         assert_eq!(nullifier, expected_nullifier);
@@ -116,8 +116,8 @@ mod tests {
             255, 29, 105, 42, 186, 43, 11, 157, 168, 132, 225, 17, 163,
         ]);
         let expected_nullifier = Nullifier([
-            1, 6, 59, 168, 16, 146, 65, 252, 255, 91, 48, 85, 116, 189, 110, 218, 110, 136, 163,
-            193, 245, 103, 51, 27, 235, 170, 215, 115, 97, 144, 36, 238,
+            149, 59, 95, 181, 2, 194, 20, 143, 72, 233, 104, 243, 59, 70, 67, 243, 110, 77, 109,
+            132, 139, 111, 51, 125, 128, 92, 107, 46, 252, 4, 20, 149,
         ]);
         let nullifier = Nullifier::for_account_initialization(&npk);
         assert_eq!(nullifier, expected_nullifier);

nssa/src/lib.rs

@@ -16,7 +16,7 @@ pub use program_deployment_transaction::ProgramDeploymentTransaction;
 pub use program_methods::PRIVACY_PRESERVING_CIRCUIT_ID;
 pub use public_transaction::PublicTransaction;
 pub use signature::{PrivateKey, PublicKey, Signature};
-pub use state::V02State;
+pub use state::V03State;
 
 pub mod encoding;
 pub mod error;

nssa/src/privacy_preserving_transaction/message.rs

@@ -32,11 +32,11 @@ impl EncryptedAccountData {
         }
     }
 
-    /// Computes the tag as the first byte of SHA256("/NSSA/v0.2/ViewTag/" || Npk || vpk).
+    /// Computes the tag as the first byte of SHA256("/LEE/v0.3/ViewTag/" || Npk || vpk).
     #[must_use]
     pub fn compute_view_tag(npk: &NullifierPublicKey, vpk: &ViewingPublicKey) -> ViewTag {
         let mut hasher = Sha256::new();
-        hasher.update(b"/NSSA/v0.2/ViewTag/");
+        hasher.update(b"/LEE/v0.3/ViewTag/");
         hasher.update(npk.to_byte_array());
         hasher.update(vpk.to_bytes());
         let digest: [u8; 32] = hasher.finalize().into();
@@ -179,7 +179,7 @@ pub mod tests {
 
         let expected_view_tag = {
             let mut hasher = Sha256::new();
-            hasher.update(b"/NSSA/v0.2/ViewTag/");
+            hasher.update(b"/LEE/v0.3/ViewTag/");
             hasher.update(npk.to_byte_array());
             hasher.update(vpk.to_bytes());
             let digest: [u8; 32] = hasher.finalize().into();

nssa/src/privacy_preserving_transaction/transaction.rs

@@ -12,7 +12,7 @@ use sha2::{Digest as _, digest::FixedOutput as _};
 
 use super::{message::Message, witness_set::WitnessSet};
 use crate::{
-    AccountId, V02State,
+    AccountId, V03State,
     error::NssaError,
     privacy_preserving_transaction::{circuit::Proof, message::EncryptedAccountData},
 };
@@ -34,7 +34,7 @@ impl PrivacyPreservingTransaction {
 
     pub(crate) fn validate_and_produce_public_state_diff(
         &self,
-        state: &V02State,
+        state: &V03State,
     ) -> Result<HashMap<AccountId, Account>, NssaError> {
         let message = &self.message;
         let witness_set = &self.witness_set;

nssa/src/program_deployment_transaction/transaction.rs

@@ -3,7 +3,7 @@ use nssa_core::account::AccountId;
 use sha2::{Digest as _, digest::FixedOutput as _};
 
 use crate::{
-    V02State, error::NssaError, program::Program, program_deployment_transaction::message::Message,
+    V03State, error::NssaError, program::Program, program_deployment_transaction::message::Message,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
@@ -24,7 +24,7 @@ impl ProgramDeploymentTransaction {
 
     pub(crate) fn validate_and_produce_public_state_diff(
         &self,
-        state: &V02State,
+        state: &V03State,
     ) -> Result<Program, NssaError> {
         // TODO: remove clone
         let program = Program::new(self.message.bytecode.clone())?;

nssa/src/public_transaction/transaction.rs

@@ -9,7 +9,7 @@ use nssa_core::{
 use sha2::{Digest as _, digest::FixedOutput as _};
 
 use crate::{
-    V02State, ensure,
+    V03State, ensure,
     error::NssaError,
     public_transaction::{Message, WitnessSet},
     state::MAX_NUMBER_CHAINED_CALLS,
@@ -69,7 +69,7 @@ impl PublicTransaction {
 
     pub(crate) fn validate_and_produce_public_state_diff(
         &self,
-        state: &V02State,
+        state: &V03State,
     ) -> Result<HashMap<AccountId, Account>, NssaError> {
         let message = self.message();
         let witness_set = self.witness_set();
@@ -247,7 +247,7 @@ pub mod tests {
     use sha2::{Digest as _, digest::FixedOutput as _};
 
     use crate::{
-        AccountId, PrivateKey, PublicKey, PublicTransaction, Signature, V02State,
+        AccountId, PrivateKey, PublicKey, PublicTransaction, Signature, V03State,
         error::NssaError,
         program::Program,
         public_transaction::{Message, WitnessSet},
@@ -261,10 +261,10 @@ pub mod tests {
         (key1, key2, addr1, addr2)
     }
 
-    fn state_for_tests() -> V02State {
+    fn state_for_tests() -> V03State {
         let (_, _, addr1, addr2) = keys_for_tests();
         let initial_data = [(addr1, 10000), (addr2, 20000)];
-        V02State::new_with_genesis_accounts(&initial_data, &[])
+        V03State::new_with_genesis_accounts(&initial_data, &[])
     }
 
     fn transaction_for_tests() -> PublicTransaction {

nssa/src/state.rs

@@ -107,13 +107,13 @@ impl BorshDeserialize for NullifierSet {
 
 #[derive(Clone, BorshSerialize, BorshDeserialize)]
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
-pub struct V02State {
+pub struct V03State {
     public_state: HashMap<AccountId, Account>,
     private_state: (CommitmentSet, NullifierSet),
     programs: HashMap<ProgramId, Program>,
 }
 
-impl V02State {
+impl V03State {
     #[must_use]
     pub fn new_with_genesis_accounts(
         initial_data: &[(AccountId, u128)],
@@ -286,7 +286,7 @@ impl V02State {
 }
 
 // TODO: Testnet only. Refactor to prevent compilation on mainnet.
-impl V02State {
+impl V03State {
     pub fn add_pinata_program(&mut self, account_id: AccountId) {
         self.insert_program(Program::pinata());
 
@@ -318,7 +318,7 @@ impl V02State {
 }
 
 #[cfg(any(test, feature = "test-utils"))]
-impl V02State {
+impl V03State {
     pub fn force_insert_account(&mut self, account_id: AccountId, account: Account) {
         self.public_state.insert(account_id, account);
     }
@@ -342,7 +342,7 @@ pub mod tests {
     };
 
     use crate::{
-        PublicKey, PublicTransaction, V02State,
+        PublicKey, PublicTransaction, V03State,
         error::NssaError,
         execute_and_prove,
         privacy_preserving_transaction::{
@@ -357,7 +357,7 @@ pub mod tests {
         state::MAX_NUMBER_CHAINED_CALLS,
     };
 
-    impl V02State {
+    impl V03State {
         /// Include test programs in the builtin programs map.
         #[must_use]
         pub fn with_test_programs(mut self) -> Self {
@@ -504,7 +504,7 @@ pub mod tests {
             this
         };
 
-        let state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+        let state = V03State::new_with_genesis_accounts(&initial_data, &[]);
 
         assert_eq!(state.public_state, expected_public_state);
         assert_eq!(state.programs, expected_builtin_programs);
@@ -512,7 +512,7 @@ pub mod tests {
 
     #[test]
     fn insert_program() {
-        let mut state = V02State::new_with_genesis_accounts(&[], &[]);
+        let mut state = V03State::new_with_genesis_accounts(&[], &[]);
         let program_to_insert = Program::simple_balance_transfer();
         let program_id = program_to_insert.id();
         assert!(!state.programs.contains_key(&program_id));
@@ -527,7 +527,7 @@ pub mod tests {
         let key = PrivateKey::try_new([1; 32]).unwrap();
         let account_id = AccountId::from(&PublicKey::new_from_private_key(&key));
         let initial_data = [(account_id, 100_u128)];
-        let state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+        let state = V03State::new_with_genesis_accounts(&initial_data, &[]);
         let expected_account = &state.public_state[&account_id];
 
         let account = state.get_account_by_id(account_id);
@@ -538,7 +538,7 @@ pub mod tests {
     #[test]
     fn get_account_by_account_id_default_account() {
         let addr2 = AccountId::new([0; 32]);
-        let state = V02State::new_with_genesis_accounts(&[], &[]);
+        let state = V03State::new_with_genesis_accounts(&[], &[]);
         let expected_account = Account::default();
 
         let account = state.get_account_by_id(addr2);
@@ -548,7 +548,7 @@ pub mod tests {
 
     #[test]
     fn builtin_programs_getter() {
-        let state = V02State::new_with_genesis_accounts(&[], &[]);
+        let state = V03State::new_with_genesis_accounts(&[], &[]);
 
         let builtin_programs = state.programs();
 
@@ -560,7 +560,7 @@ pub mod tests {
         let key = PrivateKey::try_new([1; 32]).unwrap();
         let account_id = AccountId::from(&PublicKey::new_from_private_key(&key));
         let initial_data = [(account_id, 100)];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[]);
         let from = account_id;
         let to = AccountId::new([2; 32]);
         assert_eq!(state.get_account_by_id(to), Account::default());
@@ -580,7 +580,7 @@ pub mod tests {
         let key = PrivateKey::try_new([1; 32]).unwrap();
         let account_id = AccountId::from(&PublicKey::new_from_private_key(&key));
         let initial_data = [(account_id, 100)];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[]);
         let from = account_id;
         let from_key = key;
         let to = AccountId::new([2; 32]);
@@ -604,7 +604,7 @@ pub mod tests {
         let account_id1 = AccountId::from(&PublicKey::new_from_private_key(&key1));
         let account_id2 = AccountId::from(&PublicKey::new_from_private_key(&key2));
         let initial_data = [(account_id1, 100), (account_id2, 200)];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[]);
         let from = account_id2;
         let from_key = key2;
         let to = account_id1;
@@ -627,7 +627,7 @@ pub mod tests {
         let key2 = PrivateKey::try_new([2; 32]).unwrap();
         let account_id2 = AccountId::from(&PublicKey::new_from_private_key(&key2));
         let initial_data = [(account_id1, 100)];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[]);
         let account_id3 = AccountId::new([3; 32]);
         let balance_to_move = 5;
 
@@ -649,7 +649,7 @@ pub mod tests {
     fn program_should_fail_if_modifies_nonces() {
         let initial_data = [(AccountId::new([1; 32]), 100)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let account_ids = vec![AccountId::new([1; 32])];
         let program_id = Program::nonce_changer_program().id();
         let message =
@@ -666,7 +666,7 @@ pub mod tests {
     fn program_should_fail_if_output_accounts_exceed_inputs() {
         let initial_data = [(AccountId::new([1; 32]), 100)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let account_ids = vec![AccountId::new([1; 32])];
         let program_id = Program::extra_output_program().id();
         let message =
@@ -683,7 +683,7 @@ pub mod tests {
     fn program_should_fail_with_missing_output_accounts() {
         let initial_data = [(AccountId::new([1; 32]), 100)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let account_ids = vec![AccountId::new([1; 32]), AccountId::new([2; 32])];
         let program_id = Program::missing_output_program().id();
         let message =
@@ -700,7 +700,7 @@ pub mod tests {
     fn program_should_fail_if_modifies_program_owner_with_only_non_default_program_owner() {
         let initial_data = [(AccountId::new([1; 32]), 0)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let account_id = AccountId::new([1; 32]);
         let account = state.get_account_by_id(account_id);
         // Assert the target account only differs from the default account in the program owner
@@ -723,7 +723,7 @@ pub mod tests {
     #[test]
     fn program_should_fail_if_modifies_program_owner_with_only_non_default_balance() {
         let initial_data = [];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[])
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[])
             .with_test_programs()
             .with_non_default_accounts_but_default_program_owners();
         let account_id = AccountId::new([255; 32]);
@@ -747,7 +747,7 @@ pub mod tests {
     #[test]
     fn program_should_fail_if_modifies_program_owner_with_only_non_default_nonce() {
         let initial_data = [];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[])
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[])
             .with_test_programs()
             .with_non_default_accounts_but_default_program_owners();
         let account_id = AccountId::new([254; 32]);
@@ -771,7 +771,7 @@ pub mod tests {
     #[test]
     fn program_should_fail_if_modifies_program_owner_with_only_non_default_data() {
         let initial_data = [];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[])
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[])
             .with_test_programs()
             .with_non_default_accounts_but_default_program_owners();
         let account_id = AccountId::new([253; 32]);
@@ -796,7 +796,7 @@ pub mod tests {
     fn program_should_fail_if_transfers_balance_from_non_owned_account() {
         let initial_data = [(AccountId::new([1; 32]), 100)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let sender_account_id = AccountId::new([1; 32]);
         let receiver_account_id = AccountId::new([2; 32]);
         let balance_to_move: u128 = 1;
@@ -823,7 +823,7 @@ pub mod tests {
     #[test]
     fn program_should_fail_if_modifies_data_of_non_owned_account() {
         let initial_data = [];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[])
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[])
             .with_test_programs()
             .with_non_default_accounts_but_default_program_owners();
         let account_id = AccountId::new([255; 32]);
@@ -849,7 +849,7 @@ pub mod tests {
     fn program_should_fail_if_does_not_preserve_total_balance_by_minting() {
         let initial_data = [];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let account_id = AccountId::new([1; 32]);
         let program_id = Program::minter().id();
 
@@ -866,7 +866,7 @@ pub mod tests {
     #[test]
     fn program_should_fail_if_does_not_preserve_total_balance_by_burning() {
         let initial_data = [];
-        let mut state = V02State::new_with_genesis_accounts(&initial_data, &[])
+        let mut state = V03State::new_with_genesis_accounts(&initial_data, &[])
             .with_test_programs()
             .with_account_owned_by_burner_program();
         let program_id = Program::burner().id();
@@ -916,7 +916,7 @@ pub mod tests {
         sender_keys: &TestPublicKeys,
         recipient_keys: &TestPrivateKeys,
         balance_to_move: u128,
-        state: &V02State,
+        state: &V03State,
     ) -> PrivacyPreservingTransaction {
         let sender = AccountWithMetadata::new(
             state.get_account_by_id(sender_keys.account_id()),
@@ -960,7 +960,7 @@ pub mod tests {
         sender_private_account: &Account,
         recipient_keys: &TestPrivateKeys,
         balance_to_move: u128,
-        state: &V02State,
+        state: &V03State,
     ) -> PrivacyPreservingTransaction {
         let program = Program::authenticated_transfer_program();
         let sender_commitment = Commitment::new(&sender_keys.npk(), sender_private_account);
@@ -1012,7 +1012,7 @@ pub mod tests {
         sender_private_account: &Account,
         recipient_account_id: &AccountId,
         balance_to_move: u128,
-        state: &V02State,
+        state: &V03State,
     ) -> PrivacyPreservingTransaction {
         let program = Program::authenticated_transfer_program();
         let sender_commitment = Commitment::new(&sender_keys.npk(), sender_private_account);
@@ -1058,7 +1058,7 @@ pub mod tests {
         let recipient_keys = test_private_account_keys_1();
 
         let mut state =
-            V02State::new_with_genesis_accounts(&[(sender_keys.account_id(), 200)], &[]);
+            V03State::new_with_genesis_accounts(&[(sender_keys.account_id(), 200)], &[]);
 
         let balance_to_move = 37;
 
@@ -1106,7 +1106,7 @@ pub mod tests {
         };
         let recipient_keys = test_private_account_keys_2();
 
-        let mut state = V02State::new_with_genesis_accounts(&[], &[])
+        let mut state = V03State::new_with_genesis_accounts(&[], &[])
             .with_private_account(&sender_keys, &sender_private_account);
 
         let balance_to_move = 37;
@@ -1173,7 +1173,7 @@ pub mod tests {
         };
         let recipient_keys = test_public_account_keys_1();
         let recipient_initial_balance = 400;
-        let mut state = V02State::new_with_genesis_accounts(
+        let mut state = V03State::new_with_genesis_accounts(
             &[(recipient_keys.account_id(), recipient_initial_balance)],
             &[],
         )
@@ -2127,7 +2127,7 @@ pub mod tests {
         };
         let recipient_keys = test_private_account_keys_2();
 
-        let mut state = V02State::new_with_genesis_accounts(&[], &[])
+        let mut state = V03State::new_with_genesis_accounts(&[], &[])
             .with_private_account(&sender_keys, &sender_private_account);
 
         let balance_to_move = 37;
@@ -2212,7 +2212,7 @@ pub mod tests {
         let initial_balance = 100;
         let initial_data = [(account_id, initial_balance)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let from = account_id;
         let from_key = key;
         let to = AccountId::new([2; 32]);
@@ -2253,7 +2253,7 @@ pub mod tests {
         let initial_balance = 1000;
         let initial_data = [(from, initial_balance), (to, 0)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let from_key = key;
         let amount: u128 = 37;
         let instruction: (u128, ProgramId, u32, Option<PdaSeed>) = (
@@ -2298,7 +2298,7 @@ pub mod tests {
         let initial_balance = 100;
         let initial_data = [(from, initial_balance), (to, 0)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let from_key = key;
         let amount: u128 = 0;
         let instruction: (u128, ProgramId, u32, Option<PdaSeed>) = (
@@ -2336,7 +2336,7 @@ pub mod tests {
         let initial_balance = 1000;
         let initial_data = [(from, initial_balance), (to, 0)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let amount: u128 = 58;
         let instruction: (u128, ProgramId, u32, Option<PdaSeed>) = (
             amount,
@@ -2382,7 +2382,7 @@ pub mod tests {
         let initial_balance = 100;
         let initial_data = [(account_id, initial_balance)];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let from = account_id;
         let from_key = key;
         let to = AccountId::new([2; 32]);
@@ -2454,7 +2454,7 @@ pub mod tests {
 
         let from_commitment = Commitment::new(&from_keys.npk(), &from_account.account);
         let to_commitment = Commitment::new(&to_keys.npk(), &to_account.account);
-        let mut state = V02State::new_with_genesis_accounts(
+        let mut state = V03State::new_with_genesis_accounts(
             &[],
             &[from_commitment.clone(), to_commitment.clone()],
         )
@@ -2563,7 +2563,7 @@ pub mod tests {
             ..Account::default()
         };
 
-        let mut state = V02State::new_with_genesis_accounts(&[], &[]);
+        let mut state = V03State::new_with_genesis_accounts(&[], &[]);
         state.add_pinata_token_program(pinata_definition_id);
 
         // Execution of the token program to create new token for the pinata token
@@ -2624,7 +2624,7 @@ pub mod tests {
     #[test]
     fn claiming_mechanism_cannot_claim_initialied_accounts() {
         let claimer = Program::claimer();
-        let mut state = V02State::new_with_genesis_accounts(&[], &[]).with_test_programs();
+        let mut state = V03State::new_with_genesis_accounts(&[], &[]).with_test_programs();
         let account_id = AccountId::new([2; 32]);
 
         // Insert an account with non-default program owner
@@ -2659,7 +2659,7 @@ pub mod tests {
         let recipient_id = AccountId::from(&PublicKey::new_from_private_key(&recipient_key));
         let recipient_init_balance: u128 = 10;
 
-        let mut state = V02State::new_with_genesis_accounts(
+        let mut state = V03State::new_with_genesis_accounts(
             &[
                 (sender_id, sender_init_balance),
                 (recipient_id, recipient_init_balance),
@@ -2714,7 +2714,7 @@ pub mod tests {
 
     #[test]
     fn private_authorized_uninitialized_account() {
-        let mut state = V02State::new_with_genesis_accounts(&[], &[]);
+        let mut state = V03State::new_with_genesis_accounts(&[], &[]);
 
         // Set up keys for the authorized private account
         let private_keys = test_private_account_keys_1();
@@ -2766,7 +2766,7 @@ pub mod tests {
 
     #[test]
     fn private_account_claimed_then_used_without_init_flag_should_fail() {
-        let mut state = V02State::new_with_genesis_accounts(&[], &[]).with_test_programs();
+        let mut state = V03State::new_with_genesis_accounts(&[], &[]).with_test_programs();
 
         // Set up keys for the private account
         let private_keys = test_private_account_keys_1();
@@ -2847,7 +2847,7 @@ pub mod tests {
     fn public_changer_claimer_no_data_change_no_claim_succeeds() {
         let initial_data = [];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let account_id = AccountId::new([1; 32]);
         let program_id = Program::changer_claimer().id();
         // Don't change data (None) and don't claim (false)
@@ -2871,7 +2871,7 @@ pub mod tests {
     fn public_changer_claimer_data_change_no_claim_fails() {
         let initial_data = [];
         let mut state =
-            V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+            V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let account_id = AccountId::new([1; 32]);
         let program_id = Program::changer_claimer().id();
         // Change data but don't claim (false) - should fail
@@ -2965,7 +2965,7 @@ pub mod tests {
 
         let recipient_commitment =
             Commitment::new(&recipient_keys.npk(), &recipient_account.account);
-        let state = V02State::new_with_genesis_accounts(
+        let state = V03State::new_with_genesis_accounts(
             &[(sender_account.account_id, sender_account.account.balance)],
             std::slice::from_ref(&recipient_commitment),
         )
@@ -3001,9 +3001,9 @@ pub mod tests {
         let account_id_1 = AccountId::new([1; 32]);
         let account_id_2 = AccountId::new([2; 32]);
         let initial_data = [(account_id_1, 100_u128), (account_id_2, 151_u128)];
-        let state = V02State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
+        let state = V03State::new_with_genesis_accounts(&initial_data, &[]).with_test_programs();
         let bytes = borsh::to_vec(&state).unwrap();
-        let state_from_bytes: V02State = borsh::from_slice(&bytes).unwrap();
+        let state_from_bytes: V03State = borsh::from_slice(&bytes).unwrap();
         assert_eq!(state, state_from_bytes);
     }
 }

programs/amm/src/tests.rs

@@ -5,7 +5,7 @@ use amm_core::{
     compute_pool_pda, compute_vault_pda, compute_vault_pda_seed,
 };
 use nssa::{
-    PrivateKey, PublicKey, PublicTransaction, V02State, program::Program, public_transaction,
+    PrivateKey, PublicKey, PublicTransaction, V03State, program::Program, public_transaction,
 };
 use nssa_core::{
     account::{Account, AccountId, AccountWithMetadata, Data},
@@ -2636,9 +2636,9 @@ fn new_definition_lp_symmetric_amounts() {
     assert_eq!(chained_call_lp, expected_lp_call);
 }
 
-fn state_for_amm_tests() -> V02State {
+fn state_for_amm_tests() -> V03State {
     let initial_data = [];
-    let mut state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+    let mut state = V03State::new_with_genesis_accounts(&initial_data, &[]);
     state.force_insert_account(
         IdForExeTests::pool_definition_id(),
         AccountsForExeTests::pool_definition_init(),
@@ -2679,9 +2679,9 @@ fn state_for_amm_tests() -> V02State {
     state
 }
 
-fn state_for_amm_tests_with_new_def() -> V02State {
+fn state_for_amm_tests_with_new_def() -> V03State {
     let initial_data = [];
-    let mut state = V02State::new_with_genesis_accounts(&initial_data, &[]);
+    let mut state = V03State::new_with_genesis_accounts(&initial_data, &[]);
     state.force_insert_account(
         IdForExeTests::token_a_definition_id(),
         AccountsForExeTests::token_a_definition_account(),

sequencer/core/src/block_store.rs

@@ -6,7 +6,7 @@ use common::{
     block::{Block, BlockMeta, MantleMsgId},
     transaction::NSSATransaction,
 };
-use nssa::V02State;
+use nssa::V03State;
 use storage::{error::DbError, sequencer::RocksDBIO};
 
 pub struct SequencerStore {
@@ -92,7 +92,7 @@ impl SequencerStore {
         &mut self,
         block: &Block,
         msg_id: MantleMsgId,
-        state: &V02State,
+        state: &V03State,
     ) -> Result<()> {
         let new_transactions_map = block_to_transactions_map(block);
         self.dbio.atomic_update(block, msg_id, state)?;
@@ -100,7 +100,7 @@ impl SequencerStore {
         Ok(())
     }
 
-    pub fn get_nssa_state(&self) -> Option<V02State> {
+    pub fn get_nssa_state(&self) -> Option<V03State> {
         self.dbio.get_nssa_state().ok()
     }
 }
@@ -150,7 +150,7 @@ mod tests {
         let retrieved_tx = node_store.get_transaction_by_hash(tx.hash());
         assert_eq!(None, retrieved_tx);
         // Add the block with the transaction
-        let dummy_state = V02State::new_with_genesis_accounts(&[], &[]);
+        let dummy_state = V03State::new_with_genesis_accounts(&[], &[]);
         node_store.update(&block, [1; 32], &dummy_state).unwrap();
         // Try again
         let retrieved_tx = node_store.get_transaction_by_hash(tx.hash());
@@ -209,7 +209,7 @@ mod tests {
         let block_hash = block.header.hash;
         let block_msg_id = [1; 32];
 
-        let dummy_state = V02State::new_with_genesis_accounts(&[], &[]);
+        let dummy_state = V03State::new_with_genesis_accounts(&[], &[]);
         node_store
             .update(&block, block_msg_id, &dummy_state)
             .unwrap();
@@ -244,7 +244,7 @@ mod tests {
         let block = common::test_utils::produce_dummy_block(1, None, vec![tx]);
         let block_id = block.header.block_id;
 
-        let dummy_state = V02State::new_with_genesis_accounts(&[], &[]);
+        let dummy_state = V03State::new_with_genesis_accounts(&[], &[]);
         node_store.update(&block, [1; 32], &dummy_state).unwrap();
 
         // Verify initial status is Pending

sequencer/core/src/lib.rs

@@ -15,7 +15,7 @@ use logos_blockchain_key_management_system_service::keys::{ED25519_SECRET_KEY_SI
 use mempool::{MemPool, MemPoolHandle};
 #[cfg(feature = "mock")]
 pub use mock::SequencerCoreWithMockClients;
-use nssa::V02State;
+use nssa::V03State;
 pub use storage::error::DbError;
 use testnet_initial_state::initial_state;
 
@@ -37,7 +37,7 @@ pub struct SequencerCore<
     BC: BlockSettlementClientTrait = BlockSettlementClient,
     IC: IndexerClientTrait = IndexerClient,
 > {
-    state: nssa::V02State,
+    state: nssa::V03State,
     store: SequencerStore,
     mempool: MemPool<NSSATransaction>,
     sequencer_config: SequencerConfig,
@@ -135,7 +135,7 @@ impl<BC: BlockSettlementClientTrait, IC: IndexerClientTrait> SequencerCore<BC, I
             // If initial commitments or accounts are present in config, need to construct state
             // from them
             if initial_commitments.is_some() || init_accs.is_some() {
-                V02State::new_with_genesis_accounts(
+                V03State::new_with_genesis_accounts(
                     &init_accs.unwrap_or_default(),
                     &initial_commitments.unwrap_or_default(),
                 )
@@ -302,7 +302,7 @@ impl<BC: BlockSettlementClientTrait, IC: IndexerClientTrait> SequencerCore<BC, I
         Ok((tx, msg_id))
     }
 
-    pub const fn state(&self) -> &nssa::V02State {
+    pub const fn state(&self) -> &nssa::V03State {
         &self.state
     }
 

sequencer/service/Dockerfile

@@ -26,7 +26,7 @@ RUN ARCH=$(uname -m); \
     else \
         echo "Using manual build for $ARCH"; \
         git clone --depth 1 --branch release-3.0 https://github.com/risc0/risc0.git; \
-        git clone --depth 1 --branch r0.1.94.0 https://github.com/risc0/rust.git; \
+        git clone --depth 1 --branch r0.1.91.0 https://github.com/risc0/rust.git; \
         cd /risc0; \
         cargo install --path rzup; \
         rzup build --path /rust rust --verbose; \
@@ -55,7 +55,11 @@ FROM chef AS builder
 ARG STANDALONE
 COPY --from=planner /sequencer_service/recipe.json recipe.json
 # Build dependencies only (this layer will be cached)
-RUN if [ "$STANDALONE" = "true" ]; then \
+RUN --mount=type=cache,target=/usr/local/cargo/registry/index \
+    --mount=type=cache,target=/usr/local/cargo/registry/cache \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/sequencer_service/target \
+    if [ "$STANDALONE" = "true" ]; then \
       cargo chef cook --bin sequencer_service --features standalone --release --recipe-path recipe.json; \
     else \
       cargo chef cook --bin sequencer_service --release --recipe-path recipe.json; \
@@ -64,31 +68,29 @@ RUN if [ "$STANDALONE" = "true" ]; then \
 # Copy source code
 COPY . .
 
-# Build the actual application
-RUN if [ "$STANDALONE" = "true" ]; then \
+# Build the actual application and copy the binary out of the cache mount
+RUN --mount=type=cache,target=/usr/local/cargo/registry/index \
+    --mount=type=cache,target=/usr/local/cargo/registry/cache \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/sequencer_service/target \
+    if [ "$STANDALONE" = "true" ]; then \
       cargo build --release --features standalone --bin sequencer_service; \
     else \
       cargo build --release --bin sequencer_service; \
-    fi
-
-# Strip debug symbols to reduce binary size
-RUN strip /sequencer_service/target/release/sequencer_service
+    fi \
+    && strip /sequencer_service/target/release/sequencer_service \
+    && cp /sequencer_service/target/release/sequencer_service /usr/local/bin/sequencer_service
 
 # Runtime stage - minimal image
 FROM debian:trixie-slim
 
-# Install runtime dependencies
-RUN apt-get update \
- && apt-get install -y gosu jq \
- && rm -rf /var/lib/apt/lists/*
-
 # Create non-root user for security
 RUN useradd -m -u 1000 -s /bin/bash sequencer_user && \
-    mkdir -p /sequencer_service /etc/sequencer_service && \
-    chown -R sequencer_user:sequencer_user /sequencer_service /etc/sequencer_service
+    mkdir -p /sequencer_service /etc/sequencer_service /var/lib/sequencer_service && \
+    chown -R sequencer_user:sequencer_user /sequencer_service /etc/sequencer_service /var/lib/sequencer_service
 
 # Copy binary from builder
-COPY --from=builder --chown=sequencer_user:sequencer_user /sequencer_service/target/release/sequencer_service /usr/local/bin/sequencer_service
+COPY --from=builder --chown=sequencer_user:sequencer_user /usr/local/bin/sequencer_service /usr/local/bin/sequencer_service
 
 # Copy r0vm binary from builder
 COPY --from=builder --chown=sequencer_user:sequencer_user /usr/local/bin/r0vm /usr/local/bin/r0vm
@@ -96,9 +98,7 @@ COPY --from=builder --chown=sequencer_user:sequencer_user /usr/local/bin/r0vm /u
 # Copy logos blockchain circuits from builder
 COPY --from=builder --chown=sequencer_user:sequencer_user /root/.logos-blockchain-circuits /home/sequencer_user/.logos-blockchain-circuits
 
-# Copy entrypoint script
-COPY sequencer/service/docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+VOLUME /var/lib/sequencer_service
 
 # Expose default port
 EXPOSE 3040
@@ -120,9 +120,7 @@ ENV RUST_LOG=info
 # Set explicit location for r0vm binary
 ENV RISC0_SERVER_PATH=/usr/local/bin/r0vm
 
-USER root
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
+USER sequencer_user
 
 WORKDIR /sequencer_service
 CMD ["sequencer_service", "/etc/sequencer_service/sequencer_config.json"]

sequencer/service/docker-compose.yml

@@ -10,5 +10,8 @@ services:
     volumes:
       # Mount configuration file
       - ./configs/docker/sequencer_config.json:/etc/sequencer_service/sequencer_config.json
-      # Mount data folder
-      - ./data:/var/lib/sequencer_service
+      # Mount data volume
+      - sequencer_data:/var/lib/sequencer_service
+
+volumes:
+  sequencer_data:

sequencer/service/docker-entrypoint.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# This is an entrypoint script for the sequencer_service Docker container,
-# it's not meant to be executed outside of the container.
-
-set -e
-
-CONFIG="/etc/sequencer/service/sequencer_config.json"
-
-# Check config file exists
-if [ ! -f "$CONFIG" ]; then
-  echo "Config file not found: $CONFIG" >&2
-  exit 1
-fi
-
-# Parse home dir
-HOME_DIR=$(jq -r '.home' "$CONFIG")
-
-if [ -z "$HOME_DIR" ] || [ "$HOME_DIR" = "null" ]; then
-  echo "'home' key missing in config" >&2
-  exit 1
-fi
-
-# Give permissions to the data directory and switch to non-root user
-if [ "$(id -u)" = "0" ]; then
-  mkdir -p "$HOME_DIR"
-  chown -R sequencer_user:sequencer_user "$HOME_DIR"
-  exec gosu sequencer_user "$@"
-fi

storage/src/indexer.rs

@@ -4,7 +4,7 @@ use common::{
     block::{Block, BlockId},
     transaction::NSSATransaction,
 };
-use nssa::V02State;
+use nssa::V03State;
 use rocksdb::{
     BoundColumnFamily, ColumnFamilyDescriptor, DBWithThreadMode, MultiThreaded, Options, WriteBatch,
 };
@@ -63,7 +63,7 @@ impl RocksDBIO {
     pub fn open_or_create(
         path: &Path,
         genesis_block: &Block,
-        initial_state: &V02State,
+        initial_state: &V03State,
     ) -> DbResult<Self> {
         let mut cf_opts = Options::default();
         cf_opts.set_max_write_buffer_number(16);
@@ -594,7 +594,7 @@ impl RocksDBIO {
 
     // State
 
-    pub fn put_breakpoint(&self, br_id: u64, breakpoint: &V02State) -> DbResult<()> {
+    pub fn put_breakpoint(&self, br_id: u64, breakpoint: &V03State) -> DbResult<()> {
         let cf_br = self.breakpoint_column();
 
         self.db
@@ -616,7 +616,7 @@ impl RocksDBIO {
             .map_err(|rerr| DbError::rocksdb_cast_message(rerr, None))
     }
 
-    fn get_breakpoint(&self, br_id: u64) -> DbResult<V02State> {
+    pub fn get_breakpoint(&self, br_id: u64) -> DbResult<V03State> {
         let cf_br = self.breakpoint_column();
         let res = self
             .db
@@ -632,7 +632,7 @@ impl RocksDBIO {
             .map_err(|rerr| DbError::rocksdb_cast_message(rerr, None))?;
 
         if let Some(data) = res {
-            Ok(borsh::from_slice::<V02State>(&data).map_err(|serr| {
+            Ok(borsh::from_slice::<V03State>(&data).map_err(|serr| {
                 DbError::borsh_cast_message(
                     serr,
                     Some("Failed to deserialize breakpoint data".to_owned()),
@@ -647,7 +647,7 @@ impl RocksDBIO {
         }
     }
 
-    pub fn calculate_state_for_id(&self, block_id: u64) -> DbResult<V02State> {
+    pub fn calculate_state_for_id(&self, block_id: u64) -> DbResult<V03State> {
         let last_block = self.get_meta_last_block_in_db()?;
 
         if block_id <= last_block {
@@ -694,7 +694,7 @@ impl RocksDBIO {
         }
     }
 
-    pub fn final_state(&self) -> DbResult<V02State> {
+    pub fn final_state(&self) -> DbResult<V03State> {
         self.calculate_state_for_id(self.get_meta_last_block_in_db()?)
     }
 
@@ -989,8 +989,8 @@ mod tests {
         nssa::PrivateKey::try_new([2; 32]).unwrap()
     }
 
-    fn initial_state() -> V02State {
-        nssa::V02State::new_with_genesis_accounts(&[(acc1(), 10000), (acc2(), 20000)], &[])
+    fn initial_state() -> V03State {
+        nssa::V03State::new_with_genesis_accounts(&[(acc1(), 10000), (acc2(), 20000)], &[])
     }
 
     fn transfer(amount: u128, nonce: u128, direction: bool) -> NSSATransaction {

storage/src/sequencer.rs

@@ -1,7 +1,7 @@
 use std::{path::Path, sync::Arc};
 
 use common::block::{BedrockStatus, Block, BlockMeta, MantleMsgId};
-use nssa::V02State;
+use nssa::V03State;
 use rocksdb::{
     BoundColumnFamily, ColumnFamilyDescriptor, DBWithThreadMode, MultiThreaded, Options, WriteBatch,
 };
@@ -195,7 +195,7 @@ impl RocksDBIO {
         Ok(res.is_some())
     }
 
-    pub fn put_nssa_state_in_db(&self, state: &V02State, batch: &mut WriteBatch) -> DbResult<()> {
+    pub fn put_nssa_state_in_db(&self, state: &V03State, batch: &mut WriteBatch) -> DbResult<()> {
         let cf_nssa_state = self.nssa_state_column();
         batch.put_cf(
             &cf_nssa_state,
@@ -469,7 +469,7 @@ impl RocksDBIO {
         }
     }
 
-    pub fn get_nssa_state(&self) -> DbResult<V02State> {
+    pub fn get_nssa_state(&self) -> DbResult<V03State> {
         let cf_nssa_state = self.nssa_state_column();
         let res = self
             .db
@@ -485,7 +485,7 @@ impl RocksDBIO {
             .map_err(|rerr| DbError::rocksdb_cast_message(rerr, None))?;
 
         if let Some(data) = res {
-            Ok(borsh::from_slice::<V02State>(&data).map_err(|serr| {
+            Ok(borsh::from_slice::<V03State>(&data).map_err(|serr| {
                 DbError::borsh_cast_message(
                     serr,
                     Some("Failed to deserialize block data".to_owned()),
@@ -580,7 +580,7 @@ impl RocksDBIO {
         &self,
         block: &Block,
         msg_id: MantleMsgId,
-        state: &V02State,
+        state: &V03State,
     ) -> DbResult<()> {
         let block_id = block.header.block_id;
         let mut batch = WriteBatch::default();

testnet_initial_state/src/lib.rs

@@ -3,7 +3,7 @@ use key_protocol::key_management::{
     KeyChain,
     secret_holders::{PrivateKeyHolder, SecretSpendingKey},
 };
-use nssa::{Account, AccountId, Data, PrivateKey, PublicKey, V02State};
+use nssa::{Account, AccountId, Data, PrivateKey, PublicKey, V03State};
 use nssa_core::{NullifierPublicKey, encryption::shared_key_derivation::Secp256k1Point};
 use serde::{Deserialize, Serialize};
 
@@ -195,7 +195,7 @@ pub fn initial_accounts() -> Vec<PublicAccountPublicInitialData> {
 }
 
 #[must_use]
-pub fn initial_state() -> V02State {
+pub fn initial_state() -> V03State {
     let initial_commitments: Vec<nssa_core::Commitment> = initial_commitments()
         .iter()
         .map(|init_comm_data| {
@@ -214,11 +214,11 @@ pub fn initial_state() -> V02State {
         .map(|acc_data| (acc_data.account_id, acc_data.balance))
         .collect();
 
-    nssa::V02State::new_with_genesis_accounts(&init_accs, &initial_commitments)
+    nssa::V03State::new_with_genesis_accounts(&init_accs, &initial_commitments)
 }
 
 #[must_use]
-pub fn initial_state_testnet() -> V02State {
+pub fn initial_state_testnet() -> V03State {
     let mut state = initial_state();
 
     state.add_pinata_program(PINATA_BASE58.parse().unwrap());