From 1ac526d679dea820d0ef458519087c08fb9a7f97 Mon Sep 17 00:00:00 2001 From: Zach Obront Date: Sun, 16 Jun 2024 20:45:10 -0500 Subject: [PATCH 1/4] add serde flag to preimage crate for keys --- crates/preimage/src/key.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/preimage/src/key.rs b/crates/preimage/src/key.rs index 1ba26b15c4..99784bb2bf 100644 --- a/crates/preimage/src/key.rs +++ b/crates/preimage/src/key.rs @@ -2,8 +2,11 @@ //! the preimage oracle. use alloy_primitives::{B256, U256}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash)] #[repr(u8)] pub enum PreimageKeyType { @@ -53,6 +56,7 @@ impl TryFrom for PreimageKeyType { /// |---------|-------------| /// | [0, 1) | Type byte | /// | [1, 32) | Data | +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash)] pub struct PreimageKey { data: [u8; 31], From 8a6ab8e95d4978068cce9663932718cd77a813da Mon Sep 17 00:00:00 2001 From: Zach Obront Date: Sun, 16 Jun 2024 21:10:39 -0500 Subject: [PATCH 2/4] cargo.toml update --- crates/preimage/Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/preimage/Cargo.toml b/crates/preimage/Cargo.toml index 51eb95a4af..bdd848d3e7 100644 --- a/crates/preimage/Cargo.toml +++ b/crates/preimage/Cargo.toml @@ -19,6 +19,12 @@ async-trait.workspace = true # local kona-common = { path = "../common", version = "0.0.1" } +serde = { version = "1.0.203", optional = true } + [dev-dependencies] tokio = { version = "1.38.0", features = ["full"] } tempfile = "3.10.1" + +[features] +default = [] +serde = ["serde"] From 1282a409ddd44d38ee0cf2d4668c66b3a63ff51b Mon Sep 17 00:00:00 2001 From: Zach Obront Date: Sun, 16 Jun 2024 21:12:55 -0500 Subject: [PATCH 3/4] dep:serde --- crates/preimage/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/preimage/Cargo.toml b/crates/preimage/Cargo.toml index bdd848d3e7..5becbcf6d1 100644 --- a/crates/preimage/Cargo.toml +++ b/crates/preimage/Cargo.toml @@ -27,4 +27,4 @@ tempfile = "3.10.1" [features] default = [] -serde = ["serde"] +serde = ["dep:serde"] From 2673f746b7c1ea93ca75b70bcb4659c2ed3e398d Mon Sep 17 00:00:00 2001 From: Zach Obront Date: Sun, 16 Jun 2024 21:15:01 -0500 Subject: [PATCH 4/4] derive feature --- Cargo.lock | 1 + crates/preimage/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 0b00692fe6..9d2ed23434 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1853,6 +1853,7 @@ dependencies = [ "async-trait", "cfg-if", "kona-common", + "serde", "tempfile", "tokio", "tracing", diff --git a/crates/preimage/Cargo.toml b/crates/preimage/Cargo.toml index 5becbcf6d1..69c817004d 100644 --- a/crates/preimage/Cargo.toml +++ b/crates/preimage/Cargo.toml @@ -19,7 +19,7 @@ async-trait.workspace = true # local kona-common = { path = "../common", version = "0.0.1" } -serde = { version = "1.0.203", optional = true } +serde = { version = "1.0.203", features = ["derive"], optional = true } [dev-dependencies] tokio = { version = "1.38.0", features = ["full"] }