Switch to near macro

Cargo.toml

@@ -8,13 +8,13 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "5.0.0"
-near-contract-standards = "5.0.0"
+near-sdk = "5.1.0"
+near-contract-standards = "5.1.0"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 devhub_common = { path = "./devhub_common" }
 
 [dev-dependencies]
-near-sdk = { version = "5.0.0", features = ["unit-testing"] }
+near-sdk = { version = "5.1.0", features = ["unit-testing"] }
 insta = { version = "1.31.0", features = ["json", "redactions"] }
 regex = "1"
 near-workspaces = { version = "0.10.0", features = ["unstable"], default-features = false  }

community-factory/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "5.0.0"
+near-sdk = "5.1.0"
 devhub_common = { path = "../devhub_common" }
 
 [profile.release]

community-factory/src/lib.rs

@@ -1,5 +1,4 @@
-use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
-use near_sdk::{env, near_bindgen, require, AccountId, Gas, NearToken, Promise};
+use near_sdk::{env, near, require, AccountId, Gas, NearToken, Promise};
 use near_sdk::serde_json::json;
 
 use devhub_common::social_db_contract;
@@ -8,12 +7,11 @@ const CODE: &[u8] = include_bytes!("../../community/target/near/devhub_community
 const INITIAL_BALANCE: NearToken = NearToken::from_near(4);
 const PUBKEY_STR: &str = "ed25519:4deBAvg1S4MF7qe9GBDJwDCGLyyXtJa73JnMXwyG9vsB";
 
-#[near_bindgen]
-#[derive(BorshDeserialize, BorshSerialize, Default)]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(contract_state)]
+#[derive(Default)]
 pub struct Contract {}
 
-#[near_bindgen]
+#[near]
 impl Contract {
     #[payable]
     pub fn create_community_account(&mut self, community: String) -> Promise {

community/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "5.0.0"
+near-sdk = "5.1.0"
 devhub_common = { path = "../devhub_common" }
 
 [profile.release]

community/src/lib.rs

@@ -1,18 +1,16 @@
 use devhub_common::social_db_contract;
 use near_sdk;
-use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
 use near_sdk::Gas;
-use near_sdk::{env, near_bindgen, require, AccountId, NearToken, Promise};
+use near_sdk::{env, near, require, AccountId, NearToken, Promise};
 
 const CODE: &[u8] = include_bytes!("../../discussions/target/near/devhub_discussions.wasm");
 const PUBKEY_STR: &str = "ed25519:4deBAvg1S4MF7qe9GBDJwDCGLyyXtJa73JnMXwyG9vsB";
 
-#[near_bindgen]
-#[derive(BorshDeserialize, BorshSerialize, Default)]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(contract_state)]
+#[derive(Default)]
 pub struct Contract {}
 
-#[near_bindgen]
+#[near]
 impl Contract {
     #[payable]
     pub fn new(&mut self) -> Promise {

devhub_common/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-near-sdk = "5.0.0"
+near-sdk = "5.1.0"
 
 [profile.release]
 codegen-units = 1

discussions/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "5.0.0"
+near-sdk = "5.1.0"
 devhub_common = { path = "../devhub_common" }
 
 [profile.release]

discussions/src/lib.rs

@@ -1,13 +1,11 @@
 use devhub_common::social_db_contract;
-use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
-use near_sdk::{env, near_bindgen, require, AccountId, NearToken, Promise};
+use near_sdk::{env, require, near, AccountId, NearToken, Promise};
 
-#[near_bindgen]
-#[derive(BorshDeserialize, BorshSerialize, Default)]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(contract_state)]
+#[derive(Default)]
 pub struct Contract {}
 
-#[near_bindgen]
+#[near]
 impl Contract {
     #[init]
     pub fn new() -> Self {

src/access_control/members.rs

@@ -1,28 +1,12 @@
 use crate::access_control::rules::Rule;
-use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
-use near_sdk::serde::{Deserialize, Serialize};
-use near_sdk::{AccountId, NearSchema};
+use near_sdk::{near, AccountId};
 use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet};
 
-#[derive(
-    BorshSerialize,
-    BorshDeserialize,
-    Serialize,
-    Deserialize,
-    Clone,
-    Debug,
-    PartialOrd,
-    PartialEq,
-    Ord,
-    Eq,
-    Hash,
-    NearSchema,
-)]
-#[serde(crate = "near_sdk::serde")]
+#[near(serializers=[borsh, json])]
+#[derive(Clone, Debug, PartialOrd, PartialEq, Ord, Eq, Hash)]
 #[serde(from = "String")]
 #[serde(into = "String")]
-#[borsh(crate = "near_sdk::borsh")]
 pub enum Member {
     /// NEAR account names do not allow `:` character so this structure cannot be abused.
     Account(AccountId),
@@ -51,65 +35,28 @@ impl Into<String> for Member {
     }
 }
 
-#[derive(
-    BorshSerialize,
-    BorshDeserialize,
-    Serialize,
-    Deserialize,
-    Clone,
-    Default,
-    Debug,
-    Eq,
-    PartialEq,
-    NearSchema,
-)]
-#[serde(crate = "near_sdk::serde")]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(serializers=[borsh, json])]
+#[derive(Clone, Default, Debug, Eq, PartialEq)]
 pub struct MemberMetadata {
     pub description: String,
     pub permissions: HashMap<Rule, HashSet<ActionType>>,
     pub children: HashSet<Member>,
     pub parents: HashSet<Member>,
 }
 
-#[derive(
-    BorshSerialize,
-    BorshDeserialize,
-    Serialize,
-    Deserialize,
-    Clone,
-    PartialOrd,
-    PartialEq,
-    Ord,
-    Eq,
-    Hash,
-    Debug,
-    NearSchema,
-)]
-#[serde(crate = "near_sdk::serde")]
+#[near(serializers=[borsh, json])]
+#[derive(Clone, PartialOrd, PartialEq, Ord, Eq, Hash, Debug)]
 #[serde(rename_all = "kebab-case")]
