address more feedback comments (delete / add comments to code)

drift-labs · Jul 5, 2024 · bc4e962 · bc4e962
1 parent bf22aa8
commit bc4e962
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/programs/drift/src/controller/orders.rs b/programs/drift/src/controller/orders.rs
@@ -1722,7 +1722,6 @@ fn fulfill_perp_order(
         taker_margin_calculation.fuel_deposits,
         taker_margin_calculation.fuel_borrows,
         taker_margin_calculation.fuel_positions,
-        now,
     )?;
     user.last_fuel_bonus_update_ts = now;
 
@@ -1765,7 +1764,6 @@ fn fulfill_perp_order(
                 maker_margin_calculation.fuel_deposits,
                 maker_margin_calculation.fuel_borrows,
                 maker_margin_calculation.fuel_positions,
-                now,
             )?;
         }
         maker.last_fuel_bonus_update_ts = now;
@@ -4088,7 +4086,6 @@ fn fulfill_spot_order(
         taker_margin_calculation.fuel_deposits,
         taker_margin_calculation.fuel_borrows,
         taker_margin_calculation.fuel_positions,
-        now,
     )?;
     user.last_fuel_bonus_update_ts = now;
 
@@ -4176,10 +4173,10 @@ fn fulfill_spot_order(
                 maker_margin_calculation.fuel_deposits,
                 maker_margin_calculation.fuel_borrows,
                 maker_margin_calculation.fuel_positions,
-                now,
             )?;
+
+            maker.last_fuel_bonus_update_ts = now;
         }
-        maker.last_fuel_bonus_update_ts = now;
 
         if !maker_margin_calculation.meets_margin_requirement() {
             msg!(

diff --git a/programs/drift/src/state/user.rs b/programs/drift/src/state/user.rs
@@ -436,6 +436,7 @@ impl User {
         if self.last_fuel_bonus_update_ts > 0 {
             now.safe_sub(self.last_fuel_bonus_update_ts)
         } else {
+            // start ts for exisiting accounts for when fuel accumulates from
             return Ok(now.safe_sub(1715745600_i64)?.max(0));
         }
     }
@@ -448,7 +449,7 @@ impl User {
         user_stats: &mut UserStats,
         now: i64,
     ) -> DriftResult {
-        user_stats.update_fuel_bonus(fuel_deposits, fuel_borrows, fuel_positions, now)?;
+        user_stats.update_fuel_bonus(fuel_deposits, fuel_borrows, fuel_positions)?;
         self.last_fuel_bonus_update_ts = now;
 
         Ok(())
@@ -488,7 +489,6 @@ impl User {
             margin_calculation.fuel_deposits,
             margin_calculation.fuel_borrows,
             margin_calculation.fuel_positions,
-            now,
         )?;
 
         self.last_fuel_bonus_update_ts = now;
@@ -542,7 +542,6 @@ impl User {
             calculation.fuel_deposits,
             calculation.fuel_borrows,
             calculation.fuel_positions,
-            now,
         )?;
         self.last_fuel_bonus_update_ts = now;
 
@@ -1615,12 +1614,10 @@ impl UserStats {
         fuel_deposits: u32,
         fuel_borrows: u32,
         fuel_positions: u32,
-        _now: i64,
     ) -> DriftResult {
         self.fuel_deposits = self.fuel_deposits.saturating_add(fuel_deposits);
         self.fuel_borrows = self.fuel_borrows.saturating_add(fuel_borrows);
         self.fuel_positions = self.fuel_positions.saturating_add(fuel_positions);
-        // self.last_fuel_bonus_update_ts = now;
 
         Ok(())
     }

diff --git a/sdk/src/adminClient.ts b/sdk/src/adminClient.ts
@@ -3561,14 +3561,6 @@ export class AdminClient extends DriftClient {
 		fuelBoostTaker?: number,
 		fuelBoostMaker?: number
 	): Promise<TransactionInstruction> {
-		// const params = {
-		// 	spotMarketIndex,
-		// 	fuelBoostDeposits: fuelBoostDeposits || null,
-		// 	fuelBoostBorrows: fuelBoostBorrows || null,
-		// 	fuelBoostTaker: fuelBoostTaker || null,
-		// 	fuelBoostMaker: fuelBoostMaker || null,
-		// };
-
 		const spotMarketPublicKey = await getSpotMarketPublicKey(
 			this.program.programId,
 			spotMarketIndex

diff --git a/test-scripts/run-anchor-tests.sh b/test-scripts/run-anchor-tests.sh
@@ -17,6 +17,7 @@ test_files=(
   # updateK.ts
   # postOnlyAmmFulfillment.ts
   # TODO BROKEN ^^
+  fuel.ts
   admin.ts
   assetTier.ts
   cancelAllOrders.ts

diff --git a/tests/fuel.ts b/tests/fuel.ts
@@ -248,7 +248,6 @@ describe('place and fill spot order', () => {
 		console.log(fuelDict);
 		assert(fuelDict['depositFuel'].gt(ZERO));
 		assert(fuelDict['depositFuel'].eqn(2142));
-		return 0;
 
 		await makerDriftClient.placeSpotOrder(
 			getLimitOrderParams({