casper-network · gRoussac · Jul 26, 2023 · Aug 3, 2023 · Aug 3, 2023 · Aug 15, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -112,7 +112,10 @@ check-std-features:
  cd smart_contracts/contract && $(CARGO) check --all-targets --no-default-features --features=std
  cd smart_contracts/contract && $(CARGO) check --all-targets --features=std
 
-.PHONY: check-testing-features
+check-std-fs-io-features:
+ cd types && $(CARGO) check --all-targets --features=std-fs-io
+ cd types && $(CARGO) check --lib --features=std-fs-io
+
 check-testing-features:
  cd types && $(CARGO) check --all-targets --no-default-features --features=testing
  cd types && $(CARGO) check --all-targets --features=testing
@@ -129,12 +132,16 @@ lint-contracts-rs:
  cd smart_contracts/contracts && $(CARGO) clippy $(patsubst %, -p %, $(ALL_CONTRACTS)) -- -D warnings -A renamed_and_removed_lints
 
 .PHONY: lint
-lint: lint-contracts-rs lint-default-features lint-all-features lint-smart-contracts
+lint: lint-contracts-rs lint-default-features lint-all-features lint-smart-contracts lint-no-default-features
 
 .PHONY: lint-default-features
 lint-default-features:
  $(CARGO) clippy --all-targets -- -D warnings
 
+.PHONY: lint-no-default-features
+lint-no-default-features:
+ $(CARGO) clippy --all-targets --no-default-features -- -D warnings
+
 .PHONY: lint-all-features
 lint-all-features:
  $(CARGO) clippy --all-targets --all-features -- -D warnings
@@ -168,6 +175,7 @@ check-rs: \
  audit \
  check-no-default-features \
  check-std-features \
+ check-std-fs-io-features \
  check-testing-features \
  test-rs \
  test-rs-no-default-features \

diff --git a/node/CHANGELOG.md b/node/CHANGELOG.md
@@ -546,4 +546,4 @@ All notable changes to this project will be documented in this file. The format
 [1.1.1]: https://github.com/casper-network/casper-node/compare/v1.0.1...v1.1.1
 [1.1.0]: https://github.com/casper-network/casper-node/compare/v1.0.1...v1.1.1
 [1.0.1]: https://github.com/casper-network/casper-node/compare/v1.0.0...v1.0.1
-[1.0.0]: https://github.com/casper-network/casper-node/releases/tag/v1.0.0
+[1.0.0]: https://github.com/casper-network/casper-node/releases/tag/v1.0.0
diff --git a/types/CHANGELOG.md b/types/CHANGELOG.md
@@ -16,10 +16,10 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 * Add new `EntryPointType::Install`, `EntryPointType::Normal`, `EntryPointAccess::Abstract` variants to support implementation of a factory pattern.
 * Add new types (`types/src/binary_port`) to support the BinaryPort interface
+* Remove filesystem I/O functionality from the `std` feature, and gated this behind a new feature `std-fs-io` which depends upon `std`.
 
 
-
-## [Unreleased] (node 1.5.4)
+## [Unreleased] (node 1.6)
 
 ### Changed
 * Remove filesystem I/O functionality from the `std` feature, and gated this behind a new feature `std-fs-io` which depends upon `std`.

diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -27,7 +27,7 @@ itertools = { version = "0.10.3", default-features = false }
 libc = { version = "0.2.146", optional = true, default-features = false }
 k256 = { version = "0.13.1", default-features = false, features = ["ecdsa", "sha256"] }
 num = { version = "0.4.0", default-features = false, features = ["alloc"] }
-num-derive = { version = "0.3.0", default-features = false }
+num-derive = { version = "0.4.0", default-features = false }
 num-integer = { version = "0.1.42", default-features = false }
 num-rational = { version = "0.4.0", default-features = false, features = ["serde"] }
 num-traits = { version = "0.2.10", default-features = false }
