Update workflows to target 'dev' branch and rename storage module

kanari-network · Jan 29, 2025 · af4b341 · af4b341
1 parent d7a0e68
commit af4b341
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 79 deletions.
diff --git a/.github/workflows/run_node_devnet.yml b/.github/workflows/run_node_devnet.yml
@@ -2,10 +2,10 @@ name: Run Kari Node
 
 on:
     push:
-      branches: [ "main" ]
+      branches: [ "dev" ]
       tags: "v*"
     pull_request:
-      branches: [ "main" ]
+      branches: [ "dev" ]
 
 env:
     CARGO_TERM_COLOR: always

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -2,10 +2,10 @@ name: Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "dev" ]
     tags: "v*"
   pull_request:
-    branches: [ "main" ]
+    branches: [ "dev" ]
 
 env:
   CARGO_TERM_COLOR: always

diff --git a/Cargo.toml b/Cargo.toml
@@ -149,7 +149,7 @@ rpc-api                             = { path = "crates/rpc/rpc-api" }
 
 
 #Storage Path List
-storage                             = { path = "monaos/storage" }
+mona-storage                        = { path = "monaos/mona-storage" }
 mona-types                          = { path = "monaos/mona-types" }
 mona-enum-compat-util               = { path = "monaos/mona-enum-compat-util" }
 

diff --git a/crates/core/k2/Cargo.toml b/crates/core/k2/Cargo.toml
@@ -44,6 +44,9 @@ env_logger.workspace = true
 colored.workspace = true
 thiserror.workspace = true
 
+
+mona-storage.workspace = true
+
 # MoveVM
 move-bytecode-verifier.workspace = true
 move-disassembler.workspace = true

diff --git a/crates/core/k2/src/blockchain/mod.rs b/crates/core/k2/src/blockchain/mod.rs
@@ -4,8 +4,8 @@ use crate::transaction::{Transaction, TransactionType};
 use bincode;
 use consensus_pos::Blake3Algorithm;
 use dirs;
-use storage::{BlockchainStorage, RocksDBStorage, StorageError};
-mod storage;
+use mona_storage::{BlockchainStorage, RocksDBStorage, StorageError};
+
 
 use std::collections::{HashMap, VecDeque};
 use std::fs;

diff --git a/crates/core/wallet/key/Cargo.toml b/crates/core/wallet/key/Cargo.toml
@@ -16,7 +16,7 @@ bip39.workspace = true
 secp256k1.workspace = true
 rand.workspace = true
 hex.workspace = true
-serde_json = { workspace = true , default-features = false, features = ["alloc"] }
+serde_json = { workspace = true , default-features = true }
 lazy_static.workspace = true
 consensus-pos.workspace = true
 

diff --git a/framework/kanari-system/sources/kanari_system.move b/framework/kanari-system/sources/kanari_system.move
diff --git a/monaos/storage/Cargo.toml → monaos/mona-storage/Cargo.toml b/monaos/storage/Cargo.toml → monaos/mona-storage/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "storage"
+name = "mona-storage"
 edition.workspace = true
 categories.workspace = true
 keywords.workspace = true
@@ -14,7 +14,11 @@ description.workspace = true
 [dependencies]
 move-core-types.workspace =true 
 async-trait = "0.1"
-thiserror = "2.0.9"
+
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.134"
-tokio = { version = "1.0", features = ["full"] }
+tokio = { version = "1.0", features = ["full"] }
+
+rocksdb.workspace = true
+bincode.workspace = true
+thiserror.workspace = true
diff --git a/crates/core/k2/src/blockchain/storage.rs → monaos/mona-storage/src/lib.rs b/crates/core/k2/src/blockchain/storage.rs → monaos/mona-storage/src/lib.rs
diff --git a/monaos/storage/src/config.rs b/monaos/storage/src/config.rs
diff --git a/monaos/storage/src/errors.rs b/monaos/storage/src/errors.rs
diff --git a/monaos/storage/src/lib.rs b/monaos/storage/src/lib.rs
diff --git a/monaos/storage/src/models.rs b/monaos/storage/src/models.rs
diff --git a/monaos/storage/src/storage.rs b/monaos/storage/src/storage.rs