Skip to content

Commit

Permalink
fix(audit): Batcher contains unmaintained and yanked crates (#995)
Browse files Browse the repository at this point in the history
  • Loading branch information
PatStiles authored Sep 24, 2024
1 parent 9d7a2d0 commit bc6f49d
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 22 deletions.
12 changes: 6 additions & 6 deletions batcher/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions batcher/aligned-batcher/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ clap = { version = "4.5.4", features = ["derive"] }
sha3 = "0.10.8"
aws-config = "1.4.0"
aws-sdk-s3 = "1.29.0"
bytes = "1.6.0"
bytes = "1.7.1"
hex = "0.4.3"
dotenv = "0.15.0"
dotenvy = "0.15.0"
anyhow = "1.0.83"
ethers = { tag = "v2.0.15-fix-reconnections", features = [
"ws",
Expand Down
2 changes: 1 addition & 1 deletion batcher/aligned-batcher/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extern crate core;
use aligned_sdk::communication::serialization::{cbor_deserialize, cbor_serialize};
use aligned_sdk::eth::batcher_payment_service::SignatureData;
use config::NonPayingConfig;
use dotenv::dotenv;
use dotenvy::dotenv;
use ethers::contract::ContractError;
use ethers::signers::Signer;
use serde::Serialize;
Expand Down
6 changes: 3 additions & 3 deletions batcher/aligned-batcher/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate dotenv;
extern crate dotenvy;

use std::sync::Arc;

Expand Down Expand Up @@ -32,8 +32,8 @@ async fn main() -> Result<(), BatcherError> {
let port = cli.port.unwrap_or(8080);

match cli.env_file {
Some(env_file) => dotenv::from_filename(env_file).ok(),
None => dotenv::dotenv().ok(),
Some(env_file) => dotenvy::from_filename(env_file).ok(),
None => dotenvy::dotenv().ok(),
};

env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
Expand Down
8 changes: 1 addition & 7 deletions operator_tracker/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion operator_tracker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ log = "0.4.22"
base64 = "0.22.1"
env_logger = "0.11.5"
regex = "1.10.6"
dotenv = "0.15.0"
dotenvy = "0.15.0"
argh = "0.1.12"
4 changes: 2 additions & 2 deletions operator_tracker/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ async fn main() {
let args: Args = argh::from_env();

if let Some(env_file) = args.env_file {
dotenv::from_filename(env_file).expect("Failed to load env file");
dotenvy::from_filename(env_file).expect("Failed to load env file");
} else {
dotenv::dotenv().expect("Failed to load env file");
dotenvy::dotenv().expect("Failed to load env file");
}

env_logger::init();
Expand Down

0 comments on commit bc6f49d

Please sign in to comment.