From 3b750d51ce3b9f441bcc14bc29f78800a36dd094 Mon Sep 17 00:00:00 2001 From: Chewing Glass Date: Fri, 20 Oct 2023 13:55:06 -0400 Subject: [PATCH] Bump proposal idl --- .gitignore | 1 + Cargo.lock | 4 +- programs/voter-stake-registry/Cargo.toml | 2 +- .../relinquish_expired_vote_v0.rs | 1 - utils/proposal/Cargo.toml | 2 +- utils/proposal/idl.json | 66 +++++++------------ 6 files changed, 28 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index b913f8250..27aa9be58 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ packages/migration-service/export.json packages/migration-service/failures.json migration-docker/data accounts +.yarn \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 27b06a9f6..9a8a948f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3082,7 +3082,7 @@ dependencies = [ [[package]] name = "proposal" -version = "0.0.1" +version = "0.1.0" dependencies = [ "anchor-gen", "anchor-lang", @@ -5725,7 +5725,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "voter-stake-registry" -version = "0.2.3" +version = "0.2.4" dependencies = [ "anchor-lang", "anchor-spl", diff --git a/programs/voter-stake-registry/Cargo.toml b/programs/voter-stake-registry/Cargo.toml index f44deb5da..f254b2dd0 100644 --- 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.3" +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 index a1255f201..1cd673ad2 100644 --- 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,7 +19,6 @@ pub struct RelinquishExpiredVoteV0<'info> { )] pub position: Box>, #[account( - mut, constraint = !matches!(proposal.state, ProposalState::Voting { .. }) )] pub proposal: Box>, diff --git a/utils/proposal/Cargo.toml b/utils/proposal/Cargo.toml index 9bdfd1085..baa933f67 100644 --- 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 index 49741a50b..6fe3ba43e 100644 --- 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,6 +470,10 @@ "type": { "vec": "u16" } + }, + { + "name": "end_ts", + "type": "i64" } ] }, @@ -505,8 +481,12 @@ "name": "Custom", "fields": [ { - "name": "state", + "name": "name", "type": "string" + }, + { + "name": "bin", + "type": "bytes" } ] } @@ -521,4 +501,4 @@ "msg": "Error in arithmetic" } ] -} \ No newline at end of file +}