diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 10cdee4..799ca25 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,6 +24,11 @@ updates: rust-dependencies: patterns: - "*" + ignore: + # Pinned to 1.x to match the transitive dep used by x402-chain-eip155. + # Re-evaluate once upstream x402-rs upgrades to alloy 2. + - dependency-name: "alloy-signer-local" + update-types: ["version-update:semver-major"] - package-ecosystem: "pip" directory: "/" diff --git a/Cargo.lock b/Cargo.lock index 96f06a3..2b83e74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,39 +56,12 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f16daaf7e1f95f62c6c3bf8a3fc3d78b08ae9777810c0bb5e94966c7cd57ef0" dependencies = [ - "alloy-eips 1.8.3", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 1.8.3", + "alloy-serde", "alloy-trie", - "alloy-tx-macros 1.8.3", - "auto_impl", - "borsh", - "c-kzg", - "derive_more", - "either", - "k256", - "once_cell", - "rand 0.8.5", - "secp256k1", - "serde", - "serde_json", - "serde_with", - "thiserror 2.0.18", -] - -[[package]] -name = "alloy-consensus" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8c24c95e90c1608c2d91cff1b451d796474168d3310ccc8b7cd12502ca8169" -dependencies = [ - "alloy-eips 2.0.1", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 2.0.1", - "alloy-trie", - "alloy-tx-macros 2.0.1", + "alloy-tx-macros", "auto_impl", "borsh", "c-kzg", @@ -110,25 +83,11 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "118998d9015332ab1b4720ae1f1e3009491966a0349938a1f43ff45a8a4c6299" dependencies = [ - "alloy-consensus 1.8.3", - "alloy-eips 1.8.3", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 1.8.3", - "serde", -] - -[[package]] -name = "alloy-consensus-any" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d211ad0ef468a70a7a829e49683ff59ad25f02b4ab3764344c4c2663329a52c" -dependencies = [ - "alloy-consensus 2.0.1", - "alloy-eips 2.0.1", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 2.0.1", + "alloy-serde", "serde", ] @@ -138,14 +97,14 @@ version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca63b7125a981415898ffe2a2a696c83696c9c6bdb1671c8a912946bbd8e49e7" dependencies = [ - "alloy-consensus 1.8.3", + "alloy-consensus", "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 1.8.3", - "alloy-network-primitives 1.8.3", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", "alloy-provider", - "alloy-rpc-types-eth 1.8.3", + "alloy-rpc-types-eth", "alloy-sol-types", "alloy-transport", "futures", @@ -232,30 +191,7 @@ dependencies = [ "alloy-eip7928", "alloy-primitives", "alloy-rlp", - "alloy-serde 1.8.3", - "auto_impl", - "borsh", - "c-kzg", - "derive_more", - "either", - "serde", - "serde_with", - "sha2", -] - -[[package]] -name = "alloy-eips" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae69eaa5096b47ffe97e6a5d6bde7e7fa2dec106af22a9315621d11039c3de3c" -dependencies = [ - "alloy-eip2124", - "alloy-eip2930", - "alloy-eip7702", - "alloy-eip7928", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 2.0.1", + "alloy-serde", "auto_impl", "borsh", "c-kzg", @@ -293,63 +229,22 @@ dependencies = [ "tracing", ] -[[package]] -name = "alloy-json-rpc" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662b525af73e86b2167dae923261c8edf440ba7e1426b30a8b993177bc214c02" -dependencies = [ - "alloy-primitives", - "alloy-sol-types", - "http", - "serde", - "serde_json", - "thiserror 2.0.18", - "tracing", -] - [[package]] name = "alloy-network" version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7197a66d94c4de1591cdc16a9bcea5f8cccd0da81b865b49aef97b1b4016e0fa" dependencies = [ - "alloy-consensus 1.8.3", - "alloy-consensus-any 1.8.3", - "alloy-eips 1.8.3", - "alloy-json-rpc 1.8.3", - "alloy-network-primitives 1.8.3", - "alloy-primitives", - "alloy-rpc-types-any 1.8.3", - "alloy-rpc-types-eth 1.8.3", - "alloy-serde 1.8.3", - "alloy-signer 1.8.3", - "alloy-sol-types", - "async-trait", - "auto_impl", - "derive_more", - "futures-utils-wasm", - "serde", - "serde_json", - "thiserror 2.0.18", -] - -[[package]] -name = "alloy-network" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c657c2d9751d3c7d94990554b231e5372c3c2e4bad842806280b6151a0d6a05d" -dependencies = [ - "alloy-consensus 2.0.1", - "alloy-consensus-any 2.0.1", - "alloy-eips 2.0.1", - "alloy-json-rpc 2.0.1", - "alloy-network-primitives 2.0.1", + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", "alloy-primitives", - "alloy-rpc-types-any 2.0.1", - "alloy-rpc-types-eth 2.0.1", - "alloy-serde 2.0.1", - "alloy-signer 2.0.1", + "alloy-rpc-types-any", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", "alloy-sol-types", "async-trait", "auto_impl", @@ -366,23 +261,10 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb82711d59a43fdfd79727c99f270b974c784ec4eb5728a0d0d22f26716c87ef" dependencies = [ - "alloy-consensus 1.8.3", - "alloy-eips 1.8.3", + "alloy-consensus", + "alloy-eips", "alloy-primitives", - "alloy-serde 1.8.3", - "serde", -] - -[[package]] -name = "alloy-network-primitives" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e7c4bb0ebbd6d7406d2808968f43c0d5186c69c5e58cedcbee7380f4cd1fcf" -dependencies = [ - "alloy-consensus 2.0.1", - "alloy-eips 2.0.1", - "alloy-primitives", - "alloy-serde 2.0.1", + "alloy-serde", "serde", ] @@ -420,15 +302,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d181c8cc7cf4805d7e589bf4074d56d55064fa1a979f005a45a62b047616d870" dependencies = [ "alloy-chains", - "alloy-consensus 1.8.3", - "alloy-eips 1.8.3", - "alloy-json-rpc 1.8.3", - "alloy-network 1.8.3", - "alloy-network-primitives 1.8.3", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 1.8.3", - "alloy-signer 1.8.3", + "alloy-rpc-types-eth", + "alloy-signer", "alloy-sol-types", "alloy-transport", "async-stream", @@ -477,7 +359,7 @@ version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2792758a93ae32a32e9047c843d536e1448044f78422d71bf7d7c05149e103f" dependencies = [ - "alloy-json-rpc 1.8.3", + "alloy-json-rpc", "alloy-primitives", "alloy-transport", "futures", @@ -497,24 +379,9 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3823026d1ed239a40f12364fac50726c8daf1b6ab8077a97212c5123910429ed" dependencies = [ - "alloy-consensus-any 1.8.3", - "alloy-rpc-types-eth 1.8.3", - "alloy-serde 1.8.3", -] - -[[package]] -name = "alloy-rpc-types-any" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1a9a3bda9be7f6515316eb792710532411878bbfc88934973f4b371376b00d" -dependencies = [ - "alloy-consensus-any 2.0.1", - "alloy-network-primitives 2.0.1", - "alloy-primitives", - "alloy-rpc-types-eth 2.0.1", - "alloy-serde 2.0.1", - "serde", - "serde_json", + "alloy-consensus-any", + "alloy-rpc-types-eth", + "alloy-serde", ] [[package]] @@ -523,34 +390,13 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59c095f92c4e1ff4981d89e9aa02d5f98c762a1980ab66bec49c44be11349da2" dependencies = [ - "alloy-consensus 1.8.3", - "alloy-consensus-any 1.8.3", - "alloy-eips 1.8.3", - "alloy-network-primitives 1.8.3", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 1.8.3", - "alloy-sol-types", - "itertools 0.14.0", - "serde", - "serde_json", - "serde_with", - "thiserror 2.0.18", -] - -[[package]] -name = "alloy-rpc-types-eth" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda4ece0050154ab278241aeffade58916b04f38254832e8cb6e4671c6e72ed2" -dependencies = [ - "alloy-consensus 2.0.1", - "alloy-consensus-any 2.0.1", - "alloy-eips 2.0.1", - "alloy-network-primitives 2.0.1", + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-network-primitives", "alloy-primitives", "alloy-rlp", - "alloy-serde 2.0.1", + "alloy-serde", "alloy-sol-types", "itertools 0.14.0", "serde", @@ -570,17 +416,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "alloy-serde" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beaa5c581a67e2743d95b4849eb9cfeb90866429cdaa6d8f6b75eb988b2d0cd9" -dependencies = [ - "alloy-primitives", - "serde", - "serde_json", -] - [[package]] name = "alloy-signer" version = "1.8.3" @@ -596,47 +431,16 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "alloy-signer" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5da9ae50f9b48d7b4e2e5cde87175257be7e5e56909a7794720597c1d9806f6" -dependencies = [ - "alloy-primitives", - "async-trait", - "auto_impl", - "either", - "elliptic-curve", - "k256", - "thiserror 2.0.18", -] - [[package]] name = "alloy-signer-local" version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f721f4bf2e4812e5505aaf5de16ef3065a8e26b9139ac885862d00b5a55a659a" dependencies = [ - "alloy-consensus 1.8.3", - "alloy-network 1.8.3", + "alloy-consensus", + "alloy-network", "alloy-primitives", - "alloy-signer 1.8.3", - "async-trait", - "k256", - "rand 0.8.5", - "thiserror 2.0.18", -] - -[[package]] -name = "alloy-signer-local" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b794002d57fd2f71b4c87298a41ca24dfc0f2cf6630d95106a477e451747ba" -dependencies = [ - "alloy-consensus 2.0.1", - "alloy-network 2.0.1", - "alloy-primitives", - "alloy-signer 2.0.1", + "alloy-signer", "async-trait", "eth-keystore", "k256", @@ -723,7 +527,7 @@ version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa186e560d523d196580c48bf00f1bf62e63041f28ecf276acc22f8b27bb9f53" dependencies = [ - "alloy-json-rpc 1.8.3", + "alloy-json-rpc", "auto_impl", "base64", "derive_more", @@ -769,18 +573,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "alloy-tx-macros" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520337f3d3d063a7fe20f47aaa62d695e3dc0372b34f601560dee24e76988b9" -dependencies = [ - "darling 0.23.0", - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "android_system_properties" version = "0.1.5" @@ -826,7 +618,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -837,7 +629,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1791,7 +1583,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1921,7 +1713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3692,7 +3484,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3749,7 +3541,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4114,7 +3906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4263,7 +4055,7 @@ dependencies = [ "getrandom 0.4.1", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4890,7 +4682,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5333,8 +5125,8 @@ source = "git+https://github.com/x402-rs/x402-rs.git#0fe107ce73f532163d2bb38c4a1 dependencies = [ "alloy-contract", "alloy-primitives", - "alloy-signer 1.8.3", - "alloy-signer-local 1.8.3", + "alloy-signer", + "alloy-signer-local", "alloy-sol-types", "async-trait", "rand 0.9.2", @@ -5377,7 +5169,7 @@ dependencies = [ name = "x402curl" version = "0.2.0" dependencies = [ - "alloy-signer-local 2.0.1", + "alloy-signer-local", "assert_cmd", "clap", "dirs", diff --git a/Cargo.toml b/Cargo.toml index 9d8def0..58bad9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ toml = "1.1" serde_json = "1" dirs = "6" thiserror = "2" -alloy-signer-local = { version = "2", features = ["keystore"] } +alloy-signer-local = { version = "1", features = ["keystore"] } [dev-dependencies] wiremock = "0.6"