diff --git a/Cargo.lock b/Cargo.lock index c9308368..92856f0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2737,25 +2737,11 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fastrlp" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", -] +version = "0.3.99" [[package]] name = "fastrlp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", -] +version = "0.4.99" [[package]] name = "fdlimit" @@ -3845,15 +3831,6 @@ dependencies = [ "xmltree", ] -[[package]] -name = "impl-codec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" -dependencies = [ - "parity-scale-codec", -] - [[package]] name = "impl-codec" version = "0.7.1" @@ -3871,7 +3848,7 @@ checksum = "803d15461ab0dcc56706adf266158acbc44ccf719bf7d0af30705f58b90a4b8c" dependencies = [ "integer-sqrt", "num-traits", - "uint 0.10.0", + "uint", ] [[package]] @@ -4383,7 +4360,7 @@ dependencies = [ "smallvec", "thiserror 2.0.17", "tracing", - "uint 0.10.0", + "uint", "web-time", ] @@ -6017,14 +5994,7 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" -dependencies = [ - "fixed-hash", - "impl-codec 0.6.0", - "uint 0.9.5", -] +version = "0.12.99" [[package]] name = "primitive-types" @@ -6033,11 +6003,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "721a1da530b5a2633218dc9f75713394c983c352be88d2d7c9ee85e2c4c21794" dependencies = [ "fixed-hash", - "impl-codec 0.7.1", + "impl-codec", "impl-num-traits", "impl-serde", "scale-info", - "uint 0.10.0", + "uint", ] [[package]] @@ -6811,13 +6781,7 @@ dependencies = [ [[package]] name = "rlp" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" -dependencies = [ - "bytes", - "rustc-hex", -] +version = "0.5.99" [[package]] name = "rocksdb" @@ -6885,13 +6849,13 @@ dependencies = [ "ark-ff 0.4.99", "ark-ff 0.5.0", "bytes", - "fastrlp 0.3.1", - "fastrlp 0.4.0", + "fastrlp 0.3.99", + "fastrlp 0.4.99", "num-bigint", "num-integer", "num-traits", "parity-scale-codec", - "primitive-types 0.12.2", + "primitive-types 0.12.99", "proptest", "rand 0.8.5", "rand 0.9.2", @@ -10647,18 +10611,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" -[[package]] -name = "uint" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" -dependencies = [ - "byteorder", - "crunchy", - "hex", - "static_assertions", -] - [[package]] name = "uint" version = "0.10.0" diff --git a/Cargo.toml b/Cargo.toml index 50941bdc..9975d574 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -184,7 +184,11 @@ alloy-eip2124 = { path = "patches/ethereum/alloy-eip2124" } ark-ff-3 = { package = "ark-ff", path = "patches/ethereum/ark-ff-0.3" } ark-ff-4 = { package = "ark-ff", path = "patches/ethereum/ark-ff-0.4" } c-kzg = { path = "patches/ethereum/c-kzg" } -secp256k1-30 = { package = "secp256k1", path = "patches/ethereum/secp256k1-30" } +fastrlp-3 = { package = "fastrlp", path = "patches/ethereum/fastrlp-0.3" } +fastrlp-4 = { package = "fastrlp", path = "patches/ethereum/fastrlp-0.4" } +primitive-types-12 = { package = "primitive-types", path = "patches/ethereum/primitive-types-0.12" } +rlp = { path = "patches/ethereum/rlp" } +secp256k1-30 = { package = "secp256k1", path = "patches/ethereum/secp256k1-0.30" } # Dependencies from monero-oxide which originate from within our own tree, potentially shimmed to account for deviations since publishing std-shims = { path = "patches/std-shims" } diff --git a/patches/ethereum/fastrlp-0.3/Cargo.toml b/patches/ethereum/fastrlp-0.3/Cargo.toml new file mode 100644 index 00000000..f8ad344c --- /dev/null +++ b/patches/ethereum/fastrlp-0.3/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "fastrlp" +version = "0.3.99" +description = "Patch to an empty crate" +license = "MIT" +repository = "https://github.com/serai-dex/serai/tree/develop/patches/ethereum/fastrlp-0.3" +authors = ["Luke Parker "] +keywords = [] +edition = "2021" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[workspace] + +[features] +alloc = [] +std = [] diff --git a/patches/ethereum/secp256k1-30/src/lib.rs b/patches/ethereum/fastrlp-0.3/src/lib.rs similarity index 100% rename from patches/ethereum/secp256k1-30/src/lib.rs rename to patches/ethereum/fastrlp-0.3/src/lib.rs diff --git a/patches/ethereum/fastrlp-0.4/Cargo.toml b/patches/ethereum/fastrlp-0.4/Cargo.toml new file mode 100644 index 00000000..90734124 --- /dev/null +++ b/patches/ethereum/fastrlp-0.4/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "fastrlp" +version = "0.4.99" +description = "Patch to an empty crate" +license = "MIT" +repository = "https://github.com/serai-dex/serai/tree/develop/patches/ethereum/fastrlp-0.4" +authors = ["Luke Parker "] +keywords = [] +edition = "2021" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[workspace] + +[features] +alloc = [] +std = [] diff --git a/patches/ethereum/fastrlp-0.4/src/lib.rs b/patches/ethereum/fastrlp-0.4/src/lib.rs new file mode 100644 index 00000000..0670b71f --- /dev/null +++ b/patches/ethereum/fastrlp-0.4/src/lib.rs @@ -0,0 +1 @@ +const _NEVER_COMPILED: [(); 0 - 1] = [(); 0 - 1]; diff --git a/patches/ethereum/primitive-types-0.12/Cargo.toml b/patches/ethereum/primitive-types-0.12/Cargo.toml new file mode 100644 index 00000000..81fe2bdd --- /dev/null +++ b/patches/ethereum/primitive-types-0.12/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "primitive-types" +version = "0.12.99" +description = "Patch to an empty crate" +license = "MIT" +repository = "https://github.com/serai-dex/serai/tree/develop/patches/ethereum/primitive-types" +authors = ["Luke Parker "] +keywords = [] +edition = "2021" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[workspace] + +[features] +std = [] diff --git a/patches/ethereum/primitive-types-0.12/src/lib.rs b/patches/ethereum/primitive-types-0.12/src/lib.rs new file mode 100644 index 00000000..0670b71f --- /dev/null +++ b/patches/ethereum/primitive-types-0.12/src/lib.rs @@ -0,0 +1 @@ +const _NEVER_COMPILED: [(); 0 - 1] = [(); 0 - 1]; diff --git a/patches/ethereum/rlp/Cargo.toml b/patches/ethereum/rlp/Cargo.toml new file mode 100644 index 00000000..dfb1ecd7 --- /dev/null +++ b/patches/ethereum/rlp/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "rlp" +version = "0.5.99" +description = "Patch to an empty crate" +license = "MIT" +repository = "https://github.com/serai-dex/serai/tree/develop/patches/ethereum/rlp" +authors = ["Luke Parker "] +keywords = [] +edition = "2021" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[workspace] + +[features] +std = [] diff --git a/patches/ethereum/rlp/src/lib.rs b/patches/ethereum/rlp/src/lib.rs new file mode 100644 index 00000000..0670b71f --- /dev/null +++ b/patches/ethereum/rlp/src/lib.rs @@ -0,0 +1 @@ +const _NEVER_COMPILED: [(); 0 - 1] = [(); 0 - 1]; diff --git a/patches/ethereum/secp256k1-30/Cargo.toml b/patches/ethereum/secp256k1-0.30/Cargo.toml similarity index 93% rename from patches/ethereum/secp256k1-30/Cargo.toml rename to patches/ethereum/secp256k1-0.30/Cargo.toml index 52541226..986bfd1c 100644 --- a/patches/ethereum/secp256k1-30/Cargo.toml +++ b/patches/ethereum/secp256k1-0.30/Cargo.toml @@ -3,7 +3,7 @@ name = "secp256k1" version = "0.30.99" description = "Patch to an empty crate" license = "MIT" -repository = "https://github.com/serai-dex/serai/tree/develop/patches/ethereum/secp256k1-30" +repository = "https://github.com/serai-dex/serai/tree/develop/patches/ethereum/secp256k1-0.30" authors = ["Luke Parker "] keywords = [] edition = "2021" diff --git a/patches/ethereum/secp256k1-0.30/src/lib.rs b/patches/ethereum/secp256k1-0.30/src/lib.rs new file mode 100644 index 00000000..0670b71f --- /dev/null +++ b/patches/ethereum/secp256k1-0.30/src/lib.rs @@ -0,0 +1 @@ +const _NEVER_COMPILED: [(); 0 - 1] = [(); 0 - 1];