solana: adjustments to proposals

solana/programs/matching-engine/src/processor/admin/propose/mod.rs

@@ -5,7 +5,7 @@ use crate::state::{Custodian, Proposal, ProposalAction};
 use anchor_lang::prelude::*;
 
 struct Propose<'ctx, 'info> {
-    custodian: &'ctx mut Account<'info, Custodian>,
+    custodian: &'ctx Account<'info, Custodian>,
     proposal: &'ctx mut Account<'info, Proposal>,
     by: &'ctx AccountInfo<'info>,
     epoch_schedule: &'ctx Sysvar<'info, EpochSchedule>,
@@ -19,7 +19,7 @@ fn propose(accounts: Propose, action: ProposalAction, proposal_bump_seed: u8) ->
         epoch_schedule,
     } = accounts;
 
-    let slot_proposed_at = Clock::get().map(|clock| clock.slot)?;
+    let slot_proposed_at = Clock::get().unwrap().slot;
 
     cfg_if::cfg_if! {
         if #[cfg(feature = "integration-test")] {
@@ -43,9 +43,6 @@ fn propose(accounts: Propose, action: ProposalAction, proposal_bump_seed: u8) ->
         slot_enacted_at: None,
     });
 
-    // Uptick the next proposal ID.
-    custodian.next_proposal_id += 1;
-
     // Done.
     Ok(())
 }

solana/programs/matching-engine/src/processor/admin/update/auction_parameters.rs

@@ -1,21 +1,16 @@
 use crate::{
     error::MatchingEngineError,
-    state::{AuctionConfig, Custodian, Proposal, ProposalAction},
+    state::custodian::*,
+    state::{AuctionConfig, Proposal, ProposalAction},
 };
 use anchor_lang::prelude::*;
 
 #[derive(Accounts)]
 pub struct UpdateAuctionParameters<'info> {
     #[account(mut)]
-    owner: Signer<'info>,
+    payer: Signer<'info>,
 
-    #[account(
-        mut,
-        seeds = [Custodian::SEED_PREFIX],
-        bump = Custodian::BUMP,
-        has_one = owner @ MatchingEngineError::OwnerOnly,
-    )]
-    custodian: Account<'info, Custodian>,
+    admin: OwnerMutCustodian<'info>,
 
     #[account(
         mut,
@@ -24,23 +19,25 @@ pub struct UpdateAuctionParameters<'info> {
             proposal.id.to_be_bytes().as_ref(),
         ],
         bump = proposal.bump,
-        has_one = owner,
         constraint = {
+            require_keys_eq!(
+                proposal.owner, admin.owner.key()
+            );
             require!(
                 proposal.slot_enacted_at.is_none(),
                 MatchingEngineError::ProposalAlreadyEnacted
             );
 
             require!(
-                Clock::get()?.slot >= proposal.slot_enact_delay,
+                Clock::get().unwrap().slot >= proposal.slot_enact_delay,
                 MatchingEngineError::ProposalDelayNotExpired
             );
 
             match &proposal.action {
                 ProposalAction::UpdateAuctionParameters { id, .. } => {
                     require_eq!(
                         *id,
-                        custodian.auction_config_id + 1,
+                        admin.custodian.auction_config_id + 1,
                         MatchingEngineError::AuctionConfigMismatch
                     );
                 },
@@ -54,11 +51,11 @@ pub struct UpdateAuctionParameters<'info> {
 
     #[account(
         init,
-        payer = owner,
+        payer = payer,
         space = 8 + AuctionConfig::INIT_SPACE,
         seeds = [
             AuctionConfig::SEED_PREFIX,
-            (custodian.auction_config_id + 1).to_be_bytes().as_ref()
+            (admin.custodian.auction_config_id + 1).to_be_bytes().as_ref()
         ],
         bump,
     )]
@@ -78,10 +75,13 @@ pub fn update_auction_parameters(ctx: Context<UpdateAuctionParameters>) -> Resul
     }
 
     // Update the auction config ID.
