ergotree-ir, ergotree-interpreter: Fix serde support for no_std

ergoplatform · Nov 26, 2024 · 51c632d · 51c632d
1 parent 4a2db23
commit 51c632d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,9 +32,9 @@ ergotree-ir = { version = "^0.28.0", path = "./ergotree-ir", default-features =
 ergo-chain-types = { version = "^0.15.0", path = "./ergo-chain-types", default-features = false }
 sigma-test-util = { version = "^0.3.0", path = "./sigma-test-util" }
 ergoscript-compiler = { version = "^0.24.0", path = "./ergoscript-compiler" }
-ergotree-interpreter = { version = "^0.28.0", path = "./ergotree-interpreter" }
+ergotree-interpreter = { version = "^0.28.0", path = "./ergotree-interpreter", default-features = false }
 ergo-nipopow = { version = "^0.15", path = "./ergo-nipopow" }
-ergo-merkle-tree = { version = "^0.15.0", path = "./ergo-merkle-tree" }
+ergo-merkle-tree = { version = "^0.15.0", path = "./ergo-merkle-tree", default-features = false }
 ergo-rest = { version = "^0.13.0", path = "./ergo-rest" }
 ergo-lib = { version = "^0.28.0", path = "./ergo-lib" }
 k256 = { version = "0.13.1", default-features = false, features = [
@@ -66,13 +66,15 @@ lazy_static = { version = "1.4", features = ["spin_no_std"] }
 bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] }
 base16 = { version = "0.2.1", default-features = false, features = ["alloc"] }
 base64 = { version = "0.13.0", default-features = false, features = ["alloc"] }
-indexmap = { version = "2.6.0", default-features = false } #TODO: enable std conditionally
-serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0", features = [
+indexmap = { version = "2.6.0", default-features = false }
+serde = { version = "1.0", default-features = false, features = ["derive"] }
+serde_json = { version = "1.0", default-features = false, features = [
     "arbitrary_precision",
-    "preserve_order",
 ] }
-serde_with = { version = "1.9.1", features = ["json"] }
+serde_with = { version = "3.11.0", default-features = false, features = [
+    "json",
+    "macros",
+] }
 rand = "0.8.5"
 bytes = { version = "1.1", default-features = false }
 byteorder = "1"
@@ -83,7 +85,7 @@ tokio-util = { version = "0.6.9", features = ["codec"] }
 bounded-integer = { version = "^0.5", features = ["types"] }
 url = "~2.2"
 getrandom = { version = "0.2.7" }
-itertools = "0.10.3"
+itertools = { version = "0.10.3", default-features = false }
 miette = { version = "5", features = ["fancy"] }
 hashbrown = { version = "0.14.3", features = ["serde"] }
 core2 = { version = "0.4.0", default-features = false, features = ["alloc"] }

diff --git a/ergo-chain-types/Cargo.toml b/ergo-chain-types/Cargo.toml
@@ -30,7 +30,7 @@ core2 = { workspace = true }
 [features]
 default = ["std", "json"]
 arbitrary = ["proptest", "proptest-derive", "std"]
-json = ["serde", "serde_json", "serde_with", "std"]
-std = ["dep:url", "base16/std", "base64/std"]
+json = ["serde", "serde_json", "serde_with"]
+std = ["dep:url", "base16/std", "base64/std", "serde/std"]
 
 [dev-dependencies]
diff --git a/ergo-chain-types/src/json/autolykos_solution.rs b/ergo-chain-types/src/json/autolykos_solution.rs
@@ -1,6 +1,9 @@
 //! Code to implement `AutolykosSolution` JSON encoding
 
-use std::str::FromStr;
+use alloc::string::String;
+use alloc::string::ToString;
+use alloc::vec::Vec;
+use core::str::FromStr;
 
 use num_bigint::BigInt;
 use num_traits::FromPrimitive;

diff --git a/ergo-chain-types/src/json/votes.rs b/ergo-chain-types/src/json/votes.rs
@@ -1,6 +1,7 @@
 //! Code to implement `Votes` JSON encoding
 
-use std::convert::{TryFrom, TryInto};
+use alloc::vec::Vec;
+use core::convert::{TryFrom, TryInto};
 
 use crate::votes::{Votes, VotesError};
 use crate::Base16DecodedBytes;

diff --git a/ergotree-interpreter/Cargo.toml b/ergotree-interpreter/Cargo.toml
@@ -49,7 +49,7 @@ json = [
     "ergo-chain-types/json",
 ]
 default = ["json", "std"]
-std = ["rand", "miette"]
+std = ["rand", "miette", "ergotree-ir/std"]
 arbitrary = [
     "std",
     "proptest",

diff --git a/ergotree-interpreter/src/json/hint.rs b/ergotree-interpreter/src/json/hint.rs
@@ -1,6 +1,9 @@
+use alloc::string::String;
+use alloc::string::ToString;
+use alloc::vec::Vec;
 use core::convert::TryFrom;
-use std::num::ParseIntError;
-use std::str::FromStr;
+use core::num::ParseIntError;
+use core::str::FromStr;
 
 use ergo_chain_types::Base16DecodedBytes;
 use ergotree_ir::sigma_protocol::sigma_boolean::SigmaBoolean;

diff --git a/ergotree-ir/Cargo.toml b/ergotree-ir/Cargo.toml
@@ -49,7 +49,6 @@ json = [
     "serde_json",
     "serde_with",
     "bounded-vec/serde",
-    "std",
     "ergo-chain-types/json",
     "indexmap/serde",
 ]

diff --git a/ergotree-ir/src/chain/context_extension.rs b/ergotree-ir/src/chain/context_extension.rs
@@ -19,7 +19,7 @@ use super::IndexMap;
 #[cfg_attr(
     feature = "json",
     derive(serde::Deserialize),
-    serde(try_from = "indexmap::IndexMap<String, String>")
+    serde(try_from = "IndexMap<String, String>")
 )]
 pub struct ContextExtension {
     /// key-value pairs of variable id and it's value