Merge branch 'main' into Pravdyvy/accounts-core

This commit is contained in:
Oleksandr Pravdyvyi 2024-10-31 10:31:52 +02:00
commit 9c5dee8f37
18 changed files with 42 additions and 33 deletions

View File

@ -59,7 +59,14 @@ jobs:
if: success() || failure() if: success() || failure()
run: | run: |
cargo clippy --release -- -D warnings cargo clippy --release -- -D warnings
- name: install taplo
if: success() || failure()
run: |
cargo install taplo-cli --locked
- name: taplo fmt
if: success() || failure()
run: |
taplo fmt --check
test: test:
strategy: strategy:
matrix: matrix:

View File

@ -1,21 +1,21 @@
[workspace] [workspace]
resolver = "2" resolver = "2"
members = [ members = [
"node_runner", "node_runner",
"sequencer_runner", "sequencer_runner",
"storage", "storage",
"accounts", "accounts",
"utxo", "utxo",
"vm", "vm",
"networking", "networking",
"consensus", "consensus",
"node_rpc", "node_rpc",
"sequencer_rpc", "sequencer_rpc",
"mempool", "mempool",
"zkvm", "zkvm",
"node_core", "node_core",
"sequencer_core", "sequencer_core",
"rpc_primitives", "rpc_primitives",
] ]
[workspace.dependencies] [workspace.dependencies]
@ -38,7 +38,9 @@ monotree = "0.1.5"
hex = "0.4.3" hex = "0.4.3"
aes-gcm = "0.10.3" aes-gcm = "0.10.3"
rocksdb = { version = "0.21.0", default-features = false, features = ["snappy"] } rocksdb = { version = "0.21.0", default-features = false, features = [
"snappy",
] }
#ToDo: Add necessary risc0 submodules for zkvm module #ToDo: Add necessary risc0 submodules for zkvm module

View File

@ -20,4 +20,4 @@ aes-gcm.workspace = true
path = "../storage" path = "../storage"
[dependencies.utxo] [dependencies.utxo]
path = "../utxo" path = "../utxo"

View File

@ -12,4 +12,4 @@ serde.workspace = true
tokio.workspace = true tokio.workspace = true
[dependencies.networking] [dependencies.networking]
path = "../networking" path = "../networking"

View File

@ -8,4 +8,4 @@ anyhow.workspace = true
serde_json.workspace = true serde_json.workspace = true
env_logger.workspace = true env_logger.workspace = true
log.workspace = true log.workspace = true
serde.workspace = true serde.workspace = true

View File

@ -8,4 +8,4 @@ anyhow.workspace = true
serde_json.workspace = true serde_json.workspace = true
env_logger.workspace = true env_logger.workspace = true
log.workspace = true log.workspace = true
serde.workspace = true serde.workspace = true

View File

@ -11,4 +11,4 @@ log.workspace = true
serde.workspace = true serde.workspace = true
[dependencies.storage] [dependencies.storage]
path = "../storage" path = "../storage"

View File

@ -40,4 +40,4 @@ path = "../zkvm"
path = "../node_core" path = "../node_core"
[dependencies.rpc_primitives] [dependencies.rpc_primitives]
path = "../rpc_primitives" path = "../rpc_primitives"

View File

@ -42,4 +42,4 @@ path = "../node_rpc"
path = "../node_core" path = "../node_core"
[dependencies.rpc_primitives] [dependencies.rpc_primitives]
path = "../rpc_primitives" path = "../rpc_primitives"

View File

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "nightly" channel = "nightly"

View File

@ -1 +1 @@
edition = "2021" edition = "2021"

View File

@ -14,4 +14,4 @@ serde.workspace = true
path = "../storage" path = "../storage"
[dependencies.mempool] [dependencies.mempool]
path = "../mempool" path = "../mempool"

View File

@ -28,4 +28,4 @@ path = "../networking"
path = "../sequencer_core" path = "../sequencer_core"
[dependencies.rpc_primitives] [dependencies.rpc_primitives]
path = "../rpc_primitives" path = "../rpc_primitives"

View File

@ -30,4 +30,4 @@ path = "../sequencer_rpc"
path = "../sequencer_core" path = "../sequencer_core"
[dependencies.rpc_primitives] [dependencies.rpc_primitives]
path = "../rpc_primitives" path = "../rpc_primitives"

View File

@ -15,4 +15,4 @@ thiserror.workspace = true
rocksdb.workspace = true rocksdb.workspace = true
rs_merkle.workspace = true rs_merkle.workspace = true
sha2.workspace = true sha2.workspace = true
monotree.workspace = true monotree.workspace = true

View File

@ -13,4 +13,4 @@ monotree.workspace = true
sha2.workspace = true sha2.workspace = true
[dependencies.storage] [dependencies.storage]
path = "../storage" path = "../storage"

View File

@ -8,4 +8,4 @@ anyhow.workspace = true
serde_json.workspace = true serde_json.workspace = true
env_logger.workspace = true env_logger.workspace = true
log.workspace = true log.workspace = true
serde.workspace = true serde.workspace = true

View File

@ -13,4 +13,4 @@ serde.workspace = true
#ToDo: Add necessary risc0 dependencies #ToDo: Add necessary risc0 dependencies
[dependencies.vm] [dependencies.vm]
path = "../vm" path = "../vm"