build SCs on std

Cargo.toml

@@ -189,6 +189,8 @@ members = [
   "contracts/feature-tests/rust-testing-framework-tester/meta",
   "contracts/feature-tests/scenario-tester",
   "contracts/feature-tests/scenario-tester/meta",
+  "contracts/feature-tests/std-contract",
+  "contracts/feature-tests/std-contract/meta",
   "contracts/feature-tests/use-module",
   "contracts/feature-tests/use-module/meta",
 ]

contracts/feature-tests/std-contract/.gitignore

@@ -0,0 +1,7 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+*/target/
+
+# The mxpy output
+/output*/

contracts/feature-tests/std-contract/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "std-contract"
+version = "0.0.0"
+authors = ["you"]
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/lib.rs"
+
+[dependencies.multiversx-sc]
+version = "0.57.0"
+path = "../../../framework/base"
+
+[dev-dependencies.multiversx-sc-scenario]
+version = "0.57.0"
+path = "../../../framework/scenario"
+
+[dev-dependencies]
+num-bigint = "0.4"

contracts/feature-tests/std-contract/meta/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "std-contract-meta"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dependencies.std-contract]
+path = ".."
+
+[dependencies.multiversx-sc-meta-lib]
+version = "0.57.0"
+path = "../../../../framework/meta-lib"
+default-features = false

contracts/feature-tests/std-contract/meta/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    multiversx_sc_meta_lib::cli_main::<std_contract::AbiProvider>();
+}

contracts/feature-tests/std-contract/multiversx.json

@@ -0,0 +1,3 @@
+{
+    "language": "rust"
+}

contracts/feature-tests/std-contract/sc-config.toml

@@ -0,0 +1,2 @@
+[contracts.std-contract]
+std = true

contracts/feature-tests/std-contract/scenarios/empty.scen.json

@@ -0,0 +1,39 @@
+{
+    "name": "empty",
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "1",
+                    "balance": "0"
+                }
+            },
+            "newAddresses": [
+                {
+                    "creatorAddress": "address:owner",
+                    "creatorNonce": "1",
+                    "newAddress": "sc:empty"
+                }
+            ]
+        },
+        {
+            "step": "scDeploy",
+            "id": "deploy",
+            "tx": {
+                "from": "address:owner",
+                "contractCode": "mxsc:../output/std-contract.mxsc.json",
+                "arguments": [],
+                "gasLimit": "5,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": [],
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}

contracts/feature-tests/std-contract/src/lib.rs

@@ -0,0 +1,19 @@
+use std::sync::Arc;
+
+#[allow(unused_imports)]
+use multiversx_sc::imports::*;
+
+pub struct Config {
+    pub settings: Arc<Vec<u8>>,
+    pub allowed: bool,
+}
+
+/// An empty contract. To be used as a template when starting a new contract from scratch.
+#[multiversx_sc::contract]
+pub trait StdContract {
+    #[init]
+    fn init(&self) {}
+
+    #[upgrade]
+    fn upgrade(&self) {}
+}

contracts/feature-tests/std-contract/tests/empty_scenario_go_test.rs

@@ -0,0 +1,10 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
+#[test]
+fn empty_go() {
+    world().run("scenarios/empty.scen.json");
+}

contracts/feature-tests/std-contract/tests/empty_scenario_rs_test.rs

@@ -0,0 +1,17 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    let mut blockchain = ScenarioWorld::new();
+
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/std-contract");
+    blockchain.register_contract(
+        "mxsc:output/std-contract.mxsc.json",
+        std_contract::ContractBuilder,
+    );
+    blockchain
+}
+
+#[test]
+fn empty_rs() {
+    world().run("scenarios/empty.scen.json");
+}

contracts/feature-tests/std-contract/wasm/Cargo.toml

@@ -0,0 +1,35 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
+[package]
+name = "std-contract-wasm"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[lib]
+crate-type = ["cdylib"]
+
+[profile.release]
+codegen-units = 1
+opt-level = "z"
+lto = true
+debug = false
+panic = "abort"
+overflow-checks = false
+
+[profile.dev]
+panic = "abort"
+
+[dependencies.std-contract]
+path = ".."
+
+[dependencies.multiversx-sc-wasm-adapter]
+version = "0.57.0"
+path = "../../../../framework/wasm-adapter"
+
+[workspace]
+members = ["."]

contracts/feature-tests/std-contract/wasm/src/lib.rs

