Pre Mainnnet (#4557)

* Update ci.yml * Feature/feature/versioning ser der harden 2 (#4554) * Add some unit tests for versioning deserialization to the limits * Clippy pass * Better error message * Minor fixes * Excluded -> Included --------- Co-authored-by: sydhds <[email protected]> * Add versioninig key & value checks (#4552) * Add versioninig key & value checks * Improve error message when no prefix --------- Co-authored-by: sydhds <[email protected]> * Update CI, Version and genesis timestamp --------- Co-authored-by: Sydhds <[email protected]> Co-authored-by: sydhds <[email protected]>
massalabs · Nov 27, 2023 · 1f32b9d · 1f32b9d
1 parent 8b1e610
commit 1f32b9d
Show file tree

Hide file tree

Showing 46 changed files with 293 additions and 97 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main, staging, trying]
   pull_request:
-    branches: [main, 'testnet_*', 'buildnet_wip']
+    branches: [main, 'testnet_*']
     types:
     - opened
     - reopened

diff --git a/massa-api-exports/Cargo.toml b/massa-api-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_api_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-api/Cargo.toml b/massa-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_api"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [features]

diff --git a/massa-async-pool/Cargo.toml b/massa-async-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_async_pool"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-bootstrap/Cargo.toml b/massa-bootstrap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_bootstrap"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-channel/Cargo.toml b/massa-channel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_channel"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [features]

diff --git a/massa-cipher/Cargo.toml b/massa-cipher/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_cipher"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [dependencies]

diff --git a/massa-client/Cargo.toml b/massa-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa-client"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [dependencies]

diff --git a/massa-consensus-exports/Cargo.toml b/massa-consensus-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_consensus_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-consensus-worker/Cargo.toml b/massa-consensus-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_consensus_worker"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-db-exports/Cargo.toml b/massa-db-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_db_exports"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [features]

diff --git a/massa-db-worker/Cargo.toml b/massa-db-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_db_worker"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [features]

diff --git a/massa-executed-ops/Cargo.toml b/massa-executed-ops/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_executed_ops"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-execution-exports/Cargo.toml b/massa-execution-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_execution_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-execution-worker/Cargo.toml b/massa-execution-worker/Cargo.toml
@@ -4,7 +4,7 @@ harness = false
 
 [package]
 name = "massa_execution_worker"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-factory-exports/Cargo.toml b/massa-factory-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_factory_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-factory-worker/Cargo.toml b/massa-factory-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_factory_worker"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-final-state/Cargo.toml b/massa-final-state/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_final_state"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-final-state/src/final_state.rs b/massa-final-state/src/final_state.rs
@@ -10,12 +10,12 @@ use crate::{config::FinalStateConfig, error::FinalStateError, state_changes::Sta
 
 use anyhow::{anyhow, Result as AnyResult};
 use massa_async_pool::AsyncPool;
-use massa_db_exports::EXECUTION_TRAIL_HASH_PREFIX;
 use massa_db_exports::{
     DBBatch, MassaIteratorMode, ShareableMassaDBController, ASYNC_POOL_PREFIX,
     CYCLE_HISTORY_PREFIX, DEFERRED_CREDITS_PREFIX, EXECUTED_DENUNCIATIONS_PREFIX,
     EXECUTED_OPS_PREFIX, LEDGER_PREFIX, MIP_STORE_PREFIX, STATE_CF,
 };
+use massa_db_exports::{EXECUTION_TRAIL_HASH_PREFIX, MIP_STORE_STATS_PREFIX, VERSIONING_CF};
 use massa_executed_ops::ExecutedDenunciations;
 use massa_executed_ops::ExecutedOps;
 use massa_hash::Hash;
@@ -635,16 +635,55 @@ impl FinalState {
                     ));
                 }
             } else if serialized_key.starts_with(MIP_STORE_PREFIX.as_bytes()) {
-                // TODO: check MIP_STORE_PREFIX
+                if !self
+                    .mip_store
+                    .is_key_value_valid(&serialized_key, &serialized_value)
+                {
+                    warn!("Wrong key/value for MIP Store");
+                    return Err(anyhow!(
+                        "Wrong key/value for MIP Store serialized_key: {:?}, serialized_value: {:?}", 
+                        serialized_key, serialized_value
+                    ));
+                }
             } else if serialized_key.starts_with(EXECUTION_TRAIL_HASH_PREFIX.as_bytes()) {
                 // no checks here as they are performed above by direct reading
             } else {
                 warn!(
                     "Key/value does not correspond to any prefix: serialized_key: {:?}, serialized_value: {:?}",
                     serialized_key, serialized_value
                 );
-                return Err(anyhow!(""));
-                // return false;
+                return Err(anyhow!(
+                    "Key/value does not correspond to any prefix: serialized_key: {:?}, serialized_value: {:?}",
+                    serialized_key, serialized_value
+                ));
+            }
+        }
+
+        for (serialized_key, serialized_value) in
+            db.iterator_cf(VERSIONING_CF, MassaIteratorMode::Start)
+        {
+            if serialized_key.starts_with(MIP_STORE_PREFIX.as_bytes())
+                || serialized_key.starts_with(MIP_STORE_STATS_PREFIX.as_bytes())
+            {
+                if !self
+                    .mip_store
+                    .is_key_value_valid(&serialized_key, &serialized_value)
+                {
+                    warn!("Wrong key/value for MIP Store");
+                    return Err(anyhow!(
+                        "Wrong key/value for MIP Store serialized_key: {:?}, serialized_value: {:?}",
+                        serialized_key, serialized_value
+                    ));
+                }
+            } else {
+                warn!(
+                    "Key/value does not correspond to any prefix: serialized_key: {:?}, serialized_value: {:?}",
+                    serialized_key, serialized_value
+                );
+                return Err(anyhow!(
+                    "Key/value does not correspond to any prefix: serialized_key: {:?}, serialized_value: {:?}",
+                    serialized_key, serialized_value
+                ));
             }
         }
 

