fixed tests

Author: itxtoledo

apps/app/src/pages/presaleCreation.tsx

@@ -185,34 +185,38 @@ export default function PresaleCreation() {
       endTimeUnix
     );
     console.log("- No Time Limit:", values.noTimeLimit);
-    console.log("- Full args array:", [{
-      name: values.name,
-      symbol: values.symbol,
-      supply: BigInt(cleanSupply),
-      price: priceinETH,
-      hardCap: hardCapInETH,
-      softCap: softCapInETH,
-      startTime: BigInt(startTimeUnix),
-      endTime: BigInt(endTimeUnix),
-      softCapPrice: softCapPriceInETH,
-    }]);
+    console.log("- Full args array:", [
+      {
+        name: values.name,
+        symbol: values.symbol,
+        supply: BigInt(cleanSupply),
+        price: priceinETH,
+        hardCap: hardCapInETH,
+        softCap: softCapInETH,
+        startTime: BigInt(startTimeUnix),
+        endTime: BigInt(endTimeUnix),
+        softCapPrice: softCapPriceInETH,
+      },
+    ]);
 
     if (contractAddress) {
       createPresale({
         address: contractAddress,
         abi: PresaleFactoryABI,
         functionName: "createPresale",
-        args: [{
-          name: values.name,
-          symbol: values.symbol,
-          supply: BigInt(cleanSupply),
-          price: priceinETH,
-          hardCap: hardCapInETH,
-          softCap: softCapInETH,
-          startTime: BigInt(startTimeUnix),
-          endTime: BigInt(endTimeUnix),
-          softCapPrice: softCapPriceInETH,
-        }],
+        args: [
+          {
+            name: values.name,
+            symbol: values.symbol,
+            supply: BigInt(cleanSupply),
+            price: priceinETH,
+            hardCap: hardCapInETH,
+            softCap: softCapInETH,
+            startTime: BigInt(startTimeUnix),
+            endTime: BigInt(endTimeUnix),
+            softCapPrice: softCapPriceInETH,
+          },
+        ],
       });
     }
   }
@@ -453,13 +457,18 @@ export default function PresaleCreation() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>
-                    End Time {form.watch("hasSoftCap") && <span className="text-red-500">*</span>}
+                    End Time{" "}
+                    {form.watch("hasSoftCap") && (
+                      <span className="text-red-500">*</span>
+                    )}
                   </FormLabel>
                   <FormControl>
                     <Input
                       type="datetime-local"
                       {...field}
-                      disabled={form.watch("noTimeLimit") || form.watch("hasSoftCap")}
+                      disabled={
+                        form.watch("noTimeLimit") || form.watch("hasSoftCap")
+                      }
                     />
                   </FormControl>
                   <FormDescription>

packages/contracts/contracts/Presale.sol

