Merge branch 'breaking-enha-rocksdb' into rocks_db_config

Cargo.toml

@@ -111,7 +111,6 @@ tracing-subscriber = { version = "=0.3.18", features = ["env-filter", "json"] }
 tracing-serde = "=0.1.3"
 
 # storage
-redis = "=0.26.0"
 rocksdb = { version = "=0.22.0", features = ["multi-threaded-cf"] }
 sqlx = { version = "=0.8.2", features = [
     "runtime-tokio",
@@ -123,7 +122,6 @@ sqlx = { version = "=0.8.2", features = [
 # test
 fake = { version = "=2.9.2", features = ["chrono", "derive"] }
 rdkafka = {version = "=0.36.2", features = ["ssl", "sasl"] }
-openssl = { version = "=0.10.68", features = ["vendored"] }
 sasl2-sys = { version = "=0.1.22", features = ["vendored"] }
 
 # Historic events processor
@@ -153,10 +151,7 @@ console-subscriber = { git = "https://github.com/tokio-rs/console.git", rev = "8
 # ------------------------------------------------------------------------------
 
 [dev-dependencies]
-binary_macros = "=1.0.0"
-fancy-duration = "=0.9.2"
 serde_plain = "=1.0.2"
-stringreader = "=0.1.1"
 tempfile = "=3.10.1"
 glob = "=0.3.1"
 

README.md

@@ -5,7 +5,6 @@ Welcome to Stratus, the cutting-edge EVM executor and JSON-RPC server with custo
 ## Current storage implementations
 
 - In Memory
-- Redis
 - RocksDB (default)
 
 ## Performance Landscape

docker-compose.yaml

@@ -24,22 +24,7 @@ services:
       - manual
 
   # ----------------------------------------------------------------------------
-  # Redis
-  # ----------------------------------------------------------------------------
-  redis:
-    image: redis:7.2.5
-    ports:
-      - "6379:6379"
-
-  redis-commander:
-    image: rediscommander/redis-commander:latest
-    ports:
-      - "8081:8081"
-    environment:
-    - REDIS_HOSTS=local:redis:6379
-
-  # ----------------------------------------------------------------------------
-  # PromethMeus
+  # Prometheus
   # ----------------------------------------------------------------------------
   prometheus:
     image: prom/prometheus

e2e/cloudwalk-contracts/integration/package.json

@@ -2,7 +2,7 @@
     "name": "hardhat-project",
     "devDependencies": {
         "@nomicfoundation/hardhat-toolbox": "^4.0.0",
-        "@openzeppelin/hardhat-upgrades": "^3.0.1",
+        "@openzeppelin/hardhat-upgrades": "3.3.0",
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "axios": "^1.6.7",
         "ethers": "^6.9.0",

justfile

@@ -364,8 +364,6 @@ e2e-leader-follower-up test="brlc" release_flag="--release":
         fi
     )
     fi
-    killport 3000 -s sigterm
-    killport 3001 -s sigterm
 
 # E2E: Leader & Follower Down
 e2e-leader-follower-down:
@@ -543,6 +541,8 @@ stratus-test-coverage output="":
     -rm -r temp_3001-rocksdb
     -docker compose down -v
     just e2e-leader-follower-up kafka " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -551,6 +551,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up deploy " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -559,6 +561,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up brlc " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -567,6 +571,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up change " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -575,6 +581,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up miner " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log
@@ -583,6 +591,8 @@ stratus-test-coverage output="":
     -rm -r temp_3000-rocksdb
     -rm -r temp_3001-rocksdb
     just e2e-leader-follower-up importer " "
+    killport 3000 -s sigterm
+    killport 3001 -s sigterm
     sleep 10
     -rm -r e2e_logs
     -rm utils/deploy/deploy_01.log