Governance: Fix Realm deserialisation and bump create versions for V2 (#2863)

* fix: realm deserialisation

* chore: update spl-gov version for chat

* chore: update spl-governance-tools version to 0.1.2

* chore: upgrade Anchor to 0.20.1

* chore: update addin-api version

* chore: update spl-governance-test-sdk version

Author: SebastianBor

Anchor.toml

@@ -1,5 +1,5 @@
-anchor_version = "0.16.1"
-solana_version = "1.7.11"
+anchor_version = "0.20.1"
+solana_version = "1.9.5"
 
 [workspace]
 members = ["governance/program"]

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance-addin-api"
-version = "0.1.0"
+version = "0.1.1"
 description = "Solana Program Library Governance Addin Api"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -9,6 +9,6 @@ edition = "2018"
 
 [dependencies]
 borsh = "0.9.1"
-spl-governance-tools= { version = "0.1.1", path ="../tools"}
+spl-governance-tools= { version = "0.1.2", path ="../tools"}
 solana-program = "1.9.5"
 

governance/addin-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance-addin-mock"
-version = "0.1.0"
+version = "0.1.1"
 description = "Solana Program Library Governance Voter Weight Addin Program"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -21,8 +21,8 @@ serde = "1.0.127"
 serde_derive = "1.0.103"
 solana-program = "1.9.5"
 spl-token = { version = "3.3", path = "../../../token/program", features = [ "no-entrypoint" ] }
-spl-governance-addin-api= { version = "0.1.0", path ="../../addin-api"}
-spl-governance-tools= { version = "0.1.1", path ="../../tools"}
+spl-governance-addin-api= { version = "0.1.1", path ="../../addin-api"}
+spl-governance-tools= { version = "0.1.2", path ="../../tools"}
 thiserror = "1.0"
 
 
@@ -32,7 +32,7 @@ base64 = "0.13"
 proptest = "1.0"
 solana-program-test = "1.9.5"
 solana-sdk = "1.9.5"
-spl-governance-test-sdk = { version = "0.1.1", path ="../../test-sdk"}
+spl-governance-test-sdk = { version = "0.1.2", path ="../../test-sdk"}
 
 
 [lib]

governance/addin-mock/program/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance-chat"
-version = "0.2.2"
+version = "0.2.3"
 description = "Solana Program Library Governance Chat Program"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -21,9 +21,9 @@ serde = "1.0.127"
 serde_derive = "1.0.103"
 solana-program = "1.9.5"
 spl-token = { version = "3.3", path = "../../../token/program", features = [ "no-entrypoint" ] }
-spl-governance= { version = "2.2.0", path ="../../program", features = [ "no-entrypoint" ]}
-spl-governance-tools= { version = "0.1.1", path ="../../tools"}
-spl-governance-addin-api= { version = "0.1.0", path ="../../addin-api"}
+spl-governance= { version = "2.2.1", path ="../../program", features = [ "no-entrypoint" ]}
+spl-governance-tools= { version = "0.1.2", path ="../../tools"}
+spl-governance-addin-api= { version = "0.1.1", path ="../../addin-api"}
 thiserror = "1.0"
 
 
@@ -33,8 +33,8 @@ base64 = "0.13"
 proptest = "1.0"
 solana-program-test = "1.9.5"
 solana-sdk = "1.9.5"
-spl-governance-test-sdk = { version = "0.1.1", path ="../../test-sdk"}
-spl-governance-addin-mock = { version = "0.1.0", path ="../../addin-mock/program"}
+spl-governance-test-sdk = { version = "0.1.2", path ="../../test-sdk"}
+spl-governance-addin-mock = { version = "0.1.1", path ="../../addin-mock/program"}
 
 
 [lib]

governance/chat/program/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance"
-version = "2.2.0"
+version = "2.2.1"
 description = "Solana Program Library Governance Program"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -21,8 +21,8 @@ serde = "1.0.130"
 serde_derive = "1.0.103"
 solana-program = "1.9.5"
 spl-token = { version = "3.3", path = "../../token/program", features = [ "no-entrypoint" ] }
-spl-governance-tools= { version = "0.1.1", path ="../tools"}
-spl-governance-addin-api= { version = "0.1.0", path ="../addin-api"}
+spl-governance-tools= { version = "0.1.2", path ="../tools"}
+spl-governance-addin-api= { version = "0.1.1", path ="../addin-api"}
 thiserror = "1.0"
 
 [dev-dependencies]
@@ -31,8 +31,8 @@ base64 = "0.13"
 proptest = "1.0"
 solana-program-test = "1.9.5"
 solana-sdk = "1.9.5"
-spl-governance-test-sdk = { version = "0.1.1", path ="../test-sdk"}
-spl-governance-addin-mock = { version = "0.1.0", path ="../addin-mock/program"}
+spl-governance-test-sdk = { version = "0.1.2", path ="../test-sdk"}
+spl-governance-addin-mock = { version = "0.1.1", path ="../addin-mock/program"}
 
 
 [lib]

governance/program/Cargo.toml

@@ -323,7 +323,7 @@ pub fn get_realm_data_for_authority(
     realm_info: &AccountInfo,
     realm_authority: &Pubkey,
 ) -> Result<RealmV2, ProgramError> {
-    let realm_data = get_account_data::<RealmV2>(program_id, realm_info)?;
+    let realm_data = get_realm_data(program_id, realm_info)?;
 
     if realm_data.authority.is_none() {
         return Err(GovernanceError::RealmHasNoAuthority.into());

governance/program/src/state/realm.rs

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance-test-sdk"
-version = "0.1.1"
+version = "0.1.2"
 description = "Solana Program Library Governance Program Test SDK"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"

governance/test-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance-tools"
-version = "0.1.1"
+version = "0.1.2"
 description = "Solana Program Library Governance Tools"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"