diff --git a/Cargo.lock b/Cargo.lock index 27febb09..bff5e0bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2319,8 +2319,8 @@ dependencies = [ "tree_hash 0.4.1 (git+https://github.com/webb-tools/pallet-eth2-light-client)", "webb 0.5.25", "webb-proposals", - "webb-relayer-types 0.5.5-dev (git+https://github.com/webb-tools/relayer.git)", - "webb-relayer-utils 0.5.5-dev (git+https://github.com/webb-tools/relayer.git)", + "webb-relayer-types 0.5.5-dev", + "webb-relayer-utils 0.5.5-dev", ] [[package]] @@ -2466,7 +2466,7 @@ dependencies = [ "warp", "webb 0.5.25", "webb-proposals", - "webb-relayer-utils 0.5.5-dev (git+https://github.com/webb-tools/relayer.git)", + "webb-relayer-utils 0.5.5-dev", ] [[package]] @@ -9470,7 +9470,7 @@ dependencies = [ [[package]] name = "webb-bridge-registry-backends" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "async-trait", "ethereum-types 0.14.1", @@ -9484,12 +9484,12 @@ dependencies = [ "webb 0.6.1", "webb-proposals", "webb-relayer-config", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-chains-info" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "anyhow", "prettyplease", @@ -9528,7 +9528,7 @@ dependencies = [ [[package]] name = "webb-event-watcher-traits" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "async-trait", "backoff", @@ -9544,12 +9544,12 @@ dependencies = [ "webb-relayer-config", "webb-relayer-context", "webb-relayer-store", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-ew-dkg" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "async-trait", "ethereum-types 0.14.1", @@ -9563,12 +9563,12 @@ dependencies = [ "webb-proposals", "webb-relayer-config", "webb-relayer-store", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-ew-evm" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -9593,12 +9593,12 @@ dependencies = [ "webb-proposals", "webb-relayer-config", "webb-relayer-store", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-price-oracle-backends" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "async-trait", "axum", @@ -9612,7 +9612,7 @@ dependencies = [ "webb 0.6.1", "webb-chains-info", "webb-relayer-store", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] @@ -9638,7 +9638,7 @@ dependencies = [ [[package]] name = "webb-proposal-signing-backends" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "async-trait", "ethereum-types 0.14.1", @@ -9657,8 +9657,8 @@ dependencies = [ "webb 0.6.1", "webb-proposals", "webb-relayer-store", - "webb-relayer-types 0.5.5-dev", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-types 0.5.6-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] @@ -9679,11 +9679,10 @@ dependencies = [ [[package]] name = "webb-relayer" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "anyhow", "axum", - "build-data", "config", "dotenv", "ethereum-types 0.14.1", @@ -9710,12 +9709,12 @@ dependencies = [ "webb-relayer-handlers", "webb-relayer-store", "webb-relayer-tx-queue", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-relayer-config" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "anyhow", "config", @@ -9736,13 +9735,13 @@ dependencies = [ "webb 0.6.1", "webb-proposals", "webb-relayer-store", - "webb-relayer-types 0.5.5-dev", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-types 0.5.6-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-relayer-context" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "http", "native-tls", @@ -9756,12 +9755,12 @@ dependencies = [ "webb-price-oracle-backends", "webb-relayer-config", "webb-relayer-store", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-relayer-handler-utils" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "native-tls", "serde", @@ -9773,10 +9772,11 @@ dependencies = [ [[package]] name = "webb-relayer-handlers" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "axum", "axum-client-ip", + "build-data", "ethereum-types 0.14.1", "futures", "native-tls", @@ -9793,12 +9793,12 @@ dependencies = [ "webb-relayer-handler-utils", "webb-relayer-store", "webb-relayer-tx-relay", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-relayer-store" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "hex", "native-tls", @@ -9810,12 +9810,12 @@ dependencies = [ "tracing", "webb 0.6.1", "webb-proposals", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-relayer-tx-queue" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "backoff", "ethereum-types 0.14.1", @@ -9834,13 +9834,13 @@ dependencies = [ "webb-relayer-config", "webb-relayer-context", "webb-relayer-store", - "webb-relayer-types 0.5.5-dev", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-types 0.5.6-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-relayer-tx-relay" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "chrono", "ethereum-types 0.14.1", @@ -9859,12 +9859,12 @@ dependencies = [ "webb-relayer-context", "webb-relayer-handler-utils", "webb-relayer-store", - "webb-relayer-utils 0.5.5-dev", + "webb-relayer-utils 0.5.6-dev", ] [[package]] name = "webb-relayer-tx-relay-utils" -version = "0.5.5-dev" +version = "0.5.6-dev" dependencies = [ "native-tls", "serde", @@ -9873,6 +9873,7 @@ dependencies = [ [[package]] name = "webb-relayer-types" version = "0.5.5-dev" +source = "git+https://github.com/webb-tools/relayer.git#2bcce85926fca9d280edebd6b6519becf3162441" dependencies = [ "ethereum-types 0.14.1", "native-tls", @@ -9886,8 +9887,7 @@ dependencies = [ [[package]] name = "webb-relayer-types" -version = "0.5.5-dev" -source = "git+https://github.com/webb-tools/relayer.git#2bcce85926fca9d280edebd6b6519becf3162441" +version = "0.5.6-dev" dependencies = [ "ethereum-types 0.14.1", "native-tls", @@ -9902,6 +9902,7 @@ dependencies = [ [[package]] name = "webb-relayer-utils" version = "0.5.5-dev" +source = "git+https://github.com/webb-tools/relayer.git#2bcce85926fca9d280edebd6b6519becf3162441" dependencies = [ "ark-std", "async-trait", @@ -9914,7 +9915,6 @@ dependencies = [ "hex", "hyper 0.14.27", "libsecp256k1", - "native-tls", "prometheus 0.13.3", "reqwest", "serde", @@ -9923,7 +9923,6 @@ dependencies = [ "serde_path_to_error", "sled", "thiserror", - "tokio 1.29.1", "url", "webb 0.6.1", "webb-proposals", @@ -9931,8 +9930,7 @@ dependencies = [ [[package]] name = "webb-relayer-utils" -version = "0.5.5-dev" -source = "git+https://github.com/webb-tools/relayer.git#2bcce85926fca9d280edebd6b6519becf3162441" +version = "0.5.6-dev" dependencies = [ "ark-std", "async-trait", @@ -9945,6 +9943,7 @@ dependencies = [ "hex", "hyper 0.14.27", "libsecp256k1", + "native-tls", "prometheus 0.13.3", "reqwest", "serde", @@ -9953,6 +9952,7 @@ dependencies = [ "serde_path_to_error", "sled", "thiserror", + "tokio 1.29.1", "url", "webb 0.6.1", "webb-proposals", diff --git a/Cargo.toml b/Cargo.toml index 7a6b6298..abcf7168 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.5.5-dev" +version = "0.5.6-dev" authors = ["Webb Developers "] license = "Apache-2.0" documentation = "https://docs.rs/webb-relayer" diff --git a/crates/relayer-handlers/Cargo.toml b/crates/relayer-handlers/Cargo.toml index 9c8a028f..44377ded 100644 --- a/crates/relayer-handlers/Cargo.toml +++ b/crates/relayer-handlers/Cargo.toml @@ -34,3 +34,5 @@ axum = { workspace = true } axum-client-ip = "0.4.0" tokio-stream = { version = "^0.1" } +[build-dependencies] +build-data = "0.1.4" diff --git a/services/webb-relayer/build.rs b/crates/relayer-handlers/build.rs similarity index 100% rename from services/webb-relayer/build.rs rename to crates/relayer-handlers/build.rs diff --git a/crates/relayer-handlers/src/routes/info.rs b/crates/relayer-handlers/src/routes/info.rs index 6c41de00..a004c15a 100644 --- a/crates/relayer-handlers/src/routes/info.rs +++ b/crates/relayer-handlers/src/routes/info.rs @@ -80,9 +80,9 @@ pub async fn handle_relayer_info( // Build info let build_info = BuildInfo { - version: std::env::var("CARGO_PKG_VERSION").unwrap_or_default(), - commit: std::env::var("GIT_COMMIT").unwrap_or_default(), - timestamp: std::env::var("SOURCE_TIMESTAMP").unwrap_or_default(), + version: env!("CARGO_PKG_VERSION").into(), + commit: env!("GIT_COMMIT").into(), + timestamp: env!("SOURCE_TIMESTAMP").into(), }; let relayer_config = RelayerConfig { config, diff --git a/flake.nix b/flake.nix index 16621950..03b357d9 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,7 @@ pkgs.clang # Mold Linker for faster builds (only on Linux) (lib.optionals pkgs.stdenv.isLinux pkgs.mold) + (lib.optionals pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security) ]; buildInputs = [ # Used for DVC @@ -53,7 +54,7 @@ # Environment variables RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library"; # Needed for running DKG/Tangle locally - LD_LIBRARY_PATH = "${pkgs.gmp}/lib"; + LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.gmp ]; }; }); } diff --git a/services/webb-relayer/Cargo.toml b/services/webb-relayer/Cargo.toml index 82dff60b..5e4768e5 100644 --- a/services/webb-relayer/Cargo.toml +++ b/services/webb-relayer/Cargo.toml @@ -10,9 +10,6 @@ documentation = { workspace = true } homepage = { workspace = true } repository = { workspace = true } -[build-dependencies] -build-data = "0.1.4" - [lib] doctest = false