fix pr comments

Author: ericneil-sanc

hardhat.config.ts

@@ -21,17 +21,12 @@ const config: HardhatUserConfig = {
     version: "0.8.26",
     settings: {
       optimizer: { enabled: true, runs: 200 },
-      viaIR: true, // Required for complex contracts
     },
   },
   networks: {
     hardhat: {
       blockGasLimit: 40_000_000,
       accounts: {
-        count: 20,
-        initialIndex: 0,
-        mnemonic: "test test test test test test test test test test test junk",
-        path: "m/44'/60'/0'/0",
         accountsBalance: "10000000000000000000000", // 10k ETH
       },
     },

package.json

@@ -5,9 +5,6 @@
     "main": "index.js",
     "scripts": {
         "test": "hardhat test",
-        "test:setup": "hardhat test --grep 'Setup'",
-        "test:interaction": "hardhat test --grep 'Interaction'",
-        "test:combined": "hardhat test --grep 'Combined'",
         "test:all": "hardhat test",
         "e2e": "forge build && npm run typechain && hardhat test test/e2e/tests/e2e.test.ts",
         "e2e:run": "forge build && npm run typechain && npx ts-node test/e2e/src/E2ECliRunner.ts",

test/e2e/instances/interaction/AdvancedInteraction.ts

@@ -174,12 +174,11 @@ export const advancedInteraction: TestInteractionData = {
       reason: "Check auction state parameters",
       assert: {
         type: AssertionInterfaceType.AUCTION,
-        isGraduated: false,
+        isGraduated: true,
         clearingPrice: "79228162514264337593543950336000",
         currencyRaised: "661363636363636363",
         latestCheckpoint: {
           clearingPrice: "79228162514264337593543950336000",
-          currencyRaisedQ96_X7: "523986256628430050902756580631272727272727272726000000",
           currencyRaisedAtClearingPriceQ96_X7: "0",
           cumulativeMpsPerPrice: "435754893828453856764491726848000",
           cumulativeMps: "5500000",

test/e2e/instances/interaction/VariationInteraction.ts

@@ -90,7 +90,7 @@ export const variationInteraction: TestInteractionData = {
       reason: "Check auction state with variance on currencyRaised",
       assert: {
         type: AssertionInterfaceType.AUCTION,
-        isGraduated: false,
+        isGraduated: true,
         clearingPrice: "79228162514264337593543950336000",
         // Currency raised will vary based on random bid amounts
         // Expected around 0.326 ETH with variance due to bid variations
@@ -101,10 +101,6 @@ export const variationInteraction: TestInteractionData = {
         latestCheckpoint: {
           clearingPrice: "79228162514264337593543950336000",
           // These will also vary, so we use VariableAmount with raw amount variation
-          currencyRaisedQ96_X7: {
-            amount: "80593446990424197784923982579080313706988320995000000",
-            variation: "30%", // +/- 30% to account for variation
-          },
           currencyRaisedAtClearingPriceQ96_X7: "0",
           cumulativeMpsPerPrice: {
             amount: "158456325028528675187087900672000",

test/e2e/instances/setup/AdvancedSetup.ts

@@ -36,7 +36,6 @@ export const advancedSetup: TestSetupData = {
       },
     ],
   },
-
   auctionParameters: {
     currency: "0x0000000000000000000000000000000000000000" as Address,
     auctionedToken: "AdvancedToken",
@@ -47,8 +46,8 @@ export const advancedSetup: TestSetupData = {
     tickSpacing: "396140812571321687967719751680",
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: "79228162514264337593543950336000",
+    requiredCurrencyRaised: "0",
   },
-
   additionalTokens: [
     {
       name: "AdvancedToken",

test/e2e/instances/setup/ERC20Setup.ts

@@ -34,9 +34,10 @@ export const erc20Setup: TestSetupData = {
     fundsRecipient: "0x3333333333333333333333333333333333333333" as Address,
     auctionDurationBlocks: 50,
     claimDelayBlocks: 10,
-    tickSpacing: 100,
+    tickSpacing: 100n,
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: "79228162514264337593543950336000",
+    requiredCurrencyRaised: "0",
   },
 
   additionalTokens: [

test/e2e/instances/setup/ExtendedSetup.ts

@@ -100,6 +100,7 @@ export const extendedSetup: TestSetupData = {
     tickSpacing: "69324642199981300000000", // From params - large value as string
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: "6932464219998130000000000", // 0.0000875 ETH in Q96 format
+    requiredCurrencyRaised: "0",
     // Using the exact hex string from the params file
     auctionStepsData:
       "0x00000000000189c0325aa000000000010000000000001c2007a12000000000010000000000001c2007a12000000000010000000000001c200f424000000000010000000000001c200f424000000000010000000000001c200f424000000000010000000000001c202932e00000000001",
@@ -112,11 +113,5 @@ export const extendedSetup: TestSetupData = {
       totalSupply: "1000000000000000000000000000", // 1 billion tokens (1e9 * 1e18)
       percentAuctioned: "15.0", // 15% of 1B = 150M tokens
     },
-    {
-      name: "USDC",
-      decimals: "6",
-      totalSupply: "1000000000000",
-      percentAuctioned: "0.0",
-    },
   ],
 };

test/e2e/instances/setup/SimpleSetup.ts

@@ -29,9 +29,10 @@ export const simpleSetup: TestSetupData = {
     fundsRecipient: "0x3333333333333333333333333333333333333333" as Address,
     auctionDurationBlocks: 50,
     claimDelayBlocks: 10,
-    tickSpacing: 100,
+    tickSpacing: 100n,
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: "79228162514264337593543950336000",
+    requiredCurrencyRaised: "0",
   },
 
   additionalTokens: [
@@ -41,11 +42,5 @@ export const simpleSetup: TestSetupData = {
       totalSupply: "1000000000000000000000",
       percentAuctioned: "10.0",
     },
-    {
-      name: "USDC",
-      decimals: "6",
-      totalSupply: "1000000000000",
-      percentAuctioned: "0.0",
-    },
   ],
 };

test/e2e/instances/setup/VariationSetup.ts

@@ -34,9 +34,10 @@ export const variationSetup: TestSetupData = {
     fundsRecipient: "0x4444444444444444444444444444444444444444" as Address,
     auctionDurationBlocks: 50,
     claimDelayBlocks: 10,
-    tickSpacing: 100,
+    tickSpacing: 100n,
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
-    floorPrice: "79228162514264337593543950336000",
+    floorPrice: 79228162514264337593543950336000n,
+    requiredCurrencyRaised: "0",
   },
 
   additionalTokens: [
@@ -46,11 +47,5 @@ export const variationSetup: TestSetupData = {
       totalSupply: "1000000000000000000000",
       percentAuctioned: "10.0",
     },
-    {
-      name: "USDC",
-      decimals: "6",
-      totalSupply: "1000000000000",
-      percentAuctioned: "0.0",
-    },
   ],
 };

test/e2e/schemas/TestInteractionSchema.ts

@@ -133,7 +133,6 @@ export interface AuctionAssertion {
 
 export interface InternalCheckpointStruct {
   clearingPrice: string | VariableAmount;
-  currencyRaisedQ96_X7: string | VariableAmount;
   currencyRaisedAtClearingPriceQ96_X7: string | VariableAmount;
   cumulativeMpsPerPrice: string | VariableAmount;
   cumulativeMps: string | VariableAmount;