Merge pull request #5330 from casper-network/wro-2025

Reconciling small changes

Author: mpapierski

Cargo.lock

@@ -16,18 +16,17 @@ 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",
     "executor/wasm_common",
     "executor/wasm_interface",
     "executor/wasm_host",
     "executor/wasmer_backend",
-    "executor/wasm",
+    "executor/wasm", "smart_contracts/vm2/sdk_contrib",
 ]
 
 default-members = [
@@ -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",
 ]

Cargo.toml

@@ -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/main.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/casper_updater/src/regex_data.rs

@@ -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