Update offchain/Cargo.toml

Co-authored-by: Gabriel de Quadros Ligneul <[email protected]>
cartesi · Sep 21, 2023 · 9fce2cb · 9fce2cb
1 parent fbfd4e0
commit 9fce2cb
Show file tree

Hide file tree

Showing 29 changed files with 48 additions and 98 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -65,6 +65,7 @@ RUN cargo chef cook --release --recipe-path recipe.json
 
 # Build application
 COPY ./offchain/ .
+COPY ./.git ../
 RUN cargo build --release
 
 #

diff --git a/grpc-interfaces b/grpc-interfaces
diff --git a/offchain/Cargo.lock b/offchain/Cargo.lock
diff --git a/offchain/Cargo.toml b/offchain/Cargo.toml
@@ -2,7 +2,6 @@
 members = [
   "advance-runner",
   "authority-claimer",
-  "build-info",
   "contracts",
   "data",
   "dispatcher",
@@ -93,8 +92,3 @@ urlencoding = "2.1"
 users = "0.11"
 uuid = "1.4"
 
-[profile.release]
-strip = true  # Automatically strip symbols from the binary.
-[workspace.build-dependencies]
-built = "0.6"
-
diff --git a/offchain/advance-runner/Cargo.toml b/offchain/advance-runner/Cargo.toml
@@ -3,14 +3,13 @@ name = "advance-runner"
 edition.workspace = true
 license.workspace = true
 version.workspace = true
-build = "../build-info/src/build.rs"
+build = "../log/src/build.rs"
 
 [[bin]]
 name = "cartesi-rollups-advance-runner"
 path = "src/main.rs"
 
 [dependencies]
-build-info = { path = "../build-info" }
 contracts = { path = "../contracts" }
 grpc-interfaces = { path = "../grpc-interfaces" }
 http-health-check = { path = "../http-health-check" }
@@ -41,4 +40,4 @@ testcontainers.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [build-dependencies]
-built = {workspace = true, features = ["git2"]}
+built = { workspace = true, features = ["git2"] }
diff --git a/offchain/advance-runner/src/main.rs b/offchain/advance-runner/src/main.rs
@@ -16,9 +16,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     info!(?config, "Starting Advance Runner");
 
-    build_info::log_build_info(
+    log::log_build_info(
         built_info::PKG_VERSION,
-        built_info::BUILT_TIME_UTC,
         built_info::GIT_HEAD_REF,
         built_info::GIT_COMMIT_HASH,
     );

diff --git a/offchain/authority-claimer/Cargo.toml b/offchain/authority-claimer/Cargo.toml
@@ -3,7 +3,7 @@ name = "authority-claimer"
 edition.workspace = true
 license.workspace = true
 version.workspace = true
-build = "src/built/build.rs"
+build = "../log/src/build.rs"
 
 
 [[bin]]
@@ -12,7 +12,6 @@ path = "src/main.rs"
 test = false
 
 [dependencies]
-build-info = { path = "../build-info" }
 http-server = { path = "../http-server" }
 log = { path = "../log" }
 rollups-events = { path = "../rollups-events" }
@@ -29,4 +28,4 @@ tracing.workspace = true
 
 
 [build-dependencies]
-built = {workspace = true, features = ["chrono","git2"]}
+built = { workspace = true, features = ["git2"] }
diff --git a/offchain/authority-claimer/src/built/build.rs b/offchain/authority-claimer/src/built/build.rs
diff --git a/offchain/authority-claimer/src/main.rs b/offchain/authority-claimer/src/main.rs
@@ -19,9 +19,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     info!(?config, "Starting Authority Claimer");
 
-    build_info::log_build_info(
+    log::log_build_info(
         built_info::PKG_VERSION,
-        built_info::BUILT_TIME_UTC,
         built_info::GIT_HEAD_REF,
         built_info::GIT_COMMIT_HASH,
     );

diff --git a/offchain/build-info/Cargo.toml b/offchain/build-info/Cargo.toml
diff --git a/offchain/build-info/src/lib.rs b/offchain/build-info/src/lib.rs
diff --git a/offchain/dispatcher/Cargo.toml b/offchain/dispatcher/Cargo.toml
@@ -3,14 +3,13 @@ name = "dispatcher"
 edition.workspace = true
 license.workspace = true
 version.workspace = true
-build = "../build-info/src/build.rs"
+build = "../log/src/build.rs"
 
 [[bin]]
 name = "cartesi-rollups-dispatcher"
 path = "src/main.rs"
 
 [dependencies]
-build-info = { path = "../build-info" }
 contracts = { path = "../contracts" }
 http-server = { path = "../http-server" }
 log = { path = "../log" }
@@ -20,7 +19,6 @@ types = { path = "../types" }
 async-trait.workspace = true
 axum.workspace = true
 backoff = { workspace = true, features = ["tokio"] }
-built = { workspace = true, features = ["chrono","git2"] }
 clap = { workspace = true, features = ["derive", "env"] }
 eth-state-client-lib.workspace = true
 eth-state-fold-types = { workspace = true, features = ["ethers"] }
@@ -51,4 +49,4 @@ testcontainers.workspace = true
 tracing-test = { workspace = true, features = ["no-env-filter"] }
 
 [build-dependencies]
-built = {workspace = true, features = ["chrono","git2"]}
+built = { workspace = true, features = ["git2"] }
diff --git a/offchain/dispatcher/src/main.rs b/offchain/dispatcher/src/main.rs
@@ -18,9 +18,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     info!(?config, "Starting Dispatcher");
 
-    build_info::log_build_info(
+    log::log_build_info(
         built_info::PKG_VERSION,
-        built_info::BUILT_TIME_UTC,
         built_info::GIT_HEAD_REF,
         built_info::GIT_COMMIT_HASH,
     );

diff --git a/offchain/graphql-server/Cargo.toml b/offchain/graphql-server/Cargo.toml
@@ -3,7 +3,7 @@ name = "graphql-server"
 edition.workspace = true
 license.workspace = true
 version.workspace = true
-build = "../build-info/src/build.rs"
+build = "../log/src/build.rs"
 
 [[bin]]
 name = "cartesi-rollups-graphql-server"
@@ -14,14 +14,12 @@ name = "generate-schema"
 path = "src/schema/generate_schema.rs"
 
 [dependencies]
-build-info = { path = "../build-info" }
 http-health-check = { path = "../http-health-check" }
 log = { path = "../log" }
 rollups-data = { path = "../data" }
 
 actix-cors.workspace = true
 actix-web.workspace = true
-built = { workspace = true, features = ["chrono","git2"] }
 clap = { workspace = true, features = ["derive", "env"] }
 hex.workspace = true
 juniper.workspace = true
@@ -39,4 +37,4 @@ serial_test.workspace = true
 testcontainers.workspace = true
 
 [build-dependencies]
-built = {workspace = true, features = ["chrono","git2"]}
+built = { workspace = true, features = ["git2"] }
diff --git a/offchain/graphql-server/src/main.rs b/offchain/graphql-server/src/main.rs
@@ -19,9 +19,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     info!(?config, "Starting GraphQL Server");
 
-    build_info::log_build_info(
+    log::log_build_info(
         built_info::PKG_VERSION,
-        built_info::BUILT_TIME_UTC,
         built_info::GIT_HEAD_REF,
         built_info::GIT_COMMIT_HASH,
     );

diff --git a/offchain/host-runner/Cargo.toml b/offchain/host-runner/Cargo.toml
@@ -3,14 +3,13 @@ name = "host-runner"
 edition.workspace = true
 license.workspace = true
 version.workspace = true
-build = "../build-info/src/build.rs"
+build = "../log/src/build.rs"
 
 [[bin]]
 name = "cartesi-rollups-host-runner"
 path = "src/main.rs"
 
 [dependencies]
-build-info = { path = "../build-info" }
 grpc-interfaces = { path = "../grpc-interfaces" }
 http-health-check = { path = "../http-health-check" }
 log = { path = "../log" }
@@ -40,4 +39,4 @@ serial_test.workspace = true
 tracing-test.workspace = true
 
 [build-dependencies]
-built = {workspace = true, features = ["chrono","git2"]}
+built = { workspace = true, features = ["git2"] }
diff --git a/offchain/host-runner/src/main.rs b/offchain/host-runner/src/main.rs
@@ -42,9 +42,8 @@ async fn main() {
 
     info!(?config, "Starting Host Runner");
 
-    build_info::log_build_info(
+    log::log_build_info(
         built_info::PKG_VERSION,
-        built_info::BUILT_TIME_UTC,
         built_info::GIT_HEAD_REF,
         built_info::GIT_COMMIT_HASH,
     );

diff --git a/offchain/indexer/Cargo.toml b/offchain/indexer/Cargo.toml
@@ -3,15 +3,14 @@ name = "indexer"
 edition.workspace = true
 license.workspace = true
 version.workspace = true
-build = "../build-info/src/build.rs"
+build = "../log/src/build.rs"
 
 [[bin]]
 name = "cartesi-rollups-indexer"
 path = "src/main.rs"
 test = false
 
 [dependencies]
-build-info = { path = "../build-info" }
 http-health-check = { path = "../http-health-check" }
 log = { path = "../log" }
 rollups-data = { path = "../data" }

diff --git a/offchain/indexer/src/main.rs b/offchain/indexer/src/main.rs
@@ -18,9 +18,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     info!(?config, "Starting Indexer");
 
-    build_info::log_build_info(
+    log::log_build_info(
         built_info::PKG_VERSION,
-        built_info::BUILT_TIME_UTC,
         built_info::GIT_HEAD_REF,
         built_info::GIT_COMMIT_HASH,
     );

diff --git a/offchain/inspect-server/Cargo.toml b/offchain/inspect-server/Cargo.toml
@@ -3,14 +3,14 @@ name = "inspect-server"
 edition.workspace = true
 license.workspace = true
 version.workspace = true
+build = "../log/src/build.rs"
 
 [[bin]]
 name = "cartesi-rollups-inspect-server"
 path = "src/main.rs"
 
 [dependencies]
 grpc-interfaces = { path = "../grpc-interfaces" }
-build-info = { path = "../build-info" }
 http-health-check = { path = "../http-health-check" }
 log = { path = "../log" }