Merge pull request #4350 from Fraser999/revert-types-change

Revert types change and bump versions
casper-network · Oct 18, 2023 · 53dd338 · 53dd338
2 parents 273d309 + ced9145
commit 53dd338
Show file tree

Hide file tree

Showing 39 changed files with 249 additions and 259 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,6 +41,3 @@ lto = true
 [profile.bench]
 codegen-units = 1
 lto = true
-
-[patch.crates-io]
-parity-wasm = { git = "https://github.com/casper-network/casper-wasm.git", branch = "casper-0.45.0" }
diff --git a/execution_engine/CHANGELOG.md b/execution_engine/CHANGELOG.md
@@ -10,10 +10,19 @@ All notable changes to this project will be documented in this file.  The format
 [comment]: <> (Security:   in case of vulnerabilities)
 
 
-## [Unreleased]
+
+## 6.0.0
 
 ### Changed
 * Default value for `max_stack_height` is increased to 500.
+* Replaced usage of `parity-wasm` and `wasmi` with Casper forks `casper-wasm` and `casper-wasmi` respectively.
+
+### Fixed
+* Fix incorrect handling of unbonding purses for validators that were also evicted in that era.
+* Fix issue with one-time code used for migrating data to support redelegations.
+
+### Security
+* Fix unbounded memory allocation issue while parsing Wasm.
 
 
 

diff --git a/execution_engine/Cargo.toml b/execution_engine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "casper-execution-engine"
-version = "5.0.0" # when updating, also update 'html_root_url' in lib.rs
+version = "6.0.0" # when updating, also update 'html_root_url' in lib.rs
 authors = ["Henry Till <henrytill@gmail.com>", "Ed Hastings <ed@casperlabs.io>"]
 edition = "2018"
 description = "CasperLabs execution engine crates."
@@ -15,12 +15,14 @@ anyhow = "1.0.33"
 base16 = "0.2.1"
 bincode = "1.3.1"
 casper-hashing = { version = "2.0.0", path = "../hashing" }
