build: add taplo formatting

.github/workflows/ci.yml

@@ -60,6 +60,23 @@ jobs:
             -W clippy::suspicious \
             -W clippy::correctness
 
+  toml-format:
+    name: toml-format
+    runs-on: ubuntu-22.04
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: Install Taplo
+        env:
+          version: "0.9.3"
+        run: |
+          curl -Ls "https://github.com/tamasfe/taplo/releases/download/${{ env.version }}/taplo-full-linux-x86_64.gz" | \
+          gzip -d > taplo && \
+          chmod +x taplo && \
+          sudo mv taplo /usr/local/bin/taplo
+      - name: Run Taplo
+        run: taplo fmt --check
+
   test:
     name: test
     runs-on: ubuntu-22.04

.vscode/settings.json

@@ -18,5 +18,14 @@
         "clippy::suspicious",
         "-W",
         "clippy::correctness"
-    ]
+    ],
+    "[toml]": {
+        "editor.defaultFormatter": "tamasfe.even-better-toml",
+        "editor.formatOnSave": true
+    },
+    "evenBetterToml.formatter.alignEntries": true,
+    "evenBetterToml.formatter.arrayTrailingComma": true,
+    "evenBetterToml.formatter.columnWidth": 100,
+    "evenBetterToml.formatter.indentString": "    ",
+    "evenBetterToml.formatter.reorderKeys": true
 }

Cargo.toml

@@ -1,79 +1,76 @@
 [workspace]
+members  = [ "atoma-auth", "atoma-proxy", "atoma-proxy-service", "atoma-state" ]
 resolver = "2"
-members = ["atoma-auth", "atoma-proxy-service", "atoma-proxy", "atoma-state"]
 
 [workspace.package]
-version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+version = "0.1.0"
 
 [workspace.dependencies]
