Serde JSON in contracts

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/serde-features",
+  "contracts/feature-tests/serde-features/meta",
   "contracts/feature-tests/std-contract",
   "contracts/feature-tests/std-contract/meta",
   "contracts/feature-tests/use-module",

contracts/feature-tests/serde-features/.gitignore

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

contracts/feature-tests/serde-features/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "serde-features"
+version = "0.0.0"
+authors = [ "you",]
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/serde_features.rs"
+
+[dependencies]
+num-bigint = {version = "0.4.6", default-features = false, features = ["serde"] }
+serde = { version = "1.0", optional = false, default-features = false, features = ["derive"] }
+serde-json-core = { version = "0.6.0", optional = false, default-features = true}
+# serde_json = { version = "1.0", optional = false, default-features = false, features = ["alloc", "raw_value"] }
+
+[dependencies.multiversx-sc]
+version = "0.60.0"
+path = "../../../framework/base"
+features = ["alloc", "serde-util", "serde"]
+
+[dev-dependencies.multiversx-sc-scenario]
+version = "0.60.0"
+features = ["wasmer-experimental"]
+path = "../../../framework/scenario"

contracts/feature-tests/serde-features/meta/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "serde-features-meta"
+version = "0.0.0"
+edition = "2021"
+publish = false
+authors = ["you"]
+
+[dev-dependencies]
+
+[dependencies.serde-features]
+path = ".."
+
+[dependencies.multiversx-sc-meta-lib]
+version = "0.60.0"
+path = "../../../../framework/meta-lib"
+default-features = false

contracts/feature-tests/serde-features/meta/src/main.rs

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

contracts/feature-tests/serde-features/multiversx.json

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

contracts/feature-tests/serde-features/sc-config.toml

@@ -0,0 +1,2 @@
+[contracts.serde-features]
+allocator = "static64k"

contracts/feature-tests/serde-features/scenarios/serde_1.scen.json

@@ -0,0 +1,64 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:serde-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/serde-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "out_value_1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:serde-features",
+                "function": "out_value_1",
+                "arguments": [],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "file:value_1.json"
+                ],
+                "status": "0",
+                "message": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "inc_serde_1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:serde-features",
+                "function": "inc_serde_1",
+                "arguments": [
+                    "file:value_1.json"
+                ],
+                "gasLimit": "105,500,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "file:value_1_inc.json"
+                ],
+                "status": "0",
+                "message": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}

contracts/feature-tests/serde-features/scenarios/serde_2.scen.json

@@ -0,0 +1,64 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "sc:serde-features": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../output/serde-features.mxsc.json"
+                },
+                "address:an_account": {
+                    "nonce": "0",
+                    "balance": "0"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "out_value_2",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:serde-features",
+                "function": "out_value_2",
+                "arguments": [],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "file:value_2.json"
+                ],
+                "status": "0",
+                "message": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "inc_serde_2",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:serde-features",
+                "function": "inc_serde_2",
+                "arguments": [
+                    "file:value_2.json"
+                ],
+                "gasLimit": "105,500,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "file:value_2_inc.json"
+                ],
+                "status": "0",
+                "message": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}

contracts/feature-tests/serde-features/scenarios/value_1.json

@@ -0,0 +1 @@
+{"value1":10,"value2":20}

contracts/feature-tests/serde-features/scenarios/value_1_inc.json

@@ -0,0 +1 @@
+{"value1":11,"value2":21}

contracts/feature-tests/serde-features/scenarios/value_1_pretty.json

@@ -0,0 +1,4 @@
+{
+  "value1": 10,
+  "value2": 20
+}

contracts/feature-tests/serde-features/scenarios/value_2.json

@@ -0,0 +1 @@
+{"mb":"abc"}

contracts/feature-tests/serde-features/scenarios/value_2_inc.json

@@ -0,0 +1 @@
+{"mb":"abcdef"}

contracts/feature-tests/serde-features/src/serde_features.rs

@@ -0,0 +1,70 @@
+#![no_std]
+
+use multiversx_sc::imports::*;
+use serde::{Deserialize, Serialize};
+
+const BUFFER_SIZE: usize = 200;
+
+// #[type_abi]
+// #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, ManagedVecItem)]
+#[derive(Serialize, Deserialize)]
+pub struct SerdeStruct1 {
+    pub value1: u32,
+    pub value2: u32,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct SerdeStruct2 {
+    // pub v: Vec<u8>,
+    pub big_int: num_bigint::BigInt,
+}
+
+#[derive(Serialize, Deserialize)]
+#[serde(bound = "M: ManagedTypeApi")]
+pub struct ManagedSerdeStruct<M: ManagedTypeApi> {
+    mb: ManagedBuffer<M>,
+}
+
+#[multiversx_sc::contract]
+pub trait SerdeFeatures {
+    #[init]
+    fn init(&self) {}
+
+    #[endpoint]
+    fn out_value_1(&self) -> ManagedBuffer {
+        let s = SerdeStruct1 {
+            value1: 10,
+            value2: 20,
+        };
+
+        multiversx_sc::serde_util::to_buffered_json::<_, _, BUFFER_SIZE>(&s)
+    }
+
+    #[endpoint]
+    fn out_value_2(&self) -> ManagedBuffer {
+        let s = ManagedSerdeStruct::<Self::Api> { mb: "abc".into() };
+
+        multiversx_sc::serde_util::to_buffered_json::<_, _, BUFFER_SIZE>(&s)
+    }
+
+    #[endpoint]
+    fn inc_serde_1(&self, json: ManagedBuffer) -> ManagedBuffer {
+        let mut buf = [0u8; BUFFER_SIZE];
+        let slice = json.load_to_byte_array(&mut buf);
+        let (mut s, _) = serde_json_core::from_slice::<SerdeStruct1>(slice)
+            .unwrap_or_else(|_| sc_panic!("deserialization failed"));
+        s.value1 += 1;
+        s.value2 += 1;
+        multiversx_sc::serde_util::to_buffered_json::<_, _, BUFFER_SIZE>(&s)
+    }
+
+    #[endpoint]
+    fn inc_serde_2(&self, json: ManagedBuffer) -> ManagedBuffer {
+        let mut buf = [0u8; BUFFER_SIZE];
+        let slice = json.load_to_byte_array(&mut buf);
+        let (mut s, _) = serde_json_core::from_slice::<ManagedSerdeStruct<Self::Api>>(slice)
+            .unwrap_or_else(|_| sc_panic!("deserialization failed"));
+        s.mb.append_bytes(b"def");
+        multiversx_sc::serde_util::to_buffered_json::<_, _, BUFFER_SIZE>(&s)
+    }
+}