1.6 feature merge

Cargo.toml

@@ -6,13 +6,16 @@ members = [
     "execution_engine_testing/tests",
     "hashing",
     "json_rpc",
+    "juliet",
     "node",
     "smart_contracts/contract",
     "smart_contracts/contracts/[!.]*/*",
     "types",
     "utils/global-state-update-gen",
     "utils/validation",
 ]
+# Ensures we do not pull in all the features of dev dependencies when building.
+resolver = "2"
 
 default-members = [
     "ci/casper_updater",
@@ -21,6 +24,7 @@ default-members = [
     "execution_engine_testing/tests",
     "hashing",
     "json_rpc",
+    "juliet",    
     "node",
     "types",
     "utils/global-state-update-gen",
@@ -29,15 +33,17 @@ default-members = [
 
 exclude = ["utils/nctl/remotes/casper-client-rs"]
 
-# Include debug symbols in the release build of `casper-engine-tests` so that `simple-transfer` will yield useful
-# perf data.
-[profile.release.package.casper-engine-tests]
-debug = true
-
 [profile.release]
 codegen-units = 1
 lto = true
 
 [profile.bench]
 codegen-units = 1
 lto = true
+
+[profile.release-with-debug]
+inherits = "release"
+debug = true
+
+[patch.crates-io]
+datasize = { git = "https://github.com/casperlabs/datasize-rs", rev = "2b980c05af5553522dde5f2751e5a0fd3347d881" }

README.md

@@ -141,6 +141,8 @@ RUST_LOG=info cargo run --release -- validator resources/local/config.toml
 
 If the environment variable is unset, it is equivalent to setting `RUST_LOG=error`.
 
+When developing and running unit tests, setting `NODE_TEST_LOG=json` will cause the log messages produced by the tests to be JSON-formatted.
+
 ### Log message format
 
 A typical log message will look like:

execution_engine/Cargo.toml

@@ -16,7 +16,7 @@ base16 = "0.2.1"
 bincode = "1.3.1"
 casper-hashing = { version = "2.0.0", path = "../hashing" }
 casper-types = { version = "3.0.0", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema"] }
-casper-wasm-utils = "1.0.0"
+casper-wasm-utils = "2.0.0"
 datasize = "0.2.4"
 either = "1.8.1"
 hex_fmt = "0.3.0"
@@ -34,7 +34,7 @@ num-rational = { version = "0.4.0", features = ["serde"] }
 num-traits = "0.2.10"
 num_cpus = "1"
 once_cell = "1.5.2"
-parity-wasm = { version = "0.42", default-features = false }
+parity-wasm = { version = "0.45.0", default-features = false }
 proptest = { version = "1.0.0", optional = true }
 rand = "0.8.3"
 rand_chacha = "0.3.0"
@@ -47,7 +47,7 @@ thiserror = "1.0.18"
 tracing = "0.1.18"
 uint = "0.9.0"
 uuid = { version = "0.8.1", features = ["serde", "v4"] }
-wasmi = "0.9.1"
+wasmi = "0.13.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"

execution_engine/benches/trie_bench.rs

@@ -42,19 +42,19 @@ fn deserialize_trie_node(b: &mut Bencher) {
 }
 
 fn serialize_trie_node_pointer(b: &mut Bencher) {
-    let node = Trie::<Key, StoredValue>::Extension {
-        affix: (0..255).collect(),
-        pointer: Pointer::NodePointer(Digest::hash([0; 32])),
-    };
+    let node = Trie::<Key, StoredValue>::extension(
+        (0..255).collect(),
+        Pointer::NodePointer(Digest::hash([0; 32])),
+    );
 
     b.iter(|| ToBytes::to_bytes(black_box(&node)));
 }
 
 fn deserialize_trie_node_pointer(b: &mut Bencher) {
-    let node = Trie::<Key, StoredValue>::Extension {
-        affix: (0..255).collect(),
-        pointer: Pointer::NodePointer(Digest::hash([0; 32])),
-    };
+    let node = Trie::<Key, StoredValue>::extension(
+        (0..255).collect(),
+        Pointer::NodePointer(Digest::hash([0; 32])),
+    );
     let node_bytes = node.to_bytes().unwrap();
 
     b.iter(|| Trie::<Key, StoredValue>::from_bytes(black_box(&node_bytes)));

execution_engine/src/core/engine_state/engine_config.rs

@@ -30,13 +30,8 @@ pub const DEFAULT_MAX_STORED_VALUE_SIZE: u32 = 8 * 1024 * 1024;
 pub const DEFAULT_MINIMUM_DELEGATION_AMOUNT: u64 = 500 * 1_000_000_000;
 /// Default value for strict argument checking.
 pub const DEFAULT_STRICT_ARGUMENT_CHECKING: bool = false;
-/// 91 days / 7 days in a week = 13 weeks
-/// Length of total vesting schedule in days.
-const VESTING_SCHEDULE_LENGTH_DAYS: usize = 91;
-const DAY_MILLIS: usize = 24 * 60 * 60 * 1000;
 /// Default length of total vesting schedule period expressed in days.
-pub const DEFAULT_VESTING_SCHEDULE_LENGTH_MILLIS: u64 =
-    VESTING_SCHEDULE_LENGTH_DAYS as u64 * DAY_MILLIS as u64;
+pub const DEFAULT_VESTING_SCHEDULE_LENGTH_MILLIS: u64 = 0;
 /// Default value for allowing auction bids.
 pub const DEFAULT_ALLOW_AUCTION_BIDS: bool = true;
 /// Default value for allowing unrestricted transfers.

execution_engine/src/core/engine_state/execution_effect.rs

@@ -31,6 +31,7 @@ impl From<ExecutionJournal> for ExecutionEffect {
                 | Transform::AddUInt256(_)
                 | Transform::AddUInt512(_)
                 | Transform::AddKeys(_) => ops.insert_add(key, Op::Add),
+                Transform::Prune => ops.insert_add(key, Op::Prune),
             };
             transforms.insert_add(key, transform);
         }

execution_engine/src/core/engine_state/mod.rs

@@ -497,7 +497,7 @@ where
 
         match self
             .state
-            .delete_keys(correlation_id, state_root_hash, keys_to_delete)
+            .prune_keys(correlation_id, state_root_hash, keys_to_delete)
         {
             Ok(DeleteResult::Deleted(post_state_hash)) => {
                 Ok(PruneResult::Success { post_state_hash })
@@ -2342,12 +2342,12 @@ where
                 (delay, era_id)
             };
 
-            for key in withdraw_keys {
+            for key in &withdraw_keys {
                 // Transform only those withdraw purses that are still to be
                 // processed in the unbonding queue.
                 let withdraw_purses = tracking_copy
                     .borrow_mut()
-                    .read(correlation_id, &key)
+                    .read(correlation_id, key)
                     .map_err(|_| Error::FailedToGetWithdrawKeys)?
                     .ok_or(Error::FailedToGetStoredWithdraws)?
                     .as_withdraw()
@@ -2382,6 +2382,11 @@ where
             }
         }
 
+        // Post-migration clean up
+
+        for withdraw_key in withdraw_keys {
+            tracking_copy.borrow_mut().prune(withdraw_key);
+        }
         Ok(())
     }
 

execution_engine/src/core/engine_state/op.rs

@@ -6,15 +6,18 @@ use std::{
 };
 
 /// Representation of a single operation during execution.
-#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+#[derive(PartialEq, Eq, Debug, Clone, Copy, Default)]
 pub enum Op {
     /// Read value from a `Key`.
     Read,
     /// Write value under a `Key`.
     Write,
     /// Add a value into a `Key`.
     Add,
+    /// Prune a value under a `Key`.
+    Prune,
     /// No operation.
+    #[default]
     NoOp,
 }
 
@@ -44,19 +47,14 @@ impl Display for Op {
     }
 }
 
-impl Default for Op {
-    fn default() -> Self {
-        Op::NoOp
-    }
-}
-
 impl From<&Op> for casper_types::OpKind {
     fn from(op: &Op) -> Self {
         match op {
             Op::Read => casper_types::OpKind::Read,
             Op::Write => casper_types::OpKind::Write,
             Op::Add => casper_types::OpKind::Add,
             Op::NoOp => casper_types::OpKind::NoOp,
+            Op::Prune => casper_types::OpKind::Delete,
         }
     }
 }