-casper-types = { version = "4.0.0", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema"] }
-casper-wasm-utils = "2.0.0"
+casper-types = { version = "3.0.0", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema"] }
+casper-wasm = { version = "0.46.0", default-features = false }
+casper-wasm-utils = "3.0.0"
+casper-wasmi = "0.13.2"
 datasize = "0.2.4"
 either = "1.8.1"
-hex_fmt = "0.3.0"
 hex-buffer-serde = "0.2.1"
+hex_fmt = "0.3.0"
 hostname = "0.3.0"
 humantime = "2"
 itertools = "0.10.0"
@@ -34,7 +36,6 @@ 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.45.0", default-features = false }
 proptest = { version = "1.0.0", optional = true }
 rand = "0.8.3"
 rand_chacha = "0.3.0"
@@ -47,7 +48,6 @@ thiserror = "1.0.18"
 tracing = "0.1.18"
 uint = "0.9.0"
 uuid = { version = "0.8.1", features = ["serde", "v4"] }
-wasmi = "0.13.2"
 
 [dev-dependencies]
 assert_matches = "1.3.0"

diff --git a/execution_engine/src/core/engine_state/error.rs b/execution_engine/src/core/engine_state/error.rs
@@ -33,7 +33,7 @@ pub enum Error {
     WasmPreprocessing(#[from] wasm_prep::PreprocessingError),
     /// WASM serialization error.
     #[error("Wasm serialization error: {0:?}")]
-    WasmSerialization(#[from] parity_wasm::SerializationError),
+    WasmSerialization(#[from] casper_wasm::SerializationError),
     /// Contract execution error.
     #[error(transparent)]
     Exec(execution::Error),

diff --git a/execution_engine/src/core/execution/error.rs b/execution_engine/src/core/execution/error.rs
@@ -1,5 +1,5 @@
 //! Execution error and supporting code.
-use parity_wasm::elements;
+use casper_wasm::elements;
 use thiserror::Error;
 
 use casper_types::{
@@ -197,10 +197,10 @@ impl Error {
     }
 }
 
-impl wasmi::HostError for Error {}
+impl casper_wasmi::HostError for Error {}
 
-impl From<wasmi::Error> for Error {
-    fn from(error: wasmi::Error) -> Self {
+impl From<casper_wasmi::Error> for Error {
+    fn from(error: casper_wasmi::Error) -> Self {
         match error
             .as_host_error()
             .and_then(|host_error| host_error.downcast_ref::<Error>())

diff --git a/execution_engine/src/core/resolvers/memory_resolver.rs b/execution_engine/src/core/resolvers/memory_resolver.rs
@@ -1,5 +1,5 @@
 //! This module contains resolver of a memory section of the WASM code.
-use wasmi::MemoryRef;
+use casper_wasmi::MemoryRef;
 
 use super::error::ResolverError;
 

diff --git a/execution_engine/src/core/resolvers/mod.rs b/execution_engine/src/core/resolvers/mod.rs
@@ -4,7 +4,7 @@ pub mod memory_resolver;
 pub(crate) mod v1_function_index;
 mod v1_resolver;
 
-use wasmi::ModuleImportResolver;
+use casper_wasmi::ModuleImportResolver;
 
 use casper_types::ProtocolVersion;
 

diff --git a/execution_engine/src/core/resolvers/v1_resolver.rs b/execution_engine/src/core/resolvers/v1_resolver.rs
@@ -1,6 +1,6 @@
 use std::cell::RefCell;
 
-use wasmi::{
+use casper_wasmi::{
     memory_units::Pages, Error as InterpreterError, FuncInstance, FuncRef, MemoryDescriptor,
     MemoryInstance, MemoryRef, ModuleImportResolver, Signature, ValueType,
 };

diff --git a/execution_engine/src/core/runtime/args.rs b/execution_engine/src/core/runtime/args.rs
@@ -1,4 +1,4 @@
-use wasmi::{FromValue, RuntimeArgs, Trap};
+use casper_wasmi::{FromValue, RuntimeArgs, Trap};
 
 pub(crate) trait Args
 where

diff --git a/execution_engine/src/core/runtime/externals.rs b/execution_engine/src/core/runtime/externals.rs
@@ -1,6 +1,6 @@
 use std::{collections::BTreeSet, convert::TryFrom};
 
-use wasmi::{Externals, RuntimeArgs, RuntimeValue, Trap};
+use casper_wasmi::{Externals, RuntimeArgs, RuntimeValue, Trap};
 
 use casper_types::{
     account::AccountHash,

diff --git a/execution_engine/src/core/runtime/mod.rs b/execution_engine/src/core/runtime/mod.rs
@@ -16,9 +16,9 @@ use std::{
     iter::FromIterator,
 };
 
-use parity_wasm::elements::Module;
+use casper_wasm::elements::Module;
+use casper_wasmi::{MemoryRef, Trap, TrapCode};
 use tracing::error;
-use wasmi::{MemoryRef, Trap, TrapCode};
 
 use casper_types::{
     account::{Account, AccountHash, ActionType, Weight},
@@ -205,14 +205,14 @@ where
         self.try_get_memory()?
             .with_direct_access(|buffer| {
                 let end = offset.checked_add(size).ok_or_else(|| {
-                    wasmi::Error::Memory(format!(
+                    casper_wasmi::Error::Memory(format!(
                         "trying to access memory block of size {} from offset {}",
                         size, offset
                     ))
                 })?;
 
                 if end > buffer.len() {
-                    return Err(wasmi::Error::Memory(format!(
+                    return Err(casper_wasmi::Error::Memory(format!(
                         "trying to access region [{}..{}] in memory [0..{}]",
                         offset,
                         end,
@@ -1367,7 +1367,7 @@ where
                 None => return Err(Error::KeyNotFound(context_key)),
             };
 
-            parity_wasm::deserialize_buffer(contract_wasm.bytes())?
+            casper_wasm::deserialize_buffer(contract_wasm.bytes())?
         };
 
         let context = self.context.new_from_self(

diff --git a/execution_engine/src/core/runtime/utils.rs b/execution_engine/src/core/runtime/utils.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
-use parity_wasm::elements::Module;
-use wasmi::{ImportsBuilder, MemoryRef, ModuleInstance, ModuleRef};
+use casper_wasm::elements::Module;
+use casper_wasmi::{ImportsBuilder, MemoryRef, ModuleInstance, ModuleRef};
 
 use casper_types::{
     contracts::NamedKeys, AccessRights, CLType, CLValue, Key, ProtocolVersion, PublicKey,
@@ -30,7 +30,7 @@ pub(super) fn instance_and_memory(
     protocol_version: ProtocolVersion,
     wasm_config: &WasmConfig,
 ) -> Result<(ModuleRef, MemoryRef), Error> {
-    let module = wasmi::Module::from_parity_wasm_module(parity_module)?;
+    let module = casper_wasmi::Module::from_casper_wasm_module(parity_module)?;
     let resolver = resolvers::create_module_resolver(protocol_version, wasm_config)?;
     let mut imports = ImportsBuilder::new();
     imports.push_resolver("env", &resolver);

diff --git a/execution_engine/src/lib.rs b/execution_engine/src/lib.rs
@@ -1,6 +1,6 @@
 //! The engine which executes smart contracts on the Casper network.
 
-#![doc(html_root_url = "https://docs.rs/casper-execution-engine/5.0.0")]
+#![doc(html_root_url = "https://docs.rs/casper-execution-engine/6.0.0")]
 #![doc(
     html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png",
     html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png",

diff --git a/execution_engine/src/shared/opcode_costs.rs b/execution_engine/src/shared/opcode_costs.rs
@@ -1,9 +1,9 @@
 //! Support for Wasm opcode costs.
 use std::{convert::TryInto, num::NonZeroU32};
 
+use casper_wasm::elements::Instruction;
 use casper_wasm_utils::rules::{MemoryGrowCost, Rules};
 use datasize::DataSize;
-use parity_wasm::elements::Instruction;
 use rand::{distributions::Standard, prelude::*, Rng};
 use serde::{Deserialize, Serialize};
 

diff --git a/execution_engine/src/shared/wasm_prep.rs b/execution_engine/src/shared/wasm_prep.rs
@@ -1,8 +1,8 @@
 //! Preprocessing of Wasm modules.
-use casper_wasm_utils::{self, stack_height};
-use parity_wasm::elements::{
+use casper_wasm::elements::{
     self, External, Instruction, Internal, MemorySection, Module, Section, TableType, Type,
 };
+use casper_wasm_utils::{self, stack_height};
 use thiserror::Error;
 
 use super::wasm_config::WasmConfig;
@@ -405,7 +405,7 @@ pub fn preprocess(
 
 /// Returns a parity Module from the given bytes without making modifications or checking limits.
 pub fn deserialize(module_bytes: &[u8]) -> Result<Module, PreprocessingError> {
-    parity_wasm::deserialize_buffer::<Module>(module_bytes).map_err(Into::into)
+    casper_wasm::deserialize_buffer::<Module>(module_bytes).map_err(Into::into)
 }
 
 /// Creates new wasm module from entry points.
@@ -431,15 +431,15 @@ pub fn get_module_from_entry_points(
         Some(missing_name) => Err(execution::Error::FunctionNotFound(missing_name)),
         None => {
             casper_wasm_utils::optimize(&mut module, entry_point_names)?;
-            parity_wasm::serialize(module).map_err(execution::Error::ParityWasm)
+            casper_wasm::serialize(module).map_err(execution::Error::ParityWasm)
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use casper_types::contracts::DEFAULT_ENTRY_POINT_NAME;
-    use parity_wasm::{
+    use casper_wasm::{
         builder,
         elements::{CodeSection, Instructions},
     };
@@ -484,7 +484,7 @@ mod tests {
             .memory()
             .build()
             .build();
-        let module_bytes = parity_wasm::serialize(module).expect("should serialize");
+        let module_bytes = casper_wasm::serialize(module).expect("should serialize");
         let error = preprocess(WasmConfig::default(), &module_bytes)
             .expect_err("should fail with an error");
         assert!(
@@ -523,7 +523,7 @@ mod tests {
             .memory()
             .build()
             .build();
-        let module_bytes = parity_wasm::serialize(module).expect("should serialize");
+        let module_bytes = casper_wasm::serialize(module).expect("should serialize");
         let error = preprocess(WasmConfig::default(), &module_bytes)
             .expect_err("should fail with an error");
         assert!(
@@ -559,7 +559,7 @@ mod tests {
             .memory()
             .build()
             .build();
-        let module_bytes = parity_wasm::serialize(module).expect("should serialize");
+        let module_bytes = casper_wasm::serialize(module).expect("should serialize");
         let error = preprocess(WasmConfig::default(), &module_bytes)
             .expect_err("should fail with an error");
         assert!(
@@ -580,7 +580,7 @@ mod tests {
             .memory()
             .build()
             .build();
-        let module_bytes = parity_wasm::serialize(module).expect("should serialize");
+        let module_bytes = casper_wasm::serialize(module).expect("should serialize");
 
         let error = preprocess(WasmConfig::default(), &module_bytes)
             .expect_err("should fail with an error");
@@ -603,7 +603,7 @@ mod tests {
             .memory()
             .build()
             .build();
-        let module_bytes = parity_wasm::serialize(module).expect("should serialize");
+        let module_bytes = casper_wasm::serialize(module).expect("should serialize");
         let error = preprocess(WasmConfig::default(), &module_bytes)
             .expect_err("should fail with an error");
         assert!(

diff --git a/execution_engine/src/storage/error/lmdb.rs b/execution_engine/src/storage/error/lmdb.rs
@@ -28,7 +28,7 @@ pub enum Error {
     CommitError(#[from] CommitError),
 }
 
-impl wasmi::HostError for Error {}
+impl casper_wasmi::HostError for Error {}
 
 impl From<bytesrepr::Error> for Error {
     fn from(error: bytesrepr::Error) -> Self {

diff --git a/execution_engine_testing/test_support/CHANGELOG.md b/execution_engine_testing/test_support/CHANGELOG.md
@@ -11,6 +11,14 @@ All notable changes to this project will be documented in this file.  The format
 
 
 
+## 6.0.0
+
+### Changed
+* Update `casper-execution-engine` dependency.
+* Handle evict items in the `WasmTestBuilder` when advancing eras or calling `step`.
+
+
+
 ## 5.0.0
 
 ### Added

diff --git a/execution_engine_testing/test_support/Cargo.toml b/execution_engine_testing/test_support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "casper-engine-test-support"
-version = "5.0.0" # when updating, also update 'html_root_url' in lib.rs
+version = "6.0.0" # when updating, also update 'html_root_url' in lib.rs
 authors = ["Fraser Hutchison <fraser@casperlabs.io>"]
 edition = "2018"
 description = "Library to support testing of Wasm smart contracts for use on the Casper network."
@@ -11,9 +11,9 @@ repository = "https://github.com/CasperLabs/casper-node/tree/master/execution_en
 license = "Apache-2.0"
 
 [dependencies]
-casper-execution-engine = { version = "5.0.0", path = "../../execution_engine", features = ["test-support"] }
+casper-execution-engine = { version = "6.0.0", path = "../../execution_engine", features = ["test-support"] }
 casper-hashing = { version = "2.0.0", path = "../../hashing" }
-casper-types = { version = "4.0.0", path = "../../types" }
+casper-types = { version = "3.0.0", path = "../../types" }
 humantime = "2"
 filesize = "0.2.0"
 lmdb-rkv = "0.14"
@@ -27,7 +27,7 @@ toml = "0.5.6"
 tempfile = "3.4.0"
 
 [dev-dependencies]
-casper-types = { version = "4.0.0", path = "../../types", features = ["std"] }
+casper-types = { version = "3.0.0", path = "../../types", features = ["std"] }
 version-sync = "0.9.3"
 
 [features]

diff --git a/execution_engine_testing/test_support/src/lib.rs b/execution_engine_testing/test_support/src/lib.rs
@@ -1,6 +1,6 @@
 //! A library to support testing of Wasm smart contracts for use on the Casper Platform.
 
-#![doc(html_root_url = "https://docs.rs/casper-engine-test-support/5.0.0")]
+#![doc(html_root_url = "https://docs.rs/casper-engine-test-support/6.0.0")]
 #![doc(
     html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png",
     html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png",

diff --git a/execution_engine_testing/tests/Cargo.toml b/execution_engine_testing/tests/Cargo.toml
@@ -10,10 +10,10 @@ casper-engine-test-support = { path = "../test_support", features = ["test-suppo
 casper-execution-engine = { path = "../../execution_engine", features = ["test-support"] }
 casper-hashing = { path = "../../hashing" }
 casper-types = { path = "../../types", features = ["datasize", "json-schema"] }
+casper-wasm = "0.46.0"
 clap = "2"
 fs_extra = "1.2.0"
 log = "0.4.8"
-parity-wasm = "0.45.0"
 rand = "0.8.3"
 serde = "1"
 serde_json = "1"

diff --git a/execution_engine_testing/tests/src/test/gas_counter.rs b/execution_engine_testing/tests/src/test/gas_counter.rs
@@ -1,5 +1,5 @@
 use assert_matches::assert_matches;
-use parity_wasm::{
+use casper_wasm::{
     builder,
     elements::{BlockType, Instruction, Instructions},
 };
@@ -33,7 +33,7 @@ fn make_session_code_with(instructions: Vec<Instruction>) -> Vec<u8> {
         .memory()
         .build()
         .build();
-    parity_wasm::serialize(module).expect("should serialize")
+    casper_wasm::serialize(module).expect("should serialize")
 }
 
 #[ignore]