-anyhow = "1.0.91"
-async-trait = "0.1.88"
-atoma-auth = { path = "./atoma-auth" }
-atoma-proxy-service = { path = "./atoma-proxy-service" }
-atoma-state = { path = "./atoma-state" }
-atoma-p2p = { git = "https://github.com/atoma-network/atoma-node.git", package = "atoma-p2p", branch = "main" }
-atoma-sui = { git = "https://github.com/atoma-network/atoma-node.git", package = "atoma-sui", branch = "main" }
-atoma-utils = { git = "https://github.com/atoma-network/atoma-node.git", package = "atoma-utils", branch = "main" }
-axum = "0.7.7"
-base64 = "0.22.1"
-bcs = "0.1.6"
-blake2 = "0.10.6"
-blake3 = "1.6.1"
-chrono = "=0.4.39"
-clap = "4.5.31"
-config = "0.14.1"
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "69d496c71fb37e3d22fe85e5bbfd4256d61422b9", package = "fastcrypto" }
-fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "69d496c71fb37e3d22fe85e5bbfd4256d61422b9", package = "fastcrypto-zkp" }
-fastrand = "2.3.0"
-flume = "0.11.1"
-futures = "0.3.31"
-hex = "0.4.3"
-hf-hub = "0.3.2"
-isocountry = "0.3.2"
-itertools = "0.14.0"
-jsonwebtoken = "9.3.0"
-tracing-loki = "0.2.6"
-mockito = "1.6.1"
-remote-attestation = { git = "https://github.com/atoma-network/nvrust", branch = "main" }
-once_cell = "1.21.0"
-opentelemetry = "0.27.1"
-opentelemetry-otlp = "0.27.0"
-opentelemetry_sdk = "0.27.1"
-prometheus = "0.13.4"
-pem = "3.0.5"
-proptest = "1.6.0"
-rand = "0.8.5"
-regex = "1.11.1"
-reqwest = "0.12.12"
-rsa = "0.9.7"
-serde = "1.0.214"
-serde_json = "1.0.140"
-serde_yaml = "0.9.34"
-serial_test = "3.1.1"
-shared-crypto = { git = "https://github.com/mystenlabs/sui", package = "shared-crypto", tag = "testnet-v1.45.2" }
-sqlx = { version = "0.8.2", features = [
-	"postgres",
-	"runtime-tokio-native-tls",
-] }
-sui-keys = { git = "https://github.com/mystenlabs/sui", package = "sui-keys", tag = "testnet-v1.45.2" }
-sui-sdk = { git = "https://github.com/mystenlabs/sui", package = "sui-sdk", tag = "testnet-v1.45.2" }
-sui-sdk-types = "0.0.2"
-thiserror = "2.0.12"
-tokenizers = "0.21.0"
-tokio = "1.41.0"
-toml = "0.8.19"
-tonic = "0.12"
-tower = "0.5.1"
-tower-http = "0.6.2"
-tracing = "0.1.40"
-tracing-appender = "0.2.3"
+anyhow                = "1.0.91"
+async-trait           = "0.1.88"
+atoma-auth            = { path = "./atoma-auth" }
+atoma-p2p             = { git = "https://github.com/atoma-network/atoma-node.git", package = "atoma-p2p", branch = "main" }
+atoma-proxy-service   = { path = "./atoma-proxy-service" }
+atoma-state           = { path = "./atoma-state" }
+atoma-sui             = { git = "https://github.com/atoma-network/atoma-node.git", package = "atoma-sui", branch = "main" }
+atoma-utils           = { git = "https://github.com/atoma-network/atoma-node.git", package = "atoma-utils", branch = "main" }
+axum                  = "0.7.7"
+base64                = "0.22.1"
+bcs                   = "0.1.6"
+blake2                = "0.10.6"
+blake3                = "1.6.1"
+chrono                = "=0.4.39"
+clap                  = "4.5.31"
+config                = "0.14.1"
+fastcrypto            = { git = "https://github.com/MystenLabs/fastcrypto", rev = "69d496c71fb37e3d22fe85e5bbfd4256d61422b9", package = "fastcrypto" }
+fastcrypto-zkp        = { git = "https://github.com/MystenLabs/fastcrypto", rev = "69d496c71fb37e3d22fe85e5bbfd4256d61422b9", package = "fastcrypto-zkp" }
+fastrand              = "2.3.0"
+flume                 = "0.11.1"
+futures               = "0.3.31"
+hex                   = "0.4.3"
+hf-hub                = "0.3.2"
+isocountry            = "0.3.2"
+itertools             = "0.14.0"
+jsonwebtoken          = "9.3.0"
+mockito               = "1.6.1"
+once_cell             = "1.21.0"
+opentelemetry         = "0.27.1"
+opentelemetry-otlp    = "0.27.0"
+opentelemetry_sdk     = "0.27.1"
+pem                   = "3.0.5"
+prometheus            = "0.13.4"
+proptest              = "1.6.0"
+rand                  = "0.8.5"
+regex                 = "1.11.1"
+remote-attestation    = { git = "https://github.com/atoma-network/nvrust", branch = "main" }
+reqwest               = "0.12.12"
+rsa                   = "0.9.7"
+serde                 = "1.0.214"
+serde_json            = "1.0.140"
+serde_yaml            = "0.9.34"
+serial_test           = "3.1.1"
+shared-crypto         = { git = "https://github.com/mystenlabs/sui", package = "shared-crypto", tag = "testnet-v1.45.2" }
+sqlx                  = { version = "0.8.2", features = [ "postgres", "runtime-tokio-native-tls" ] }
+sui-keys              = { git = "https://github.com/mystenlabs/sui", package = "sui-keys", tag = "testnet-v1.45.2" }
+sui-sdk               = { git = "https://github.com/mystenlabs/sui", package = "sui-sdk", tag = "testnet-v1.45.2" }
+sui-sdk-types         = "0.0.2"
+thiserror             = "2.0.12"
+tokenizers            = "0.21.0"
+tokio                 = "1.41.0"
+toml                  = "0.8.19"
+tonic                 = "0.12"
+tower                 = "0.5.1"
+tower-http            = "0.6.2"
+tracing               = "0.1.40"
+tracing-appender      = "0.2.3"
+tracing-loki          = "0.2.6"
 tracing-opentelemetry = "0.28.0"
