From cbbfe9c9f2f3e17d4e67e979f954cd9e67b45753 Mon Sep 17 00:00:00 2001 From: Leo Alt Date: Fri, 24 Nov 2023 16:32:08 +0100 Subject: [PATCH 1/6] use serde as no-std --- Cargo.lock | 1 - bins/revme/Cargo.toml | 6 +++--- crates/interpreter/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 4 ++-- crates/revm/Cargo.toml | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf68662c8e..5b42120bb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2794,7 +2794,6 @@ version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap", "itoa", "ryu", "serde", diff --git a/bins/revme/Cargo.toml b/bins/revme/Cargo.toml index 03f34cb563..464c0c5954 100644 --- a/bins/revme/Cargo.toml +++ b/bins/revme/Cargo.toml @@ -16,15 +16,15 @@ indicatif = "0.17" plain_hasher = "0.2" revm = { path = "../../crates/revm", version = "3.5.0", default-features = false, features = [ "ethersdb", - "std", + #"std", "serde", "c-kzg", ] } alloy-rlp = { version = "0.3", default-features = false, features = [ "arrayvec", ] } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } +serde_json = { version = "1.0", default-features = false } structopt = "0.3" thiserror = "1.0" triehash = "0.8" diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml index e0dc8e4b28..548dbf2c4c 100644 --- a/crates/interpreter/Cargo.toml +++ b/crates/interpreter/Cargo.toml @@ -13,7 +13,7 @@ readme = "../../README.md" revm-primitives = { path = "../primitives", version = "1.3.0", default-features = false } # optional -serde = { version = "1.0", features = ["derive", "rc"], optional = true } +serde = { version = "1.0", default-features = false, features = ["derive", "rc"], optional = true } [features] default = ["std"] diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 17ddf04982..811d6a23fa 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -31,10 +31,10 @@ enumn = "0.1" derive_more = { version = "0.99", optional = true } # optional -serde = { version = "1.0", features = ["derive", "rc"], optional = true } +serde = { version = "1.0", default-features = false, features = ["derive", "rc"], optional = true } [build-dependencies] -hex = "0.4" +hex = { version = "0.4", default-features = false } [features] default = ["std", "c-kzg"] diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index 1d21d33694..2ded1d7506 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -17,8 +17,8 @@ revm-precompile = { path = "../precompile", version = "2.2.0", default-features auto_impl = { version = "1.1", default-features = false } # Optional -serde = { version = "1.0", features = ["derive", "rc"], optional = true } -serde_json = { version = "1.0", features = ["preserve_order"], optional = true } +serde = { version = "1.0", default-features = false, features = ["derive", "rc"], optional = true } +serde_json = { version = "1.0", default-features = false, optional = true } # ethersdb tokio = { version = "1.34", features = [ From 15c51faf740fd548acc452ce79d20ea6bf081f48 Mon Sep 17 00:00:00 2001 From: ceciliaz030 Date: Thu, 18 Jan 2024 13:30:33 +0800 Subject: [PATCH 2/6] optional serde std --- bins/revme/Cargo.toml | 6 +++++- crates/interpreter/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 8 +------- crates/revm/Cargo.toml | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/bins/revme/Cargo.toml b/bins/revme/Cargo.toml index 464c0c5954..e399c07fdb 100644 --- a/bins/revme/Cargo.toml +++ b/bins/revme/Cargo.toml @@ -24,8 +24,12 @@ alloy-rlp = { version = "0.3", default-features = false, features = [ "arrayvec", ] } serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } -serde_json = { version = "1.0", default-features = false } +serde_json = { version = "1.0", default-features = false, features = ["alloc"]} structopt = "0.3" thiserror = "1.0" triehash = "0.8" walkdir = "2.4" + +[features] +default = ["std"] +std = ["serde/std", "serde_json/std", "alloy-rlp/std", "revm/std"] \ No newline at end of file diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml index 548dbf2c4c..43e7a09d24 100644 --- a/crates/interpreter/Cargo.toml +++ b/crates/interpreter/Cargo.toml @@ -17,7 +17,7 @@ serde = { version = "1.0", default-features = false, features = ["derive", "rc"] [features] default = ["std"] -std = ["revm-primitives/std"] +std = ["serde?/std", "revm-primitives/std"] serde = ["dep:serde", "revm-primitives/serde"] arbitrary = ["std", "revm-primitives/arbitrary"] diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 811d6a23fa..d35f1c0954 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -38,13 +38,7 @@ hex = { version = "0.4", default-features = false } [features] default = ["std", "c-kzg"] -std = [ - "alloy-primitives/std", - "alloy-rlp/std", - "hex/std", - "bitvec/std", - "bitflags/std", -] +std = ["serde?/std", "alloy-rlp/std", "hex/std", "bitvec/std", "bitflags/std"] serde = [ "dep:serde", "alloy-primitives/serde", diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index 2ded1d7506..d20b5c5c5f 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -18,7 +18,7 @@ auto_impl = { version = "1.1", default-features = false } # Optional serde = { version = "1.0", default-features = false, features = ["derive", "rc"], optional = true } -serde_json = { version = "1.0", default-features = false, optional = true } +serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true } # ethersdb tokio = { version = "1.34", features = [ @@ -36,7 +36,7 @@ criterion = "0.5" [features] default = ["std", "c-kzg", "secp256k1"] -std = ["revm-interpreter/std", "revm-precompile/std"] +std = ["serde?/std", "serde_json?/std", "revm-interpreter/std", "revm-precompile/std"] serde = ["dep:serde", "dep:serde_json", "revm-interpreter/serde"] arbitrary = ["revm-interpreter/arbitrary"] From 6f951139e178ffb7619707b3a98c72fe79d8a7a4 Mon Sep 17 00:00:00 2001 From: ceciliaz030 Date: Thu, 18 Jan 2024 14:33:28 +0800 Subject: [PATCH 3/6] delete comment #"std" --- bins/revme/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/bins/revme/Cargo.toml b/bins/revme/Cargo.toml index e399c07fdb..8989bb8052 100644 --- a/bins/revme/Cargo.toml +++ b/bins/revme/Cargo.toml @@ -16,7 +16,6 @@ indicatif = "0.17" plain_hasher = "0.2" revm = { path = "../../crates/revm", version = "3.5.0", default-features = false, features = [ "ethersdb", - #"std", "serde", "c-kzg", ] } From cf4da2fa8cce0c8cd65f52c62f985dfc82a8a6e7 Mon Sep 17 00:00:00 2001 From: ceciliaz030 Date: Thu, 18 Jan 2024 14:35:37 +0800 Subject: [PATCH 4/6] "preserve_order" --- Cargo.lock | 1 + crates/revm/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 5b42120bb9..bf68662c8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2794,6 +2794,7 @@ version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ + "indexmap", "itoa", "ryu", "serde", diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index d20b5c5c5f..f6638644d4 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -18,7 +18,7 @@ auto_impl = { version = "1.1", default-features = false } # Optional serde = { version = "1.0", default-features = false, features = ["derive", "rc"], optional = true } -serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true } +serde_json = { version = "1.0", default-features = false, features = ["alloc", "preserve_order"], optional = true } # ethersdb tokio = { version = "1.34", features = [ From 2f0f19f5759e1aedb62626ebe70f22d1b4e8cbb1 Mon Sep 17 00:00:00 2001 From: ceciliaz030 Date: Fri, 19 Jan 2024 00:19:42 +0800 Subject: [PATCH 5/6] revme revert --- bins/revme/Cargo.toml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bins/revme/Cargo.toml b/bins/revme/Cargo.toml index c854c9feba..7d11e5fa9c 100644 --- a/bins/revme/Cargo.toml +++ b/bins/revme/Cargo.toml @@ -16,6 +16,7 @@ indicatif = "0.17" plain_hasher = "0.2" revm = { path = "../../crates/revm", version = "3.5.0", default-features = false, features = [ "ethersdb", + "std", "serde", "c-kzg", ] } @@ -23,13 +24,9 @@ alloy-rlp = { version = "0.3", default-features = false, features = [ "arrayvec", "derive", ] } -serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } -serde_json = { version = "1.0", default-features = false, features = ["alloc"]} +serde = { version = "1.0", features = ["derive", "rc"] } +serde_json = { version = "1.0", features = ["preserve_order"]} structopt = "0.3" thiserror = "1.0" triehash = "0.8" walkdir = "2.4" - -[features] -default = ["std"] -std = ["serde/std", "serde_json/std", "alloy-rlp/std", "revm/std"] \ No newline at end of file From 53d6e8bb6ab9e91f2e9e1f7caab5a3530b334e04 Mon Sep 17 00:00:00 2001 From: rakita Date: Thu, 18 Jan 2024 19:34:13 +0100 Subject: [PATCH 6/6] Update bins/revme/Cargo.toml --- bins/revme/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bins/revme/Cargo.toml b/bins/revme/Cargo.toml index 7d11e5fa9c..fad281a9ea 100644 --- a/bins/revme/Cargo.toml +++ b/bins/revme/Cargo.toml @@ -25,7 +25,7 @@ alloy-rlp = { version = "0.3", default-features = false, features = [ "derive", ] } serde = { version = "1.0", features = ["derive", "rc"] } -serde_json = { version = "1.0", features = ["preserve_order"]} +serde_json = { version = "1.0", features = ["preserve_order"] } structopt = "0.3" thiserror = "1.0" triehash = "0.8"