Merge remote-tracking branch 'origin/master' into develop

helium · Oct 25, 2023 · 1ce59a4 · 1ce59a4
2 parents cc95cfd + eaa3dc9
commit 1ce59a4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,6 @@ packages/migration-service/export.json
 packages/migration-service/failures.json
 migration-docker/data
 accounts
-
 .yarn/*
 !.yarn/patches
 !.yarn/releases

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/voter-stake-registry/Cargo.toml b/programs/voter-stake-registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "voter-stake-registry"
-version = "0.2.2"
+version = "0.2.4"
 description = "Heliums voter weight plugin for spl-governance"
 license = "GPL-3.0-or-later"
 homepage = "https://github.com/helium/helium-program-library"

diff --git a/programs/voter-stake-registry/src/instructions/relinquish_expired_vote_v0.rs b/programs/voter-stake-registry/src/instructions/relinquish_expired_vote_v0.rs
@@ -19,10 +19,9 @@ pub struct RelinquishExpiredVoteV0<'info> {
   )]
   pub position: Box<Account<'info, PositionV0>>,
   #[account(
-    mut,
     constraint = !matches!(proposal.state, ProposalState::Voting { .. })
   )]
-  pub proposal: Account<'info, ProposalV0>,
+  pub proposal: Box<Account<'info, ProposalV0>>,
   pub system_program: Program<'info, System>,
 }
 

diff --git a/utils/proposal/Cargo.toml b/utils/proposal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proposal"
-version = "0.0.1"
+version = "0.1.0"
 description = "Proposal cpi wrapper"
 edition = "2021"
 

diff --git a/utils/proposal/idl.json b/utils/proposal/idl.json
@@ -122,19 +122,13 @@
           "name": "proposalConfig",
           "isMut": false,
           "isSigner": false,
-          "relations": [
-            "on_vote_hook",
-            "state_controller",
-            "vote_controller"
-          ]
+          "relations": ["on_vote_hook", "state_controller", "vote_controller"]
         },
         {
           "name": "proposal",
           "isMut": true,
           "isSigner": false,
-          "relations": [
-            "proposal_config"
-          ]
+          "relations": ["proposal_config"]
         },
         {
           "name": "onVoteHook",
@@ -163,17 +157,13 @@
           "name": "proposal",
           "isMut": true,
           "isSigner": false,
-          "relations": [
-            "proposal_config"
-          ]
+          "relations": ["proposal_config"]
         },
         {
           "name": "proposalConfig",
           "isMut": false,
           "isSigner": false,
-          "relations": [
-            "state_controller"
-          ]
+          "relations": ["state_controller"]
         }
       ],
       "args": [
@@ -194,9 +184,7 @@
         "fields": [
           {
             "name": "voteController",
-            "docs": [
-              "Signer that controls voting and vote weights"
-            ],
+            "docs": ["Signer that controls voting and vote weights"],
             "type": "publicKey"
           },
           {
@@ -259,9 +247,7 @@
           },
           {
             "name": "maxChoicesPerVoter",
-            "docs": [
-              "Allows for multiple selection votes"
-            ],
+            "docs": ["Allows for multiple selection votes"],
             "type": "u16"
           },
           {
@@ -274,9 +260,7 @@
           },
           {
             "name": "uri",
-            "docs": [
-              "URI to json containing name, description, etc"
-            ],
+            "docs": ["URI to json containing name, description, etc"],
             "type": "string"
           },
           {
@@ -313,9 +297,7 @@
           },
           {
             "name": "voteController",
-            "docs": [
-              "Signer that controls voting and vote weights"
-            ],
+            "docs": ["Signer that controls voting and vote weights"],
             "type": "publicKey"
           },
           {
@@ -351,9 +333,7 @@
           },
           {
             "name": "uri",
-            "docs": [
-              "Any other data that you may want to put in here"
-            ],
+            "docs": ["Any other data that you may want to put in here"],
             "type": {
               "option": "string"
             }
@@ -368,9 +348,7 @@
         "fields": [
           {
             "name": "seed",
-            "docs": [
-              "Allow a custom seed for indexing"
-            ],
+            "docs": ["Allow a custom seed for indexing"],
             "type": "bytes"
           },
           {
@@ -383,9 +361,7 @@
           },
           {
             "name": "maxChoicesPerVoter",
-            "docs": [
-              "Allows for multiple selection votes"
-            ],
+            "docs": ["Allows for multiple selection votes"],
             "type": "u16"
           },
           {
@@ -434,9 +410,7 @@
           },
           {
             "name": "removeVote",
-            "docs": [
-              "This is a remove operation"
-            ],
+            "docs": ["This is a remove operation"],
             "type": "bool"
           }
         ]
@@ -460,9 +434,7 @@
           },
           {
             "name": "uri",
-            "docs": [
-              "Any other data that you may want to put in here"
-            ],
+            "docs": ["Any other data that you may want to put in here"],
             "type": {
               "option": "string"
             }
@@ -498,15 +470,23 @@
                 "type": {
                   "vec": "u16"
                 }
+              },
+              {
+                "name": "end_ts",
+                "type": "i64"
               }
             ]
           },
           {
             "name": "Custom",
             "fields": [
               {
-                "name": "state",
+                "name": "name",
                 "type": "string"
+              },
+              {
+                "name": "bin",
+                "type": "bytes"
               }
             ]
           }
@@ -521,4 +501,4 @@
       "msg": "Error in arithmetic"
     }
   ]
-}
+}