-tracing-subscriber = "0.3.18"
-url = "2.5.4"
-utoipa = "5.2.0"
-utoipa-swagger-ui = "8.0.3"
-uuid = "1.15.1"
-x25519-dalek = "2.0.1"
-zeroize = "1.8.1"
+tracing-subscriber    = "0.3.18"
+url                   = "2.5.4"
+utoipa                = "5.2.0"
+utoipa-swagger-ui     = "8.0.3"
+uuid                  = "1.15.1"
+x25519-dalek          = "2.0.1"
+zeroize               = "1.8.1"

atoma-auth/Cargo.toml

@@ -1,39 +1,39 @@
 [package]
-name = "atoma-auth"
-version.workspace = true
 edition.workspace = true
 license.workspace = true
+name              = "atoma-auth"
+version.workspace = true
 
 [dependencies]
-anyhow.workspace = true
-atoma-state.workspace = true
-atoma-sui.workspace = true
-atoma-utils.workspace = true
-base64.workspace = true
-bcs.workspace = true
-blake2.workspace = true
-chrono.workspace = true
-config.workspace = true
-fastcrypto.workspace = true
+anyhow.workspace         = true
+atoma-state.workspace    = true
+atoma-sui.workspace      = true
+atoma-utils.workspace    = true
+base64.workspace         = true
+bcs.workspace            = true
+blake2.workspace         = true
+chrono.workspace         = true
+config.workspace         = true
+fastcrypto.workspace     = true
 fastcrypto-zkp.workspace = true
-flume.workspace = true
-hex.workspace = true
-itertools.workspace = true
-jsonwebtoken.workspace = true
-pem.workspace = true
-rand.workspace = true
-regex.workspace = true
-reqwest.workspace = true
-rsa.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_json.workspace = true
-shared-crypto.workspace = true
-sui-keys.workspace = true
-sui-sdk.workspace = true
-sui-sdk-types = { workspace = true, features = ["serde"] }
-thiserror.workspace = true
-tokio.workspace = true
-tracing.workspace = true
+flume.workspace          = true
+hex.workspace            = true
+itertools.workspace      = true
+jsonwebtoken.workspace   = true
+pem.workspace            = true
+rand.workspace           = true
+regex.workspace          = true
+reqwest.workspace        = true
+rsa.workspace            = true
+serde                    = { workspace = true, features = [ "derive" ] }
+serde_json.workspace     = true
+shared-crypto.workspace  = true
+sui-keys.workspace       = true
+sui-sdk.workspace        = true
+sui-sdk-types            = { workspace = true, features = [ "serde" ] }
+thiserror.workspace      = true
+tokio.workspace          = true
+tracing.workspace        = true
 
 [features]
-google-oauth = []
+google-oauth = [  ]

atoma-proxy-service/Cargo.toml

@@ -1,31 +1,31 @@
 [package]
-name = "atoma-proxy-service"
-version.workspace = true
 edition.workspace = true
 license.workspace = true
+name              = "atoma-proxy-service"
+version.workspace = true
 
 [dependencies]
-anyhow.workspace = true
-atoma-auth.workspace = true
-atoma-state.workspace = true
-atoma-sui.workspace = true
-axum.workspace = true
-base64.workspace = true
-chrono.workspace = true
-config.workspace = true
-rand.workspace = true
-reqwest.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_yaml = { workspace = true }
-serde_json.workspace = true
-sui-sdk.workspace = true
-thiserror = { workspace = true }
-tokio = { workspace = true, features = ["full"] }
-tower-http = { workspace = true, features = ["cors"] }
+anyhow.workspace             = true
+atoma-auth.workspace         = true
+atoma-state.workspace        = true
+atoma-sui.workspace          = true
+axum.workspace               = true
+base64.workspace             = true
+chrono.workspace             = true
+config.workspace             = true
+rand.workspace               = true
+reqwest.workspace            = true
+serde                        = { workspace = true, features = [ "derive" ] }
+serde_json.workspace         = true
+serde_yaml                   = { workspace = true }
+sui-sdk.workspace            = true
+thiserror                    = { workspace = true }
+tokio                        = { workspace = true, features = [ "full" ] }
+tower-http                   = { workspace = true, features = [ "cors" ] }
+tracing.workspace            = true
 tracing-subscriber.workspace = true
