Skip to content

Commit

Permalink
Merge branch 'main' into 3082/driver-sends-quote-jit-orders
Browse files Browse the repository at this point in the history
# Conflicts:
#	crates/e2e/tests/e2e/quote_verification.rs
#	crates/shared/src/trade_finding/mod.rs
  • Loading branch information
squadgazzz committed Dec 2, 2024
2 parents 523ea2a + eb98aaf commit fdba85c
Show file tree
Hide file tree
Showing 27 changed files with 142 additions and 165 deletions.
101 changes: 40 additions & 61 deletions 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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cached = { version = "0.49.3", default-features = false }
chrono = { version = "0.4.38", default-features = false }
clap = { version = "4.5.6", features = ["derive", "env"] }
derivative = "2.2.0"
derive_more = "0.99.17"
derive_more = { version = "1.0.0", features = ["full"] }
ethcontract = { version = "0.25.7", default-features = false, features = ["aws-kms"] }
mimalloc = "0.1.43"
ethcontract-generate = { version = "0.25.7", default-features = false }
Expand Down
Loading

0 comments on commit fdba85c

Please sign in to comment.