token-haver: Enforce uniqueness of token account mints (#96)

* init

* .

* start tests

* more test updates

* check locked

* typo

* typo

* pubkey

* rn

* answer comments

* shift by 9 decimals

* use 7gobfUihgoxA14RUnVaseoah89ggCgYAzgz1JoaPAXam

* use 6 decimals to match realms default

* Enforce unique mints

* bump ver

Anchor.toml

@@ -8,7 +8,7 @@ seeds = false
 nft_voter = "GnftV5kLjd67tvHpNGyodwWveEKivz3ZWvvE3Z4xi2iw"
 gateway = "GgathUhdrCWRHowoRKACjgWhYHfxCEdBi5ViqYN6HVxk"
 solana-gateway-program = "gatem74V238djXdzWnJf94Wo1DcnuGkfijbf3AuBhfs"
-token-haver = "vo65JQC6U8HCDPfoJxRrr17n7RZ5fKdfyjHm3erHJ2V"
+token-haver = "7gobfUihgoxA14RUnVaseoah89ggCgYAzgz1JoaPAXam"
 
 [registry]
 url = "https://anchor.projectserum.com"

programs/token-haver/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gpl-token-haver"
-version = "0.0.1"
+version = "0.0.2"
 description = "SPL Governance plugin granting governance power based on the nonzero presence of locked tokens"
 license = "Apache-2.0"
 edition = "2018"

programs/token-haver/src/error.rs

@@ -23,6 +23,9 @@ pub enum TokenHaverError {
     #[msg("All token accounts' mints must be included in the registrar")]
     TokenAccountWrongMint,
 
-    #[msg("All token accounts' mints must be included in the registrar")]
+    #[msg("All token accounts must be locked")]
     TokenAccountNotLocked,
+
+    #[msg("All token accounts' mints must be unique")]
+    TokenAccountDuplicateMint,
 }

programs/token-haver/src/instructions/update_voter_weight_record.rs

@@ -42,6 +42,17 @@ pub fn update_voter_weight_record(ctx: Context<UpdateVoterWeightRecord>) -> Resu
             voter_weight_record.governing_token_owner,
             TokenHaverError::TokenAccountWrongOwner
         );
+
+        // Throw an error if a token account's mint is not unique amount the accounts
+        require!(
+            nonzero_token_accounts
+                .iter()
+                .filter(|a| a.mint == account.mint)
+                .count()
+                == 1,
+            TokenHaverError::TokenAccountDuplicateMint
+        );
+
         // Throw an error if a token account's mint isn't in registrar.mints
         require!(
             registrar.mints.contains(&account.mint),
@@ -52,7 +63,7 @@ pub fn update_voter_weight_record(ctx: Context<UpdateVoterWeightRecord>) -> Resu
     }
 
     // Setup voter_weight
-    voter_weight_record.voter_weight = nonzero_token_accounts.len() as u64;
+    voter_weight_record.voter_weight = (nonzero_token_accounts.len() as u64) * 1_000_000;
 
     // Record is only valid as of the current slot
     voter_weight_record.voter_weight_expiry = Some(Clock::get()?.slot);

programs/token-haver/src/lib.rs

@@ -9,7 +9,7 @@ pub mod state;
 
 pub mod tools;
 
-declare_id!("vo65JQC6U8HCDPfoJxRrr17n7RZ5fKdfyjHm3erHJ2V");
+declare_id!("7gobfUihgoxA14RUnVaseoah89ggCgYAzgz1JoaPAXam");
 
 #[program]
 pub mod token_haver {