contract fixes, deployment scripts,subgraph deployment

contracts/FluidGrants.sol

@@ -3,14 +3,12 @@ pragma solidity 0.8.24;
 
 import {ISuperToken} from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import {ISuperfluidPool} from "@superfluid-finance/ethereum-contracts/contracts/interfaces/agreements/gdav1/ISuperfluidPool.sol";
-import {SuperTokenV1Library} from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
-import "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
+import {SuperTokenV1Library, PoolConfig} from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
 
 contract FluidGrants {
     using SuperTokenV1Library for ISuperToken;
 
     uint256 public grantCount;
-    uint256 public projectCount;
 
     struct Grant {
         uint256 id;
@@ -70,13 +68,11 @@ contract FluidGrants {
 
     event GrantDistributed(uint256 grantId, uint256 amount);
 
-    mapping(uint256 grantId => Grant) public grants;
-    mapping(uint256 projectId => Project) public projects;
-    mapping(uint256 grantId => uint256 count) public grantProjectCount;
-    mapping(uint256 grantId => mapping(address user => bool hasSubmitted))
-        public hasSubmittedToGrant;
-    mapping(uint256 grantId => mapping(uint256 projectId => bool))
-        public isProjectInGrant;
+    mapping(uint256 => Grant) public grants;
+    mapping(uint256 => Project) public projects;
+    mapping(uint256 => uint256) public grantProjectCount;
+    mapping(uint256 => mapping(address => bool)) public hasSubmittedToGrant;
+    mapping(uint256 => mapping(uint256 => bool)) public isProjectInGrant;
 
     function createGrant(
         string memory _name,
@@ -151,16 +147,14 @@ contract FluidGrants {
         Grant memory grant = grants[_grantId];
         require(grant.isActive, "Grant is not active");
         require(
-            block.timestamp >= grant.submissionStartsAt ||
+            block.timestamp >= grant.submissionStartsAt &&
                 block.timestamp <= grant.submissionEndsAt,
             "Grant is not in submission period"
         );
         require(
             !hasSubmittedToGrant[_grantId][msg.sender],
             "You have already submitted a project to this grant"
         );
-        ISuperToken token = grant.distributionToken;
-        ISuperfluidPool pool = grant.pool;
         uint256 projectId = grantProjectCount[_grantId]++;
         projects[projectId] = Project({
             id: projectId,
@@ -194,7 +188,7 @@ contract FluidGrants {
         require(project.walletAddress != address(0), "Project does not exist");
         require(grant.isActive, "Grant is not active");
         require(
-            block.timestamp >= grant.judgingStartsAt ||
+            block.timestamp >= grant.judgingStartsAt &&
                 block.timestamp <= grant.judgingEndsAt,
             "Grant is not in judging period"
         );

hardhat.config.ts

@@ -1,8 +1,16 @@
 import { HardhatUserConfig } from "hardhat/config";
 import "@nomicfoundation/hardhat-toolbox";
 
+const accounts = process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : [];
+
 const config: HardhatUserConfig = {
   solidity: "0.8.24",
+  networks: {
+    sepolia: {
+      url: "https://sepolia.drpc.org",
+      accounts
+    }
+  }
 };
 
 export default config;

ignition/deployments/chain-11155111/journal.jsonl

@@ -0,0 +1,2 @@
+
+{"chainId":11155111,"type":"DEPLOYMENT_INITIALIZE"}

ignition/modules/FluidGrants.ts

@@ -0,0 +1,9 @@
+import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";
+
+const FluidGrantsModule = buildModule("FluidGrants", (m) => {
+  const fluidGrants = m.contract("FluidGrants", []);
+
+  return { fluidGrants };
+});
+
+export default FluidGrantsModule;

subgraph/package.json

@@ -13,6 +13,5 @@
   "dependencies": {
     "@graphprotocol/graph-cli": "0.82.0",
     "@graphprotocol/graph-ts": "0.32.0"
-  },
-  "devDependencies": { "matchstick-as": "0.5.0" }
+  }
 }

subgraph/subgraph.yaml

@@ -8,9 +8,9 @@ dataSources:
     name: FluidGrants
     network: sepolia
     source:
-      address: "0xDe1EdD357001273Cd6415B225831bf636d0Ac710"
+      address: "0xecd65f216559427cd681ed09c6c484eedee1839a"
       abi: FluidGrants
-      startBlock: 6725519
+      startBlock: 6744543
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7