@@ -35,7 +35,7 @@ contract Presale is OwnableUpgradeable {
     bool public softCapReached;
 
     function presaleFailed() public view returns (bool) {
-        return hasSoftCap() && !softCapReached && block.timestamp > endTime;
+        return hasSoftCap() && block.timestamp > endTime && !softCapReached;
     }
 
     mapping(address => uint256) public tokenContributions;
@@ -89,16 +89,17 @@ contract Presale is OwnableUpgradeable {
     function contribute(uint256 amount) external payable {
         if (block.timestamp < startTime) revert PresaleNotStarted();
 
-        // If presale failed (time is up and softcap not reached), don't allow contributions
-        if (presaleFailed()) {
-            revert PresaleFailedNoRefund();
-        }
-
         // Check if we're past the end time (but not yet failed, meaning soft cap was reached)
         if (endTime != 0 && block.timestamp > endTime) {
+            // If the presale has ended and hasn't reached soft cap, contributions are not allowed
+            if (hasSoftCap() && !softCapReached) {
+                revert PresaleFailedNoRefund();
+            }
+            // If time is up regardless of soft cap status, no new contributions allowed
             revert PresaleEnded();
         }
 
+        // Determine the price to use for this contribution (before updating softCapReached)
         uint256 total = amount * currentPrice();
 
         if (total != msg.value) revert InvalidEtherSent(msg.value, total);
@@ -108,9 +109,13 @@ contract Presale is OwnableUpgradeable {
 
         totalContributed += msg.value;
         ethContributions[msg.sender] += msg.value;
+
+        // Add the tokens based on the amount contributed using the current price at time of contribution
         tokenContributions[msg.sender] += amount * 10 ** token.decimals();
 
-        if (!softCapReached && totalContributed >= softCap) {
+        // Check if soft cap is reached after the contribution
+        // Only update if soft cap is set (greater than 0)
+        if (!softCapReached && hasSoftCap() && totalContributed >= softCap) {
             softCapReached = true;
         }
 

packages/contracts/hardhat.config.ts

@@ -1,9 +1,51 @@
-import type { HardhatUserConfig } from "hardhat/config";
+import { configVariable, type HardhatUserConfig } from "hardhat/config";
 import hardhatViem from "@nomicfoundation/hardhat-viem";
 import hardhatVerify from "@nomicfoundation/hardhat-verify";
 import hardhatViemAssertions from "@nomicfoundation/hardhat-viem-assertions";
 import HardhatNodeTestRunner from "@nomicfoundation/hardhat-node-test-runner";
 import hardhatNetworkHelpers from "@nomicfoundation/hardhat-network-helpers";
+import hardhatAbiExporter from "@solidstate/hardhat-abi-exporter";
+import {
+  bsc,
+  bscTestnet,
+  mainnet,
+  sepolia,
+  polygon,
+  polygonAmoy,
+  celo,
+  celoAlfajores,
+} from "viem/chains";
+
+export const desiredChains = [
+  // 56
+  bsc,
+  // 1
+  mainnet,
+  // 137
+  polygon,
+  // 42220
+  celo,
+  // ========== Testnets ==========
+  // 11155111
+  sepolia,
+  // 97
+  bscTestnet,
+  // 44787
+  celoAlfajores,
+  // 80002
+  polygonAmoy,
+];
+
+const networks: HardhatUserConfig["networks"] = {};
+
+for (const chain of desiredChains) {
+  networks[chain.id.toString()] = {
+    url: chain.rpcUrls.default.http[0],
+    accounts: [configVariable("DEPLOYER_PRIVATE_KEY")],
+    chainId: chain.id,
+    type: "http",
+  };
+}
 
 const config: HardhatUserConfig = {
   plugins: [
@@ -12,6 +54,7 @@ const config: HardhatUserConfig = {
     hardhatViem,
     hardhatViemAssertions,
     hardhatNetworkHelpers,
+    hardhatAbiExporter,
   ],
   paths: {
     tests: {
@@ -27,9 +70,23 @@ const config: HardhatUserConfig = {
       },
     },
   },
+  abiExporter: [
+    {
+      path: "./abi",
+      format: "json",
+      runOnCompile: true,
+    },
+    {
+      path: "./abi_ts",
+      format: "typescript",
+      clear: true,
+      runOnCompile: true,
+    },
+  ],
+  networks,
   verify: {
     etherscan: {
-      apiKey: "YOUR_ETHERSCAN_API_KEY",
+      apiKey: configVariable("ETHERSCAN_API_KEY"),
     },
     blockscout: {
       enabled: true,

packages/contracts/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "build": "hardhat compile && hardhat export-abi",
+    "build": "hardhat compile",
     "clean": "hardhat clean && hardhat clear-abi && rm -rf .turbo && rm -rf node_modules && rm -rf dist",
     "test": "hardhat test",
     "deploy": "hardhat ignition deploy ignition/modules/PresaleFactory.ts --network",
@@ -16,9 +16,11 @@
     "@nomicfoundation/hardhat-network-helpers": "^3.0.0",
     "@nomicfoundation/hardhat-node-test-runner": "^3.0.3",
     "@nomicfoundation/hardhat-toolbox-mocha-ethers": "^3.0.0",
+    "@nomicfoundation/hardhat-toolbox-viem": "^5.0.0",
     "@nomicfoundation/hardhat-verify": "^3.0.2",
     "@nomicfoundation/hardhat-viem": "^3.0.0",
     "@nomicfoundation/hardhat-viem-assertions": "^3.0.2",
+    "@solidstate/hardhat-abi-exporter": "^3.0.0",
     "@types/chai": "^4.3.16",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.7",