diff --git a/offchain/Cargo.lock b/offchain/Cargo.lock index 931609afe..cc73f7153 100644 --- a/offchain/Cargo.lock +++ b/offchain/Cargo.lock @@ -882,7 +882,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" dependencies = [ "cargo-lock", - "chrono", "git2", ] diff --git a/offchain/Cargo.toml b/offchain/Cargo.toml index 2010a1d26..eb22b5d69 100644 --- a/offchain/Cargo.toml +++ b/offchain/Cargo.toml @@ -93,8 +93,6 @@ 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 index 0a57f7c50..28ac10cb9 100644 --- a/offchain/advance-runner/Cargo.toml +++ b/offchain/advance-runner/Cargo.toml @@ -41,4 +41,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 index cff6299a1..56a6e1bcc 100644 --- a/offchain/advance-runner/src/main.rs +++ b/offchain/advance-runner/src/main.rs @@ -18,7 +18,6 @@ async fn main() -> Result<(), Box> { build_info::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 index 304851967..615276cb0 100644 --- 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 = "../build-info/src/build.rs" [[bin]] @@ -29,4 +29,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 deleted file mode 100644 index c8a3a44b7..000000000 --- a/offchain/authority-claimer/src/built/build.rs +++ /dev/null @@ -1,5 +0,0 @@ -use built; - -pub(crate) fn main() { - built::write_built_file().expect("Failed to acquire build-time information"); -} \ No newline at end of file diff --git a/offchain/authority-claimer/src/main.rs b/offchain/authority-claimer/src/main.rs index 9752d6a19..458031bb0 100644 --- a/offchain/authority-claimer/src/main.rs +++ b/offchain/authority-claimer/src/main.rs @@ -21,7 +21,6 @@ async fn main() -> Result<(), Box> { build_info::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 index 0d0340016..f07563caa 100644 --- a/offchain/build-info/Cargo.toml +++ b/offchain/build-info/Cargo.toml @@ -5,6 +5,6 @@ license.workspace = true version.workspace = true [dependencies] -built = {workspace = true, features = ["chrono","git2"]} +built = {workspace = true, features = ["git2"]} tracing.workspace = true tracing-subscriber = { workspace = true, features = ["env-filter"] } \ No newline at end of file diff --git a/offchain/build-info/src/lib.rs b/offchain/build-info/src/lib.rs index dd3e916d9..0cdbcaf9c 100644 --- a/offchain/build-info/src/lib.rs +++ b/offchain/build-info/src/lib.rs @@ -2,12 +2,10 @@ use tracing::info; pub fn log_build_info( version: &str, - build_time: &str, git_head_ref: Option<&str>, git_commit_hash: Option<&str>, ) { info!("Version: {}", version); - info!("Build time: {}", build_time); match git_head_ref { Some(v) => info!("Git ref: {}", v), None => (), diff --git a/offchain/dispatcher/Cargo.toml b/offchain/dispatcher/Cargo.toml index e1e118965..e507fc235 100644 --- a/offchain/dispatcher/Cargo.toml +++ b/offchain/dispatcher/Cargo.toml @@ -20,7 +20,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 +50,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 index 0da23eafb..47423467f 100644 --- a/offchain/dispatcher/src/main.rs +++ b/offchain/dispatcher/src/main.rs @@ -20,7 +20,6 @@ async fn main() -> Result<(), Box> { build_info::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 index d1b874cf6..e359a9e61 100644 --- a/offchain/graphql-server/Cargo.toml +++ b/offchain/graphql-server/Cargo.toml @@ -21,7 +21,6 @@ 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 +38,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 index 8b13aea4b..36153f80f 100644 --- a/offchain/graphql-server/src/main.rs +++ b/offchain/graphql-server/src/main.rs @@ -21,7 +21,6 @@ async fn main() -> Result<(), Box> { build_info::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 index 84599160f..63b383bdc 100644 --- a/offchain/host-runner/Cargo.toml +++ b/offchain/host-runner/Cargo.toml @@ -40,4 +40,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 index 362bac778..b201447ba 100644 --- a/offchain/host-runner/src/main.rs +++ b/offchain/host-runner/src/main.rs @@ -44,7 +44,6 @@ async fn main() { build_info::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/src/main.rs b/offchain/indexer/src/main.rs index ff2ab7f1f..9814d5bb0 100644 --- a/offchain/indexer/src/main.rs +++ b/offchain/indexer/src/main.rs @@ -20,7 +20,6 @@ async fn main() -> Result<(), Box> { build_info::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/src/main.rs b/offchain/inspect-server/src/main.rs index 1e57f460a..2287f786e 100644 --- a/offchain/inspect-server/src/main.rs +++ b/offchain/inspect-server/src/main.rs @@ -20,7 +20,6 @@ async fn main() -> Result<(), Box> { build_info::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/state-server/Cargo.toml b/offchain/state-server/Cargo.toml index 1ceb82668..9f3ce95c2 100644 --- a/offchain/state-server/Cargo.toml +++ b/offchain/state-server/Cargo.toml @@ -14,7 +14,6 @@ build-info = { path = "../build-info" } log = { path = "../log" } types = { path = "../types" } -built = {workspace = true, features = ["chrono","git2"]} clap = { workspace = true, features = ["derive", "env"] } eth-block-history.workspace = true eth-state-fold-types.workspace = true @@ -28,4 +27,4 @@ tracing.workspace = true url.workspace = true [build-dependencies] -built = {workspace = true, features = ["chrono","git2"]} +built = {workspace = true, features = ["git2"]} diff --git a/offchain/state-server/src/main.rs b/offchain/state-server/src/main.rs index 95dca9d33..99c892be1 100644 --- a/offchain/state-server/src/main.rs +++ b/offchain/state-server/src/main.rs @@ -18,7 +18,6 @@ async fn main() -> Result<(), Box> { build_info::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/onchain/rollups-arbitration/lib/forge-std b/onchain/rollups-arbitration/lib/forge-std new file mode 160000 index 000000000..d26946aee --- /dev/null +++ b/onchain/rollups-arbitration/lib/forge-std @@ -0,0 +1 @@ +Subproject commit d26946aeef956d9d11238ce02c94b7a22ac23ca8 diff --git a/onchain/rollups-arbitration/lib/solidity-util b/onchain/rollups-arbitration/lib/solidity-util new file mode 160000 index 000000000..63f02ddcf --- /dev/null +++ b/onchain/rollups-arbitration/lib/solidity-util @@ -0,0 +1 @@ +Subproject commit 63f02ddcff5c1523ae65045b78b57bdb98f3d0a0 diff --git a/onchain/rollups/lib/forge-std b/onchain/rollups/lib/forge-std new file mode 160000 index 000000000..fc560fa34 --- /dev/null +++ b/onchain/rollups/lib/forge-std @@ -0,0 +1 @@ +Subproject commit fc560fa34fa12a335a50c35d92e55a6628ca467c