diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35b9f04..0f9cf19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: run: echo "SOURCE_DATE_EPOCH=$(git log -1 --format=%ct)" >> "$GITHUB_ENV" - name: Build - run: repro-env build --env CFLAGS="-fno-link-libatomic" --env SOURCE_DATE_EPOCH -- cargo build --features sev-snp,smtp --release --target x86_64-unknown-linux-musl + run: repro-env build --env SOURCE_DATE_EPOCH -- cargo build --features sev-snp,smtp --release --target x86_64-unknown-linux-musl --bin ic-gateway - name: Generate SHA checksum run: shasum target/x86_64-unknown-linux-musl/release/ic-gateway > ic-gateway.shasum @@ -46,7 +46,7 @@ jobs: run: rm -rf target - name: Build again - run: repro-env build --env CFLAGS="-fno-link-libatomic" --env SOURCE_DATE_EPOCH -- cargo build --features sev-snp,smtp --release --target x86_64-unknown-linux-musl + run: repro-env build --env SOURCE_DATE_EPOCH -- cargo build --features sev-snp,smtp --release --target x86_64-unknown-linux-musl --bin ic-gateway - name: Check SHA checksum run: shasum -c ic-gateway.shasum diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c366e2b..6fb4c1c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,4 +40,4 @@ jobs: ./run-tests.sh - name: Build using repro-env - run: repro-env build --env CFLAGS="-fno-link-libatomic" -- cargo build --features sev-snp --target x86_64-unknown-linux-musl + run: repro-env build -- cargo build --all-features --target x86_64-unknown-linux-musl --bin ic-gateway diff --git a/Cargo.lock b/Cargo.lock index 5823284..29fe0dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -142,15 +142,6 @@ dependencies = [ "object", ] -[[package]] -name = "arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" -dependencies = [ - "derive_arbitrary", -] - [[package]] name = "arc-swap" version = "1.9.2" @@ -350,7 +341,7 @@ checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -513,6 +504,15 @@ dependencies = [ "rand 0.8.7", ] +[[package]] +name = "backon" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" +dependencies = [ + "fastrand", +] + [[package]] name = "base16ct" version = "0.2.0" @@ -969,9 +969,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.3" +version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb99565819980999fb7b4a1796046a5c949e6d4ff132cf5fadf5a641e20d776" +checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7" dependencies = [ "clap_builder", "clap_derive", @@ -991,14 +991,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.3" +version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f2392eae7f16557a3d727ef3a12e57b2b2ca6f98566a5f4fb41ffe305df077" +checksum = "d012d2b9d65aca7f18f4d9878a045bc17899bba951561ba5ec3c2ba1eed9a061" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] @@ -1531,17 +1531,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "derive_arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "digest" version = "0.9.0" @@ -1867,7 +1856,6 @@ checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", - "zlib-rs", ] [[package]] @@ -2619,16 +2607,16 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.47.3" +version = "0.49.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85dbab284eac1806b77833cff143d66ae97aae74d34b0e60fb4ab4edf3d6fa12" +checksum = "1f9086b59107b6d6485a915762a2a3986ef208e80bb40eff22d099bbcd71deea" dependencies = [ "arc-swap", "async-channel 2.5.0", "async-lock", "async-trait", "async-watch", - "backoff", + "backon", "bytes", "cached 0.56.0", "candid", @@ -2642,7 +2630,7 @@ dependencies = [ "http-body-util", "ic-certification 3.2.0", "ic-ed25519", - "ic-transport-types 0.47.3", + "ic-transport-types 0.49.2", "ic-verify-bls-signature", "ic_principal", "k256", @@ -2669,9 +2657,9 @@ dependencies = [ [[package]] name = "ic-bn-lib" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91da5c27b490f0212b68c7871fa73faabc9e4585527c320ef4e06642395575dd" +checksum = "1ea8fa20bc6bac82a9491e26a43b70b9e0f276da534957c6cf0d589cf1a689ac" dependencies = [ "ahash", "anyhow", @@ -2754,8 +2742,6 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "utoipa", - "utoipa-swagger-ui", "uuid", "vrl", "webpki-root-certs", @@ -2967,7 +2953,7 @@ dependencies = [ "ic-certified-assets", "ic-http-certification 3.2.0", "ic-http-gateway-protocol", - "ic-transport-types 0.47.3", + "ic-transport-types 0.49.2", "isbot", "itertools 0.15.0", "lazy_static", @@ -3041,7 +3027,7 @@ dependencies = [ [[package]] name = "ic-http-gateway-protocol" version = "0.0.0-git" -source = "git+https://github.com/dfinity/ic-http-gateway-protocol?tag=v0.5.1#ec1a288ec9f02cd3a398be429a30399844bca2e4" +source = "git+https://github.com/dfinity/ic-http-gateway-protocol?tag=v0.6.0#cf47127b978b1ed9c64cf6cbc3ce82c93cec4c6c" dependencies = [ "bytes", "candid", @@ -3069,9 +3055,9 @@ dependencies = [ [[package]] name = "ic-management-canister-types" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51705516ed4d23f24e8d714a70fe9d7ec17106cfd830d5434a1b29f583ef70ee" +checksum = "3187ba94198a8df0e38a478f289812fcead6a86c658b9552b00f1f8081f06bb3" dependencies = [ "candid", "serde", @@ -3166,9 +3152,9 @@ dependencies = [ [[package]] name = "ic-transport-types" -version = "0.47.3" +version = "0.49.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2116182b3ec5a831d579db0a205b6cf9c2ca96616493bef99480532d0b3c2f5" +checksum = "e2d13d859ea481e8d5766a54a3b4dfcf4c11ff6f21d5e2aeaf9a44dd710a76ff" dependencies = [ "candid", "hex", @@ -3184,15 +3170,15 @@ dependencies = [ [[package]] name = "ic-utils" -version = "0.47.3" +version = "0.49.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f793db5d338dd9d0b659c2ce40080d7c9811cff6f171560f781cd2d6a43b7353" +checksum = "750a78f121d81831af5cdf065cf1f89efd5b4fe7822130b4b32eb296ad515d67" dependencies = [ "async-trait", "candid", "futures-util", "ic-agent", - "ic-management-canister-types 0.7.1", + "ic-management-canister-types 0.8.0", "once_cell", "semver", "serde", @@ -3719,9 +3705,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" -version = "0.2.188" +version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22053b6a34f84abc97f9129e61334f40174659a1b9bd18c970b83db6a9a6348b" +checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" [[package]] name = "libm" @@ -3820,7 +3806,7 @@ dependencies = [ "serde", "serde_json", "similar", - "zip 8.6.0", + "zip", ] [[package]] @@ -5013,7 +4999,7 @@ checksum = "2c9283685feec7d69af75fb0e858d5e7378f33fe4fc699383b2916ab9273e03c" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -5212,41 +5198,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rust-embed" -version = "8.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097" -dependencies = [ - "mime_guess", - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.119", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0" -dependencies = [ - "sha2 0.11.0", - "walkdir", -] - [[package]] name = "rustc-hash" version = "2.1.3" @@ -5351,9 +5302,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ "web-time", "zeroize", @@ -5576,7 +5527,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -5622,7 +5573,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -6085,9 +6036,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a207d6d6a2b7fc470b80443726053f18a2481b7e1eee970597051596567987a3" +checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" dependencies = [ "proc-macro2", "quote", @@ -6233,7 +6184,7 @@ checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" dependencies = [ "proc-macro2", "quote", - "syn 3.0.2", + "syn 3.0.3", ] [[package]] @@ -6413,9 +6364,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b" dependencies = [ "futures-core", "pin-project-lite", @@ -6424,9 +6375,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52" dependencies = [ "bytes", "futures-core", @@ -6434,6 +6385,7 @@ dependencies = [ "futures-sink", "futures-util", "hashbrown 0.15.5", + "libc", "pin-project-lite", "slab", "tokio", @@ -6795,48 +6747,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "utoipa" -version = "5.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde15df68e80b16c7d16b9616e80770ad158988daa56a27dccd1e55558b0160" -dependencies = [ - "indexmap 2.14.0", - "serde", - "serde_json", - "utoipa-gen", -] - -[[package]] -name = "utoipa-gen" -version = "5.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba0b99ee52df3028635d93840c797102da61f8a7bb3cf751032455895b52ef8" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 2.0.119", -] - -[[package]] -name = "utoipa-swagger-ui" -version = "9.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d047458f1b5b65237c2f6dc6db136945667f40a7668627b3490b9513a3d43a55" -dependencies = [ - "axum", - "base64 0.22.1", - "mime_guess", - "regex", - "rust-embed", - "serde", - "serde_json", - "url", - "utoipa", - "zip 3.0.0", -] - [[package]] name = "uuid" version = "1.12.1" @@ -7518,20 +7428,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "zip" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308" -dependencies = [ - "arbitrary", - "crc32fast", - "flate2", - "indexmap 2.14.0", - "memchr", - "zopfli", -] - [[package]] name = "zip" version = "8.6.0" @@ -7545,30 +7441,12 @@ dependencies = [ "typed-path", ] -[[package]] -name = "zlib-rs" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b142a20ec14a91d5bc708c1dc21b080c550113d8aa77afa29635673a65dd02c5" - [[package]] name = "zmij" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" -[[package]] -name = "zopfli" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" -dependencies = [ - "bumpalo", - "crc32fast", - "log", - "simd-adler32", -] - [[package]] name = "zstd" version = "0.13.3" diff --git a/Cargo.toml b/Cargo.toml index 745cdff..e87ec93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,11 @@ default = [] smtp = ["ic-bn-lib/smtp"] sev-snp = ["ic-bn-lib/sev-snp"] acme = ["ic-bn-lib/acme-dns", "ic-bn-lib/acme-alpn"] -bench = ["dep:ic-http-certification", "dep:rand_regex"] +bench = [ + "dep:ic-http-certification", + "dep:ic-transport-types", + "dep:rand_regex", +] tokio_console = ["dep:console-subscriber"] debug = [] @@ -35,7 +39,7 @@ http = "1.3.1" http-body = "1.0.1" http-body-util = "0.1.2" humantime = "2.2.0" -ic-bn-lib = { version = "0.4.1", features = [ +ic-bn-lib = { version = "0.5.0", features = [ "cert-providers", "lb", "clients-hyper", @@ -43,8 +47,9 @@ ic-bn-lib = { version = "0.4.1", features = [ "vector", ] } ic-http-certification = { version = "3.1.0", optional = true } -ic-transport-types = "0.47" -ic-http-gateway-protocol = { package = "ic-http-gateway-protocol", git = "https://github.com/dfinity/ic-http-gateway-protocol", tag = "v0.5.1" } +ic-http-gateway-protocol = { package = "ic-http-gateway-protocol", git = "https://github.com/dfinity/ic-http-gateway-protocol", tag = "v0.6.0" } +# TODO: drop & re-export from ic-bn-lib +ic-transport-types = { version = "0.49", optional = true } isbot = "0.1" itertools = "0.15.0" lazy_static = "1.5.0" @@ -97,6 +102,8 @@ hex = "0.4.3" httptest = "0.16.1" ic-certified-assets = { git = "https://github.com/dfinity/sdk.git", rev = "d65717bd6d0c172247c37dd23395c9fb13b2ba20" } ic-http-certification = "3.1.0" +# TODO: drop & re-export from ic-bn-lib +ic-transport-types = "0.49" mockall = "0.15.0" nix = { version = "0.31.0", features = ["signal"] } pocket-ic = "=13.0.0" diff --git a/repro-env.lock b/repro-env.lock index 22b0b11..8fe1581 100644 --- a/repro-env.lock +++ b/repro-env.lock @@ -1,29 +1,37 @@ [container] -image = "docker.io/library/archlinux@sha256:36301eef718527e362e568206b7606a3246c1fc089b24fce20c47cf68065f229" +image = "docker.io/library/archlinux@sha256:592e11bd99ab579f933a0cb77a8f66e2f3ae57f5eafacf13aea44a6e98ef21ae" [[package]] name = "abseil-cpp" -version = "20260107.1-1" +version = "20260526.0-2" system = "archlinux" -url = "https://archive.archlinux.org/packages/a/abseil-cpp/abseil-cpp-20260107.1-1-x86_64.pkg.tar.zst" -sha256 = "84f5d6e68585d650f02aaa84e8a0a681483cca0734a67bec1c6ba09ebbd893c9" -signature = "iQIzBAABCgAdFiEE8AuW0VIoAT/8nJ0Dk7EdqkwZfj0FAmnGwzoACgkQk7EdqkwZfj3UYQ//UIYzZaTzFYj7uqSSSF/kI8VxBi1tYifPhcc6kHVjW90SVBTPG2ess58gjU2BGV/jP7NKlwUuxiwlkFCjHkDrC0GRWyDYxOUuQFDARkH1D/yxBdvaUamnMbnrTTHaBuPoAs6hXcOhV8e5C0LKd1NblLM0dGdwuzDrHRJ1Wp7HSe2ZhK52FmBsWL2mxco7JilZLoTrmKs9loGzdsd8J+QyHurpf/c0Grh4fD+b/XhajbeJaBYdVEgyE5BgEg1MDc83NKfx+uUDO1yaP3NJQPrqyj1GtHhR9ehcxzPciVGbCkwEmEdDun256nr6Q1c2DOxqUb9Y0nxl8gtpB3lpF1nQIW/ReukU5yd7SgL5OK9A27C6BO8WniFcB/kjOD7pwZTo7vAn61WQp+drsJRRleblvxlIdexZIeV6iZdGbQcqpOPARenRiZmBsXlwARoUvPD4nRgxWJhSRJnwS+PnkSRqcDQraf2RblxBRFt1xk4SagbWuh9SJT+LSmBuUYZsOv3umlS16a6HDD1hEJn1CBllaYpvOwLBcEwBN10/R+vVM6tNFCsPCeBMNQ8T8RaNhaeqAogEoqHoxD3Eqm0DZGQD8GN6DuAeIgvMj0tJgUEN4Fkr1JNn+WBeuek/bgw8vcNgpu39Qh+hGwKosLcKDwTCap7XNIMsySbPPrZesWN5WaY=" +url = "https://archive.archlinux.org/packages/a/abseil-cpp/abseil-cpp-20260526.0-2-x86_64.pkg.tar.zst" +sha256 = "6266ca9133e80c3f1643480d67d2a113b0b427b79ea8611b06cca9b4ddfa1694" +signature = "iQIzBAABCgAdFiEEj8FaBklQqZ3RvRTdOeS4d+YuuRUFAmop/QAACgkQOeS4d+YuuRVmqQ/+M2ISHEcTN7hPHS80X+Y2e2AdvzmZNaOgWJ/OS3vC0R4w9s0gTzo0a4qsKETrIDF6VrmjbqdRmHjcA3VcmWzDF//y64wcnYTEoPs4Y6lRWhTEblf1g68HeJJw7nnM/V4cprUxuI6jfBrnFl/y/xiI0iXsknfDTVQFfUQP/BMU7wxoKAIl4oDRQDEtG8Sm5/M4Bl6/oF+zCPkE9LPxRPsmtbXgZfP4d7RO/VjSyGDuuSJ+fjpePvjN2JjKveHBWRdh2wegVNs5hgH2zdCPJZUkQU9c6PtI7Rzrm6LrdqJge30BFqyBWDswtfMFBAFbHc8Eh48Twk+uKrCzjc7YFZb9tK81t7VvV4sFNcqeLHqgG1bBkLRLr6tKRILVZYsjEmTH/IlDBJQ6NTzXQCiYmO1HT5Gw/9mnCOXrntYmgL6CElNMj2uAlb0ZJqLQSP80Batc2tJDGOhuE9cyK2PiiKj4/nNAKFOkYe2mjx7v2Ibpo8fJkfLwDkn6rCIskZGF+qyEAcee+2DQCA/gtZSSyvlYsvmmJv9WeOIcuxOPj85n07zk8D7Zc4f+cNFz8Dda1VBnH5UgSX80ewGHmgVINMJF/csLIMb72QgTT8NUg6Yro7ptBtrkd1OoHGgnVfisaCuFLcXXOUm6CRqwtexnaKD+Vr0uY5m1rU4MJrfPfPKmpNw=" + +[[package]] +name = "ca-certificates-mozilla" +version = "3.126-1" +system = "archlinux" +url = "https://archive.archlinux.org/packages/c/ca-certificates-mozilla/ca-certificates-mozilla-3.126-1-x86_64.pkg.tar.zst" +sha256 = "a734f218ff0c21f97edbd3304cd9f35aa083aa59dbae977856facc798daab415" +signature = "iHUEABYKAB0WIQSDvIiJNRtd67toQW64rAhgDxCM3wUCalsT0wAKCRC4rAhgDxCM32WfAQD8n/vtCqXLrAZQoC+Bf/NWOn49opBaAD6H1ClZiWDsggEA+Vpc+7tsBHDYGPJw9XNVYJ/03F+JoHRmMdy/hS69iQc=" [[package]] name = "cmake" -version = "4.3.2-1" +version = "4.4.0-2" system = "archlinux" -url = "https://archive.archlinux.org/packages/c/cmake/cmake-4.3.2-1-x86_64.pkg.tar.zst" -sha256 = "a450d6b4f0785592f1c8ccfe1508f956465088f6479163e82b90f9568a0d9100" -signature = "iQEzBAABCgAdFiEEFRnVq6Zb9vwrc8dWek52CV2KUuQFAmnnskcACgkQek52CV2KUuQHSggAlLchXADc4ASLJrPZETCcesbJbzYtpi+4fJ8xoJlIV8gT7XN4Y9q7v6sKrVIMwiIjaFhjfMnRZBaCATdXDToZt1xPVy6jW6J4HLhd/qpU0oh3iOtny0exoW+sA5Y3CtBRpOpfootWf0VkJPFphxkT48GPNgj5wsWjRa9C/gDf/9mCrIxfc8DYMqkB9lHmPcZFOiQZwTrdUNVWisE99JA49uZPCV9vzwW8ZeTkwmOw25dLuntSLzsSQN737fiwYRF0Wzv+Sd7RJGbuSuNkFcLtbX1kfcLGUkytx6xhXz6IS9v5rVD4GDzj3jgFmmR9Mk0f3frkxIERzEBK1ZeRfU6JqA==" +url = "https://archive.archlinux.org/packages/c/cmake/cmake-4.4.0-2-x86_64.pkg.tar.zst" +sha256 = "4c3fbb45566fb10a4616bf19a1a1a90ba4eaad358c27aeca70178d5f8f68889d" +signature = "iQEzBAABCgAdFiEEFRnVq6Zb9vwrc8dWek52CV2KUuQFAmpfm98ACgkQek52CV2KUuTKRAf/XP+62viT5qX2Lyrlt7lJEnsR+vvWMAG68dDtMIA0/LB889ZZrx/rrfFRA0MPEmYqKXqcsRERzqwX6YPCS4iaAxSPxoffxLT1WHtFWreNpiePfZW0yftslS0nClU5dLLrfyeY83JKvqqUMHBR3K9OBYxKc7TRWpPaPRHPzQuYtmB3hByibjhjalLJHgOmd7V8HCgec3NScJ9Jt8amgQPhB4nweqayrZbXRxo6P6aU1v3O3Enri5pR/UqYScxb8PoHEzr0q37bWrCG7ZIS58OACDISNCrwMhQmu2pJJFeT0sAA4lxdE16spNwrgEVxSiu6uvyyofJYipeqBw5onp3Hag==" [[package]] name = "compiler-rt" -version = "22.1.5-1" +version = "22.1.8-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/c/compiler-rt/compiler-rt-22.1.5-1-x86_64.pkg.tar.zst" -sha256 = "247d72e99e3ebbd46f8e14e162a6d162bdfcedf500af61b5a426aaab668e5320" -signature = "iHUEABYKAB0WIQTS6V/sAVzx+RGqqww9TFAIu1yNKQUCafy6uwAKCRA9TFAIu1yNKW0eAQCtpYK/Klh3WdzGiDlzLd9IIQ/JoKHpUSJJWgEw24dXvQD9E9ZycrdYnou5D7fiNRW/QdjhnZasOGOQTLpR5OYcTgA=" +url = "https://archive.archlinux.org/packages/c/compiler-rt/compiler-rt-22.1.8-1-x86_64.pkg.tar.zst" +sha256 = "e7531589d13fcbacf3fe4a64624b2a62081f2532b690e77bbf88fbe0a5d1b75e" +signature = "iHUEABYKAB0WIQQhkbiUMbrAqLlt6T0kR0DRfH/Q7AUCajfhYwAKCRAkR0DRfH/Q7BkBAQD/2Kj1l+/9hGeo0pQqRP6wVTKCVoILVRvSXiLGB1WXDAD8CmUyN8kDvGYasFDEbCmZL5aAwH+TF2NlkcSaJuGT8w0=" [[package]] name = "cppdap" @@ -34,20 +42,12 @@ sha256 = "5c8bd9b3881ba9b2bea98eefa95df21d92b026f0c7537105d943857b22388be3" signature = "iQIzBAABCgAdFiEEtZcfLFwQqaCMYAMPeGxj8zDXy5IFAmnGazMACgkQeGxj8zDXy5JhQhAAtaJdE9CFS5GVdCnlKxC6yDubujzmc1LczN3GgtCIzNbIn+hbXnpNsescN+kZ+qeTtecc8cwP8qDBL81KWb1cG5VyYC61hnoI+R4P8yF0NhDRQKEbFOuNft5joN5NWRPrSKEKBkqttBA1tnV15VnXVfkkbzdCwc4xdEWFZMhNuFd9tSDux+TuYaOeshid3u2oer/JKD9o9X/3uwWDuF/U2u77nzQ2yOgerRMdHqjohmQ2pP1DbM051/6z246TLIPdvEKuDiKB5JG+fBVCHGQ6WxMxfHINvoxa77OezVS1dIcjkPOJuHSdHBHxVoMNzvSAx4VFcKMJzofwuaCEHaV3t6+lvO3rbygraqDWA3XlvO7L7Ad3TcVa467wlMUh7PqDaXq+cwaTZAsFXB9bDRoeOL9xWTSeRrZmeJDkOc1o7hZlra3A/6bc9NtsmUHZeOuT8XE3tRBsoNssPTo5FBD+ZeYtqh0d/e/I9A2iqLzlksdHSNS4kcDNA2oen0cnOPnCZyYsPXkf1sfrMKbgHne5HtHQF1I2EOXTBBMXDIDdLV8APabEKw7UtbtTFilyjeAwPzh3yW0EiLFB6n2ybR+a7mDtaK/UvxGo2w0ptiDaYcr7xtPgX/Y6aIvj9Z7jm3xu3vangBYDpqnN5a47rloXv1QClf0YSani45+Qby7b/60=" [[package]] -name = "curl" -version = "8.20.0-6" -system = "archlinux" -url = "https://archive.archlinux.org/packages/c/curl/curl-8.20.0-6-x86_64.pkg.tar.zst" -sha256 = "b55de8ad1a51a4d071dfe5d98a0e46daee8c837cf7d857e11e173ee113efeea1" -signature = "iHUEABYKAB0WIQQEKYl95fO9rFN6MGltQr3RFuAGjwUCafsCEAAKCRBtQr3RFuAGj0TGAQDDsfEGIPdEcAIdgrCnrcHy7nLObvPGF37phJ/TCTR4DAD+Ox4ucCYtOA2bM110KZTUIuHJV7//mhmVdIc/qxGTegQ=" - -[[package]] -name = "expat" -version = "2.8.1-1" +name = "cryptsetup" +version = "2.8.7-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/e/expat/expat-2.8.1-1-x86_64.pkg.tar.zst" -sha256 = "6dc98b2806cc8f7cd1e2e02b0ea83c2f209c2823eec1108f726bbf88b37ab563" -signature = "iHUEABYKAB0WIQRizHP4hOUpV7L92IObeih9mi7GCAUCagD5WQAKCRCbeih9mi7GCBOOAP92U0uk2Bc/gn1WiEmNSnKALCfmhdEaq0qvWOYF4Gf7FQEAyrljq6VtjMvFDcrDZZKpFi1JA1JchE7X4eVwIhGYxg8=" +url = "https://archive.archlinux.org/packages/c/cryptsetup/cryptsetup-2.8.7-1-x86_64.pkg.tar.zst" +sha256 = "3e77b353731dd4432a7b451fca4b6880b89405c5914324b82a294f3c5fd75393" +signature = "iHUEABYKAB0WIQQEKYl95fO9rFN6MGltQr3RFuAGjwUCamBS9AAKCRBtQr3RFuAGjwT4AQDHzLKDCNqqtcFbbhj+fC/FM4NAU7pJKBz7pvHEHdMxAwEAshQwT+J9FBhD9hytgZxEJ5yh7T+2KmyzKFkFLI1qCQg=" [[package]] name = "gc" @@ -59,27 +59,11 @@ signature = "iNUEABYKAH0WIQQFx3danouXdAf+COadTFqhVCbaCgUCaYTRLF8UgAAAAAAuAChpc3N [[package]] name = "gcc" -version = "16.1.1+r12+g301eb08fa2c5-1" +version = "16.1.1+r346+g4e03491b401d-4" system = "archlinux" -url = "https://archive.archlinux.org/packages/g/gcc/gcc-16.1.1+r12+g301eb08fa2c5-1-x86_64.pkg.tar.zst" -sha256 = "80ecc89c7ca567a2c1d460803e1efa434040861f824c34d8fe7000bf27ad82c0" -signature = "iNUEABYKAH0WIQQFx3danouXdAf+COadTFqhVCbaCgUCafS5tV8UgAAAAAAuAChpc3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MDVDNzc3NUE5RThCOTc3NDA3RkUwOEU2OUQ0QzVBQTE1NDI2REEwQQAKCRCdTFqhVCbaCuUiAQCgvoBNp3cS3853nVXfsTs+d/es9OS4BeQYBmVGWL6r0AEAlA6Udb4ZVS6Bhrn9tDrQRVWgGw/cqRgWi4boE2D3rAA=" - -[[package]] -name = "glib2" -version = "2.88.1-1" -system = "archlinux" -url = "https://archive.archlinux.org/packages/g/glib2/glib2-2.88.1-1-x86_64.pkg.tar.zst" -sha256 = "dc245f5234660abbde431980b24fed9cf5ecbe3cfc829ba0ffb83588c41f665c" -signature = "iHUEABYKAB0WIQSDvIiJNRtd67toQW64rAhgDxCM3wUCafX4zwAKCRC4rAhgDxCM38M7AP9rwvszygiykkORDIiRTc2MYPigFK6qTmFshE1cW+FIFQD/RoZGEqs+4kol2IscAR0iYzWp+wyKdetso//iwxsIZQU=" - -[[package]] -name = "gnutls" -version = "3.8.13-2" -system = "archlinux" -url = "https://archive.archlinux.org/packages/g/gnutls/gnutls-3.8.13-2-x86_64.pkg.tar.zst" -sha256 = "381e8679ec096bba9d25e6bf8de1d186b1f46e892215aa2a63e1582c34a036f1" -signature = "iQEzBAABCgAdFiEErcih/MFeAdRTEEGelGV6sg8qCSsFAmnyXAQACgkQlGV6sg8qCSuSmQf/XhEm8evSbwYD2cyGzAO1f0FgQDIjwmsO6GIw4K1aiJM0jaIseyly/2a5JMCPvqyiCTpk4Fu1iKGahPhkqV5d5MML18z8l1BA/K2hbLH/DM50W5klnLGHmR8MzL3fbvtmsIofgvmrLcVwXmm66S/Rp7fHnz9JsESngJ5GYtJLg+vwQ4wXs8q8neoYolAUgnfWoziBXm7LMoLhcvkjsdkIO+On7u1Vv/ra+mMCbRf7oTa6EoNNMv4/0GGHIzqMAnm6/eMLurk2sPjIQipfj8lcwbBGNo9bmXAQPSKrXfWtE5Kfi9xl5uo54d2unv87oeInV5MVdUShgAH3W1d9L0zwMg==" +url = "https://archive.archlinux.org/packages/g/gcc/gcc-16.1.1+r346+g4e03491b401d-4-x86_64.pkg.tar.zst" +sha256 = "346a52cc965b67f362d5b6701ec339eb43df8e68f8167a491a30847d15545a48" +signature = "iNUEABYKAH0WIQQFx3danouXdAf+COadTFqhVCbaCgUCalVDgl8UgAAAAAAuAChpc3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MDVDNzc3NUE5RThCOTc3NDA3RkUwOEU2OUQ0QzVBQTE1NDI2REEwQQAKCRCdTFqhVCbaCphDAPoCr4b+frRqXkq4A7C9iTGXNO+5xVaYL8vXOug+qKHFUwEA1hdn9wdZnzEa3P/1B9g0S0h2vgKb9uisFBaanJdVfAo=" [[package]] name = "gtest" @@ -105,14 +89,6 @@ url = "https://archive.archlinux.org/packages/h/hicolor-icon-theme/hicolor-icon- sha256 = "22ec69012b9a55e276b5891f916366f692541dce3793bff3e85a28a10b91990a" signature = "iHUEABYKAB0WIQSDvIiJNRtd67toQW64rAhgDxCM3wUCZk/ttQAKCRC4rAhgDxCM39FIAP9Zcpg7ei4MUwFlnla8x7YDFRtQFp2WtiPOhyohRoMxhwEA2Fjer9ZWaLxYDvXfG3TbweF7ZzIQ621pJSfzl/HCnw8=" -[[package]] -name = "hwdata" -version = "0.407-1" -system = "archlinux" -url = "https://archive.archlinux.org/packages/h/hwdata/hwdata-0.407-1-any.pkg.tar.zst" -sha256 = "ae6c0fa1e3247a3b02cd7e40849245a58cabd8ec0b68ae46280b21e9075a27cf" -signature = "iQEzBAABCgAdFiEEW34/txt/EDKaHAOrdx32Yn7faB8FAmn64HwACgkQdx32Yn7faB/lcAf6ArEFMvMuharND/eXRk2SNazRjM2u51tMlQtj8WaABPEvbjYEb46Pd5ZuXHAjU8emphGR15mz2eP8auYNUjdFIkQQPQaDs0/mYg6PsI5wQ/DMZr40AKtKV+tVWhJC3PIK/x3z2tzTVhjyR3NtQhJOwx+NFy77K33Dz0tyHkAGOvnHMX9n2C+ZUyVDTEK374G3fnb07C290aa45FxqK2rlLWF72jzg/gZY2FytDGpEDXtuahX0Pr56K6hqXeK8PBgXZOmmlwPffzWpFD4EniwR3B2G2aRaGLrnAhkC2Ma9Klaetit0FisMRDooMLlJrP41iim3SNmjQQ8hdzBdFWE7fA==" - [[package]] name = "jsoncpp" version = "1.9.6-3" @@ -123,43 +99,27 @@ signature = "iQEzBAABCAAdFiEEFRnVq6Zb9vwrc8dWek52CV2KUuQFAmblvasACgkQek52CV2KUuS [[package]] name = "libedit" -version = "20251016_3.1-1" +version = "20260512_3.1-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/l/libedit/libedit-20251016_3.1-1-x86_64.pkg.tar.zst" -sha256 = "62fd156cc247c3feb8a750efdfbf5842d9a7c07327890339d4342095d6c86f51" -signature = "iQIzBAABCgAdFiEEtZcfLFwQqaCMYAMPeGxj8zDXy5IFAmmnYnMACgkQeGxj8zDXy5IRKw/+M9+I0lNV6GAHsqFT85ZxcO1HhZux3sdo1/PZsT81Tana8kud9jHGjDfS7zOItz6a0pJ7Q/7CL5BKUd7T6TKLjhFeuiZeBfREiiHqXoXnFopZZzEiXGLu0qDjS1Q8jPfs3BydLIa7niUx6uCjDBegULZkJgyEg+zeUc60tzywrb8/Ii6/MKazq7dmMVU6F+ZQH4Nv/jovsnT6RWS0YexKF0qMZzDRaUCZs7pHkllQJCWPa2O3OdUEhTopKxqWn5UeeMmdeIyyqy7cBhGKmQbbK7wxhQkIpK3Q2By7fLldeXOsrqD64xHXL7dupuXqI+6U/uO8KsNhbJRY2JRI2nUsqDwM8qxoR9OTpjJuBbFX6PzpgluB9c0WD/ISO60o/bcd4iXdkfCb66Tk+Oav6dr5tRVj7ifFzrmmV4Av6UMwtajKiebckOc4WXmgAd4Rd8uMAecFS+Mz7ZIKwaJkFRHGa7L57FpLAh0ox58cILYdqXJdUcwT4vTQvKEXO3ZIvcKmQBc8PhD/iSjEln5KcQy/2B3+e2n3gsVbggykMYHhFY6ae1x2b5Knt17NqCLTj/ITbgAdsrBFikkRCUKHMKthz8YcSYL/tUkrSd0AmxVMteSZUO19bqj0ZTwrU2eI2zqPon4j2rhAEEpohfpfvPDoOvronFeObj0S+nF4IGbmzp8=" - -[[package]] -name = "libelf" -version = "0.195-1" -system = "archlinux" -url = "https://archive.archlinux.org/packages/l/libelf/libelf-0.195-1-x86_64.pkg.tar.zst" -sha256 = "e7faf9dc2d9dab8975a4a95ce0804c45b3fe69c1551ccb4c05c52003cb2e75c1" -signature = "iQJLBAABCAA1FiEEwQA0ZnZjToDJQPuenAL/QZ/svhYFAmnjfU0XHGZveGJvcm9uQGFyY2hsaW51eC5vcmcACgkQnAL/QZ/svhbxqg/8DGBgcos38yvljfVizgfic9tpeMU2aFipOy0szxl0drQsC1SNO9LoYimjK0zzyQCPtqrkAFjoCgStV9gq6xn8zry2NfvqYuDXYcshlbZ+ey5zNzjtMwsPyXtONSeexP4KI2EzKy9LhUQeF2SMs/W4inS2r1dxlLnfBvZhJghdO3e28Wz08zw+KbizhIr1b/dtD9W8+kSL3flKvFj+4WDWdf+4vWPJIqUy2VEl8gkvrZpRPMimrog+9PvMA778PqCTCoX6EenIhno9rhx8MFgFWHIP2xW3PKPgmhjOCtH6s1zxCN5zYS1i8UCfXmGj1Rp4KAUstphXFOKuLjmMHxllftlvI0HvMhdEC0N/8fHM/wa0XqxBs/xn0ysqBSoRp2fI/A3z5D4KOZCIPYFeL02wzgolK6bl65vZK80/HCToyyNxv4rH9r4Ka5+Hr1nEd3CDwKmjDMISJ7JTBzv//qpQwuqLP08I2ZbqaP6XCN6i5e0CSNMpG6/OTynn1zQ0NDTpBTGByVQtowko0VqmHdgkly4GPKqCV7IrP6R+tJmpbnFVwkRgs3up9xlDnphp1oSM4jLSUNPMlQqMyyCNzz0lGpBMmshhfgVFN9iePfe6ZFUh64OinzikJxjEyWvHkfbz15gB5j986DwYbhkA0Td8HEOWU1sLfdYB3SfI+FcOJJM=" +url = "https://archive.archlinux.org/packages/l/libedit/libedit-20260512_3.1-1-x86_64.pkg.tar.zst" +sha256 = "70cb736e4fdee330cd0dfab45875f6ea378ae819958dd15748c300b8d7285b42" +signature = "iQIzBAABCgAdFiEE4kC1fixGMLp2ji8m/BtUfI2BcsgFAmoI97oACgkQ/BtUfI2BcsikyQ/7B/S1MQ9uI6NeSwoCUxSh8LvJjSc0ixgimM4BsDqxYM0HGTPGXEGMqdjvCFE3duhNfmGphGqSmTGQcxiJjgKKGmzj4xW1b4M3lWoyiv98jx7kR1aRtVthXGWbVFmJKuCuUQd9iWT+h3gh5QHVKib122FAWuWnWgXrXPyfYFMaY7I5nUMr8URDEYVZje5Cjx81AcavUg+6nAQyeH4hDxgsVhvyhqBNzfodN6v/1oV50jaayMs4QvU/CXQL2lnXB1NjMcTJMdYDJ0mXaLHEqYwUj6evQEXlkqlakG32OJ9uQBojYLpATpCheWxqDmjsoRwIay/EGmyYJVvzzqx21bmP5VtAKz63LIQTHqNAZS06hjF65+NYnjFGcwGdWE6FD1DAXWKM/K0KP+tjFg9i7DqwSK578Q6GdLCPty3Jjn7PlaOs9Qt1ysWOOVym3RRAI8isAb+33uCodqhgh5+i52sHhxZDJC9tLju+ESVKWceOschHx9GBz/K6jLa+/xodsEdv/G2J8U1WgIrty2tVWwsy0OaWghLEgx/6yNO09+/D9CYNOukBebOnLiiCQFtkjI6Aj+YiT9LKbf204trvzgWqc0huMrkh80ZcvEt3Rc9MQciuQCyFIy6FF/Pva02PXi0D42S1trgkmnMmLHLP0RGkqKPxdKrofibe5D0Uucyaaus=" [[package]] name = "libgit2" -version = "1:1.9.3-1" -system = "archlinux" -url = "https://archive.archlinux.org/packages/l/libgit2/libgit2-1:1.9.3-1-x86_64.pkg.tar.zst" -sha256 = "676caaf7c963aedc46db0a3475064344d9eea74fe0d8429c6c6aa438b5d00a7e" -signature = "iHUEABYKAB0WIQQEKYl95fO9rFN6MGltQr3RFuAGjwUCafl5IgAKCRBtQr3RFuAGj5YOAP460nYsYISWcglMsp+ZuvB1buTRmP3N2GpNDO88QKnhLQD/WONQLtk1BqMrG09NepuDz4/3AVnri64jDURi+t6i7Q0=" - -[[package]] -name = "libgpg-error" -version = "1.61-1" +version = "1:1.9.6-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/l/libgpg-error/libgpg-error-1.61-1-x86_64.pkg.tar.zst" -sha256 = "7d5a5b39f588b275558f5e13bd792bff84cf89abb6d48e3e494d6c30e8ea9ca4" -signature = "iQEyBAABCgAdFiEErcih/MFeAdRTEEGelGV6sg8qCSsFAmn8smkACgkQlGV6sg8qCSvbxgf4ofr+pdCIe+566ohHSxoUw5m8MIv2QSUbXbX/1ExhMJkipVhdS976rl0u5SQEsXuYLx7+XpsKvOgwG2bBE5V5gMuiwAzqfwijefuroyqqMrMfgMv1C4oKS0GcWc9R3kQtDM/xAap4OR75KqkeWt+t3vBV2z/HdBdOZeJXPprPFjYeye5c466JcoJCcxDO3Nl9qZiIsK4NY1rDRn0y8K69v/1dOcfIZu3dvAHczIMub2rTOt7MVSKFBA+AvTRnFI7VC/N+Z5LmZVunoCNaLnuIIc9yANfedS+UkFdvGc2giAcveb/n92dwzDHv3p79YYFgdnvydsGKqn7gabB7NVp6" +url = "https://archive.archlinux.org/packages/l/libgit2/libgit2-1:1.9.6-1-x86_64.pkg.tar.zst" +sha256 = "ecad55ff6d0ee582faded4c2056c061fde9537627df77481d93b22f1a9b12e49" +signature = "iQIzBAABCgAdFiEEsNZSlUdmBrcfDG+CqF6BHrTKLggFAmpbfqAACgkQqF6BHrTKLgi77Q/8Dewk7j6wNQR6SQCrGxRh1EyFyQQkXNcteXGBrQEaonTDEed2d5XBaOUltb51vlANY+QqDlrFGQsaIYaR1qSlsV181MoWJGHdL+HhHthsWoTYUh9wjEypCfp0Mo2yvS9ycNnWU9xZgfHtmQ4nyK5HVs4WQTuOProJH1fOuFFq5hPtYdpemgQuA4NBZvJckAlv3WowdAJvVtMr7565QAZRyVWlYIVczqmfKn4cKg8k5s5zUHQjTLzTqthjawydPM8JgAkxNo12E1N6VYayXiv3r4kE2rcf/9KNvtBeOJy9zuKJJ5HB8I34l0GodXMnPOwYJ+2hvZe4o7+G/JAPWVyxeluNrTBfFJvJ+fPs6NNpR0TY0NjussJa3piNcdrRXz9G0lYI0kkD0+v/e/e+beRU8bNpLkPZ7seQ+TtNBfvpJajIIoNSxDnxRGdFyZg/K2WW+NcZfwhLeLp9eVmy+570j/ZrviysZiOIw/I4BlIqSNCWax9JBY/lZiBkTg10oHaza6zV1rMSJB5XRsIfFnWiJGRzAC7dd1klVenmn0YHr0WeeUjOjfibdp2eZQMtlKhzvTFtZ4YcBuOakuluCc2n+JNfQeOV5Wu6l2sHfCSsgtSV8CZNOrnjYawjlfI0beUKKFzOtPOF7VXhlKdRAC+c1jyO/J4Xaju8YfANSukz6GU=" [[package]] name = "libisl" -version = "0.27-1" +version = "0.28-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/l/libisl/libisl-0.27-1-x86_64.pkg.tar.zst" -sha256 = "55a36e8195e6d9ce2efeb4276c60df6b6e7d94812fa36f8423d5ce664a5d34df" -signature = "iNUEABYKAH0WIQQFx3danouXdAf+COadTFqhVCbaCgUCZtWJeV8UgAAAAAAuAChpc3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MDVDNzc3NUE5RThCOTc3NDA3RkUwOEU2OUQ0QzVBQTE1NDI2REEwQQAKCRCdTFqhVCbaCgPbAP9GNpnE0ra4qZOGYyJtfnyG42f8Z9dLpX21F/sY/a2UCgD/dz8x7harwjTofWctVHyyCacJsLhSq2jvSfrvvL4H/w8=" +url = "https://archive.archlinux.org/packages/l/libisl/libisl-0.28-1-x86_64.pkg.tar.zst" +sha256 = "e72fd1165d674f440ff9882b514c999423098a5852ea41fa692db65f391c98c1" +signature = "iNUEABYKAH0WIQQFx3danouXdAf+COadTFqhVCbaCgUCakq0ul8UgAAAAAAuAChpc3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MDVDNzc3NUE5RThCOTc3NDA3RkUwOEU2OUQ0QzVBQTE1NDI2REEwQQAKCRCdTFqhVCbaCgMCAQCuIvVOR12g+pI+G/EumoSVkYRBDCOsNAzAuLbJxyXcpgEAvEHsrU/aKFdekdJJd9dP8MP7vGSvSxsELAtS99pJZAI=" [[package]] name = "libmpc" @@ -179,11 +139,11 @@ signature = "iHUEABYKAB0WIQRUwf0nM2HqUUojd5Pylr3lA2jGzgUCaas73QAKCRDylr3lA2jGzqk [[package]] name = "lld" -version = "22.1.5-3" +version = "22.1.8-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/l/lld/lld-22.1.5-3-x86_64.pkg.tar.zst" -sha256 = "63ee376649e81e82896557965aea3b580cfc586bb0aff9ea7e1323df60b79b62" -signature = "iHUEABYKAB0WIQTS6V/sAVzx+RGqqww9TFAIu1yNKQUCaf8l5wAKCRA9TFAIu1yNKZIZAP9x47L46/b1+pD/kAX3GSy4S6AKKFeOMzPkmCNiuIv6cQD9GUHaZjFuVBcQOYu6LcoQpD9ZxRXz+yvYN7mYxwDwvw8=" +url = "https://archive.archlinux.org/packages/l/lld/lld-22.1.8-1-x86_64.pkg.tar.zst" +sha256 = "3032282365f09110922c8df0ef6afc56be2427b9396044334e22dced1aadc31c" +signature = "iHUEABYKAB0WIQQhkbiUMbrAqLlt6T0kR0DRfH/Q7AUCajflPgAKCRAkR0DRfH/Q7AVFAQDJ3eLW4cf3dxIzwFpqbQp9SiyjynrUgiHhhYiZBnKQHQD+OtDRDXWRDiJgQxSG++3Lo2JxJlHrz3DiCWurtvEcnAU=" [[package]] name = "llhttp" @@ -195,11 +155,11 @@ signature = "iQIzBAABCgAdFiEEsNZSlUdmBrcfDG+CqF6BHrTKLggFAmmQzoAACgkQqF6BHrTKLgj [[package]] name = "llvm-libs" -version = "22.1.5-1" +version = "22.1.8-2" system = "archlinux" -url = "https://archive.archlinux.org/packages/l/llvm-libs/llvm-libs-22.1.5-1-x86_64.pkg.tar.zst" -sha256 = "4694118dbf5704a482c82bd0ea292f891068ef36935f897bea73743187bc3482" -signature = "iHUEABYKAB0WIQTS6V/sAVzx+RGqqww9TFAIu1yNKQUCafy4/AAKCRA9TFAIu1yNKdU1AP9hn3ew7dYYkgFxQ6Q6rgETUJuASDqZmiBdG4kQMamFXAEA5dNjMQIMAAzyugJHR0bMzNjJeJ4kz3jN4mG43qcttww=" +url = "https://archive.archlinux.org/packages/l/llvm-libs/llvm-libs-22.1.8-2-x86_64.pkg.tar.zst" +sha256 = "ad4454d1b969192e7a878066400a583b984210322d67c6fa8958ad1175342658" +signature = "iHUEABYKAB0WIQQhkbiUMbrAqLlt6T0kR0DRfH/Q7AUCalc5awAKCRAkR0DRfH/Q7MUNAQCOh9XJ64uH5p1RL1zr5XbJTe7cG3gRcMnI4RvjsCPEHAD/cTIn9Y72hB23JWZxfV10B3h2H3lpyPRqfwyGl+6euQc=" [[package]] name = "lua" @@ -225,29 +185,13 @@ url = "https://archive.archlinux.org/packages/m/musl/musl-1.2.6-1-x86_64.pkg.tar sha256 = "193b040c7174637ebcb7449914017e4b300089884a659d00bce59888744dc184" signature = "iQJLBAABCgA1FiEEiee5MxxK59f699MFwTIpOVS75K0FAmm/In4XHHNwdXB5a2luQGFyY2hsaW51eC5vcmcACgkQwTIpOVS75K11JBAAtrp8Ovvj6VJOhuR/QKfUDDCpWbcvh+wyqSwXIgRGBR3+m5+HcHkaTUGxtodWpCjiEJeM303SGTgPVsSKlUpNzK/emqhRpKX6pETNvFCjGYZGplvBhdh/LNRf/OMzU2Ld16woc4RUYKciV1LDohB1XVMHpG//QkTHcLOJT4G57NJoS9t0JumxPdZUwEbVrYG56wEMIIVABfY2zb2iFCrjkr1N8GlTCnI8HXpsq0E4yMkhIZ/a1dkFEDmWgFX8g+7JaVVbMFGDaJMGBIM/9bI7Ydc9JtXFbC6aRizF86ZfZdlK3xj0/WAFaqDoj1/O3aToaTqYic/qgPeOqo/nBOyyMxPU9dpz3RBOD9poSiLhjvhERyMSGwuGeAt8D2EGsrUjhJvydF84WfF0ZhlIZIWh1pW+Rf/CPzMeeM3eipLv58HTj5v70JSJuinTM0oIHWoIhsyZPz39dW0UJ+Qqi455f8h8Nj3a/UZfwElNqwLFkV4Qjt9qSRy8twaBNlQuh04PpRhSktRiXNKqc4Ldvcuo/9rhxdByORyfaelYL7OvyX5DyZqmlr1MmtREu4mHU2wN0znRfGinGdVNcqFtFScaABM2tnG8ZE1fOngHg6+P7cFzYYNN8PRaNUHGmSEmbHOoC3k236GmWbCTbDfcZcLauORmJg5GxxoW64PO53CdBRs=" -[[package]] -name = "nettle" -version = "4.0-1" -system = "archlinux" -url = "https://archive.archlinux.org/packages/n/nettle/nettle-4.0-1-x86_64.pkg.tar.zst" -sha256 = "679138a8405ca383aba7836d54fdc282db9394b7dc23c097b8965f70119adf13" -signature = "iQEzBAABCgAdFiEErcih/MFeAdRTEEGelGV6sg8qCSsFAmnyWiAACgkQlGV6sg8qCStpDAgAo5ldL6CUnrLyJdgSJpTvyVbXyHpEHzBKgB6dFclj0rkgOG+RkT8yfXtnnSOM2KDLAayjnlc2YhcvgS6KHQU4Mk44CDzZIR9ino3PkpktB+F5IHiLPPrvZmfUs9kMM2OQqsFhSwEDV8AmRbub7rRL/sUZ+gCAWqcI7c/0wNd21nbgzrTdZvQD8oX6Ce9e3r9yvbyzxwea8jDwt+jTX4BdTr3XuCHv1W/oaqSMY9xw6tedxkwoNG2FJWxxb3zOvF5ujPnGSlKikGGYkkqXip/ikeHwRSd7LRu64rSwvdS6Q89qSaXvn88A8GhaDM8GlprfYy08JwuQyMlMHGHuR0s0CA==" - -[[package]] -name = "pacman" -version = "7.1.0.r9.g54d9411-2" -system = "archlinux" -url = "https://archive.archlinux.org/packages/p/pacman/pacman-7.1.0.r9.g54d9411-2-x86_64.pkg.tar.zst" -sha256 = "2092ec7a0391416e4a1757c455bc071d7b58a124cedc83f582cb7d37d52f211b" -signature = "iHUEABYKAB0WIQQEKYl95fO9rFN6MGltQr3RFuAGjwUCafsCRAAKCRBtQr3RFuAGjyafAQCx4yIjOB4jkD7O3w4d1/J4FpASbwGRJY3HKSHs/yyzMAEA1wtPIrTB4JigNv/GHqUGbkcNfuTenATlAa8bDXuEsAk=" - [[package]] name = "protobuf" -version = "34.1-1" +version = "35.1-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/p/protobuf/protobuf-34.1-1-x86_64.pkg.tar.zst" -sha256 = "f1781a1490e7eb5da64f248c8eea62d753ceba7dd7fb6aee6591c09ef9278019" -signature = "iQIzBAABCgAdFiEELjbYYgIhSC/EXLfyqRdkdZMmtEAFAmnG07gACgkQqRdkdZMmtEB39BAAxQphXHOxzQUxP1gsfg34Oc+VlOu939WszvTX3RoENQ7Dzi3wFclxBT7YRywgecBzwaKkWEu4hUnp9e+/xG+np5sLHRDRqMKpfIKiIrAtFiSmdKSTrEApjlRAdLJNlNZ8/mOER4k+4LA4eH5hVcvRtOfmv4k7wrkLtrZWgfX1OAiMW7b0Rjle6iZX+ungjbnztREmhRTZaF5VP9NLbj9SWansCusgyPBn/cpxfAPUN22n3htm0YspeFG/2fsFO6/Rz+FXjvbJp0pPjcmqS0Tgq+lkfflZpPNQP0U/iBLTBZGErI8bVNMTF/y6xv2pVRwTC5jCJM1MunJ9gdYXZyG4Z5IivBDU2H11irDgCaSx3EEQ66KnYkmk/+7KdmlpYe6u8Yvk8bxCU+gnvbmT01UJ3FBbOCakqymDyLQdnszJa0JdEMyq94elLeyjxOUUvhY4S4buGO1/D1v7xDSz1p7DFgisIO7X+wR/zlsl/q4/7ltXeCSuLBd/+JoXuQLbNJFXxAOLOjFM0KZV3bL7idyWxIQpobXTWDX7Ue3ONEsWaAbQDfeUmHvT3PjBjJwNxIIGRMYGHD/SdQLez/uG8bV3OD9S6qUO4guJSdnsBToDqkxadfTVoA4KctB7GijXjTT9tS28ewfmQXj0bOqrMiWmCzIU+VIAm6J9rd7Ipp3dMB4=" +url = "https://archive.archlinux.org/packages/p/protobuf/protobuf-35.1-1-x86_64.pkg.tar.zst" +sha256 = "98b52af6bc5f07d0765e3b1248f54c3f18efb022d78b698c74c81bcc9b3ee650" +signature = "iQIzBAABCgAdFiEE8AuW0VIoAT/8nJ0Dk7EdqkwZfj0FAmo4RsAACgkQk7EdqkwZfj2qMhAAwgSfdrKaPhsn/6Tkk/4jHFRvdw2Oq9+9Rg8unb3ctdhmrz+Wu17YwC0BnYc/Os3adfaqzw9VBXNzhCgwvO8rQxa6QW3SZrVFY8Dey9BP/r1atIBZV7kceUaibkLktPgRbqQe033YSDX/WQP1biOEX/N6yDYqGcitOKsInBALJBv3XfzL8NA4HnDVlkSTIwZCx+qkJQ1StEt5bFvKNDZVS7TRh6UEZb4d/4uerEUF9StBesym/HFt5CB5C3UL6F4XH6qLV95jyi86gOqQqi5UzCg+Qwo3RGqkPq/ZyU9FMh7PctPW4GD6aPB00sG2VEuDnKGxlw0XKgvOjIquE1GKwcblgptDqpXyhG2sF9rGVz5mrL3AqSVURG97fbcyPOX7rVhZO2b9/udlcyJLmCCNoTRFcydHVXPwcD+EuITSuEjgDAbws5mTSjNw8DOkcueihFo+GkG/TSLFZKlgr9ZMVLwYNRkGvUUEHIpBPjodcdk0EzPztHOWBCGjROlsaE55pfTN5mWBSex9JznJ/tHjfAvuyBPxqaU6/Fh6TEPAL6zQ8GPtGhCtwTc4NcevgXgA9kHfRcXqgQXmDbZOiNFtUkp5n9xLVcdbcrh/pc6yFVBBRsYejdjj5STep0J9Bjigw5zKloK4yOYDF8Hs6yeRXQj4sojaL/Hz7MwV/Htn83Q=" [[package]] name = "rhash" @@ -259,24 +203,16 @@ signature = "iHUEABYKAB0WIQTrPXZP9dh+CBij4OXwXowSExrrXgUCaPVaqgAKCRDwXowSExrrXvp [[package]] name = "rust" -version = "1:1.95.0-1" +version = "1:1.97.1-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/r/rust/rust-1:1.95.0-1-x86_64.pkg.tar.zst" -sha256 = "7fb944fe7316c4b56946e97629c1c274c7dd477301f72ff38665e516a961cf61" -signature = "iHUEABYKAB0WIQSDvIiJNRtd67toQW64rAhgDxCM3wUCaeD+JwAKCRC4rAhgDxCM3+a+AQDYqAJgf84M0ML7M7irZpz+lqnDUPOWdv1f2Ncndw5ilQD/Y5IQ3hhescVkc3Qq957lfwEtFF4JHwVgHDUYSb7NXgM=" +url = "https://archive.archlinux.org/packages/r/rust/rust-1:1.97.1-1-x86_64.pkg.tar.zst" +sha256 = "c13025b265ed7070ec74f5afd32723e18e1610a9bc6231a76d9156d30e372000" +signature = "iHUEABYKAB0WIQSDvIiJNRtd67toQW64rAhgDxCM3wUCalkW7AAKCRC4rAhgDxCM308JAQDpRGxCoWV6iOi9jlbr83iEiYV6wXqS5juzKyqRi2CemQEA4CDxr0lQpnMrU1I4jpalExorhyLhnoboLOa1vpPj1Ao=" [[package]] name = "rust-musl" -version = "1:1.95.0-1" -system = "archlinux" -url = "https://archive.archlinux.org/packages/r/rust-musl/rust-musl-1:1.95.0-1-x86_64.pkg.tar.zst" -sha256 = "362af945af3da46608036f094f73124694d816001810872d728a34fe8af5f683" -signature = "iHUEABYKAB0WIQSDvIiJNRtd67toQW64rAhgDxCM3wUCaeD+KQAKCRC4rAhgDxCM39dFAP4jpCK0BwjQlfA9DIICUNe81RSMq3dC1LwoGny1v6pYggD8CmDX4Y2TizyqFq53J6i+lTe1jhW6qjtDTxw/MSpO9wQ=" - -[[package]] -name = "sqlite" -version = "3.53.1-1" +version = "1:1.97.1-1" system = "archlinux" -url = "https://archive.archlinux.org/packages/s/sqlite/sqlite-3.53.1-1-x86_64.pkg.tar.zst" -sha256 = "22a1cbbfb507506959c29e8f352c378add53cea35963465bd1a783bd7a3f7262" -signature = "iQEzBAABCgAdFiEErcih/MFeAdRTEEGelGV6sg8qCSsFAmn6BEwACgkQlGV6sg8qCSv7Xwf9FEkCzpAHj2A1CoKqx+JgPcv0bwQDHo3ZLVvz3CPoKwnY6NkZv4mdBqZ6PLYr8i3Rd/hBFmgWEx9yNibhDoZyVZb8Gv1JyCZnmD+61gI8dITd086AJbmlF7219TpT648BRdHbtpNDEI8jj4oR3YqiDvhss69b+kzFRJrlooGvW6Rg1HMvG5IC2bzJez/nVy+4XghBFObBWLG0wcSwtw4vqdF+tZ5hK6m3yJhcEDNYQUqVMeLi8PhFV5rfGjCzHGoCX70gxx6IHOCLCPdn9Yxxh/bo/YnbBc4PJqTZzY89iWhX/ZCTkjqWPRexygintYR09FWPwofYwRf3SJzU2MVUbw==" +url = "https://archive.archlinux.org/packages/r/rust-musl/rust-musl-1:1.97.1-1-x86_64.pkg.tar.zst" +sha256 = "e63845d4388190b7ef62b67793c763faf24ce9a114bb82d9e54297fafc4c594e" +signature = "iHUEABYKAB0WIQSDvIiJNRtd67toQW64rAhgDxCM3wUCalkW7QAKCRC4rAhgDxCM39CLAP93abfXpD7NVM9Wiprd4uyCo6iWhbkYGFuFoA0/lsOwiAD/R7QN7ioO8/iyPqduAUVTd/DOCzR7EGVZJHCuuqNtTAE=" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 69f7728..5252298 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.95.0" +channel = "1.97.1" targets = ["x86_64-unknown-linux-musl"] profile = "default" diff --git a/src/routing/error_cause.rs b/src/routing/error_cause.rs index f7ca80b..03a461d 100644 --- a/src/routing/error_cause.rs +++ b/src/routing/error_cause.rs @@ -10,10 +10,9 @@ use ic_bn_lib::{ Error as HttpError, headers::{CONTENT_TYPE_HTML, X_IC_ERROR_CAUSE}, }, - ic_agent::AgentError, + ic_agent::{AgentError, agent::RejectCode}, }; use ic_http_gateway_protocol::HttpGatewayError; -use ic_transport_types::RejectCode; use serde::{Deserialize, Serialize}; use serde_json::to_string_pretty; use strum::{Display, IntoStaticStr}; @@ -712,8 +711,11 @@ mod test { use fqdn::fqdn; use http::HeaderMap; use http_body_util::BodyExt; - use ic_bn_lib::{http::headers::X_IC_ERROR_CAUSE, hval, ic_agent::AgentError}; - use ic_transport_types::RejectResponse; + use ic_bn_lib::{ + http::headers::X_IC_ERROR_CAUSE, + hval, + ic_agent::{AgentError, agent::RejectResponse}, + }; #[tokio::test] async fn test_error_cause() { diff --git a/src/test.rs b/src/test.rs index c54b204..64f6013 100644 --- a/src/test.rs +++ b/src/test.rs @@ -18,12 +18,12 @@ use ic_bn_lib::{ custom_domains::{CustomDomain, ProvidesCustomDomains}, health::HealthManager, http::{Client, ClientHttp, Error as HttpError}, - ic_agent::agent::route_provider::RoundRobinRouteProvider, + ic_agent::agent::{ReplyResponse, route_provider::RoundRobinRouteProvider}, principal, tasks::TaskManager, }; use ic_http_certification::HttpResponse; -use ic_transport_types::{QueryResponse, ReplyResponse}; +use ic_transport_types::QueryResponse; use prometheus::Registry; use rand::{Rng, SeedableRng}; use serde_cbor::to_vec; diff --git a/tests/integration_tests/api_proxy_test.rs b/tests/integration_tests/api_proxy_test.rs index efa9d80..8eb3fd0 100644 --- a/tests/integration_tests/api_proxy_test.rs +++ b/tests/integration_tests/api_proxy_test.rs @@ -50,14 +50,14 @@ pub async fn proxy_api_calls_test(env: &TestEnv) -> anyhow::Result<()> { info!("api/v2/query - query counter"); let out = agent.query(&canister_id, "read").call().await?; if !out.eq(&[0, 0, 0, 0]) { - bail!("failed: got {:?}, expected {:?}", out, &[0, 0, 0, 0],) + bail!("failed: got {:?}, expected {:?}", out, [0, 0, 0, 0],) } info!("api/v3/call - increase counter"); agent.update(&canister_id, "write").call_and_wait().await?; let out = agent.query(&canister_id, "read").call().await?; if !out.eq(&[1, 0, 0, 0]) { - bail!("failed: got {:?}, expected {:?}", out, &[1, 0, 0, 0],) + bail!("failed: got {:?}, expected {:?}", out, [1, 0, 0, 0],) } info!("api/v2/read_state - fetch canister module hash");