Merge branch 'openmina:develop' into develop

Author: olton

cli/src/commands/node/mod.rs

@@ -226,10 +226,12 @@ impl Node {
 
         if let Some(producer_key_path) = self.producer_key {
             let password = &self.producer_key_password;
-            node::core::info!(node::core::log::system_time(); summary = "loading provers index");
-            let provers = BlockProver::make(Some(block_verifier_index), Some(work_verifier_index));
-            node::core::info!(node::core::log::system_time(); summary = "loaded provers index");
-            node_builder.block_producer_from_file(provers, producer_key_path, password)?;
+            openmina_core::thread::spawn(|| {
+                node::core::info!(node::core::log::system_time(); summary = "loading provers index");
+                BlockProver::make(Some(block_verifier_index), Some(work_verifier_index));
+                node::core::info!(node::core::log::system_time(); summary = "loaded provers index");
+            });
+            node_builder.block_producer_from_file(producer_key_path, password, None)?;
 
             if let Some(pub_key) = self.coinbase_receiver {
                 node_builder

core/src/consensus.rs

@@ -7,7 +7,7 @@ use time::{macros::format_description, OffsetDateTime};
 
 use crate::constants::constraint_constants;
 pub use crate::constants::{
-    checkpoint_window_size_in_slots, grace_period_end, slots_per_window, CHECKPOINTS_PER_YEAR,
+    checkpoint_window_size_in_slots, slots_per_window, CHECKPOINTS_PER_YEAR,
 };
 
 // TODO get constants from elsewhere
@@ -39,21 +39,21 @@ pub fn is_short_range_fork(a: &MinaConsensusState, b: &MinaConsensusState) -> bo
         if s1.epoch_count.as_u32() == s2.epoch_count.as_u32() + 1
             && s2_epoch_slot >= slots_per_epoch * 2 / 3
         {
-            crate::log::debug!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("s2 is 1 epoch behind and not in seed update range: {} vs {}", s1.staking_epoch_data.lock_checkpoint, s2.next_epoch_data.lock_checkpoint));
+            crate::log::trace!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("s2 is 1 epoch behind and not in seed update range: {} vs {}", s1.staking_epoch_data.lock_checkpoint, s2.next_epoch_data.lock_checkpoint));
             // S1 is one epoch ahead of S2 and S2 is not in the seed update range
             s1.staking_epoch_data.lock_checkpoint == s2.next_epoch_data.lock_checkpoint
         } else {
-            crate::log::debug!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("chains are from different epochs"));
+            crate::log::trace!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("chains are from different epochs"));
             false
         }
     };
 
-    crate::log::debug!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("epoch count: {} vs {}", a.epoch_count.as_u32(), b.epoch_count.as_u32()));
+    crate::log::trace!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("epoch count: {} vs {}", a.epoch_count.as_u32(), b.epoch_count.as_u32()));
     if a.epoch_count == b.epoch_count {
         let a_prev_lock_checkpoint = &a.staking_epoch_data.lock_checkpoint;
         let b_prev_lock_checkpoint = &b.staking_epoch_data.lock_checkpoint;
         // Simple case: blocks have same previous epoch, so compare previous epochs' lock_checkpoints
-        crate::log::debug!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("checkpoints: {} vs {}", a_prev_lock_checkpoint, b_prev_lock_checkpoint));
+        crate::log::trace!(crate::log::system_time(); kind = "is_short_range_fork", msg = format!("checkpoints: {} vs {}", a_prev_lock_checkpoint, b_prev_lock_checkpoint));
         a_prev_lock_checkpoint == b_prev_lock_checkpoint
     } else {
         // Check for previous epoch case using both orientations

core/src/constants.rs

@@ -107,19 +107,6 @@ pub fn checkpoint_window_size_in_slots() -> u32 {
     size_in_slots as u32
 }
 
-pub fn grace_period_end(constants: &v2::MinaBaseProtocolConstantsCheckedValueStableV1) -> u32 {
-    let slots = {
-        const NUM_DAYS: u64 = 3;
-        let n_days_ms = days_to_ms(NUM_DAYS);
-        let n_days = n_days_ms / constraint_constants().block_window_duration_ms;
-        (n_days as u32).min(constants.slots_per_epoch.as_u32())
-    };
-    match constraint_constants().fork.as_ref() {
-        None => slots,
-        Some(fork) => slots + fork.global_slot_since_genesis,
-    }
-}
-
 pub const DEFAULT_GENESIS_TIMESTAMP_MILLISECONDS: u64 = 1707157200000;
 
 pub const PROTOCOL_TRANSACTION_VERSION: u8 = 3;

core/src/thread.rs

@@ -73,6 +73,24 @@ mod main_thread {
         }));
         rx.await.ok()
     }