-    ctx.accounts.custodian.auction_config_id += 1;
+    ctx.accounts.admin.custodian.auction_config_id += 1;
 
     // Set the slot enacted at so it cannot be replayed.
-    ctx.accounts.proposal.slot_enacted_at = Some(Clock::get().map(|clock| clock.slot)?);
+    ctx.accounts.proposal.slot_enacted_at = Some(Clock::get().unwrap().slot);
+
+    // Uptick the proposal ID so that someone can create a new proposal again.
+    ctx.accounts.admin.custodian.next_proposal_id += 1;
 
     // Done.
     Ok(())

solana/target/idl/matching_engine.json

@@ -1410,14 +1410,24 @@
       "name": "updateAuctionParameters",
       "accounts": [
         {
-          "name": "owner",
+          "name": "payer",
           "isMut": true,
           "isSigner": true
         },
         {
-          "name": "custodian",
-          "isMut": true,
-          "isSigner": false
+          "name": "admin",
+          "accounts": [
+            {
+              "name": "owner",
+              "isMut": false,
+              "isSigner": true
+            },
+            {
+              "name": "custodian",
+              "isMut": true,
+              "isSigner": false
+            }
+          ]
         },
         {
           "name": "proposal",

solana/target/types/matching_engine.ts

@@ -1410,14 +1410,24 @@ export type MatchingEngine = {
       "name": "updateAuctionParameters",
       "accounts": [
         {
-          "name": "owner",
+          "name": "payer",
           "isMut": true,
           "isSigner": true
         },
         {
-          "name": "custodian",
-          "isMut": true,
-          "isSigner": false
+          "name": "admin",
+          "accounts": [
+            {
+              "name": "owner",
+              "isMut": false,
+              "isSigner": true
+            },
+            {
+              "name": "custodian",
+              "isMut": true,
+              "isSigner": false
+            }
+          ]
         },
         {
           "name": "proposal",
@@ -4191,14 +4201,24 @@ export const IDL: MatchingEngine = {
       "name": "updateAuctionParameters",
       "accounts": [
         {
-          "name": "owner",
+          "name": "payer",
           "isMut": true,
           "isSigner": true
         },
         {
-          "name": "custodian",
-          "isMut": true,
-          "isSigner": false
+          "name": "admin",
+          "accounts": [
+            {
+              "name": "owner",
+              "isMut": false,
+              "isSigner": true
+            },
+            {
+              "name": "custodian",
+              "isMut": true,
+              "isSigner": false
+            }
+          ]
         },
         {
           "name": "proposal",

solana/ts/src/matchingEngine/index.ts

@@ -500,14 +500,35 @@ export class MatchingEngineProgram {
             .instruction();
     }
 
+    async closeProposalIx(accounts: { owner: PublicKey }): Promise<TransactionInstruction> {
+        const { owner } = accounts;
+
+        const proposal = await this.proposalAddress();
+        const { by: proposedBy } = await this.fetchProposal({ address: proposal });
+
+        return this.program.methods
+            .closeProposal()
+            .accounts({
+                admin: {
+                    owner,
+                    custodian: this.custodianAddress(),
+                },
+                proposedBy,
+                proposal,
+            })
+            .instruction();
+    }
+
     async updateAuctionParametersIx(accounts: {
         owner: PublicKey;
+        payer?: PublicKey;
         custodian?: PublicKey;
         proposal?: PublicKey;
         auctionConfig?: PublicKey;
     }): Promise<TransactionInstruction> {
         const {
             owner,
+            payer: inputPayer,
             custodian: inputCustodian,
             proposal: inputProposal,
             auctionConfig: inputAuctionConfig,
@@ -526,8 +547,11 @@ export class MatchingEngineProgram {
         return this.program.methods
             .updateAuctionParameters()
             .accounts({
-                owner,
-                custodian: inputCustodian ?? this.custodianAddress(),
+                payer: inputPayer ?? owner,
+                admin: {
+                    owner,
+                    custodian: inputCustodian ?? this.custodianAddress(),
+                },
                 proposal: inputProposal ?? (await this.proposalAddress()),
                 auctionConfig,
             })