Merge branch 'main' into 3082/trade-verifier-jit-orders-support

# Conflicts: # crates/shared/src/trade_finding/mod.rs
cowprotocol · Dec 2, 2024 · ca9109d · ca9109d
2 parents fc0ad49 + 69a68bf
commit ca9109d
Show file tree

Hide file tree

Showing 26 changed files with 140 additions and 163 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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 }