Parametrize slots_per_proposal

Author: metaproph3t

programs/autocrat_v0/src/lib.rs

@@ -26,6 +26,9 @@ security_txt! {
 
 declare_id!("meta3cxKzFBmWYgCVozmvCQAS3y9b3fGxrG9HkHL7Wi");
 
+pub const SLOTS_PER_10_SECS: u64 = 25;
+pub const THREE_DAYS_IN_SLOTS: u64 = 5 * 24 * 60 * 6 * SLOTS_PER_10_SECS;
+
 // by default, the pass price needs to be 5% higher than the fail price
 pub const DEFAULT_PASS_THRESHOLD_BPS: u16 = 500;
 
@@ -34,8 +37,6 @@ pub const DEFAULT_BASE_BURN_LAMPORTS: u64 = 50 * solana_program::native_token::L
 pub const DEFAULT_BURN_DECAY_PER_SLOT_LAMPORTS: u64 = 46_300;
 
 pub const MAX_BPS: u16 = 10_000;
-pub const SLOTS_PER_10_SECS: u64 = 25;
-pub const TEN_DAYS_IN_SLOTS: u64 = 10 * 24 * 60 * 6 * SLOTS_PER_10_SECS;
 
 #[account]
 pub struct DAO {
@@ -52,6 +53,7 @@ pub struct DAO {
     pub last_proposal_slot: u64,
     pub base_burn_lamports: u64,
     pub burn_decay_per_slot_lamports: u64,
+    pub slots_per_proposal: u64,
     // treasury needed even though DAO is PDA for this reason: https://solana.stackexchange.com/questions/7667/a-peculiar-problem-with-cpis
     pub treasury_pda_bump: u8,
     pub treasury: Pubkey,
@@ -104,9 +106,12 @@ pub mod autocrat_v0 {
         dao.meta_mint = ctx.accounts.meta_mint.key();
         dao.usdc_mint = ctx.accounts.usdc_mint.key();
 
+        dao.proposal_count = 1;
+
         dao.pass_threshold_bps = DEFAULT_PASS_THRESHOLD_BPS;
         dao.base_burn_lamports = DEFAULT_BASE_BURN_LAMPORTS;
         dao.burn_decay_per_slot_lamports = DEFAULT_BURN_DECAY_PER_SLOT_LAMPORTS;
+        dao.slots_per_proposal = THREE_DAYS_IN_SLOTS;
 
         let (treasury_pubkey, treasury_bump) =
             Pubkey::find_program_address(&[dao.key().as_ref()], ctx.program_id);
@@ -281,7 +286,7 @@ pub mod autocrat_v0 {
         let clock = Clock::get()?;
 
         require!(
-            clock.slot >= proposal.slot_enqueued + TEN_DAYS_IN_SLOTS,
+            clock.slot >= proposal.slot_enqueued + ctx.accounts.dao.slots_per_proposal,
             AutocratError::ProposalTooYoung
         );
 
@@ -307,11 +312,11 @@ pub mod autocrat_v0 {
             openbook_twap_fail_market.twap_oracle.last_updated_slot - proposal.slot_enqueued;
 
         require!(
-            pass_market_slots_passed >= TEN_DAYS_IN_SLOTS,
+            pass_market_slots_passed >= ctx.accounts.dao.slots_per_proposal,
             AutocratError::MarketsTooYoung
         );
         require!(
-            fail_market_slots_passed >= TEN_DAYS_IN_SLOTS,
+            fail_market_slots_passed >= ctx.accounts.dao.slots_per_proposal,
             AutocratError::MarketsTooYoung
         );
 
@@ -396,6 +401,14 @@ pub mod autocrat_v0 {
 
         Ok(())
     }
+
+    pub fn set_slots_per_proposal(ctx: Context<Auth>, slots_per_proposal: u64) -> Result<()> {
+        let dao = &mut ctx.accounts.dao;
+
+        dao.slots_per_proposal = slots_per_proposal;
+
+        Ok(())
+    }
 }
 
 #[derive(Accounts)]

tests/autocratV0.ts

@@ -87,7 +87,6 @@ const AUTOCRAT_MIGRATOR_PROGRAM_ID = new PublicKey(
   "8C4WEdr54tBPdtmeTPUBuZX5bgUMZw4XdvpNoNaQ6NwR"
 );
 
-
 describe("autocrat_v0", async function () {
   let provider,
     connection,
@@ -173,7 +172,6 @@ describe("autocrat_v0", async function () {
         autocrat.programId
       );
 
-
       await autocrat.methods
         .initializeDao()
         .accounts({
@@ -192,13 +190,23 @@ describe("autocrat_v0", async function () {
       const daoAcc = await autocrat.account.dao.fetch(dao);
       assert(daoAcc.metaMint.equals(META));
       assert(daoAcc.usdcMint.equals(USDC));
-      assert.equal(daoAcc.proposalCount, 0);
+      assert.equal(daoAcc.proposalCount, 1);
       assert.equal(daoAcc.passThresholdBps, 500);
       assert.ok(daoAcc.baseBurnLamports.eq(new BN(1_000_000_000).muln(50)));
       assert.ok(daoAcc.burnDecayPerSlotLamports.eq(new BN(46_300)));
 
-      treasuryMetaAccount = await createAssociatedTokenAccount(banksClient, payer, META, daoTreasury);
-      treasuryUsdcAccount = await createAssociatedTokenAccount(banksClient, payer, USDC, daoTreasury);
+      treasuryMetaAccount = await createAssociatedTokenAccount(
+        banksClient,
+        payer,
+        META,
+        daoTreasury
+      );
+      treasuryUsdcAccount = await createAssociatedTokenAccount(
+        banksClient,
+        payer,
+        USDC,
+        daoTreasury
+      );
     });
   });
 
@@ -278,7 +286,6 @@ describe("autocrat_v0", async function () {
       aliceQuoteFailConditionalTokenAccount,
       newPassThresholdBps,
       instruction;
-    
 
     beforeEach(async function () {
       // const accounts = [
@@ -307,10 +314,21 @@ describe("autocrat_v0", async function () {
       await mintToOverride(context, treasuryUsdcAccount, 1_000_000n);
 
       let receiver = Keypair.generate();
-      let to0 = await createAccount(banksClient, payer, META, receiver.publicKey);
-      let to1 = await createAccount(banksClient, payer, USDC, receiver.publicKey);
+      let to0 = await createAccount(
+        banksClient,
+        payer,
+        META,
+        receiver.publicKey
+      );
+      let to1 = await createAccount(
+        banksClient,
+        payer,
+        USDC,
+        receiver.publicKey
+      );
 
-      const ix = await migrator.methods.multiTransfer2()
+      const ix = await migrator.methods
+        .multiTransfer2()
         .accounts({
           authority: daoTreasury,
           from0: treasuryMetaAccount,
@@ -324,7 +342,7 @@ describe("autocrat_v0", async function () {
         programId: ix.programId,
         accounts: ix.keys,
         data: ix.data,
-      }
+      };
 
       proposal = await initializeProposal(
         autocrat,
@@ -768,7 +786,7 @@ describe("autocrat_v0", async function () {
           //     isWritable: false,
           //     isSigner: false,
           //   })
-            instruction.accounts
+          instruction.accounts
             .concat({
               pubkey: migrator.programId,
               isWritable: false,

tests/migrator.ts

@@ -7,9 +7,7 @@ const { PublicKey, Keypair } = anchor.web3;
 
 import { assert } from "chai";
 
-import {
-  startAnchor,
-} from "solana-bankrun";
+import { startAnchor } from "solana-bankrun";
 
 const AUTOCRAT_MIGRATOR_PROGRAM_ID = new PublicKey(
   "8C4WEdr54tBPdtmeTPUBuZX5bgUMZw4XdvpNoNaQ6NwR"
@@ -30,14 +28,7 @@ import {
 } from "spl-token-bankrun";
 
 describe("autocrat_migrator", async function () {
-  let provider,
-    connection,
-    migrator,
-    payer,
-    context,
-    banksClient,
-    META,
-    USDC;
+  let provider, connection, migrator, payer, context, banksClient, META, USDC;
 
   before(async function () {
     context = await startAnchor("./", [], []);
@@ -113,7 +104,7 @@ describe("autocrat_migrator", async function () {
           to1,
         })
         .rpc();
-    
+
       assert((await getAccount(banksClient, from0)).amount == 0n);
       assert((await getAccount(banksClient, from1)).amount == 0n);