Parametrize expected_value

Author: metaproph3t

programs/autocrat_v0/src/lib.rs

@@ -58,6 +58,7 @@ pub struct DAO {
     pub burn_decay_per_slot_lamports: u64,
     pub slots_per_proposal: u64,
     pub market_taker_fee: i64,
+    pub twap_expected_value: u64,
 }
 
 #[derive(Clone, Copy, AnchorSerialize, AnchorDeserialize, PartialEq, Eq)]
@@ -114,6 +115,7 @@ pub mod autocrat_v0 {
         dao.burn_decay_per_slot_lamports = DEFAULT_BURN_DECAY_PER_SLOT_LAMPORTS;
         dao.slots_per_proposal = THREE_DAYS_IN_SLOTS;
         dao.market_taker_fee = 0;
+        dao.twap_expected_value = 10_000; // 1 USDC per META
 
         let (treasury_pubkey, treasury_bump) =
             Pubkey::find_program_address(&[dao.key().as_ref()], ctx.program_id);
@@ -226,11 +228,11 @@ pub mod autocrat_v0 {
             AutocratError::TWAPMarketTooOld
         );
         require!(
-            openbook_twap_pass_market.twap_oracle.expected_value == 1000,
+            openbook_twap_pass_market.twap_oracle.expected_value == dao.twap_expected_value,
             AutocratError::TWAPMarketInvalidExpectedValue
         );
         require!(
-            openbook_twap_fail_market.twap_oracle.expected_value == 1000,
+            openbook_twap_fail_market.twap_oracle.expected_value == dao.twap_expected_value,
             AutocratError::TWAPMarketInvalidExpectedValue
         );
 
@@ -388,61 +390,6 @@ pub mod autocrat_v0 {
         Ok(())
     }
 
-    // pub fn set_pass_threshold_bps(ctx: Context<Auth>, pass_threshold_bps: u16) -> Result<()> {
-    //     let dao = &mut ctx.accounts.dao;
-
-    //     dao.pass_threshold_bps = pass_threshold_bps;
-
-    //     Ok(())
-    // }
-
-    // pub fn set_base_burn_lamports(ctx: Context<Auth>, base_burn_lamports: u64) -> Result<()> {
-    //     let dao = &mut ctx.accounts.dao;
-
-    //     dao.base_burn_lamports = base_burn_lamports;
-
-    //     Ok(())
-    // }
-
-    // pub fn set_burn_decay_per_slot_lamports(
-    //     ctx: Context<Auth>,
-    //     burn_decay_per_slot_lamports: u64,
-    // ) -> Result<()> {
-    //     let dao = &mut ctx.accounts.dao;
-
-    //     dao.burn_decay_per_slot_lamports = burn_decay_per_slot_lamports;
-
-    //     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(())
-    // }
-
-    // pub fn set_market_taker_fee(ctx: Context<Auth>, market_taker_fee: i64) -> Result<()> {
-    //     let dao = &mut ctx.accounts.dao;
-
-    //     dao.market_taker_fee = market_taker_fee;
-
-    //     Ok(())
-    // }
-
-    #[derive(Clone, Copy, AnchorSerialize, AnchorDeserialize)]
-    pub enum Test {
-        Boo,
-        Foo,
-    }
-
-    #[derive(Clone, Copy, AnchorSerialize, AnchorDeserialize, Eq, PartialEq, Debug)]
-    pub struct Testy {
-        pub thing: Option<u64>,
-    }
-
-
     pub fn update_dao(
         ctx: Context<UpdateDao>,
         dao_params: UpdateDaoParams,
@@ -469,6 +416,10 @@ pub mod autocrat_v0 {
             dao.market_taker_fee = market_taker_fee;
         }
 
+        if let Some(twap_expected_value) = dao_params.twap_expected_value {
+            dao.twap_expected_value = twap_expected_value;
+        }
+
         Ok(())
     }
 
@@ -569,6 +520,7 @@ pub struct UpdateDaoParams {
     pub burn_decay_per_slot_lamports: Option<u64>,
     pub slots_per_proposal: Option<u64>,
     pub market_taker_fee: Option<i64>,
+    pub twap_expected_value: Option<u64>,
 }
 
 #[derive(Accounts)]
@@ -620,7 +572,7 @@ pub enum AutocratError {
     InvalidMarket,
     #[msg("`TWAPMarket` must have an `initial_slot` within 50 slots of the proposal's `slot_enqueued`")]
     TWAPMarketTooOld,
-    #[msg("`TWAPMarket` must have an expected value of 1000, or 0.1 USDC per META")]
+    #[msg("`TWAPMarket` has the wrong `expected_value`")]
     TWAPMarketInvalidExpectedValue,
     #[msg("One of the vaults has an invalid `settlement_authority`")]
     InvalidSettlementAuthority,

tests/autocratV0.ts

@@ -512,7 +512,7 @@ describe("autocrat_v0", async function () {
 
       let passBuyArgs: PlaceOrderArgs = {
         side: Side.Bid,
-        priceLots: new BN(1000), // 0.1 USDC for 1 META
+        priceLots: new BN(10000), // 1 USDC for 1 META
         maxBaseLots: new BN(10),
         maxQuoteLotsIncludingFees: new BN(10000),
         clientOrderId: new BN(1),
@@ -523,7 +523,7 @@ describe("autocrat_v0", async function () {
       };
       let failBuyArgs: PlaceOrderArgs = {
         side: Side.Bid,
-        priceLots: new BN(700), // 0.07 USDC for 1 META
+        priceLots: new BN(7000), // 0.7 USDC for 1 META
         maxBaseLots: new BN(10),
         maxQuoteLotsIncludingFees: new BN(10000),
         clientOrderId: new BN(1),
@@ -535,7 +535,7 @@ describe("autocrat_v0", async function () {
 
       let passSellArgs: PlaceOrderArgs = {
         side: Side.Ask,
-        priceLots: new BN(1100), // 0.11 USDC for 1 META
+        priceLots: new BN(11_000), // 1.1 USDC for 1 META
         maxBaseLots: new BN(10),
         maxQuoteLotsIncludingFees: new BN(12000),
         clientOrderId: new BN(2),
@@ -546,7 +546,7 @@ describe("autocrat_v0", async function () {
       };
       let failSellArgs: PlaceOrderArgs = {
         side: Side.Ask,
-        priceLots: new BN(800), // 0.8 USDC for 1 META
+        priceLots: new BN(8_000), // 8 USDC for 1 META
         maxBaseLots: new BN(10),
         maxQuoteLotsIncludingFees: new BN(12000),
         clientOrderId: new BN(2),
@@ -657,9 +657,9 @@ describe("autocrat_v0", async function () {
 
       let takeBuyArgs: PlaceOrderArgs = {
         side: Side.Bid,
-        priceLots: new BN(1_300), // 1.3 USDC for 1 META
+        priceLots: new BN(13000), // 13 USDC for 1 META
         maxBaseLots: new BN(1),
-        maxQuoteLotsIncludingFees: new BN(2000),
+        maxQuoteLotsIncludingFees: new BN(20000),
         clientOrderId: new BN(1),
         orderType: OrderType.Market,
         expiryTimestamp: new BN(0),
@@ -859,7 +859,7 @@ describe("autocrat_v0", async function () {
       assert.equal(
         (await getAccount(banksClient, aliceUnderlyingQuoteTokenAccount))
           .amount,
-        10_000n * 1_000_000n - 110_000n
+        10_000n * 1_000_000n - 1_100_000n
       );
     });
 
@@ -1458,7 +1458,7 @@ async function initializeProposal(
   );
 
   await openbookTwap.methods
-    .createTwapMarket(new BN(1000))
+    .createTwapMarket(new BN(daoBefore.twapExpectedValue))
     .accounts({
       market: openbookPassMarket,
       twapMarket: openbookTwapPassMarket,
@@ -1495,7 +1495,7 @@ async function initializeProposal(
     daoTreasury
   );
   await openbookTwap.methods
-    .createTwapMarket(new BN(1000))
+    .createTwapMarket(new BN(daoBefore.twapExpectedValue))
     .accounts({
       market: openbookFailMarket,
       twapMarket: openbookTwapFailMarket,