Merge branch 'main' into high-low-level-examples

contract-advanced-rs/Cargo.toml

@@ -9,13 +9,13 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.2.1"
+near-sdk = "5.4.0"
 schemars = "0.8.16"
 
 [dev-dependencies]
-near-sdk = { version = "5.2.1", features = ["unit-testing"] }
+near-sdk = { version = "5.4.0", features = ["unit-testing"] }
 near-workspaces = { version = "0.11.0", features = ["unstable"] }
-tokio = { version = "1.39.2", features = ["full"] }
+tokio = { version = "1.12.0", features = ["full"] }
 serde_json = "1"
 
 [profile.release]

contract-advanced-rs/tests/tests.rs

@@ -1,7 +1,7 @@
 use std::string::String;
 use serde_json::json;
 use near_workspaces::{types::NearToken, Account, Contract};
-use near_sdk::serde::{Deserialize, Serialize};
+use near_sdk::near;
 
 #[tokio::test]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -54,8 +54,8 @@ async fn test_multiple_contracts(
     guest_book_contract: &Contract,
     counter_contract: &Contract
 ) -> Result<(), Box<dyn std::error::Error>> {
-    #[derive(Deserialize, Serialize, Debug, PartialEq)]
-    #[serde(crate = "near_sdk::serde")]
+    #[derive(Debug, PartialEq)]
+    #[near(serializers = [json])]
     pub struct PostedMessage {
         pub premium: bool,
         pub sender: String,

contract-simple-rs/Cargo.toml

@@ -9,13 +9,13 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.2.1"
+near-sdk = "5.4.0"
 
 [dev-dependencies]
-near-sdk = { version = "5.2.1", features = ["unit-testing"] }
+near-sdk = { version = "5.4.0", features = ["unit-testing"] }
 near-workspaces = { version = "0.11.0", features = ["unstable"] }
-tokio = { version = "1.39.2", features = ["full"] }
-serde_json = "1.0.122"
+tokio = { version = "1.12.0", features = ["full"] }
+serde_json = "1"
 
 [profile.release]
 codegen-units = 1