Updated Governance program -- Example uses legacy mango markets DAO

Author: BifrostTitan

src/Solnet.Examples/GovernanceProgramExamples.cs

@@ -16,12 +16,12 @@ public class GovernanceProgramExamples : IExample
 
         public GovernanceProgramExamples()
         {
-            governanceClient = new GovernanceClient(mRpcClient, GovernanceProgram.MainNetProgramIdKey);
+            governanceClient = new GovernanceClient(mRpcClient, GovernanceProgram.MangoGovernanceProgramIdKey);
         }
 
         public void Run()
         {
-            var realms = governanceClient.GetRealms();
+            var realms = governanceClient.GetRealms(GovernanceProgram.MangoGovernanceProgramIdKey);
 
             for(int i = 0; i < realms.ParsedResult.Count; i++)
             {
@@ -32,18 +32,18 @@ public void Run()
                     $"Council Mint: {realms.ParsedResult[i].Config?.CouncilMint}\n" +
                     $"Vote Weight Source: {realms.ParsedResult[i].Config.CommunityMintMaxVoteWeightSource}\n");
 
-                var progGovernances = governanceClient.GetProgramGovernanceAccounts(realms.OriginalRequest.Result[i].PublicKey);
-                var mintGovernances = governanceClient.GetMintGovernanceAccounts(realms.OriginalRequest.Result[i].PublicKey);
-                var tokenGovernances = governanceClient.GetTokenGovernanceAccounts(realms.OriginalRequest.Result[i].PublicKey);
-                var genericGovernances = governanceClient.GetGenericGovernanceAccounts(realms.OriginalRequest.Result[i].PublicKey);
+                var progGovernances = governanceClient.GetProgramGovernanceAccounts(realms.OriginalRequest.Result[i].PublicKey, realms.ParsedResult[i].Name);
+                var mintGovernances = governanceClient.GetMintGovernanceAccounts(GovernanceProgram.MangoGovernanceProgramIdKey, realms.OriginalRequest.Result[i].PublicKey);
+                var tokenGovernances = governanceClient.GetTokenGovernanceAccounts(GovernanceProgram.MangoGovernanceProgramIdKey, realms.OriginalRequest.Result[i].PublicKey);
+                var genericGovernances = governanceClient.GetGenericGovernanceAccounts(GovernanceProgram.MangoGovernanceProgramIdKey, realms.OriginalRequest.Result[i].PublicKey);
                 Console.WriteLine($"Program Governance Accounts: {progGovernances.ParsedResult?.Count}\n" +
                     $"Mint Governance Accounts: {mintGovernances.ParsedResult?.Count}\n" + 
                     $"Token Governance Accounts: {tokenGovernances.ParsedResult?.Count}\n" +
                     $"Generic Governance Accounts: {genericGovernances.ParsedResult?.Count}\n");
 
                 for(int j = 0; j < progGovernances.ParsedResult?.Count; j++)
                 {
-                    var proposals = governanceClient.GetProposalsV1(progGovernances.OriginalRequest.Result[j].PublicKey);
+                    var proposals = governanceClient.GetProposalsV1(GovernanceProgram.MangoGovernanceProgramIdKey, progGovernances.OriginalRequest.Result[j].PublicKey);
                     Console.WriteLine($"Program Governance: {progGovernances.OriginalRequest.Result[j].PublicKey}\n" +
                         $"Proposals: {proposals.OriginalRequest.Result.Count}");
                     for(int k = 0; k < proposals.ParsedResult?.Count; k++)

src/Solnet.Programs/Governance/GovernanceClient.cs

@@ -23,7 +23,7 @@ public class GovernanceClient : BaseClient
         /// Initialize the governance client.
         /// </summary>
         /// <param name="rpcClient">An <see cref="IRpcClient"/> instance.</param>
-        public GovernanceClient(IRpcClient rpcClient) : base(rpcClient, null) { }
+        public GovernanceClient(IRpcClient rpcClient, PublicKey governanceProgramID) : base(rpcClient, null, governanceProgramID) { }
 
         /// <summary>
         /// Gets all <see cref="Realm"/>s for the given program id. This is an asynchronous operation.

src/Solnet.Programs/Governance/GovernanceProgram.cs

@@ -562,11 +562,11 @@ private void WithVoterWeightAccounts(List<AccountMeta> accounts, PublicKey realm
         /// <returns>The public key of the realm config.</returns>
         public static PublicKey GetRealmConfigAddress(PublicKey programId, PublicKey realm)
         {
-            bool success = AddressExtensions.TryFindProgramAddress(
+            bool success = PublicKey.TryFindProgramAddress(
                 new List<byte[]> { Encoding.UTF8.GetBytes(RealmConfigSeed), realm },
-                programId, out byte[] realmConfigAddressBytes, out _);
+                programId, out PublicKey realmConfigAddressBytes, out _);
 
-            return success ? new PublicKey(realmConfigAddressBytes) : null;
+            return success ? realmConfigAddressBytes : null;
         }
 
     }

src/Solnet.Programs/Governance/Models/ProposalOption.cs

@@ -71,7 +71,7 @@ public static class Layout
         /// <returns>The <see cref="ProposalOption"/> structure.</returns>
         public static ProposalOption Deserialize(ReadOnlySpan<byte> data)
         {
-            int labelLength = data.GetString(Layout.LabelOffset, out string label);
+            int labelLength = data.GetBorshString(Layout.LabelOffset, out string label);
 
             return new ProposalOption
             {

src/Solnet.Programs/Governance/Models/ProposalV1.cs

@@ -162,8 +162,8 @@ public static ProposalV1 Deserialize(byte[] data)
                 offset += sizeof(byte);
             }
 
-            int nameLength = span.GetString(offset, out string name);
-            _ = span.GetString(offset + nameLength, out string descriptionLink);
+            int nameLength = span.GetBorshString(offset, out string name);
+            _ = span.GetBorshString(offset + nameLength, out string descriptionLink);
 
             return new ProposalV1
             {

src/Solnet.Programs/Governance/Models/ProposalV2.cs

@@ -171,8 +171,8 @@ public static ProposalV2 Deserialize(byte[] data)
                 offset += sizeof(byte);
             }
 
-            int nameLength = span.GetString(offset, out string name);
-            _ = span.GetString(offset + nameLength, out string descriptionLink);
+            int nameLength = span.GetBorshString(offset, out string name);
+            _ = span.GetBorshString(offset + nameLength, out string descriptionLink);
 
             return new ProposalV2
             {

src/Solnet.Programs/Governance/Models/Realm.cs

@@ -90,7 +90,7 @@ public static Realm Deserialize(byte[] data)
                     nameOffset -= PublicKey.PublicKeyLength;
                 }
 
-                _ = span.GetString(nameOffset, out realmName);
+                _ = span.GetBorshString(nameOffset, out realmName);
             }
             else
             {
@@ -107,7 +107,7 @@ public static Realm Deserialize(byte[] data)
                     nameOffset -= (2 * PublicKey.PublicKeyLength);
                 }
 
-                _ = span.GetString(nameOffset, out realmName);
+                _ = span.GetBorshString(nameOffset, out realmName);
             }
 
             return new Realm