From da176eff0fac9d92783f7b637a1c6cbd6f7ec582 Mon Sep 17 00:00:00 2001 From: die-herdplatte <173669014+die-herdplatte@users.noreply.github.com> Date: Fri, 27 Mar 2026 10:47:17 +0100 Subject: [PATCH 1/5] cargo update --- Cargo.lock | 524 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 375 insertions(+), 149 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a951e7d..802cb78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,17 +26,17 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.4.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355bf68a433e0fd7f7d33d5a9fc2583fde70bf5c530f63b80845f8da5505cf28" +checksum = "de3b431b4e72cd8bd0ec7a50b4be18e73dab74de0dba180eef171055e5d5926e" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more 2.0.1", - "foldhash", - "hashbrown", + "derive_more 2.1.1", + "foldhash 0.2.0", + "hashbrown 0.16.1", "indexmap", "itoa", "k256", @@ -44,23 +44,29 @@ dependencies = [ "paste", "proptest", "rand 0.9.2", + "rapidhash", "ruint", "rustc-hash", "serde", "sha3", - "tiny-keccak", ] [[package]] name = "alloy-rlp" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" +checksum = "e93e50f64a77ad9c5470bf2ad0ca02f228da70c792a8f06634801e202579f35e" dependencies = [ "arrayvec", "bytes", ] +[[package]] +name = "anyhow" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" + [[package]] name = "ark-ff" version = "0.3.0" @@ -146,7 +152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] @@ -184,7 +190,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] @@ -264,14 +270,14 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "base16ct" @@ -281,9 +287,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64ct" -version = "1.8.0" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bit-set" @@ -302,9 +308,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "bitvec" @@ -329,9 +335,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "byte-slice-cast" @@ -347,18 +353,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.2.48" +version = "1.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" +checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" dependencies = [ "find-msvc-tools", "shlex", @@ -372,9 +378,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "const-hex" -version = "1.17.0" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bb320cac8a0750d7f25280aa97b09c26edfe161164238ecbbb31092b079e735" +checksum = "531185e432bb31db1ecda541e9e7ab21468d4d844ad7505e0546a49b4945d49b" dependencies = [ "cfg-if", "cpufeatures", @@ -414,6 +420,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cpufeatures" version = "0.2.17" @@ -425,9 +440,9 @@ dependencies = [ [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-bigint" @@ -478,31 +493,33 @@ version = "0.99.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ + "convert_case 0.10.0", "proc-macro2", "quote", - "syn 2.0.99", + "rustc_version 0.4.1", + "syn 2.0.117", "unicode-xid", ] @@ -550,7 +567,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] @@ -564,8 +581,8 @@ name = "ekubo_sdk" version = "3.1.2" dependencies = [ "alloy-primitives 0.6.4", - "alloy-primitives 1.4.1", - "derive_more 2.0.1", + "alloy-primitives 1.5.7", + "derive_more 2.1.1", "libm", "num-traits", "ruint", @@ -610,7 +627,7 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] @@ -669,9 +686,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fixed-hash" @@ -691,6 +708,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foldhash" version = "0.2.0" @@ -716,9 +739,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -735,8 +758,21 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 5.3.0", + "wasip2", +] + +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", "wasip2", + "wasip3", ] [[package]] @@ -752,14 +788,30 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ - "foldhash", + "foldhash 0.2.0", "serde", + "serde_core", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hex" version = "0.4.3" @@ -781,6 +833,12 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "impl-codec" version = "0.6.0" @@ -798,17 +856,17 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] name = "indexmap" -version = "2.12.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -833,15 +891,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" dependencies = [ "once_cell", "wasm-bindgen", @@ -863,18 +921,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ "cpufeatures", ] [[package]] name = "keccak-asm" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" +checksum = "fa468878266ad91431012b3e5ef1bf9b170eab22883503a318d46857afa4579a" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -900,7 +958,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "018a95aa873eb49896a858dee0d925c33f3978d073c64b08dd4f2c9b35a017c6" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "num-bigint", "num-traits", "rand 0.8.5", @@ -908,29 +966,41 @@ dependencies = [ "serde_json", ] +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" -version = "0.2.177" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libm" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "linux-raw-sys" -version = "0.11.0" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" + +[[package]] +name = "log" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "num-bigint" @@ -963,15 +1033,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "parity-scale-codec" -version = "3.7.4" +version = "3.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fde3d0718baf5bc92f577d652001da0f8d54cd03a7974e118d04fc888dc23d" +checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa" dependencies = [ "arrayvec", "bitvec", @@ -985,14 +1055,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.7.4" +version = "3.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3" +checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] @@ -1003,9 +1073,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pest" -version = "2.8.4" +version = "2.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22" +checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662" dependencies = [ "memchr", "ucd-trie", @@ -1030,6 +1100,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.117", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -1043,27 +1123,27 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40" +checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ "bit-set", "bit-vec", @@ -1086,9 +1166,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.39" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -1099,6 +1179,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "radium" version = "0.7.0" @@ -1123,7 +1209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_core 0.9.5", "serde", ] @@ -1144,7 +1230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1153,14 +1239,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ "getrandom 0.3.4", "serde", @@ -1172,14 +1258,23 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" dependencies = [ - "rand_core 0.9.3", + "rand_core 0.9.5", +] + +[[package]] +name = "rapidhash" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59" +dependencies = [ + "rustversion", ] [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "rfc6979" @@ -1203,9 +1298,9 @@ dependencies = [ [[package]] name = "ruint" -version = "1.17.0" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68df0380e5c9d20ce49534f292a36a7514ae21350726efe1865bdb1fa91d278" +checksum = "c141e807189ad38a07276942c6623032d3753c8859c146104ac2e4d68865945a" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", @@ -1267,9 +1362,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags", "errno", @@ -1296,12 +1391,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "sec1" version = "0.7.3" @@ -1367,20 +1456,20 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -1406,9 +1495,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" +checksum = "59cbb88c189d6352cc8ae96a39d19c7ecad8f7330b29461187f2587fdc2988d5" dependencies = [ "cc", "cfg-if", @@ -1482,9 +1571,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.99" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -1499,12 +1588,12 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.23.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", "rustix", "windows-sys", @@ -1512,22 +1601,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] @@ -1541,18 +1630,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.23.7" +version = "0.25.8+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" +checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c" dependencies = [ "indexmap", "toml_datetime", @@ -1562,9 +1651,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011" dependencies = [ "winnow", ] @@ -1601,9 +1690,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "unicode-segmentation" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" [[package]] name = "unicode-xid" @@ -1640,18 +1735,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ "cfg-if", "once_cell", @@ -1662,9 +1766,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1672,26 +1776,60 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap", + "semver 1.0.27", +] + [[package]] name = "windows-link" version = "0.2.1" @@ -1709,18 +1847,100 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.14" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" dependencies = [ "memchr", ] [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "prettyplease", + "syn 2.0.117", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.117", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver 1.0.27", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] [[package]] name = "wyz" @@ -1733,22 +1953,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] [[package]] @@ -1762,11 +1982,17 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.117", ] + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" From 4f3e7d360ab3fd27bb771ed1fea42bf16531a7fe Mon Sep 17 00:00:00 2001 From: die-herdplatte <173669014+die-herdplatte@users.noreply.github.com> Date: Fri, 27 Mar 2026 11:03:22 +0100 Subject: [PATCH 2/5] Upgrade Rust edition to 2024 --- Cargo.toml | 2 +- src/chain/evm.rs | 4 ++-- src/math/delta.rs | 6 +++--- src/math/muldiv.rs | 2 +- src/math/sqrt_ratio.rs | 2 +- src/math/swap.rs | 4 ++-- src/math/tick.rs | 2 +- src/quoting/pools/concentrated.rs | 10 +++++----- src/quoting/pools/full_range.rs | 10 +++++----- src/quoting/pools/limit_order.rs | 2 +- src/quoting/pools/mev_capture.rs | 10 +++++----- src/quoting/pools/oracle.rs | 10 +++++----- src/quoting/pools/spline.rs | 2 +- src/quoting/pools/stableswap.rs | 14 +++++++------- src/quoting/pools/twamm.rs | 2 +- src/quoting/util.rs | 2 +- 16 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4573c9d..dfb0805 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ authors = [ "Mahmoud Salem ", "Die Herdplatte ", ] -edition = "2021" +edition = "2024" license = "LGPL-2.1" description = "Types for interacting with Ekubo Protocol on Starknet & EVM chains" homepage = "https://ekubo.org" diff --git a/src/chain/evm.rs b/src/chain/evm.rs index 3e0c49a..5b85457 100644 --- a/src/chain/evm.rs +++ b/src/chain/evm.rs @@ -1,5 +1,5 @@ -use crate::alloy_primitives::{aliases::B32, fixed_bytes, Address, FixedBytes, B256, U256}; -use crate::alloy_primitives::{uint, Keccak256}; +use crate::alloy_primitives::{Address, B256, FixedBytes, U256, aliases::B32, fixed_bytes}; +use crate::alloy_primitives::{Keccak256, uint}; use derive_more::From; use num_traits::Zero as _; use thiserror::Error; diff --git a/src/math/delta.rs b/src/math/delta.rs index 446583f..113c58c 100644 --- a/src/math/delta.rs +++ b/src/math/delta.rs @@ -1,7 +1,7 @@ use core::ops::Not; use crate::math::{ - muldiv::{muldiv, MuldivError}, + muldiv::{MuldivError, muldiv}, sqrt_ratio::SQRT_RATIO_ONE, }; use num_traits::Zero; @@ -83,10 +83,10 @@ fn sort_ratios(sqrt_ratio_a: U256, sqrt_ratio_b: U256) -> Option<(U256, U256)> { mod tests { use super::*; use crate::chain::{ + Chain, evm::Evm, starknet::Starknet, - tests::{ChainEnum, CHAINS}, - Chain, + tests::{CHAINS, ChainEnum}, }; use ruint::uint; diff --git a/src/math/muldiv.rs b/src/math/muldiv.rs index 838ddb6..acf1383 100644 --- a/src/math/muldiv.rs +++ b/src/math/muldiv.rs @@ -1,6 +1,6 @@ use ruint::{ - aliases::{U256, U512}, UintTryFrom, + aliases::{U256, U512}, }; use thiserror::Error; diff --git a/src/math/sqrt_ratio.rs b/src/math/sqrt_ratio.rs index 3da9749..144e42d 100644 --- a/src/math/sqrt_ratio.rs +++ b/src/math/sqrt_ratio.rs @@ -1,4 +1,4 @@ -use crate::math::muldiv::{muldiv, MuldivError}; +use crate::math::muldiv::{MuldivError, muldiv}; use num_traits::Zero; use ruint::aliases::U256; use thiserror::Error; diff --git a/src/math/swap.rs b/src/math/swap.rs index 4027cf1..bc7a0e9 100644 --- a/src/math/swap.rs +++ b/src/math/swap.rs @@ -1,7 +1,7 @@ use crate::math::sqrt_ratio::{next_sqrt_ratio_from_amount0, next_sqrt_ratio_from_amount1}; use crate::{ chain::Chain, - math::delta::{amount0_delta, amount1_delta, AmountDeltaError}, + math::delta::{AmountDeltaError, amount0_delta, amount1_delta}, }; use num_traits::Zero; use ruint::aliases::U256; @@ -200,7 +200,7 @@ mod tests { chain::{ evm::Evm, starknet::Starknet, - tests::{ChainEnum, CHAINS}, + tests::{CHAINS, ChainEnum}, }, math::sqrt_ratio::SQRT_RATIO_ONE, }; diff --git a/src/math/tick.rs b/src/math/tick.rs index 401a94c..0bbf6d3 100644 --- a/src/math/tick.rs +++ b/src/math/tick.rs @@ -78,7 +78,7 @@ mod tests { use crate::chain::{ evm::Evm, starknet::Starknet, - tests::{ChainEnum, CHAINS}, + tests::{CHAINS, ChainEnum}, }; mod to_sqrt_ratio { diff --git a/src/quoting/pools/concentrated.rs b/src/quoting/pools/concentrated.rs index 8b24a90..0f9d7bd 100644 --- a/src/quoting/pools/concentrated.rs +++ b/src/quoting/pools/concentrated.rs @@ -1,15 +1,15 @@ use crate::private; use crate::quoting::pools::{ - ensure_valid_token_order, is_token1, CommonPoolConstructionError, CommonPoolQuoteError, + CommonPoolConstructionError, CommonPoolQuoteError, ensure_valid_token_order, is_token1, }; use crate::quoting::types::{Pool, PoolConfig, PoolKey, Quote, QuoteParams, Tick}; use crate::quoting::util::{ - approximate_extra_distinct_tick_bitmap_lookups, construct_sorted_ticks, - ConstructSortedTicksError, + ConstructSortedTicksError, approximate_extra_distinct_tick_bitmap_lookups, + construct_sorted_ticks, }; use crate::{ chain::Chain, - math::swap::{compute_step, is_price_increasing, ComputeStepError}, + math::swap::{ComputeStepError, compute_step, is_price_increasing}, }; use crate::{math::tick::to_sqrt_ratio, quoting::types::PoolState}; use alloc::vec::Vec; @@ -520,7 +520,7 @@ mod tests { use crate::{ chain::{ starknet::Starknet, - tests::{run_for_all_chains, ChainTest}, + tests::{ChainTest, run_for_all_chains}, }, math::sqrt_ratio::SQRT_RATIO_ONE, quoting::types::{PoolConfig, TokenAmount}, diff --git a/src/quoting/pools/full_range.rs b/src/quoting/pools/full_range.rs index a2ca87c..799a427 100644 --- a/src/quoting/pools/full_range.rs +++ b/src/quoting/pools/full_range.rs @@ -1,14 +1,14 @@ -use crate::{ - chain::evm::Evm, - math::swap::{compute_step, is_price_increasing, ComputeStepError}, -}; use crate::{ chain::Chain, quoting::pools::{ - ensure_valid_token_order, is_token1, CommonPoolConstructionError, CommonPoolQuoteError, + CommonPoolConstructionError, CommonPoolQuoteError, ensure_valid_token_order, is_token1, }, quoting::types::{Pool, PoolConfig, PoolKey, Quote, QuoteParams}, }; +use crate::{ + chain::evm::Evm, + math::swap::{ComputeStepError, compute_step, is_price_increasing}, +}; use crate::{private, quoting::types::PoolState}; use derive_more::{Add, AddAssign, Sub, SubAssign}; use num_traits::Zero; diff --git a/src/quoting/pools/limit_order.rs b/src/quoting/pools/limit_order.rs index 253b4b5..f9c41c6 100644 --- a/src/quoting/pools/limit_order.rs +++ b/src/quoting/pools/limit_order.rs @@ -7,8 +7,8 @@ use crate::quoting::{ pools::concentrated::{ConcentratedPoolResources, ConcentratedPoolTypeConfig}, types::PoolState, }; -use crate::{chain::starknet::Starknet, math::swap::is_price_increasing}; use crate::{chain::Chain, quoting::pools::concentrated::ConcentratedPoolState}; +use crate::{chain::starknet::Starknet, math::swap::is_price_increasing}; use crate::{math::tick::to_sqrt_ratio, quoting::types::PoolConfig}; use crate::{ private, diff --git a/src/quoting/pools/mev_capture.rs b/src/quoting/pools/mev_capture.rs index f395b1f..be71301 100644 --- a/src/quoting/pools/mev_capture.rs +++ b/src/quoting/pools/mev_capture.rs @@ -4,7 +4,11 @@ use ruint::aliases::U256; use thiserror::Error; use crate::{ - chain::evm::{Evm, EVM_FULL_RANGE_TICK_SPACING}, + chain::Chain, + quoting::types::{BlockTimestamp, Pool, PoolConfig, PoolKey, Quote, QuoteParams}, +}; +use crate::{ + chain::evm::{EVM_FULL_RANGE_TICK_SPACING, Evm}, math::{ facade::round_f64, swap::{amount_before_fee, compute_fee}, @@ -15,10 +19,6 @@ use crate::{ ConcentratedPoolState, ConcentratedPoolTypeConfig, TickSpacing, }, }; -use crate::{ - chain::Chain, - quoting::types::{BlockTimestamp, Pool, PoolConfig, PoolKey, Quote, QuoteParams}, -}; use crate::{math::tick::approximate_sqrt_ratio_to_tick, quoting::types::PoolState}; /// MEV-capture pool that wraps a concentrated liquidity pool with time-aware fees. diff --git a/src/quoting/pools/oracle.rs b/src/quoting/pools/oracle.rs index 49d22a6..ac518d3 100644 --- a/src/quoting/pools/oracle.rs +++ b/src/quoting/pools/oracle.rs @@ -197,13 +197,13 @@ mod tests { use super::*; use crate::{ chain::{ + Chain, starknet::{ - Starknet, STARKNET_MAX_SQRT_RATIO_AT_MAX_TICK_SPACING, - STARKNET_MAX_TICK_AT_MAX_TICK_SPACING, STARKNET_MIN_SQRT_RATIO_AT_MAX_TICK_SPACING, - STARKNET_MIN_TICK_AT_MAX_TICK_SPACING, + STARKNET_MAX_SQRT_RATIO_AT_MAX_TICK_SPACING, STARKNET_MAX_TICK_AT_MAX_TICK_SPACING, + STARKNET_MIN_SQRT_RATIO_AT_MAX_TICK_SPACING, STARKNET_MIN_TICK_AT_MAX_TICK_SPACING, + Starknet, }, - tests::{chain_test, ChainTest}, - Chain, + tests::{ChainTest, chain_test}, }, math::tick::to_sqrt_ratio, quoting::types::{Pool, PoolState, QuoteParams, TokenAmount}, diff --git a/src/quoting/pools/spline.rs b/src/quoting/pools/spline.rs index b7d50c2..cb6969e 100644 --- a/src/quoting/pools/spline.rs +++ b/src/quoting/pools/spline.rs @@ -1,5 +1,5 @@ use crate::{ - chain::{starknet::Starknet, Chain}, + chain::{Chain, starknet::Starknet}, quoting::pools::concentrated::{ ConcentratedPool, ConcentratedPoolConstructionError, ConcentratedPoolKey, ConcentratedPoolQuoteError, ConcentratedPoolResources, ConcentratedPoolState, diff --git a/src/quoting/pools/stableswap.rs b/src/quoting/pools/stableswap.rs index 9781e7b..969eddd 100644 --- a/src/quoting/pools/stableswap.rs +++ b/src/quoting/pools/stableswap.rs @@ -1,17 +1,17 @@ -use crate::{ - chain::evm::{Evm, EVM_MAX_STABLESWAP_AMPLIFICATION_FACTOR}, - math::swap::{compute_step, is_price_increasing, ComputeStepError}, - private, - quoting::pools::full_range::FullRangePoolState, -}; use crate::{ chain::Chain, math::tick::to_sqrt_ratio, quoting::pools::{ - ensure_valid_token_order, is_token1, CommonPoolConstructionError, CommonPoolQuoteError, + CommonPoolConstructionError, CommonPoolQuoteError, ensure_valid_token_order, is_token1, }, quoting::types::{Pool, PoolConfig, PoolKey, Quote, QuoteParams, TokenAmount}, }; +use crate::{ + chain::evm::{EVM_MAX_STABLESWAP_AMPLIFICATION_FACTOR, Evm}, + math::swap::{ComputeStepError, compute_step, is_price_increasing}, + private, + quoting::pools::full_range::FullRangePoolState, +}; use derive_more::{Add, AddAssign, Sub, SubAssign}; use ruint::aliases::U256; use thiserror::Error; diff --git a/src/quoting/pools/twamm.rs b/src/quoting/pools/twamm.rs index 8c8bca1..a54a786 100644 --- a/src/quoting/pools/twamm.rs +++ b/src/quoting/pools/twamm.rs @@ -416,7 +416,7 @@ mod tests { use crate::{ chain::{ evm::Evm, - tests::{run_for_all_chains, ChainEnum, ChainTest}, + tests::{ChainEnum, ChainTest, run_for_all_chains}, }, math::tick::to_sqrt_ratio, quoting::types::{Pool, QuoteParams, TokenAmount}, diff --git a/src/quoting/util.rs b/src/quoting/util.rs index e182e9d..2b4b636 100644 --- a/src/quoting/util.rs +++ b/src/quoting/util.rs @@ -194,7 +194,7 @@ pub fn real_last_time(current: u64, stored: u32) -> u64 { mod tests { use super::*; use crate::{ - chain::{tests::run_for_all_chains, Chain}, + chain::{Chain, tests::run_for_all_chains}, math::tick::to_sqrt_ratio, quoting::types::Tick, }; From f394401cac9feb552089e58ca642eae0c4ba4d97 Mon Sep 17 00:00:00 2001 From: die-herdplatte <173669014+die-herdplatte@users.noreply.github.com> Date: Fri, 27 Mar 2026 11:24:27 +0100 Subject: [PATCH 3/5] cargo clippy --fix --- src/quoting/pools/concentrated.rs | 10 ++++------ src/quoting/pools/mev_capture.rs | 15 ++++++--------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/quoting/pools/concentrated.rs b/src/quoting/pools/concentrated.rs index 0f9d7bd..ca97fdb 100644 --- a/src/quoting/pools/concentrated.rs +++ b/src/quoting/pools/concentrated.rs @@ -228,11 +228,10 @@ impl ConcentratedPool { for (i, tick) in sorted_ticks.iter().enumerate() { // Verify ticks are sorted - if let Some(last) = last_tick { - if tick.index <= last { + if let Some(last) = last_tick + && tick.index <= last { return Err(ConcentratedPoolConstructionError::TicksNotSorted); } - } // Verify ticks are multiples of tick_spacing if !(tick.index % spacing_i32).is_zero() { @@ -250,13 +249,12 @@ impl ConcentratedPool { .ok_or(ConcentratedPoolConstructionError::ActiveLiquidityOverflow)?; // Calculate active liquidity - if let Some(active_index) = state.active_tick_index { - if i <= active_index { + if let Some(active_index) = state.active_tick_index + && i <= active_index { active_liquidity = active_liquidity .checked_add_signed(tick.liquidity_delta) .ok_or(ConcentratedPoolConstructionError::ActiveLiquidityOverflow)?; } - } } // Verify total liquidity is zero diff --git a/src/quoting/pools/mev_capture.rs b/src/quoting/pools/mev_capture.rs index be71301..0aeb11e 100644 --- a/src/quoting/pools/mev_capture.rs +++ b/src/quoting/pools/mev_capture.rs @@ -110,21 +110,18 @@ impl MevCapturePool { // validates that the current tick is between the active tick and the active tick index + 1 if let Some(i) = concentrated_pool.state().active_tick_index { let sorted_ticks = concentrated_pool.ticks(); - if let Some(t) = sorted_ticks.get(i) { - if t.index > tick { + if let Some(t) = sorted_ticks.get(i) + && t.index > tick { return Err(MevCapturePoolConstructionError::InvalidCurrentTick); } - } - if let Some(t) = sorted_ticks.get(i + 1) { - if t.index <= tick { + if let Some(t) = sorted_ticks.get(i + 1) + && t.index <= tick { return Err(MevCapturePoolConstructionError::InvalidCurrentTick); } - } - } else if let Some(t) = concentrated_pool.ticks().first() { - if t.index <= tick { + } else if let Some(t) = concentrated_pool.ticks().first() + && t.index <= tick { return Err(MevCapturePoolConstructionError::InvalidCurrentTick); } - } Ok(Self { concentrated_pool, From c28af826ea76fa1e17d3d4f3c940b2ac6f54a5f9 Mon Sep 17 00:00:00 2001 From: die-herdplatte <173669014+die-herdplatte@users.noreply.github.com> Date: Fri, 27 Mar 2026 12:00:18 +0100 Subject: [PATCH 4/5] cargo fmt --- src/quoting/pools/concentrated.rs | 18 ++++++++++-------- src/quoting/pools/mev_capture.rs | 19 +++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/quoting/pools/concentrated.rs b/src/quoting/pools/concentrated.rs index ca97fdb..e2c859a 100644 --- a/src/quoting/pools/concentrated.rs +++ b/src/quoting/pools/concentrated.rs @@ -229,9 +229,10 @@ impl ConcentratedPool { for (i, tick) in sorted_ticks.iter().enumerate() { // Verify ticks are sorted if let Some(last) = last_tick - && tick.index <= last { - return Err(ConcentratedPoolConstructionError::TicksNotSorted); - } + && tick.index <= last + { + return Err(ConcentratedPoolConstructionError::TicksNotSorted); + } // Verify ticks are multiples of tick_spacing if !(tick.index % spacing_i32).is_zero() { @@ -250,11 +251,12 @@ impl ConcentratedPool { // Calculate active liquidity if let Some(active_index) = state.active_tick_index - && i <= active_index { - active_liquidity = active_liquidity - .checked_add_signed(tick.liquidity_delta) - .ok_or(ConcentratedPoolConstructionError::ActiveLiquidityOverflow)?; - } + && i <= active_index + { + active_liquidity = active_liquidity + .checked_add_signed(tick.liquidity_delta) + .ok_or(ConcentratedPoolConstructionError::ActiveLiquidityOverflow)?; + } } // Verify total liquidity is zero diff --git a/src/quoting/pools/mev_capture.rs b/src/quoting/pools/mev_capture.rs index 0aeb11e..da90679 100644 --- a/src/quoting/pools/mev_capture.rs +++ b/src/quoting/pools/mev_capture.rs @@ -111,17 +111,20 @@ impl MevCapturePool { if let Some(i) = concentrated_pool.state().active_tick_index { let sorted_ticks = concentrated_pool.ticks(); if let Some(t) = sorted_ticks.get(i) - && t.index > tick { - return Err(MevCapturePoolConstructionError::InvalidCurrentTick); - } + && t.index > tick + { + return Err(MevCapturePoolConstructionError::InvalidCurrentTick); + } if let Some(t) = sorted_ticks.get(i + 1) - && t.index <= tick { - return Err(MevCapturePoolConstructionError::InvalidCurrentTick); - } - } else if let Some(t) = concentrated_pool.ticks().first() - && t.index <= tick { + && t.index <= tick + { return Err(MevCapturePoolConstructionError::InvalidCurrentTick); } + } else if let Some(t) = concentrated_pool.ticks().first() + && t.index <= tick + { + return Err(MevCapturePoolConstructionError::InvalidCurrentTick); + } Ok(Self { concentrated_pool, From 2f6a3bf4ebc306b9124308a8744539517e77f017 Mon Sep 17 00:00:00 2001 From: die-herdplatte <173669014+die-herdplatte@users.noreply.github.com> Date: Fri, 27 Mar 2026 12:00:24 +0100 Subject: [PATCH 5/5] Extend `check` recipe --- justfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/justfile b/justfile index fbadea5..a69dd21 100644 --- a/justfile +++ b/justfile @@ -3,3 +3,5 @@ test: check: cargo check --features serde,evm,starknet + cargo clippy --features evm,starknet,serde --workspace -- -D warnings + cargo fmt --check