@@ -43,7 +43,7 @@ serde = { version = "1", default-features = false, features = ["alloc", "derive"
 serde_bytes = { version = "0.11.5", default-features = false, features = ["alloc"] }
 serde_json = { version = "1.0.59", default-features = false, features = ["alloc"] }
 strum = { version = "0.24", features = ["derive"], optional = true }
-thiserror = {version = "1", optional = true }
+thiserror = { version = "1", optional = true }
 tracing = { version = "0.1.37", default-features = false }
 uint = { version = "0.9.0", default-features = false }
 untrusted = { version = "0.7.1", optional = true }

diff --git a/types/src/account/account_hash.rs b/types/src/account/account_hash.rs
@@ -65,6 +65,11 @@ impl AccountHash {
  )
  }
 
+ /// Hexadecimal representation of the hash.
+ pub fn to_hex_string(&self) -> String {
+ base16::encode_lower(&self.0)
+ }
+
  /// Parses a string formatted as per `Self::to_formatted_string()` into an `AccountHash`.
  pub fn from_formatted_str(input: &str) -> Result<Self, FromStrError> {
  let remainder = input

diff --git a/types/src/account/error.rs b/types/src/account/error.rs
@@ -38,6 +38,3 @@ impl Display for FromStrError {
  }
  }
 }
-/// Associated error type of `TryFrom<&[u8]>` for [`AccountHash`](super::AccountHash).
-#[derive(Debug)]
-pub struct TryFromSliceForAccountHashError(());
diff --git a/types/src/addressable_entity.rs b/types/src/addressable_entity.rs
@@ -79,13 +79,24 @@ pub const MAX_GROUPS: u8 = 10;
 /// Maximum number of URefs which can be assigned across all user groups.
 pub const MAX_TOTAL_UREFS: usize = 100;
 
-const ADDRESSABLE_ENTITY_STRING_PREFIX: &str = "addressable-entity-";
-
-const ENTITY_PREFIX: &str = "entity-";
-const ACCOUNT_ENTITY_PREFIX: &str = "account-";
-const CONTRACT_ENTITY_PREFIX: &str = "contract-";
-const SYSTEM_ENTITY_PREFIX: &str = "system-";
-const NAMED_KEY_PREFIX: &str = "named-key-";
+/// The prefix applied to the hex-encoded `Addressable Entity` to produce a formatted string
+/// representation.
+pub const ADDRESSABLE_ENTITY_STRING_PREFIX: &str = "addressable-entity-";
+/// The prefix applied to the hex-encoded `Entity` to produce a formatted string
+/// representation.
+pub const ENTITY_PREFIX: &str = "entity-";
+/// The prefix applied to the hex-encoded `Account` to produce a formatted string
+/// representation.
+pub const ACCOUNT_ENTITY_PREFIX: &str = "account-";
+/// The prefix applied to the hex-encoded `Smart contract` to produce a formatted string
+/// representation.
+pub const CONTRACT_ENTITY_PREFIX: &str = "contract-";
+/// The prefix applied to the hex-encoded `System entity account or contract` to produce a formatted
+/// string representation.
+pub const SYSTEM_ENTITY_PREFIX: &str = "system-";
+/// The prefix applied to the hex-encoded `Named Key` to produce a formatted string
+/// representation.
+pub const NAMED_KEY_PREFIX: &str = "named-key-";
 
 /// Set of errors which may happen when working with contract headers.
 #[derive(Debug, PartialEq, Eq)]
@@ -279,6 +290,11 @@ impl AddressableEntityHash {
  )
  }
 