-#[borsh(crate = "near_sdk::borsh")]
 pub enum ActionType {
     /// Can edit posts that have these labels.
     EditPost,
     /// Can add/remove labels that fall under these rules.
     UseLabels,
 }
 
-#[derive(
-    BorshSerialize,
-    BorshDeserialize,
-    Serialize,
-    Deserialize,
-    Clone,
-    Debug,
-    Eq,
-    PartialEq,
-    NearSchema,
-)]
-#[serde(crate = "near_sdk::serde")]
+#[near(serializers=[borsh, json])]
+#[derive(Clone, Debug, Eq, PartialEq)]
 #[serde(tag = "member_metadata_version")]
-#[borsh(crate = "near_sdk::borsh")]
 pub enum VersionedMemberMetadata {
     V0(MemberMetadata),
 }
@@ -128,20 +75,8 @@ impl From<MemberMetadata> for VersionedMemberMetadata {
     }
 }
 
-#[derive(
-    BorshSerialize,
-    BorshDeserialize,
-    Serialize,
-    Deserialize,
-    Clone,
-    Debug,
-    Eq,
-    PartialEq,
-    Default,
-    NearSchema,
-)]
-#[serde(crate = "near_sdk::serde")]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(serializers=[borsh, json])]
+#[derive(Clone, Debug, Eq, PartialEq, Default)]
 pub struct MembersList {
     #[serde(flatten)]
     pub members: HashMap<Member, VersionedMemberMetadata>,

src/access_control/mod.rs

@@ -1,23 +1,20 @@
 use crate::access_control::members::{Member, MembersList, VersionedMemberMetadata};
 use crate::access_control::rules::{Rule, RulesList};
 use crate::*;
-use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
-use near_sdk::serde::{Deserialize, Serialize};
-use near_sdk::{near_bindgen, NearSchema};
+use near_sdk::near;
 use std::collections::{HashMap, HashSet};
 
 pub mod members;
 pub mod rules;
 
-#[derive(BorshSerialize, BorshDeserialize, Deserialize, Serialize, Clone, Default, NearSchema)]
-#[serde(crate = "near_sdk::serde")]
-#[borsh(crate = "near_sdk::borsh")]
+#[near(serializers=[borsh, json])]
+#[derive(Clone, Default)]
 pub struct AccessControl {
     pub rules_list: RulesList,
     pub members_list: MembersList,
 }
 
-#[near_bindgen]
+#[near]
 impl Contract {
     pub fn get_access_control_info(&self) -> &AccessControl {
         &self.access_control