add reference offset test example

programs/drift/src/controller/position/tests.rs

@@ -609,8 +609,9 @@ fn amm_perp_ref_offset() {
 
     let reserve_price = perp_market.amm.reserve_price().unwrap();
     let (b1, a1) = perp_market.amm.bid_ask_price(reserve_price).unwrap();
-    assert_eq!(b1, 7098048);
-    assert_eq!(a1, 7105178);
+    assert_eq!(reserve_price, 7101599);
+    assert_eq!(b1, 7225876);
+    assert_eq!(a1, 7233006);
     assert_eq!(
         perp_market.amm.historical_oracle_data.last_oracle_price,
         7101600
@@ -690,8 +691,8 @@ fn amm_perp_ref_offset() {
 
     let r = perp_market.amm.reserve_price().unwrap();
     let (b, a) = perp_market.amm.bid_ask_price(r).unwrap();
-    assert_eq!(b, 7098048);
-    assert_eq!(a, 7105178);
+    assert_eq!(b, 7417620);
+    assert_eq!(a, 7424750);
     assert_eq!(
         perp_market.amm.historical_oracle_data.last_oracle_price,
         7101600

programs/drift/src/state/perp_market.rs

@@ -14,10 +14,11 @@ use crate::math::constants::{
 };
 use crate::math::constants::{
     AMM_RESERVE_PRECISION_I128, AMM_TO_QUOTE_PRECISION_RATIO, BID_ASK_SPREAD_PRECISION,
-    BID_ASK_SPREAD_PRECISION_U128, DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT,
-    LIQUIDATION_FEE_PRECISION, LIQUIDATION_FEE_TO_MARGIN_PRECISION_RATIO, LP_FEE_SLICE_DENOMINATOR,
-    LP_FEE_SLICE_NUMERATOR, MARGIN_PRECISION, MARGIN_PRECISION_U128, MAX_LIQUIDATION_MULTIPLIER,
-    PEG_PRECISION, PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I128, PERCENTAGE_PRECISION_I64,
+    BID_ASK_SPREAD_PRECISION_I128, BID_ASK_SPREAD_PRECISION_U128,
+    DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT, LIQUIDATION_FEE_PRECISION,
+    LIQUIDATION_FEE_TO_MARGIN_PRECISION_RATIO, LP_FEE_SLICE_DENOMINATOR, LP_FEE_SLICE_NUMERATOR,
+    MARGIN_PRECISION, MARGIN_PRECISION_U128, MAX_LIQUIDATION_MULTIPLIER, PEG_PRECISION,
+    PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I128, PERCENTAGE_PRECISION_I64,
     PERCENTAGE_PRECISION_U64, PRICE_PRECISION, SPOT_WEIGHT_PRECISION, TWENTY_FOUR_HOUR,
 };
 use crate::math::helpers::get_proportion_i128;
@@ -1410,19 +1411,33 @@ impl AMM {
     }
 
     pub fn bid_price(&self, reserve_price: u64) -> DriftResult<u64> {
+        let adjusted_spread = (-(self
+            .short_spread
+            .cast::<i32>()?))
+            .safe_add(self.reference_price_offset)?;
+
+        let multiplier = BID_ASK_SPREAD_PRECISION_I128.safe_add(adjusted_spread.cast::<i128>()?)?;
+
         reserve_price
             .cast::<u128>()?
-            .safe_mul(BID_ASK_SPREAD_PRECISION_U128.safe_sub(self.short_spread.cast()?)?)?
+            .safe_mul(multiplier.cast::<u128>()?)?
             .safe_div(BID_ASK_SPREAD_PRECISION_U128)?
             .cast()
     }
 
     pub fn ask_price(&self, reserve_price: u64) -> DriftResult<u64> {
+        let adjusted_spread = self
+            .long_spread
+            .cast::<i32>()?
+            .safe_add(self.reference_price_offset)?;
+
+        let multiplier = BID_ASK_SPREAD_PRECISION_I128.safe_add(adjusted_spread.cast::<i128>()?)?;
+
         reserve_price
             .cast::<u128>()?
-            .safe_mul(BID_ASK_SPREAD_PRECISION_U128.safe_add(self.long_spread.cast()?)?)?
+            .safe_mul(multiplier.cast::<u128>()?)?
             .safe_div(BID_ASK_SPREAD_PRECISION_U128)?
-            .cast::<u64>()
+            .cast()
     }
 
     pub fn bid_ask_price(&self, reserve_price: u64) -> DriftResult<(u64, u64)> {

sdk/src/bankrun/bankrunConnection.ts

@@ -121,6 +121,12 @@
 	}
 
 	async moveTimeForward(increment: number): Promise<void> {
+
+		const approxSlots = increment / 0.4;
+		const slot = await this.connection.getSlot();
+		console.log(`warping to slot ${slot} -> ${BigInt(slot) + BigInt(approxSlots)}`)
+		this.context.warpToSlot(BigInt(Number(slot) + approxSlots));
+
 		const currentClock = await this.context.banksClient.getClock();
 		const newUnixTimestamp = currentClock.unixTimestamp + BigInt(increment);
 		const newClock = new Clock(
@@ -130,6 +136,7 @@
 			currentClock.leaderScheduleEpoch,
 			newUnixTimestamp
 		);
+
 		await this.context.setClock(newClock);
 	}
 
@@ -290,7 +297,7 @@
 		return signature;
 	}
 
-	private async updateSlotAndClock() {
+	async updateSlotAndClock() {
 		const currentSlot = await this.getSlot();
 		const nextSlot = currentSlot + BigInt(1);
 		this.context.warpToSlot(nextSlot);

test-scripts/single-anchor-test.sh

@@ -6,7 +6,7 @@ fi
 
 export ANCHOR_WALLET=~/.config/solana/id.json
 
-test_files=(overwritePerpAccounts.ts)
+test_files=(referencePriceOffset.ts)
 
 for test_file in ${test_files[@]}; do
   ts-mocha -t 300000 ./tests/${test_file}