+
+    pub fn run_async_fn_in_main_thread_blocking<F, FU, T>(f: F) -> Option<T>
+    where
+        T: 'static + Send,
+        FU: Future<Output = T>,
+        F: 'static + Send + FnOnce() -> FU,
+    {
+        let sender = MAIN_THREAD_TASK_SENDER
+            .get()
+            .expect("main thread not initialized");
+        let (tx, rx) = oneshot::channel();
+        let _ = sender.send(Box::pin(async move {
+            wasm_bindgen_futures::spawn_local(async move {
+                let _ = tx.send(f().await);
+            })
+        }));
+        rx.blocking_recv().ok()
+    }
 }
 #[cfg(target_family = "wasm")]
 pub use main_thread::*;

docker-compose.block-producer.yml

@@ -2,16 +2,17 @@ services:
   openmina-node:
     image: openmina/openmina:${OPENMINA_TAG:-latest}
     entrypoint: >
-      sh -c "openmina node --producer-key /root/.openmina/producer-key $${COINBASE_RECEIVER:+--coinbase-receiver $$COINBASE_RECEIVER} $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP}"
+      sh -c "openmina node --producer-key /root/.openmina/producer-key $${COINBASE_RECEIVER:+--coinbase-receiver $$COINBASE_RECEIVER} $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP} $${OPENMINA_LIBP2P_PORT:+--libp2p-port $$OPENMINA_LIBP2P_PORT}"
     ports:
       - "3000:3000"
-      - "8302:8302"
+      - "${OPENMINA_LIBP2P_PORT:-8302}:${OPENMINA_LIBP2P_PORT:-8302}"
     volumes:
       - ./openmina-workdir:/root/.openmina:rw
     environment:
       MINA_PRIVKEY_PASS: "${MINA_PRIVKEY_PASS:-}"
       COINBASE_RECEIVER: "${COINBASE_RECEIVER:-}"
       OPENMINA_LIBP2P_EXTERNAL_IP: "${OPENMINA_LIBP2P_EXTERNAL_IP}"
+      OPENMINA_LIBP2P_PORT: "${OPENMINA_LIBP2P_PORT}"
 
   frontend:
     image: openmina/frontend:${OPENMINA_FRONTEND_TAG:-latest}

docker-compose.yml

@@ -2,14 +2,15 @@ services:
   openmina-node:
     image: openmina/openmina:${OPENMINA_TAG:-latest}
     entrypoint: >
-      sh -c "openmina node $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP}"
+      sh -c "openmina node $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP} $${OPENMINA_LIBP2P_PORT:+--libp2p-port $$OPENMINA_LIBP2P_PORT}"
     volumes:
       - ./openmina-workdir:/root/.openmina:rw
     ports:
       - "3000:3000"
-      - "8302:8302"
+      - "${OPENMINA_LIBP2P_PORT:-8302}:${OPENMINA_LIBP2P_PORT:-8302}"
     environment:
       OPENMINA_LIBP2P_EXTERNAL_IP: "${OPENMINA_LIBP2P_EXTERNAL_IP}"
+      OPENMINA_LIBP2P_PORT: "${OPENMINA_LIBP2P_PORT}"
 
   frontend:
     image: openmina/frontend:${OPENMINA_FRONTEND_TAG:-latest}

frontend/docker/startup.sh

