signed commit

ericneil-sanc · ericneil-sanc · commit ac1531388902 · 2025-10-23T17:21:52.000-04:00
diff --git a/test/e2e/instances/setup/AdvancedSetup.ts b/test/e2e/instances/setup/AdvancedSetup.ts
@@ -47,6 +47,7 @@ export const advancedSetup: TestSetupData = {
     tickSpacing: "396140812571321687967719751680",
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: "79228162514264337593543950336000",
+    requiredCurrencyRaised: "0",
   },
 
   additionalTokens: [
diff --git a/test/e2e/instances/setup/ERC20Setup.ts b/test/e2e/instances/setup/ERC20Setup.ts
@@ -37,6 +37,7 @@ export const erc20Setup: TestSetupData = {
     tickSpacing: 100n,
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: "79228162514264337593543950336000",
+    requiredCurrencyRaised: "0",
   },
 
   additionalTokens: [
diff --git a/test/e2e/instances/setup/ExtendedSetup.ts b/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",
diff --git a/test/e2e/instances/setup/SimpleSetup.ts b/test/e2e/instances/setup/SimpleSetup.ts
@@ -32,6 +32,7 @@ export const simpleSetup: TestSetupData = {
     tickSpacing: 100n,
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: "79228162514264337593543950336000",
+    requiredCurrencyRaised: "0",
   },
 
   additionalTokens: [
diff --git a/test/e2e/instances/setup/VariationSetup.ts b/test/e2e/instances/setup/VariationSetup.ts
@@ -37,6 +37,7 @@ export const variationSetup: TestSetupData = {
     tickSpacing: 100n,
     validationHook: "0x0000000000000000000000000000000000000000" as Address,
     floorPrice: 79228162514264337593543950336000n,
+    requiredCurrencyRaised: "0",
   },
 
   additionalTokens: [
diff --git a/test/e2e/schemas/TestSetupSchema.ts b/test/e2e/schemas/TestSetupSchema.ts
@@ -50,7 +50,7 @@ export interface AuctionParameters {
   tickSpacing: bigint | string;
   validationHook: Address;
   floorPrice: bigint | string;
-  requiredCurrencyRaised?: string; // Optional: minimum currency that must be raised
+  requiredCurrencyRaised: bigint | string;
   auctionStepsData?: string | StepData[]; // Optional: raw hex string or array of steps
 }
 
diff --git a/test/e2e/src/AssertionEngine.ts b/test/e2e/src/AssertionEngine.ts
@@ -12,7 +12,7 @@ import {
 import { Contract } from "ethers";
 import { TokenContract } from "./types";
 import { AuctionDeployer } from "./AuctionDeployer";
-import { ZERO_ADDRESS, LOG_PREFIXES, ERROR_MESSAGES, TYPES, TYPE_FIELD } from "./constants";
+import { ZERO_ADDRESS, LOG_PREFIXES, ERROR_MESSAGES, TYPES, ONE_MILLION } from "./constants";
 import { CheckpointStruct } from "../../../typechain-types/out/Auction";
 import { resolveTokenAddress } from "./utils";
 import hre from "hardhat";
@@ -91,12 +91,12 @@ export class AssertionEngine {
       // Percentage: convert to ratio and apply to expected (e.g., "5%" -> 5% of expected)
       const percentage = parseFloat(varianceStr.slice(0, -1));
       const ratio = percentage / 100;
-      varianceAmount = (expected * BigInt(Math.floor(ratio * 1000000))) / 1000000n;
+      varianceAmount = (expected * BigInt(Math.floor(ratio * ONE_MILLION))) / BigInt(ONE_MILLION);
     } else {
       if (varianceStr.includes(".")) {
         const numericValue = parseFloat(varianceStr);
         // Ratio: treat as percentage in decimal form (e.g., "0.05" -> 5% of expected)
-        varianceAmount = (expected * BigInt(Math.floor(numericValue * 1000000))) / 1000000n;
+        varianceAmount = (expected * BigInt(Math.floor(numericValue * ONE_MILLION))) / BigInt(ONE_MILLION);
       } else {
         // Raw amount: use as absolute tolerance (e.g., "100000000000000000")
         varianceAmount = BigInt(varianceStr);
@@ -437,13 +437,7 @@ export class AssertionEngine {
       return true; // No args to check, just event name match is enough
     }
     for (const [, expectedValue] of Object.entries(expectedArgs)) {
-      let contains = false;
-      softMatchLoop: for (let i = 0; i < actualArgs.length; i++) {
-        if (actualArgs[i].toString() == expectedValue.toString()) {
-          contains = true;
-          break softMatchLoop;
-        }
-      }
+      let contains = actualArgs.some((value: any) => value == expectedValue).length > 0;
       if (!contains) {
         return false;
       }
@@ -479,6 +473,12 @@ export class AssertionEngine {
    * @returns BidderState object containing address, tokenBalance, and currencyBalance
    */
   async getBidderState(bidderAddress: Address): Promise<BidderState> {
+    if (this.token == undefined) {
+      throw new Error(ERROR_MESSAGES.TOKEN_UNSET);
+    }
+    if (this.currency === undefined) {
+      throw new Error(ERROR_MESSAGES.CURRENCY_UNSET);
+    }
     const tokenBalance = this.token ? await this.token.balanceOf(bidderAddress) : 0n;
     const currencyBalance = this.currency ? await this.currency.balanceOf(bidderAddress) : 0n;
 
diff --git a/test/e2e/src/AuctionDeployer.ts b/test/e2e/src/AuctionDeployer.ts
@@ -320,6 +320,7 @@ export class AuctionDeployer {
         typeof auctionParameters.floorPrice === "string"
           ? BigInt(auctionParameters.floorPrice)
           : auctionParameters.floorPrice,
+      requiredCurrencyRaised: auctionParameters.requiredCurrencyRaised,
       auctionStepsData: auctionStepsData,
     };
   }
@@ -385,7 +386,7 @@ export class AuctionDeployer {
       tickSpacing: config.tickSpacing,
       validationHook: config.validationHook,
       floorPrice: typeof config.floorPrice === "string" ? BigInt(config.floorPrice) : config.floorPrice,
-      requiredCurrencyRaised: config.requiredCurrencyRaised || 0,
+      requiredCurrencyRaised: config.requiredCurrencyRaised,
       auctionStepsData: config.auctionStepsData,
     };
 
diff --git a/test/e2e/src/BidSimulator.ts b/test/e2e/src/BidSimulator.ts
@@ -8,6 +8,7 @@ import {
   UINT_48_MAX,
   LOG_PREFIXES,
   ERROR_MESSAGES,
+  ONE_MILLION,
 } from "./constants";
 import { IAllowanceTransfer } from "../../../typechain-types/test/e2e/artifacts/permit2/src/interfaces/IAllowanceTransfer";
 import { TransactionInfo } from "./types";
@@ -115,8 +116,8 @@ export class BidSimulator {
               const factor = Math.pow(recurringBid.amountFactor, i);
               // Use BigInt arithmetic to avoid scientific notation conversion
               const originalValue = BigInt(recurringBid.amount.value.toString());
-              const factorScaled = Math.floor(factor * 1000000); // Scale factor to avoid decimals
-              const adjustedValue = (originalValue * BigInt(factorScaled)) / BigInt(1000000);
+              const factorScaled = Math.floor(factor * ONE_MILLION); // Scale factor to avoid decimals
+              const adjustedValue = (originalValue * BigInt(factorScaled)) / BigInt(ONE_MILLION);
               adjustedAmount = {
                 ...recurringBid.amount,
                 value: adjustedValue.toString(),
@@ -127,8 +128,8 @@ export class BidSimulator {
               const factor = recurringBid.priceFactor * i;
               // Use BigInt arithmetic to avoid scientific notation conversion
               const originalValue = BigInt(recurringBid.price.value.toString());
-              const factorScaled = Math.floor(factor * 1000000); // Scale factor to avoid decimals
-              const adjustedValue = (originalValue * BigInt(factorScaled)) / BigInt(1000000);
+              const factorScaled = Math.floor(factor * ONE_MILLION); // Scale factor to avoid decimals
+              const adjustedValue = (originalValue * BigInt(factorScaled)) / BigInt(ONE_MILLION);
               adjustedPrice = {
                 ...recurringBid.price,
                 value: adjustedValue.toString(),
@@ -442,6 +443,8 @@ export class BidSimulator {
         let tx = await this.auction.getFunction("sweepUnsoldTokens").populateTransaction();
         let msg = `   Sweeping unsold tokens`;
         transactionInfos.push({ tx, from: null, msg });
+      } else {
+        throw new Error(ERROR_MESSAGES.INVALID_ACTION_METHOD);
       }
     }
   }
diff --git a/test/e2e/src/SingleTestRunner.ts b/test/e2e/src/SingleTestRunner.ts
@@ -166,15 +166,14 @@ export class SingleTestRunner {
     // Don't add final state as a checkpoint - only use checkpoints from actual events
     // The contract only validates hints against stored checkpoints from CheckpointUpdated events
     let calculatedCurrencyRaised = -1;
-    // Exit and claim all bids if auction graduated
-    if (finalState.isGraduated) {
-      calculatedCurrencyRaised = await this.exitAndClaimAllBids(
-        auction,
-        setupData,
-        currencyToken,
-        bidSimulator.getReverseLabelMap(),
-      );
-    }
+    // Exit and claim all bids
+    calculatedCurrencyRaised = await this.exitAndClaimAllBids(
+      auction,
+      setupData,
+      currencyToken,
+      bidSimulator.getReverseLabelMap(),
+      finalState.isGraduated,
+    );
 
     // Log balances for all funded accounts (after claiming)
     await this.logAccountBalances(setupData, this.deployer, auctionedToken);
@@ -413,6 +412,7 @@ export class SingleTestRunner {
     setupData: TestSetupData,
     currencyToken: TokenContract | null,
     reverseLabelMap: Map<string, string>,
+    isGraduated: boolean,
   ): Promise<number> {
     let calculatedCurrencyRaised = 0;
     console.log("\n🎫 Exiting and claiming all bids...");
@@ -519,6 +519,10 @@ export class SingleTestRunner {
         calculatedCurrencyRaised += Number(bid.amount - refundAmount) / 10 ** currencyDecimals;
       }
 
+      if (!isGraduated) {
+        continue; // Skip claiming if auction didn't graduate
+      }
+
       // Claim all tokens in batch
       const unfilteredBidIds = bids.map((b) => b.bidId);
       const bidIds = unfilteredBidIds.filter((bidId) => shouldClaimBid.get(bidId));
diff --git a/test/e2e/src/constants.ts b/test/e2e/src/constants.ts
@@ -23,7 +23,8 @@ export const HARDHAT_METHODS = {
 } as const;
 
 // True constants - values that never change
-export const MPS = 10000000; // 1e7 - Million Price Steps
+export const MPS = 10000000; // 1e7 - mBPS
+export const ONE_MILLION = 1000000;
 export const MAX_SYMBOL_LENGTH = 4;
 export const HEX_PADDING_LENGTH = 16;
 export const DEFAULT_TOTAL_SUPPLY = "1000000000000000000000"; // 1000 tokens with 18 decimals
@@ -63,13 +64,16 @@ export const ERROR_MESSAGES = {
       ? `Balance assertion failed for ${address} token ${token}. Expected ${expected} ± ${variance}, got ${actual}`
       : `Balance assertion failed for ${address} token ${token}. Expected ${expected}, got ${actual}`,
   INVALID_ASSERTION_TYPE: `Invalid assertion type`,
+  TOKEN_UNSET: `Token is not set`,
+  CURRENCY_UNSET: `Currency is not set`,
 
   // BidSimulator errors
   PERCENT_OF_SUPPLY_INVALID_SIDE:
     "PERCENT_OF_SUPPLY can only be used for auctioned token (OUTPUT), not currency (INPUT)",
   EXPECTED_REVERT_NOT_FOUND: (expected: string, actual: string) =>
     `Expected revert data to contain "${expected}", but got: ${actual}`,
   PREVIOUS_TICK_OR_TICK_PRICE_NOT_PROVIDED: "previousTick or prevTickPrice must be provided",
+  INVALID_ACTION_METHOD: "Invalid action method",
 
   // E2ECliRunner errors
   NO_INSTANCE_FOUND: (filePath: string) => `No instance found in ${filePath}`,
diff --git a/test/e2e/src/types.ts b/test/e2e/src/types.ts
@@ -96,7 +96,7 @@ export interface AuctionConfig {
   tickSpacing: bigint | string;
   validationHook: Address;
   floorPrice: bigint | string;
-  requiredCurrencyRaised?: string; // Optional: minimum currency that must be raised
+  requiredCurrencyRaised: bigint | string;
   auctionStepsData: string;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export interface AuctionParameters {`
`50`	`50`	`tickSpacing: bigint \| string;`
`51`	`51`	`validationHook: Address;`
`52`	`52`	`floorPrice: bigint \| string;`
`53`		`- requiredCurrencyRaised?: string; // Optional: minimum currency that must be raised`
	`53`	`+ requiredCurrencyRaised: bigint \| string;`
`54`	`54`	`auctionStepsData?: string \| StepData[]; // Optional: raw hex string or array of steps`
`55`	`55`	`}`
`56`	`56`