+ /// Hexadecimal representation of the hash.
+ pub fn to_hex_string(&self) -> String {
+ base16::encode_lower(&self.0)
+ }
+
  /// Parses a string formatted as per `Self::to_formatted_string()` into a
  /// `AddressableEntityHash`.
  pub fn from_formatted_str(input: &str) -> Result<Self, FromStrError> {

diff --git a/types/src/block/block_hash.rs b/types/src/block/block_hash.rs
@@ -1,4 +1,4 @@
-use alloc::vec::Vec;
+use alloc::{string::String, vec::Vec};
 use core::fmt::{self, Display, Formatter};
 
 #[cfg(feature = "datasize")]
@@ -53,6 +53,11 @@ impl BlockHash {
  &self.0
  }
 
+ /// Hexadecimal representation of the hash.
+ pub fn to_hex_string(&self) -> String {
+ base16::encode_lower(self.inner())
+ }
+
  // This method is not intended to be used by third party crates.
  #[doc(hidden)]
  #[cfg(feature = "json-schema")]

diff --git a/types/src/chainspec.rs b/types/src/chainspec.rs
@@ -44,11 +44,12 @@ pub use activation_point::ActivationPoint;
 pub use chainspec_raw_bytes::ChainspecRawBytes;
 #[cfg(any(feature = "testing", test))]
 pub use core_config::DEFAULT_FEE_HANDLING;
+#[cfg(any(feature = "testing", test))]
+pub use core_config::DEFAULT_GAS_HOLD_BALANCE_HANDLING;
 #[cfg(any(feature = "std", test))]
 pub use core_config::DEFAULT_REFUND_HANDLING;
 pub use core_config::{
- ConsensusProtocolName, CoreConfig, LegacyRequiredFinality, DEFAULT_GAS_HOLD_BALANCE_HANDLING,
- DEFAULT_GAS_HOLD_INTERVAL,
+ ConsensusProtocolName, CoreConfig, LegacyRequiredFinality, DEFAULT_GAS_HOLD_INTERVAL,
 };
 pub use fee_handling::FeeHandling;
 #[cfg(any(feature = "testing", test))]

diff --git a/types/src/chainspec/transaction_config/transaction_v1_config.rs b/types/src/chainspec/transaction_config/transaction_v1_config.rs
@@ -4,13 +4,12 @@ use datasize::DataSize;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-#[cfg(any(feature = "testing", test))]
-use crate::testing::TestRng;
 use crate::{
  bytesrepr::{self, FromBytes, ToBytes},
  transaction::TransactionCategory,
- INSTALL_UPGRADE_LANE_ID,
 };
+#[cfg(any(feature = "testing", test))]
+use crate::{testing::TestRng, INSTALL_UPGRADE_LANE_ID};
 
 /// Default gas limit of install / upgrade contracts
 pub const DEFAULT_INSTALL_UPGRADE_GAS_LIMIT: u64 = 3_500_000_000_000;

diff --git a/types/src/chainspec/vm_config.rs b/types/src/chainspec/vm_config.rs
@@ -10,15 +10,20 @@ mod storage_costs;
 mod system_config;
 mod wasm_config;
 
-pub use auction_costs::{AuctionCosts, DEFAULT_ADD_BID_COST, DEFAULT_DELEGATE_COST};
+pub use auction_costs::AuctionCosts;
+#[cfg(any(feature = "testing", test))]
+pub use auction_costs::{DEFAULT_ADD_BID_COST, DEFAULT_DELEGATE_COST};
 pub use chainspec_registry::ChainspecRegistry;
 pub use handle_payment_costs::HandlePaymentCosts;
+#[cfg(any(feature = "testing", test))]
+pub use host_function_costs::DEFAULT_NEW_DICTIONARY_COST;
 pub use host_function_costs::{
- Cost as HostFunctionCost, HostFunction, HostFunctionCosts,
- DEFAULT_HOST_FUNCTION_NEW_DICTIONARY, DEFAULT_NEW_DICTIONARY_COST,
+ Cost as HostFunctionCost, HostFunction, HostFunctionCosts, DEFAULT_HOST_FUNCTION_NEW_DICTIONARY,
 };
 pub use message_limits::MessageLimits;
-pub use mint_costs::{MintCosts, DEFAULT_TRANSFER_COST};
+pub use mint_costs::MintCosts;
+#[cfg(any(feature = "testing", test))]
+pub use mint_costs::DEFAULT_TRANSFER_COST;
 pub use opcode_costs::{BrTableCost, ControlFlowCosts, OpcodeCosts};
 #[cfg(any(feature = "testing", test))]
 pub use opcode_costs::{

diff --git a/types/src/cl_value.rs b/types/src/cl_value.rs
@@ -1,3 +1,4 @@
+//! CLvalue type
 use alloc::{string::String, vec::Vec};
 use core::fmt::{self, Display, Formatter};
 

diff --git a/types/src/crypto/asymmetric_key.rs b/types/src/crypto/asymmetric_key.rs
@@ -503,6 +503,11 @@ impl PublicKey {
  AccountHash::from(self)
  }
 
+ /// Hexadecimal representation of the key.
+ pub fn to_hex_string(&self) -> String {
+ self.to_hex()
+ }
+
  /// Returns `true` if this public key is of the `System` variant.
  pub fn is_system(&self) -> bool {
  matches!(self, PublicKey::System)
@@ -967,6 +972,11 @@ impl Signature {
  Signature::Secp256k1(_) => SECP256K1,
  }
  }
+
+ /// Hexadecimal representation of the signature.
+ pub fn to_hex_string(&self) -> String {
+ self.to_hex()
+ }
 }
 
 impl AsymmetricType<'_> for Signature {

diff --git a/types/src/crypto/asymmetric_key/tests.rs b/types/src/crypto/asymmetric_key/tests.rs
@@ -82,6 +82,7 @@ fn known_secret_key_to_pem(expected_key: &SecretKey, known_key_pem: &str, expect
  assert_eq!(expected_tag, decoded.tag());
 }
 
+#[cfg(any(feature = "std-fs-io", test))]
 fn secret_key_file_roundtrip(secret_key: SecretKey) {
  let tempdir = tempfile::tempdir().unwrap();
  let path = tempdir.path().join("test_secret_key.pem");
@@ -140,6 +141,7 @@ fn known_public_key_to_pem(known_key_hex: &str, known_key_pem: &str) {
  assert_eq!(key_bytes, Into::<Vec<u8>>::into(decoded));
 }
 
+#[cfg(any(feature = "std-fs-io", test))]
 fn public_key_file_roundtrip(public_key: PublicKey) {
  let tempdir = tempfile::tempdir().unwrap();
  let path = tempdir.path().join("test_public_key.pem");
@@ -214,6 +216,7 @@ fn check_ord_and_hash<T: Clone + Ord + PartialOrd + Hash>(low: T, high: T) {
 }
 
 mod system {
+ #[cfg(any(feature = "std-fs-io", test))]
  use std::path::Path;
 
  use super::{sign, verify};
@@ -229,6 +232,7 @@ mod system {
  assert!(SecretKey::system().to_pem().is_err());
  }
 
+ #[cfg(any(feature = "std-fs-io", test))]
  #[test]
  fn secret_key_to_file_should_error() {
  assert!(SecretKey::system().to_file(Path::new("/dev/null")).is_err());
@@ -249,6 +253,7 @@ mod system {
  assert!(PublicKey::system().to_pem().is_err());
  }
 
+ #[cfg(any(feature = "std-fs-io", test))]
  #[test]
  fn public_key_to_file_should_error() {
  assert!(PublicKey::system().to_file(Path::new("/dev/null")).is_err());
@@ -341,6 +346,7 @@ MC4CAQAwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
  super::known_secret_key_to_pem(&expected_key, KNOWN_KEY_PEM, ED25519_TAG);
  }
 
+ #[cfg(any(feature = "std-fs-io", test))]
  #[test]
  fn secret_key_to_and_from_file() {
  let mut rng = TestRng::new();
@@ -397,6 +403,7 @@ MCowBQYDK2VwAyEAGb9ECWmEzf6FQbrBZ9w7lshQhqowtrbLDFw4rXAxZuE=
  super::known_public_key_to_pem(KNOWN_KEY_HEX, KNOWN_KEY_PEM);
  }
 
+ #[cfg(any(feature = "std-fs-io", test))]
  #[test]
  fn public_key_to_and_from_file() {
  let mut rng = TestRng::new();
@@ -584,6 +591,7 @@ Yj9oTB9fx9+vvQdxJOhMtu46kGo0Uw==
  }
 
  #[test]
+ #[cfg(any(feature = "std-fs-io", test))]
  fn secret_key_to_and_from_file() {
  let mut rng = TestRng::new();
  let secret_key = SecretKey::random_secp256k1(&mut rng);
@@ -640,6 +648,7 @@ kv+kBR5u4ISEAkuc2TFWQHX0Yj9oTB9fx9+vvQdxJOhMtu46kGo0Uw==
  super::known_public_key_to_pem(KNOWN_KEY_HEX, KNOWN_KEY_PEM);
  }
 
+ #[cfg(any(feature = "std-fs-io", test))]
  #[test]
  fn public_key_to_and_from_file() {
  let mut rng = TestRng::new();

diff --git a/types/src/lib.rs b/types/src/lib.rs
@@ -67,14 +67,15 @@ mod tagged;
 #[cfg(any(feature = "testing", test))]
 pub mod testing;
 mod timestamp;
-mod transaction;
+/// Module containing transaction types.
+pub mod transaction;
 mod transfer;
 mod transfer_result;
 mod uint;
 mod uref;
 mod validator_change;
 
-#[cfg(feature = "std")]
+#[cfg(all(feature = "std", any(feature = "std-fs-io", test)))]
 use libc::{c_long, sysconf, _SC_PAGESIZE};
 #[cfg(feature = "std")]
 use once_cell::sync::Lazy;
@@ -223,8 +224,13 @@ pub static OS_PAGE_SIZE: Lazy<usize> = Lazy::new(|| {
  /// Sensible default for many if not all systems.
  const DEFAULT_PAGE_SIZE: usize = 4096;
 
+ #[cfg(any(feature = "std-fs-io", test))]
  // https://www.gnu.org/software/libc/manual/html_node/Sysconf.html
  let value: c_long = unsafe { sysconf(_SC_PAGESIZE) };
+
+ #[cfg(not(any(feature = "std-fs-io", test)))]
+ let value = 0;
+
  if value <= 0 {
  DEFAULT_PAGE_SIZE
  } else {

diff --git a/types/src/transaction.rs b/types/src/transaction.rs
@@ -534,6 +534,11 @@ pub mod gens {
 
  use super::*;
 
+ /// Generates a random `DeployHash` for testing purposes.
+ ///
+ /// This function is used to generate random `DeployHash` values for testing purposes.
+ /// It produces a proptest `Strategy` that can be used to generate arbitrary `DeployHash`
+ /// values.
  pub fn deploy_hash_arb() -> impl Strategy<Value = DeployHash> {
  array::uniform32(<u8>::arbitrary()).prop_map(DeployHash::from_raw)
  }

diff --git a/types/src/transaction/deploy/deploy_builder.rs b/types/src/transaction/deploy/deploy_builder.rs
@@ -37,10 +37,15 @@ impl<'a> DeployBuilder<'a> {
  /// [`with_standard_payment`](Self::with_standard_payment) or
  /// [`with_payment`](Self::with_payment)
  pub fn new<C: Into<String>>(chain_name: C, session: ExecutableDeployItem) -> Self {
+ #[cfg(any(feature = "std-fs-io", test))]
+ let timestamp = Timestamp::now();
+ #[cfg(not(any(feature = "std-fs-io", test)))]
+ let timestamp = Timestamp::zero();
+
  DeployBuilder {
  account: None,
  secret_key: None,
- timestamp: Timestamp::now(),
+ timestamp,
  ttl: Self::DEFAULT_TTL,
  gas_price: Self::DEFAULT_GAS_PRICE,
  dependencies: vec![],

diff --git a/types/src/transaction/deploy/deploy_hash.rs b/types/src/transaction/deploy/deploy_hash.rs
@@ -1,4 +1,4 @@
-use alloc::vec::Vec;
+use alloc::{string::String, vec::Vec};
 use core::fmt::{self, Display, Formatter};
 
 #[cfg(feature = "datasize")]
@@ -45,6 +45,11 @@ impl DeployHash {
  &self.0
  }
 
+ /// Hexadecimal representation of the hash.
+ pub fn to_hex_string(&self) -> String {
+ base16::encode_lower(self.inner())
+ }
+
  /// Returns a new `DeployHash` directly initialized with the provided bytes; no hashing is done.
  #[cfg(any(feature = "testing", test))]
  pub const fn from_raw(raw_digest: [u8; Self::LENGTH]) -> Self {