@@ -0,0 +1,24 @@
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+// Init:                                 1
+// Upgrade:                              1
+// Endpoints:                            0
+// Async Callback (empty):               1
+// Total number of exported functions:   3
+
+multiversx_sc_wasm_adapter::allocator!();
+
+
+multiversx_sc_wasm_adapter::endpoints! {
+    std_contract
+    (
+        init => init
+        upgrade => upgrade
+    )
+}
+
+multiversx_sc_wasm_adapter::async_callback_empty! {}

framework/meta-lib/src/contract/sc_config/contract_variant_builder.rs

@@ -81,6 +81,7 @@ impl ContractVariantBuilder {
                     default_features: cms.default_features,
                     kill_legacy_callback: cms.kill_legacy_callback,
                     profile: ContractVariantProfile::from_serde(&cms.profile),
+                    std: cms.std.unwrap_or(default.settings.std),
                 },
                 ..default
             },

framework/meta-lib/src/contract/sc_config/contract_variant_settings.rs

@@ -36,6 +36,9 @@ pub struct ContractVariantSettings {
     pub kill_legacy_callback: bool,
 
     pub profile: ContractVariantProfile,
+
+    /// Allows the contract to be built with std.
+    pub std: bool,
 }
 
 impl Default for ContractVariantSettings {
@@ -50,6 +53,7 @@ impl Default for ContractVariantSettings {
             default_features: None,
             kill_legacy_callback: false,
             profile: Default::default(),
+            std: false,
         }
     }
 }

framework/meta-lib/src/contract/sc_config/sc_config_serde.rs

@@ -64,6 +64,9 @@ pub struct ContractVariantSerde {
 
     #[serde(default)]
     pub profile: Option<ContractVariantProfileSerde>,
+
+    #[serde(default)]
+    pub std: Option<bool>,
 }
 
 #[derive(Deserialize, Default, Debug)]

framework/meta-lib/src/contract/sc_config/wasm_crate_gen.rs

@@ -56,11 +56,14 @@ impl ContractVariant {
     }
 
     fn panic_handler_macro_invocation(&self) -> &'static str {
-        if self.settings.panic_message {
-            "multiversx_sc_wasm_adapter::panic_handler_with_message!();"
-        } else {
-            "multiversx_sc_wasm_adapter::panic_handler!();"
+        if !self.settings.std {
+            if self.settings.panic_message {
+                return "multiversx_sc_wasm_adapter::panic_handler_with_message!();";
+            } else {
+                return "multiversx_sc_wasm_adapter::panic_handler!();";
+            }
         }
+        ""
     }
 
     fn endpoint_macro_name(&self) -> &'static str {
@@ -83,7 +86,7 @@ impl ContractVariant {
     fn write_wasm_src_lib_contents(&self, wasm_lib_file: &mut File) {
         writeln!(wasm_lib_file, "{PREFIX_AUTO_GENERATED}").unwrap();
         self.write_stat_comments(wasm_lib_file);
-        write_prefix(wasm_lib_file);
+        write_prefix(wasm_lib_file, self.select_features());
         writeln!(wasm_lib_file, "{}", self.allocator_macro_invocation()).unwrap();
         writeln!(wasm_lib_file, "{}", self.panic_handler_macro_invocation()).unwrap();
 
@@ -137,21 +140,28 @@ impl ContractVariant {
 
         write_stat_comment(wasm_lib_file, "Total number of exported functions:", total);
     }
-}
 
-fn select_features() -> &'static str {
-    let meta = rustc_version::version_meta().unwrap();
-    if meta.semver < Version::from_str(VER_1_71).unwrap() {
-        FEATURES_PRE_RUSTC_1_71
-    } else if meta.semver < Version::from_str(VER_1_73).unwrap() {
-        FEATURES_PRE_RUSTC_1_73
-    } else {
+    fn select_features(&self) -> &'static str {
+        if self.settings.std {
+            return "";
+        }
+
+        let meta = rustc_version::version_meta().unwrap();
+
+        if meta.semver < Version::from_str(VER_1_71).unwrap() {
+            return FEATURES_PRE_RUSTC_1_71;
+        }
+
+        if meta.semver < Version::from_str(VER_1_73).unwrap() {
+            return FEATURES_PRE_RUSTC_1_73;
+        }
+
         FEATURES_DEFAULT
     }
 }
 
-fn write_prefix(wasm_lib_file: &mut File) {
-    writeln!(wasm_lib_file, "{}", select_features()).unwrap();
+fn write_prefix(wasm_lib_file: &mut File, features: &str) {
+    writeln!(wasm_lib_file, "{}", features).unwrap();
 }
 
 fn write_endpoints_macro<'a, I>(