-tracing.workspace = true
-utoipa = { workspace = true, features = ["axum_extras"] }
-utoipa-swagger-ui = { workspace = true }
+utoipa                       = { workspace = true, features = [ "axum_extras" ] }
+utoipa-swagger-ui            = { workspace = true }
 
 [features]
-google-oauth = ["atoma-auth/google-oauth"]
+google-oauth = [ "atoma-auth/google-oauth" ]

atoma-proxy/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-name = "atoma-proxy"
-version.workspace = true
 edition.workspace = true
 license.workspace = true
+name              = "atoma-proxy"
+version.workspace = true
 
 [dependencies]
 anyhow.workspace = true
@@ -13,7 +13,7 @@ atoma-proxy-service.workspace = true
 atoma-state.workspace = true
 atoma-sui.workspace = true
 atoma-utils.workspace = true
-axum = { workspace = true, features = ["json"] }
+axum = { workspace = true, features = [ "json" ] }
 base64 = { workspace = true }
 blake2.workspace = true
 clap.workspace = true
@@ -23,46 +23,37 @@ flume.workspace = true
 futures = { workspace = true }
 hf-hub = { workspace = true }
 once_cell = "1.21"
-opentelemetry = { workspace = true, features = ["trace", "metrics", "logs"] }
-opentelemetry_sdk = { workspace = true, features = [
-    "rt-tokio",
-    "trace",
-    "metrics",
-    "logs",
-] }
+opentelemetry = { workspace = true, features = [ "logs", "metrics", "trace" ] }
 opentelemetry-otlp = { workspace = true, features = [
-    "metrics",
     "grpc-tonic",
-    "trace",
-    "tls",
     "logs",
+    "metrics",
+    "tls",
+    "trace",
 ] }
+opentelemetry_sdk = { workspace = true, features = [ "logs", "metrics", "rt-tokio", "trace" ] }
 rand = { workspace = true }
-reqwest = { workspace = true, features = ["json"] }
-serde = { workspace = true, features = ["derive"] }
+reqwest = { workspace = true, features = [ "json" ] }
+serde = { workspace = true, features = [ "derive" ] }
 serde_json.workspace = true
 serde_yaml = { workspace = true }
 sqlx.workspace = true
 sui-keys.workspace = true
 sui-sdk.workspace = true
 thiserror = { workspace = true }
 tokenizers = { workspace = true }
-tokio = { workspace = true, features = ["full"] }
-tonic = { workspace = true, features = ["tls", "tls-roots", "prost"] }
+tokio = { workspace = true, features = [ "full" ] }
+tonic = { workspace = true, features = [ "prost", "tls", "tls-roots" ] }
 tower = { workspace = true }
-tower-http = { workspace = true, features = ["cors"] }
-tracing-appender.workspace = true
-tracing-opentelemetry = { workspace = true }
-tracing-subscriber = { workspace = true, features = [
-    "env-filter",
-    "json",
-    "time",
-] }
+tower-http = { workspace = true, features = [ "cors" ] }
 tracing.workspace = true
+tracing-appender.workspace = true
 tracing-loki = { workspace = true }
-utoipa = { workspace = true, features = ["axum_extras", "preserve_path_order"] }
-utoipa-swagger-ui = { workspace = true, features = ["axum"] }
+tracing-opentelemetry = { workspace = true }
+tracing-subscriber = { workspace = true, features = [ "env-filter", "json", "time" ] }
 url = { workspace = true }
+utoipa = { workspace = true, features = [ "axum_extras", "preserve_path_order" ] }
+utoipa-swagger-ui = { workspace = true, features = [ "axum" ] }
 
 [features]
-google-oauth = ["atoma-auth/google-oauth", "atoma-proxy-service/google-oauth"]
+google-oauth = [ "atoma-auth/google-oauth", "atoma-proxy-service/google-oauth" ]