diff --git a/Cargo.lock b/Cargo.lock index 5890876..f2fcb56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3242,7 +3242,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "voter-stake-registry" -version = "0.1.5" +version = "0.1.6" dependencies = [ "anchor-lang", "anchor-spl", diff --git a/package.json b/package.json index 2067022..ebcd352 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@blockworks-foundation/voter-stake-registry-client", - "version": "0.1.5", + "version": "0.1.6", "description": "Client for Voter-stake-registry which is a voter weight addin for Solana's spl-governance program.", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/programs/voter-stake-registry/Cargo.toml b/programs/voter-stake-registry/Cargo.toml index f324a7b..94d37e3 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.1.5" +version = "0.1.6" description = "Created with Anchor" edition = "2018" diff --git a/src/voter_stake_registry.ts b/src/voter_stake_registry.ts index 1539e1f..01c6e26 100644 --- a/src/voter_stake_registry.ts +++ b/src/voter_stake_registry.ts @@ -1,5 +1,5 @@ export type VoterStakeRegistry = { - "version": "0.1.5", + "version": "0.1.6", "name": "voter_stake_registry", "instructions": [ { @@ -82,7 +82,7 @@ export type VoterStakeRegistry = { "type": "i8" }, { - "name": "depositScaledFactor", + "name": "unlockedScaledFactor", "type": "u64" }, { @@ -545,7 +545,41 @@ export type VoterStakeRegistry = { ] }, { - "name": "internalTransfer", + "name": "internalTransferLocked", + "accounts": [ + { + "name": "registrar", + "isMut": false, + "isSigner": false + }, + { + "name": "voter", + "isMut": true, + "isSigner": false + }, + { + "name": "voterAuthority", + "isMut": false, + "isSigner": true + } + ], + "args": [ + { + "name": "sourceDepositEntryIndex", + "type": "u8" + }, + { + "name": "targetDepositEntryIndex", + "type": "u8" + }, + { + "name": "amount", + "type": "u64" + } + ] + }, + { + "name": "internalTransferUnlocked", "accounts": [ { "name": "registrar", @@ -623,6 +657,11 @@ export type VoterStakeRegistry = { { "name": "closeVoter", "accounts": [ + { + "name": "registrar", + "isMut": false, + "isSigner": false + }, { "name": "voter", "isMut": true, @@ -635,6 +674,11 @@ export type VoterStakeRegistry = { }, { "name": "solDestination", + "isMut": true, + "isSigner": false + }, + { + "name": "tokenProgram", "isMut": false, "isSigner": false } @@ -922,7 +966,7 @@ export type VoterStakeRegistry = { "type": "publicKey" }, { - "name": "depositScaledFactor", + "name": "unlockedScaledFactor", "type": "u64" }, { @@ -983,7 +1027,7 @@ export type VoterStakeRegistry = { "index": false }, { - "name": "votingPowerDepositOnly", + "name": "votingPowerUnlockedOnly", "type": "u64", "index": false } @@ -1003,7 +1047,7 @@ export type VoterStakeRegistry = { "index": false }, { - "name": "withdrawable", + "name": "unlocked", "type": "u64", "index": false }, @@ -1013,7 +1057,7 @@ export type VoterStakeRegistry = { "index": false }, { - "name": "votingPowerDepositOnly", + "name": "votingPowerUnlockedOnly", "type": "u64", "index": false }, @@ -1199,12 +1243,27 @@ export type VoterStakeRegistry = { "code": 6033, "name": "InvalidChangeToClawbackDepositEntry", "msg": "" + }, + { + "code": 6034, + "name": "InternalErrorBadLockupVoteWeight", + "msg": "" + }, + { + "code": 6035, + "name": "DepositStartTooFarInFuture", + "msg": "" + }, + { + "code": 6036, + "name": "VaultTokenNonZero", + "msg": "" } ] }; export const IDL: VoterStakeRegistry = { - "version": "0.1.5", + "version": "0.1.6", "name": "voter_stake_registry", "instructions": [ { @@ -1287,7 +1346,7 @@ export const IDL: VoterStakeRegistry = { "type": "i8" }, { - "name": "depositScaledFactor", + "name": "unlockedScaledFactor", "type": "u64" }, { @@ -1750,7 +1809,41 @@ export const IDL: VoterStakeRegistry = { ] }, { - "name": "internalTransfer", + "name": "internalTransferLocked", + "accounts": [ + { + "name": "registrar", + "isMut": false, + "isSigner": false + }, + { + "name": "voter", + "isMut": true, + "isSigner": false + }, + { + "name": "voterAuthority", + "isMut": false, + "isSigner": true + } + ], + "args": [ + { + "name": "sourceDepositEntryIndex", + "type": "u8" + }, + { + "name": "targetDepositEntryIndex", + "type": "u8" + }, + { + "name": "amount", + "type": "u64" + } + ] + }, + { + "name": "internalTransferUnlocked", "accounts": [ { "name": "registrar", @@ -1828,6 +1921,11 @@ export const IDL: VoterStakeRegistry = { { "name": "closeVoter", "accounts": [ + { + "name": "registrar", + "isMut": false, + "isSigner": false + }, { "name": "voter", "isMut": true, @@ -1840,6 +1938,11 @@ export const IDL: VoterStakeRegistry = { }, { "name": "solDestination", + "isMut": true, + "isSigner": false + }, + { + "name": "tokenProgram", "isMut": false, "isSigner": false } @@ -2127,7 +2230,7 @@ export const IDL: VoterStakeRegistry = { "type": "publicKey" }, { - "name": "depositScaledFactor", + "name": "unlockedScaledFactor", "type": "u64" }, { @@ -2188,7 +2291,7 @@ export const IDL: VoterStakeRegistry = { "index": false }, { - "name": "votingPowerDepositOnly", + "name": "votingPowerUnlockedOnly", "type": "u64", "index": false } @@ -2208,7 +2311,7 @@ export const IDL: VoterStakeRegistry = { "index": false }, { - "name": "withdrawable", + "name": "unlocked", "type": "u64", "index": false }, @@ -2218,7 +2321,7 @@ export const IDL: VoterStakeRegistry = { "index": false }, { - "name": "votingPowerDepositOnly", + "name": "votingPowerUnlockedOnly", "type": "u64", "index": false }, @@ -2404,6 +2507,21 @@ export const IDL: VoterStakeRegistry = { "code": 6033, "name": "InvalidChangeToClawbackDepositEntry", "msg": "" + }, + { + "code": 6034, + "name": "InternalErrorBadLockupVoteWeight", + "msg": "" + }, + { + "code": 6035, + "name": "DepositStartTooFarInFuture", + "msg": "" + }, + { + "code": 6036, + "name": "VaultTokenNonZero", + "msg": "" } ] };