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

Merge pull request #84 from SebastianBor/feat/check-upgrade-authority-when-governance-created 

Governance: Pass program data account and upgrade authority accounts
This commit is contained in:
Jordan Prince 2021-04-22 15:37:40 -05:00 committed by GitHub
parent edcbf78659 358d80ed03
commit 9d30c4b12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/proposals/src/actions/registerProgramGovernance.ts
View File

@ -127,10 +127,17 @@ export const registerProgramGovernance = async (
PROGRAM_IDS.timelock.programId,
);
const [programDataAccount] = await PublicKey.findProgramAddress(
[uninitializedTimelockConfig.program.toBuffer()],
PROGRAM_IDS.bpf_upgrade_loader,
);
instructions.push(
createEmptyTimelockConfigInstruction(
timelockConfigKey,
uninitializedTimelockConfig.program,
programDataAccount,
wallet.publicKey,
uninitializedTimelockConfig.governanceMint,
wallet.publicKey,
uninitializedTimelockConfig.councilMint,

9
packages/proposals/src/models/createEmptyTimelockConfig.ts
View File

@ -20,6 +20,8 @@ import * as Layout from '../utils/layout';
export const createEmptyTimelockConfigInstruction = (
timelockConfigAccount: PublicKey,
programAccount: PublicKey,
programDataAccount: PublicKey,
programUpgradeAuthority: PublicKey,
governanceMint: PublicKey,
payer: PublicKey,
councilMint?: PublicKey,
@ -40,15 +42,16 @@ export const createEmptyTimelockConfigInstruction = (
const keys = [
{ pubkey: timelockConfigAccount, isSigner: false, isWritable: false },
{ pubkey: programAccount, isSigner: false, isWritable: false },
{ pubkey: programDataAccount, isSigner: false, isWritable: true },
{ pubkey: programUpgradeAuthority, isSigner: true, isWritable: false },
{ pubkey: governanceMint, isSigner: false, isWritable: false },
{ pubkey: payer, isSigner: true, isWritable: false },
{ pubkey: PROGRAM_IDS.system, isSigner: false, isWritable: false },
{
pubkey: PROGRAM_IDS.timelock.programId,
pubkey: PROGRAM_IDS.bpf_upgrade_loader,
isSigner: false,
isWritable: false,
},
{ pubkey: PROGRAM_IDS.system, isSigner: false, isWritable: false },
];
if (councilMint) {