@@ -27,6 +27,8 @@ download_circuit_files() {
     CIRCUITS_VERSION="3.0.1devnet"
 
     DEVNET_CIRCUIT_FILES=(
+        "block_verifier_index.postcard"
+        "transaction_verifier_index.postcard"
         "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_gates.json"
         "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_internal_vars.bin"
         "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_rows_rev.bin"
@@ -77,35 +79,59 @@ download_wasm_files() {
         echo "Error: OPENMINA_WASM_VERSION is not set. Exiting."
         exit 1
     fi
-    
+
     WASM_URL="$OPENMINA_BASE_URL/openmina/releases/download/$OPENMINA_WASM_VERSION/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz"
     TARGET_DIR="/usr/local/apache2/htdocs/assets/webnode/pkg"
-    
+
     mkdir -p "$TARGET_DIR"
 
     echo "Downloading WASM files from $WASM_URL..."
     curl -s -L --retry 3 --retry-delay 5 -o "/tmp/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz" "$WASM_URL"
-    
+
     if [[ $? -ne 0 ]]; then
         echo "Failed to download the WASM file after 3 attempts, exiting."
         exit 1
     else
         echo "WASM file downloaded successfully. Extracting to $TARGET_DIR..."
 
         tar -xzf "/tmp/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz" -C "$TARGET_DIR"
-        
+
         # Check if the extraction was successful
         if [[ $? -ne 0 ]]; then
             echo "Failed to extract the WASM file, exiting."
             exit 1
         else
             echo "WASM files extracted successfully to $TARGET_DIR"
+
+            # Inject caching logic into openmina_node_web.js
+            OPENMINA_JS="$TARGET_DIR/openmina_node_web.js"
+            inject_caching_logic "$OPENMINA_JS"
         fi
     fi
 
     rm "/tmp/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz"
 }
 
+inject_caching_logic() {
+  local js_file="$1"
+  if [ -f "$js_file" ]; then
+    echo "Injecting caching logic into $js_file"
+
+    # Generate a unique hash
+    local hash=$(openssl rand -hex 8)
+
+    sed -i 's/module_or_path = fetch(module_or_path);/module_or_path = fetch(module_or_path, { cache: "force-cache", headers: { "Cache-Control": "max-age=31536000, immutable" } });/' "$js_file"
+    if [[ $? -ne 0 ]]; then
+      echo "Failed to inject caching logic into $js_file"
+    else
+      echo "Successfully injected caching logic into $js_file"
+    fi
+  else
+    echo "Warning: $js_file not found. Caching logic not injected."
+  fi
+}
+
+
 if [ -n "$OPENMINA_FRONTEND_ENVIRONMENT" ]; then
   echo "Using environment: $OPENMINA_FRONTEND_ENVIRONMENT"
   cp -f /usr/local/apache2/htdocs/assets/environments/"$OPENMINA_FRONTEND_ENVIRONMENT".js \

frontend/httpd.conf

@@ -228,6 +228,20 @@ SSLProxyEngine On
 </Location>
 
 <IfModule unixd_module>
+
+# Cache rules for WebNode assets
+<LocationMatch "/assets/webnode/pkg/openmina_node_web\.js">
+    Header set Cache-Control "public, max-age=31536000, immutable"
+</LocationMatch>
+<LocationMatch "/assets/webnode/pkg/openmina_node_web_bg\.wasm">
+    Header set Cache-Control "public, max-age=31536000, immutable"
+</LocationMatch>
+
+# Make sure mod_headers is enabled
+<IfModule !mod_headers.c>
+    LoadModule headers_module modules/mod_headers.so
+</IfModule>
+
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.

frontend/package.json

@@ -5,12 +5,14 @@
     "install:deps": "npm install",
     "start": "npm install && ng serve --configuration local --open",
     "start:dev": "ng serve --configuration development",
+    "start:dev:mobile": "ng serve --configuration development --host 0.0.0.0",
     "build": "ng build",
     "build:prod": "ng build --configuration production",
     "tests": "npx cypress open --config baseUrl=http://localhost:4200",
     "tests:headless": "npx cypress run --headless --config baseUrl=http://localhost:4200",
     "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t openmina/frontend:latest . && docker push openmina/frontend:latest",
-    "start:bundle": "npx http-server dist/frontend -p 4200"
+    "start:bundle": "npx http-server dist/frontend -p 4200",
+    "prebuild": "node scripts/update-webnode-version.js"
   },
   "private": true,
   "dependencies": {

frontend/scripts/update-webnode-version.js

@@ -0,0 +1,21 @@
+const fs = require('fs');
+const crypto = require('crypto');
+
+// Generate a random hash
+const hash = crypto.randomBytes(16).toString('hex'); // Generates a 32-character random hex string
+
+// Read and update index.html
+const indexPath = './src/index.html';
+let indexHtml = fs.readFileSync(indexPath, 'utf8');
+
+// Enhanced Regex Pattern
+// Match 'const WEBNODE_VERSION = ' with optional whitespace around the equals and between quotes
+const versionRegex = /const\s+WEBNODE_VERSION\s*=\s*['"][^'"]*['"];/;
+
+// Perform replacement
+indexHtml = indexHtml.replace(versionRegex, `const WEBNODE_VERSION = '${hash}';`);
+
+// Write updated content to index.html
+fs.writeFileSync(indexPath, indexHtml);
+
+console.log(`Updated WEBNODE_VERSION in ${indexPath} to ${hash}`);