certusone
/
oyster
mirror of https://github.com/certusone/oyster.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26 from solana-labs/proposals 

Proposals
This commit is contained in:
dummytester123 2021-03-18 15:52:05 -05:00 committed by GitHub
parent 1d446c1640 9c580bccd7
commit 3132591862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/common/src/utils/ids.ts
View File

@ -95,9 +95,9 @@ export const PROGRAM_IDS = [
name: 'devnet',
timelock: () => ({
programAccountId: new PublicKey(
'Hn2FtiPy4fYu4WgEeuvF8Y6os412a1iQvam2rrT6ibX1',
'Gc6ktQPgHDxf9GpN6CdLEnkkqj5NfGYJeLDWFLoN3wNb',
),
programId: new PublicKey('5naVRdHoPFFQd2vTcWywyHthqqYziKvwu8urSxzV6Qj4'),
programId: new PublicKey('FmxAXMEKaj7BvgH9zdRNMZZYdAk4mBeRdSQwUoM3QYYw'),
}),
wormhole: () => ({
pubkey: new PublicKey('WormT3McKhFJ2RkiGpdw9GKvNCrB2aB54gb2uV9MfQC'),

6
packages/proposals/src/actions/createProposal.ts
View File

@ -272,7 +272,7 @@ async function getAssociatedAccountsAndInstructions(
wallet.publicKey,
accountRentExempt,
yesVoteMint,
wallet.publicKey,
authority,
holdingSigners,
);
@ -281,7 +281,7 @@ async function getAssociatedAccountsAndInstructions(
wallet.publicKey,
accountRentExempt,
noVoteMint,
wallet.publicKey,
authority,
holdingSigners,
);
@ -290,7 +290,7 @@ async function getAssociatedAccountsAndInstructions(
wallet.publicKey,
accountRentExempt,
timelockConfig.info.governanceMint,
wallet.publicKey,
authority,
holdingSigners,
);

9
packages/proposals/src/actions/execute.ts
View File

@ -23,14 +23,7 @@ export const execute = async (
let signers: Account[] = [];
let instructions: TransactionInstruction[] = [];
const [authority] = await PublicKey.findProgramAddress(
[PROGRAM_IDS.timelock.programAccountId.toBuffer()],
PROGRAM_IDS.timelock.programId,
);
const actualMessage = decodeBufferIntoMessage(transaction.info.instruction);
console.log('Actual message', actualMessage);
const accountInfos = getAccountInfos(actualMessage);
instructions.push(
@ -38,7 +31,7 @@ export const execute = async (
transaction.pubkey,
proposal.pubkey,
actualMessage.accountKeys[actualMessage.instructions[0].programIdIndex],
authority,
proposal.info.config,
accountInfos,
),
);

1
packages/proposals/src/actions/withdrawVotingTokens.ts
View File

@ -119,7 +119,6 @@ export const withdrawVotingTokens = async (
proposal.info.noVotingDump,
proposal.info.votingMint,
proposal.pubkey,
proposal.info.config,
transferAuthority.publicKey,
yesTransferAuthority.publicKey,
noTransferAuthority.publicKey,

5
packages/proposals/src/components/Proposal/RegisterToVote.tsx
View File

@ -46,7 +46,10 @@ export function RegisterToVote({
const eligibleToView =
(timelockConfig.info.votingEntryRule == VotingEntryRule.DraftOnly &&
proposal.info.state.status == TimelockStateStatus.Draft) ||
timelockConfig.info.votingEntryRule == VotingEntryRule.Anytime;
(timelockConfig.info.votingEntryRule == VotingEntryRule.Anytime &&
[TimelockStateStatus.Draft, TimelockStateStatus.Voting].includes(
proposal.info.state.status,
));
const [_, setTokenAmount] = useState(1);
return eligibleToView ? (
<Button

14
packages/proposals/src/components/Proposal/Vote.tsx
View File

@ -41,7 +41,6 @@ export function Vote({
return eligibleToView ? (
<Button
type="primary"
disabled={!voteAccount}
onClick={() =>
confirm({
title: 'Confirm',
@ -72,15 +71,18 @@ export function Vote({
cancelText: LABELS.CANCEL,
onOk: async () => {
if (voteAccount && yesVoteAccount && noVoteAccount) {
// tokenAmount is out of date in this scope, so we use a trick to get it here.
const valueHolder = { value: 0 };
// tokenAmount and mode is out of date in this scope, so we use a trick to get it here.
const valueHolder = { value: 0, mode: true };
await setTokenAmount(amount => {
valueHolder.value = amount;
return amount;
});
const yesTokenAmount = mode ? valueHolder.value : 0;
const noTokenAmount = !mode ? valueHolder.value : 0;
await setMode(mode => {
valueHolder.mode = mode;
return mode;
});
const yesTokenAmount = valueHolder.mode ? valueHolder.value : 0;
const noTokenAmount = !valueHolder.mode ? valueHolder.value : 0;
await vote(
connection,
wallet.wallet,

22
packages/proposals/src/components/Proposal/WithdrawTokens.tsx
View File

@ -33,16 +33,20 @@ export function WithdrawTokens({
const governanceAccount = useAccountByMint(
timelockConfig.info.governanceMint,
);
const totalTokens =
((voteAccount && voteAccount.info.amount.toNumber()) || 0) +
const votingTokens = (voteAccount && voteAccount.info.amount.toNumber()) || 0;
let totalTokens = votingTokens;
const inEscrow =
((yesVoteAccount && yesVoteAccount.info.amount.toNumber()) || 0) +
((noVoteAccount && noVoteAccount.info.amount.toNumber()) || 0);
let additionalMsg = '';
if (proposal.info.state.status !== TimelockStateStatus.Voting) {
totalTokens += inEscrow;
} else additionalMsg = LABELS.ADDITIONAL_VOTING_MSG;
const [_, setTokenAmount] = useState(1);
return totalTokens > 0 ? (
return votingTokens + inEscrow > 0 ? (
<Button
type="primary"
disabled={!voteAccount}
onClick={() =>
confirm({
title: 'Confirm',
@ -50,8 +54,14 @@ export function WithdrawTokens({
content: (
<Row>
<Col span={24}>
<p>You can withdraw up to {totalTokens} voting tokens.</p>
<p>You can withdraw up to {totalTokens} voting tokens. </p>
{additionalMsg && <p>{additionalMsg}</p>}
{additionalMsg && (
<p>
You have {inEscrow} tokens in holding until voting
completes.
</p>
)}
<Slider min={1} max={totalTokens} onChange={setTokenAmount} />
</Col>
</Row>

2
packages/proposals/src/constants/labels.ts
View File

@ -90,4 +90,6 @@ export const LABELS = {
PUBLIC_KEY: 'Public Key',
MENU_GOVERNANCE: 'My Governed Programs',
LEAVE_BLANK_IF_YOU_WANT_ONE: 'Leave blank if you want one made for you',
ADDITIONAL_VOTING_MSG:
' Please note that during voting, you cannot withdraw tokens you have used to vote. You must wait for the vote to complete.',
};

14
packages/proposals/src/models/execute.ts
View File

@ -12,15 +12,15 @@ import { TimelockInstruction } from './timelock';
/// 0. `[writable]` Transaction account you wish to execute.
/// 1. `[]` Timelock set account.
/// 2. `[]` Program being invoked account
/// 3. `[]` Timelock program authority
/// 4. `[]` Timelock program account pub key.
/// 5. `[]` Clock sysvar.
/// 4. `[]` Timelock config
/// 5. `[]` Timelock program account pub key.
/// 6. `[]` Clock sysvar.
/// 6+ Any extra accounts that are part of the instruction, in order
export const executeInstruction = (
transactionAccount: PublicKey,
timelockSetAccount: PublicKey,
programBeingInvokedAccount: PublicKey,
timelockAuthority: PublicKey,
timelockConfig: PublicKey,
accountInfos: { pubkey: PublicKey; isWritable: boolean; isSigner: boolean }[],
): TransactionInstruction => {
const PROGRAM_IDS = utils.programIds();
@ -39,16 +39,12 @@ export const executeInstruction = (
},
data,
);
console.log(
'Acohjnt',
accountInfos.map(a => console.log(a.pubkey.toBase58(), a.isWritable)),
);
const keys = [
{ pubkey: transactionAccount, isSigner: false, isWritable: true },
{ pubkey: timelockSetAccount, isSigner: false, isWritable: true },
{ pubkey: programBeingInvokedAccount, isSigner: false, isWritable: true },
{ pubkey: timelockAuthority, isSigner: false, isWritable: true },
{ pubkey: timelockConfig, isSigner: false, isWritable: true },
{
pubkey: PROGRAM_IDS.timelock.programAccountId,
isSigner: false,

23
packages/proposals/src/models/withdrawVotingTokens.ts
View File

@ -11,17 +11,16 @@ import BN from 'bn.js';
/// 2. `[writable]` Initialized No Voting account from which to remove your voting tokens.
/// 3. `[writable]` Governance token account that you wish your actual tokens to be returned to.
/// 4. `[writable]` Governance holding account owned by the timelock that will has the actual tokens in escrow.
/// 6. `[writable]` Initialized Yes Voting dump account owned by timelock set to which to send your voting tokens.
/// 7. `[writable]` Initialized No Voting dump account owned by timelock set to which to send your voting tokens.
/// 8. `[]` Voting mint account.
/// 9. `[]` Timelock set account.
/// 10. `[]` Timelock config account.
/// 11. `[]` Transfer authority
/// 12. `[]` Yes Transfer authority
/// 13. `[]` No Transfer authority
/// 14. `[]` Timelock program mint authority
/// 15. `[]` Timelock program account pub key.
/// 16. `[]` Token program account.
/// 5. `[writable]` Initialized Yes Voting dump account owned by timelock set to which to send your voting tokens.
/// 6. `[writable]` Initialized No Voting dump account owned by timelock set to which to send your voting tokens.
/// 7. `[]` Voting mint account.
/// 8. `[]` Timelock set account.
/// 9. `[]` Transfer authority
/// 10. `[]` Yes Transfer authority
/// 11. `[]` No Transfer authority
/// 12. `[]` Timelock program mint authority
/// 13. `[]` Timelock program account pub key.
/// 14. `[]` Token program account.
export const withdrawVotingTokensInstruction = (
votingAccount: PublicKey,
yesVotingAccount: PublicKey,
@ -32,7 +31,6 @@ export const withdrawVotingTokensInstruction = (
noVotingDump: PublicKey,
votingMint: PublicKey,
timelockSetAccount: PublicKey,
timelockConfigAccount: PublicKey,
transferAuthority: PublicKey,
yesTransferAuthority: PublicKey,
noTransferAuthority: PublicKey,
@ -66,7 +64,6 @@ export const withdrawVotingTokensInstruction = (
{ pubkey: noVotingDump, isSigner: false, isWritable: true },
{ pubkey: votingMint, isSigner: false, isWritable: true },
{ pubkey: timelockSetAccount, isSigner: false, isWritable: false },
{ pubkey: timelockConfigAccount, isSigner: false, isWritable: false },
{ pubkey: transferAuthority, isSigner: false, isWritable: false },
{ pubkey: yesTransferAuthority, isSigner: false, isWritable: false },
{ pubkey: noTransferAuthority, isSigner: false, isWritable: false },

15
packages/proposals/src/views/proposal/index.tsx
View File

@ -41,13 +41,13 @@ export const ProposalView = () => {
return (
<div className="flexColumn">
{proposal && sigMint && votingMint && governanceMint ? (
{proposal && sigMint && votingMint && governanceMint && yesVotingMint ? (
<InnerProposalView
proposal={proposal}
timelockConfig={timelockConfig}
governanceMint={governanceMint}
votingMint={votingMint}
yesVotingMint={votingMint}
yesVotingMint={yesVotingMint}
sigMint={sigMint}
instructions={context.transactions}
/>
@ -208,7 +208,6 @@ function InnerProposalView({
: 'vertical'
}
>
<MintGovernanceTokens timelockConfig={timelockConfig} />
<RegisterToVote
timelockConfig={timelockConfig}
proposal={proposal}
@ -226,6 +225,16 @@ function InnerProposalView({
title={LABELS.VOTES_REQUIRED}
value={getVotesRequired(timelockConfig, governanceMint)}
/>
<Space
style={{ marginTop: '10px' }}
direction={
breakpoint.lg || breakpoint.xl || breakpoint.xxl
? 'horizontal'
: 'vertical'
}
>
<MintGovernanceTokens timelockConfig={timelockConfig} />
</Space>
</Col>
</Row>
<Row