Reconciling small changes

Cargo.toml

@@ -16,10 +16,9 @@ members = [
     "utils/global-state-update-gen",
     "utils/validation",
     "binary_port",
-    "smart_contracts/sdk",
-    "smart_contracts/sdk_codegen",
-    "smart_contracts/sdk_sys",
-    "smart_contracts/macros",
+    "smart_contracts/vm2/sdk",
+    "smart_contracts/vm2/sdk_sys",
+    "smart_contracts/vm2/macros",
     "vm2_cargo_casper",
     # "utils/highway-rewards-analysis",
     # "utils/highway-state-grapher",
@@ -41,10 +40,9 @@ default-members = [
     "utils/global-state-update-gen",
     "utils/validation",
     "binary_port",
-    "smart_contracts/sdk",
-    "smart_contracts/sdk_sys",
-    "smart_contracts/sdk_codegen",
-    "smart_contracts/macros",
+    "smart_contracts/vm2/sdk",
+    "smart_contracts/vm2/sdk_sys",
+    "smart_contracts/vm2/macros",
     # "utils/highway-rewards-analysis",
     # "utils/highway-state-grapher",
 ]

ci/casper_updater/src/main.rs

@@ -215,19 +215,15 @@ fn main() {
             &regex_data::smart_contracts_contract::DEPENDENT_FILES,
         ),
         Package::cargo(
-            "smart_contracts/sdk_sys",
+            "smart_contracts/v2/sdk_sys",
             &regex_data::smart_contracts_sdk_sys::DEPENDENT_FILES,
         ),
         Package::cargo(
-            "smart_contracts/sdk",
+            "smart_contracts/vm2/sdk",
             &regex_data::smart_contracts_sdk::DEPENDENT_FILES,
         ),
         Package::cargo(
-            "smart_contracts/sdk_codegen",
-            &regex_data::smart_contracts_sdk_codegen::DEPENDENT_FILES,
-        ),
-        Package::cargo(
-            "smart_contracts/macros",
+            "smart_contracts/v2/macros",
             &regex_data::smart_contracts_macros::DEPENDENT_FILES,
         ),
         Package::cargo(

ci/casper_updater/src/regex_data.rs

@@ -308,33 +308,15 @@ pub mod smart_contracts_sdk_sys {
 pub mod smart_contracts_sdk {
     use super::*;
 
-    pub static DEPENDENT_FILES: Lazy<Vec<DependentFile>> = Lazy::new(|| {
-        vec![
-            DependentFile::new(
-                "smart_contracts/sdk/Cargo.toml",
-                MANIFEST_VERSION_REGEX.clone(),
-                replacement,
-            ),
-            DependentFile::new(
-                "smart_contracts/sdk_codegen/Cargo.toml",
-                Regex::new(r#"(?m)(^casper-contract-sdk = \{[^\}]*version = )"(?:[^"]+)"#).unwrap(),
-                replacement,
-            ),
-        ]
-    });
-}
-
-pub mod smart_contracts_sdk_codegen {
-    use super::*;
-
     pub static DEPENDENT_FILES: Lazy<Vec<DependentFile>> = Lazy::new(|| {
         vec![DependentFile::new(
-            "smart_contracts/sdk_codegen/Cargo.toml",
+            "smart_contracts/sdk/Cargo.toml",
             MANIFEST_VERSION_REGEX.clone(),
             replacement,
         )]
     });
 }
+
 pub mod smart_contracts_macros {
     use super::*;
 

ci/publish_to_crates_io.sh

@@ -108,7 +108,7 @@ publish execution_engine_testing/test_support
 publish smart_contracts/contract
 
 # smart_contracts/sdk_sys (casper-contract-sdk_sys) -> None
-publish smart_contracts/sdk_sys
+publish smart_contracts/vm2/sdk_sys
 
 # executor/wasm_common (casper-executor-wasm_common)
 #     casper-contract-sdk_sys

execution_engine/src/engine_state/execution_kind.rs

@@ -104,7 +104,7 @@ impl<'a> ExecutionKind<'a> {
                     .ok_or_else(|| Error::Exec(ExecError::NamedKeyNotFound(name.to_string())))?;
 
                 let package_hash = match package_key {
-                    Key::Hash(hash) | Key::SmartContract(hash) => PackageHash::new(*hash),
+                    Key::Hash(hash) | Key::Package(hash) => PackageHash::new(*hash),
                     _ => return Err(Error::InvalidKeyVariant(*package_key)),
                 };
                 return Ok(Self::VersionedCall {

execution_engine/src/runtime/mod.rs

@@ -2480,7 +2480,7 @@ where
         let access_key = if self.context.engine_config().enable_entity {
             let (package, access_key) = self.create_package(lock_status)?;
             self.context
-                .metered_write_gs_unsafe(Key::SmartContract(addr), package)?;
+                .metered_write_gs_unsafe(Key::Package(addr), package)?;
             access_key
         } else {
             let (package, access_key) = self.create_contract_package(lock_status)?;
@@ -3145,7 +3145,7 @@ where
         contract_hash: AddressableEntityHash,
     ) -> Result<Result<(), ApiError>, ExecError> {
         if self.context.engine_config().enable_entity {
-            let contract_package_key = Key::SmartContract(contract_package_hash.value());
+            let contract_package_key = Key::Package(contract_package_hash.value());
             self.context.validate_key(&contract_package_key)?;
 
             let mut contract_package: Package =
@@ -3195,7 +3195,7 @@ where
         contract_hash: AddressableEntityHash,
     ) -> Result<Result<(), ApiError>, ExecError> {
         if self.context.engine_config().enable_entity {
-            let contract_package_key = Key::SmartContract(contract_package_hash.value());
+            let contract_package_key = Key::Package(contract_package_hash.value());
             self.context.validate_key(&contract_package_key)?;
 
             let mut contract_package: Package =

execution_engine/src/runtime_context/mod.rs

@@ -1420,7 +1420,7 @@ where
         let package_hash_key = Key::from(package_hash);
         self.validate_key(&package_hash_key)?;
         let contract_package = if self.engine_config.enable_entity {
-            self.read_gs_typed::<Package>(&Key::SmartContract(package_hash.value()))?
+            self.read_gs_typed::<Package>(&Key::Package(package_hash.value()))?
         } else {
             let cp = self.read_gs_typed::<ContractPackage>(&Key::Hash(package_hash.value()))?;
             cp.into()