diff --git a/massa-grpc/Cargo.toml b/massa-grpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_grpc"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 description = "GRPC API for Massa Blockchain"
 repository = "https://github.com/massalabs/massa/"

diff --git a/massa-hash/Cargo.toml b/massa-hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_hash"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-ledger-exports/Cargo.toml b/massa-ledger-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_ledger_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-ledger-worker/Cargo.toml b/massa-ledger-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_ledger_worker"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-logging/Cargo.toml b/massa-logging/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_logging"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-metrics/Cargo.toml b/massa-metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_metrics"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [features]

diff --git a/massa-models/Cargo.toml b/massa-models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_models"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-models/src/config/constants.rs b/massa-models/src/config/constants.rs
@@ -58,7 +58,7 @@ lazy_static::lazy_static! {
             )
         )
     } else {
-        MassaTime::from_millis(1700496600000) // Wednesday, November 20, 2023 16:10:00  UTC
+        MassaTime::from_millis(1701093600000) // Monday, November 27, 2023 14:00:00  UTC
     };
 
     /// TESTNET: time when the blockclique is ended.
@@ -77,9 +77,9 @@ lazy_static::lazy_static! {
     /// node version
     pub static ref VERSION: Version = {
         if cfg!(feature = "sandbox") {
-            "SAND.27.0"
+            "SAND.27.1"
         } else {
-            "SECU.27.0"
+            "SECU.27.1"
         }
         .parse()
         .unwrap()

diff --git a/massa-module-cache/Cargo.toml b/massa-module-cache/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_module_cache"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [features]

diff --git a/massa-node/Cargo.toml b/massa-node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa-node"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-pool-exports/Cargo.toml b/massa-pool-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_pool_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-pool-worker/Cargo.toml b/massa-pool-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_pool_worker"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-pos-exports/Cargo.toml b/massa-pos-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_pos_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-pos-worker/Cargo.toml b/massa-pos-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_pos_worker"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-protocol-exports/Cargo.toml b/massa-protocol-exports/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_protocol_exports"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-protocol-worker/Cargo.toml b/massa-protocol-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_protocol_worker"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-sdk/Cargo.toml b/massa-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_sdk"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [dependencies]

diff --git a/massa-serialization/Cargo.toml b/massa-serialization/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_serialization"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-signature/Cargo.toml b/massa-signature/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_signature"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-storage/Cargo.toml b/massa-storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_storage"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"
 

diff --git a/massa-test-framework/Cargo.toml b/massa-test-framework/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "massa_test_framework"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Massa Labs <[email protected]>"]
 edition = "2021"