feat(protocol): use "cardinalityNext" for TWAP criteria logic instead…

… of "cardinality" chore(protocol): re-generate types
hifi-finance · Oct 12, 2023 · 6a01de9 · 6a01de9
1 parent 8d65cae
commit 6a01de9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/protocol/contracts/oracles/UniswapV3PriceFeed.sol b/packages/protocol/contracts/oracles/UniswapV3PriceFeed.sol
@@ -75,7 +75,7 @@ contract UniswapV3PriceFeed is
         pool = pool_;
 
         // Fetch the pool cardinality and most recent observation index.
-        (, , uint16 index, uint16 cardinality, , , ) = pool.slot0();
+        (, , uint16 index, uint16 cardinality, uint16 cardinalityNext, , ) = pool.slot0();
 
         // Ensure the oldest pool observation is initialized and satisfies the TWAP interval.
         // The next observation at index + 1 is the oldest observation in the ring buffer.
@@ -92,7 +92,7 @@ contract UniswapV3PriceFeed is
         uint16 minimumCardinality = uint16((twapInterval_ * 10) / 125);
 
         // Ensure the available TWAP interval and cardinality satisfy the TWAP criteria.
-        if (availableTwapInterval < twapInterval_ || cardinality < minimumCardinality) {
+        if (availableTwapInterval < twapInterval_ || cardinalityNext < minimumCardinality) {
             revert IUniswapV3PriceFeed__TwapCriteriaNotSatisfied();
         }
 

diff --git a/packages/protocol/src/types/factories/contracts/oracles/UniswapV3PriceFeed__factory.ts b/packages/protocol/src/types/factories/contracts/oracles/UniswapV3PriceFeed__factory.ts
diff --git a/packages/protocol/src/types/factories/contracts/test/GodModeUniswapV3PriceFeed__factory.ts b/packages/protocol/src/types/factories/contracts/test/GodModeUniswapV3PriceFeed__factory.ts
diff --git a/packages/protocol/test/shared/fixtures.ts b/packages/protocol/test/shared/fixtures.ts
@@ -221,7 +221,7 @@ export async function unitFixtureUniswapV3PriceFeed(signers: Signer[]): Promise<
   await pool.mock.token1.returns(wbtc.address);
 
   const currentIndex: number = 0;
-  await pool.mock.slot0.returns(0, 0, currentIndex, DEFAULT_CARDINALITY, 0, 0, 0);
+  await pool.mock.slot0.returns(0, 0, currentIndex, DEFAULT_CARDINALITY, DEFAULT_CARDINALITY, 0, 0);
 
   const oldestIndex: number = (currentIndex + 1) % DEFAULT_CARDINALITY;
   const { timestamp }: { timestamp: number } = await ethers.provider.getBlock("latest");