Merge branch 'main' into 43-fix-qt-value

Author: ethanbennett

src/keeper.ts

@@ -268,19 +268,24 @@ async function verifyBufferTarget(target: bigint): Promise<void> {
 // ============= Data Fetching =============
 
 export async function _getKeeperData(): Promise<KeeperRunData> {
-  const [buckets, bufferTotal, lup, htp, price, bufferTarget] = await Promise.all([
+  const [initialBuckets, bufferTotal, lup, htp, price] = await Promise.all([
     getBuckets(),
     getBufferTotal(),
     getLup(),
     getHtp(),
     getPrice(),
-    _calculateBufferTarget(),
   ]);
 
-  const [lupIndex, htpIndex, optimalBucket] = await Promise.all([
+  for (let i = 0; i < initialBuckets.length; i++) {
+    await drain(initialBuckets[i]);
+  }
+
+  const [lupIndex, htpIndex, optimalBucket, buckets, bufferTarget] = await Promise.all([
     getPriceToIndex(lup),
     getPriceToIndex(htp),
     _calculateOptimalBucket(price),
+    getBuckets(),
+    _calculateBufferTarget(),
   ]);
 
   return {

test/helpers/vaultHelpers.ts

@@ -1,7 +1,6 @@
 import { contract } from '../../src/utils/contract.ts';
 import type { Address } from 'viem';
 
-const buffer = contract('buffer');
 const vaultAuth = contract('vaultAuth');
 const chronicle = contract('chronicle');
 const poolInfoUtils = contract('poolInfoUtils');
@@ -11,8 +10,6 @@ const pool = contract('pool');
 export const setBufferRatio = (ratio: bigint) => vaultAuth().write.setBufferRatio([ratio]);
 export const setMinBucketIndex = (index: bigint) => vaultAuth().write.setMinBucketIndex([index]);
 
-export const addToBuffer = (amount: bigint) => buffer().write.addToBuffer(amount);
-
 export const setPaused = (status: boolean) => vault().write.setPaused(status);
 
 const _setPrice = (price: bigint) => chronicle().write.setPrice(price);

test/integration/keeperSuccess.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, beforeAll, afterAll } from 'vitest';
-import { addToBuffer, setBufferRatio, setMockState, useMocks } from '../helpers/vaultHelpers';
+import { setBufferRatio, setMockState, useMocks } from '../helpers/vaultHelpers';
 import { getPrice } from '../../src/oracle/price';
 import { getIndexToPrice } from '../../src/ajna/poolInfoUtils';
 import { _calculateBufferTarget, run } from '../../src/keeper';
@@ -101,26 +101,4 @@ describe('keeper run success', () => {
       expectedMoveAmount - expectedBufferBalance,
     );
   });
-
-  it('moves buffer surplus into optimal bucket', async () => {
-    await setBufferRatio(5000n);
-    const bufferTarget = await _calculateBufferTarget();
-    const expectedMoveAmount = 12n * 100000000000000000000n;
-
-    await addToBuffer(2n * bufferTarget);
-
-    const bufferTotalBefore = await getBufferTotal();
-    const optimalBucketBalanceBefore = await lpToValue(4157n);
-
-    await run();
-
-    const bufferTotalAfter = await getBufferTotal();
-    const optimalBucketBalanceAfter = await lpToValue(4157n);
-
-    expect(bufferTotalBefore).toBe(2n * bufferTarget);
-    expect(bufferTotalAfter).toBe(bufferTarget);
-    expect(optimalBucketBalanceAfter - optimalBucketBalanceBefore).toBe(
-      bufferTarget + expectedMoveAmount,
-    );
-  });
 });