Merge pull request #19 from flmel/update_rust_sdk

chore: update rust_sdk

Author: gagdiez

contract-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "contract-rs"
-description = "cargo-near-new-project-description"
+description = "Coin Flip Examples"
 version = "0.1.0"
 edition = "2021"
 # TODO: Fill out the repository field to help NEAR ecosystem tools to discover your project.
@@ -13,10 +13,10 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = { version = "5.0.0", features = ["legacy"] }
+near-sdk = { version = "5.1.0", features = ["legacy"] }
 
 [dev-dependencies]
-near-sdk = { version = "5.0.0", features = ["unit-testing"] }
+near-sdk = { version = "5.1.0", features = ["unit-testing"] }
 near-workspaces = { version = "0.10.0", features = ["unstable"] }
 tokio = { version = "1.12.0", features = ["full"] }
 serde_json = "1"
@@ -29,4 +29,4 @@ lto = true
 debug = false
 panic = "abort"
 # Opt into extra safety checks on arithmetic operations https://stackoverflow.com/a/64136471/249801
-overflow-checks = true
+overflow-checks = true

contract-rs/src/lib.rs

@@ -1,31 +1,28 @@
 // Find all our documentation at https://docs.near.org
-use near_sdk::borsh::{BorshSerialize, BorshDeserialize};
-use near_sdk::env::{self, log_str};
-use near_sdk::{near_bindgen, AccountId, BorshStorageKey};
 use near_sdk::collections::UnorderedMap;
+use near_sdk::env::{self, log_str};
+use near_sdk::{near, AccountId, BorshStorageKey};
 
-#[derive(BorshSerialize, BorshStorageKey)]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(serializers = [borsh])]
+#[derive(BorshStorageKey)]
 enum StorageKey {
     Points,
 }
 
 pub(crate) fn simulate_coin_flip() -> String {
-  // Here we get a first byte of a random seed
-  let random_seed = *env::random_seed().get(0).unwrap() as i8;
+    // Here we get a first byte of a random seed
+    let random_seed = *env::random_seed().get(0).unwrap() as i8;
 
-  // If a first byte is EVEN we choose heads, otherwise tails
-  if let 0 = random_seed % 2 {
-      return "heads".to_string()
-  } else {
-      return "tails".to_string()
-  };
+    // If a first byte is EVEN we choose heads, otherwise tails
+    if let 0 = random_seed % 2 {
+        return "heads".to_string();
+    } else {
+        return "tails".to_string();
+    };
 }
 
 // Define the contract structure
-#[near_bindgen]
-#[derive(BorshDeserialize, BorshSerialize)]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(contract_state)]
 pub struct Contract {
     points: UnorderedMap<AccountId, u8>,
 }
@@ -34,42 +31,42 @@ pub struct Contract {
 impl Default for Contract {
     fn default() -> Self {
         Self {
-            points: UnorderedMap::new(StorageKey::Points)
+            points: UnorderedMap::new(StorageKey::Points),
         }
     }
 }
 
 // Implement the contract structure
-#[near_bindgen]
+#[near]
 impl Contract {
     /*
       Flip a coin. Pass in the side (heads or tails) and a random number will be chosen
       indicating whether the flip was heads or tails. If you got it right, you get a point.
     */
     pub fn flip_coin(&mut self, player_guess: String) -> String {
-      // Check who called the method
-      let player: AccountId = env::predecessor_account_id();
-      log_str(&format!("{player} chose {player_guess}"));
+        // Check who called the method
+        let player: AccountId = env::predecessor_account_id();
+        log_str(&format!("{player} chose {player_guess}"));
+
+        // Simulate a Coin Flip
+        let outcome = simulate_coin_flip();
 
-      // Simulate a Coin Flip
-      let outcome = simulate_coin_flip();
-      
-      // Get the current player points
-      let mut player_points = self.points.get(&player).unwrap_or(0);
+        // Get the current player points
+        let mut player_points = self.points.get(&player).unwrap_or(0);
 
-      // Check if their guess was right and modify the points accordingly
-      if outcome.eq(&player_guess) {
-        player_points = player_points + 1;
-      } else {
-        player_points = player_points.saturating_sub(1);
-      };
+        // Check if their guess was right and modify the points accordingly
+        if outcome.eq(&player_guess) {
+            player_points = player_points + 1;
+        } else {
+            player_points = player_points.saturating_sub(1);
+        };
 
-      log_str(&format!("player_points: {player_points}"));
+        log_str(&format!("player_points: {player_points}"));
 
-      // Store the new points
-      self.points.insert(&player, &player_points);
+        // Store the new points
+        self.points.insert(&player, &player_points);
 
-      return outcome;
+        return outcome;
     }
 
     // View how many points a specific player has