init lit-x-lighthouse

Author: nijoe1

README.md

@@ -4,7 +4,7 @@ Kickstart your Filecoin dApp using this open-source development stack. This bran
 
 - uploading files and directories to IPFS.
 - uploading encrypted files and directories to IPFS.
-- Interact with the LighthouseNFT to see the usage of these features
+- Interact with the LitEncryptedNFT to see the usage of these features
 
 ## Features
 

packages/hardhat/contracts/LighthouseNFT.sol renamed to packages/hardhat/contracts/LitEncryptedNFT.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.23;
 
 import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 
-contract LighthouseNFT is ERC721 {
+contract LitEncryptedNFT is ERC721 {
     // Counter for the next token ID
     uint256 private _tokenIdCounter;
 
@@ -17,23 +17,23 @@ contract LighthouseNFT is ERC721 {
     mapping(uint256 => bool) private openAccessTokens;
 
     // Constructor to initialize the ERC721 token with a name and symbol
-    constructor() ERC721("LighthouseNFT", "LNFT") {}
+    constructor() ERC721("LitEncryptedNFT", "LNFT") {}
 
     // Function to mint a new token with open access
-    function mint(string memory lighthouse_cid) public {
+    function mint(string memory file_cid) public {
         _tokenIdCounter++; // Increment the token ID counter
         uint256 tokenId = _tokenIdCounter;
         _mint(msg.sender, tokenId); // Mint the token to the sender
-        _tokenURIs[tokenId] = lighthouse_cid; // Set the token URI
+        _tokenURIs[tokenId] = file_cid; // Set the token URI
         openAccessTokens[tokenId] = true; // Mark the token as open access
     }
 
     // Function to mint a new token with restricted access
-    function mintPrivate(string memory lighthouse_cid, address[] memory accessList) public {
+    function mintPrivate(string memory file_cid, address[] memory accessList) public {
         _tokenIdCounter++; // Increment the token ID counter
         uint256 tokenId = _tokenIdCounter;
         _mint(msg.sender, tokenId); // Mint the token to the sender
-        _tokenURIs[tokenId] = lighthouse_cid; // Set the token URI
+        _tokenURIs[tokenId] = file_cid; // Set the token URI
         tokenContentAccess[tokenId][msg.sender] = true; // Grant access to the sender
         // Grant access to the specified addresses
         for (uint i = 0; i < accessList.length; i++) {

packages/hardhat/deploy/00_LighthouseNFT.ts

@@ -7,9 +7,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
  *
  * @param hre HardhatRuntimeEnvironment object.
  */
-const deployLighthouseNFT: DeployFunction = async function (
-  hre: HardhatRuntimeEnvironment
-) {
+const deployLitEncryptedNFT: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   /*
     On localhost, the deployer account is the one that comes with Hardhat, which is already funded.
 
@@ -25,7 +23,7 @@ const deployLighthouseNFT: DeployFunction = async function (
 
   const { deploy } = hre.deployments;
 
-  const LighthouseNFT = await deploy("LighthouseNFT", {
+  const LitEncryptedNFT = await deploy("LitEncryptedNFT", {
     from: deployer,
     // Contract constructor arguments
     args: [],
@@ -35,38 +33,36 @@ const deployLighthouseNFT: DeployFunction = async function (
     autoMine: true,
   });
 
-  console.log("🚀 LighthouseNFT deployed at: ", LighthouseNFT.address);
-  const LighthouseNFTAddress = LighthouseNFT.address;
+  console.log("🚀 LitEncryptedNFT deployed at: ", LitEncryptedNFT.address);
+  const LitEncryptedNFTAddress = LitEncryptedNFT.address;
 
   // Check if the --verify flag is present
   const shouldVerify = process.env.VERIFY === "true";
 
   if (shouldVerify) {
     // Timeout for 10 Seconds to wait for the contract to be indexed on explorer
-    console.log(
-      "⏳ Waiting for 15 seconds for the contract to be indexed on the explorer..."
-    );
-    await new Promise((resolve) => setTimeout(resolve, 15000));
+    console.log("⏳ Waiting for 15 seconds for the contract to be indexed on the explorer...");
+    await new Promise(resolve => setTimeout(resolve, 15000));
 
     console.log("🕵️‍♂️ Verifying the contract on the explorer...");
 
     const filecoinNetworks = ["calibration", "filecoin"];
     if (filecoinNetworks.includes(hre.network.name)) {
       // Verify the contract on the filfox explorer
       await hre.run("verify-contract", {
-        contractName: "LighthouseNFT",
+        contractName: "LitEncryptedNFT",
       });
     } else {
       await hre.run("verify:verify", {
-        address: LighthouseNFTAddress,
+        address: LitEncryptedNFTAddress,
         constructorArguments: [],
       });
     }
   }
 };
 
-export default deployLighthouseNFT;
+export default deployLitEncryptedNFT;
 
 // Tags are useful if you have multiple deploy files and only want to run one of them.
 // e.g. yarn deploy --tags DealClient
-deployLighthouseNFT.tags = ["LighthouseNFT"];
+deployLitEncryptedNFT.tags = ["LitEncryptedNFT"];

packages/hardhat/hardhat.config.ts

@@ -12,15 +12,12 @@ import { HardhatUserConfig } from "hardhat/config";
 import "solidity-coverage";
 
 dotenvConfig();
-const providerApiKey =
-  process.env.ALCHEMY_API_KEY || "oKxs-03sij-U_N0iOlrSsZFr29-IqbuF";
+const providerApiKey = process.env.ALCHEMY_API_KEY || "oKxs-03sij-U_N0iOlrSsZFr29-IqbuF";
 // If not set, it uses the hardhat account 0 private key.
 const deployerPrivateKey =
-  process.env.DEPLOYER_PRIVATE_KEY ??
-  "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80";
+  process.env.DEPLOYER_PRIVATE_KEY ?? "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80";
 // If not set, it uses ours Etherscan default API key.
-const etherscanApiKey =
-  process.env.ETHERSCAN_API_KEY || "DNXJA8RX2Q3VZ4URQIWP7Z68CJXQZSC6AW";
+const etherscanApiKey = process.env.ETHERSCAN_API_KEY || "DNXJA8RX2Q3VZ4URQIWP7Z68CJXQZSC6AW";
 
 const config: HardhatUserConfig = {
   solidity: {
@@ -52,22 +49,27 @@ const config: HardhatUserConfig = {
     filecoin: {
       url: "https://rpc.ankr.com/filecoin",
       accounts: [deployerPrivateKey],
+      chainId: 314,
     },
     calibration: {
       url: "https://api.calibration.node.glif.io/rpc/v1	",
       accounts: [deployerPrivateKey],
+      chainId: 314159,
     },
     sepolia: {
       url: `https://eth-sepolia.g.alchemy.com/v2/${providerApiKey}`,
       accounts: [deployerPrivateKey],
+      chainId: 11155111,
     },
     arbitrumSepolia: {
       url: `https://arb-sepolia.g.alchemy.com/v2/${providerApiKey}`,
       accounts: [deployerPrivateKey],
+      chainId: 421611,
     },
     optimismSepolia: {
       url: `https://opt-sepolia.g.alchemy.com/v2/${providerApiKey}`,
       accounts: [deployerPrivateKey],
+      chainId: 11155420,
     },
   },
   // configuration for harhdat-verify plugin

packages/nextjs/app/lighthouse/_components/LighthouseUpload.tsx renamed to packages/nextjs/app/lit_lighthouse/_components/LighthouseUpload.tsx

@@ -1,5 +1,4 @@
-import { accessControlConditions } from "~~/hooks/lighthouse/types";
-import { useLighthouseEncryptedFilesUpload, useLighthouseFilesUpload } from "~~/hooks/lighthouse/useUpload";
+import { useLighthouseFilesUpload, useUploadEncryptedFile } from "~~/hooks/lighthouse/useUpload";
 
 export const LighthouseFileUpload = ({
   handleGetCID,
@@ -77,19 +76,19 @@ export const LighthouseFolderUpload = ({
   );
 };
 
-export const LigthouseEnctyptedFileUpload = ({
+export const LigthouseLitEnctyptedFileUpload = ({
   handleGetCID,
   acceptMimeType,
-  accessControlConditions,
+  tokenId,
+  contractAddress,
 }: {
   handleGetCID: (cid: string) => void;
   acceptMimeType?: string;
-  accessControlConditions: {
-    conditions: accessControlConditions[];
-    aggregate: string;
-  };
+  tokenId: number;
+  chain: string;
+  contractAddress: string;
 }) => {
-  const uploadEncryptedFile = useLighthouseEncryptedFilesUpload({
+  const uploadEncryptedFile = useUploadEncryptedFile({
     onUploadSuccess: cid => {
       handleGetCID(cid);
     },
@@ -101,7 +100,11 @@ export const LigthouseEnctyptedFileUpload = ({
   const handleUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
     const file = event.target.files?.[0];
     if (file) {
-      await uploadEncryptedFile([file], accessControlConditions);
+      await uploadEncryptedFile({
+        files: [file],
+        tokenId,
+        contractAddress,
+      });
       event.target.value = "";
     }
   };
@@ -118,47 +121,3 @@ export const LigthouseEnctyptedFileUpload = ({
     </>
   );
 };
-
-export const LighthouseEncryptedFolderUpload = ({
-  handleGetCID,
-  acceptMimeType,
-  accessControlConditions,
-}: {
-  handleGetCID: (cid: string) => void;
-  acceptMimeType?: string;
-  accessControlConditions: {
-    conditions: accessControlConditions[];
-    aggregate: string;
-  };
-}) => {
-  const uploadEncryptedFiles = useLighthouseEncryptedFilesUpload({
-    onUploadSuccess: cid => {
-      handleGetCID(cid);
-    },
-    onUploadError: error => {
-      console.error("Error uploading files:", error);
-    },
-  });
-
-  const handleUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    const fileList = event.target.files;
-    // Convert FileList to array of files
-    const files = Array.from(fileList || []);
-    if (files && files.length > 0) {
-      await uploadEncryptedFiles(files, accessControlConditions);
-      event.target.value = "";
-    }
-  };
-
-  return (
-    <>
-      <input
-        type="file"
-        multiple
-        accept={acceptMimeType ?? "*"}
-        onChange={handleUpload}
-        className="file-input border-base-300 border shadow-md shadow-secondary rounded-3xl"
-      />
-    </>
-  );
-};

packages/nextjs/app/lighthouse/_components/LighthouseNFTContracts.tsx renamed to packages/nextjs/app/lit_lighthouse/_components/LitEncryptedNFTContracts.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useMemo, useState } from "react";
-import { LighthouseNFTUI } from "./LighthouseNFTUI";
+import { LitEncryptedNFTUI } from "./LitEncryptedNFTUI";
 import { MintNFTForm } from "./MintNFTForm";
 import { MintPrivateNFTForm } from "./MintPrivateNFTForm";
 import { useLocalStorage } from "usehooks-ts";
@@ -11,7 +11,7 @@ import { useAllContracts } from "~~/utils/fil-frame/contractsData";
 
 const selectedContractStorageKey = "FilFrame2.selectedContract";
 
-export function LighthouseNFTContracts() {
+export function LitEncryptedNFTContracts() {
   const contractsData = useAllContracts();
   const contractNames = useMemo(() => Object.keys(contractsData) as ContractName[], [contractsData]);
 
@@ -85,7 +85,7 @@ export function LighthouseNFTContracts() {
             </div>
 
             {contractNames.map(contractName => (
-              <LighthouseNFTUI
+              <LitEncryptedNFTUI
                 key={contractName}
                 contractName={contractName}
                 className={contractName === selectedContract ? "" : "hidden"}

packages/nextjs/app/lighthouse/_components/LighthouseNFTUI.tsx renamed to packages/nextjs/app/lit_lighthouse/_components/LitEncryptedNFTUI.tsx

@@ -9,15 +9,15 @@ import { useDeployedContractInfo, useNetworkColor } from "~~/hooks/fil-frame";
 import { useTargetNetwork } from "~~/hooks/fil-frame/useTargetNetwork";
 import { ContractName } from "~~/utils/fil-frame/contract";
 
-type LighthouseNFTUIProps = {
+type LitEncryptedNFTUIProps = {
   contractName: ContractName;
   className?: string;
 };
 
 /**
  * UI component to interface with deployed contracts.
  **/
-export const LighthouseNFTUI = ({ contractName, className = "" }: LighthouseNFTUIProps) => {
+export const LitEncryptedNFTUI = ({ contractName, className = "" }: LitEncryptedNFTUIProps) => {
   const [refreshDisplayVariables] = useReducer(value => !value, false);
   const { targetNetwork } = useTargetNetwork();
   const { data: deployedContractData, isLoading: deployedContractLoading } = useDeployedContractInfo(contractName);

packages/nextjs/app/lighthouse/_components/MintNFTForm.tsx renamed to packages/nextjs/app/lit_lighthouse/_components/MintNFTForm.tsx

@@ -9,11 +9,11 @@ import { useAllContracts } from "~~/utils/fil-frame/contractsData";
 export const MintNFTForm = () => {
   const [imageCid, setImageCid] = useState<string | null>(null);
   const contractsData = useAllContracts();
-  // Find the LighthouseNFT contract address
-  const [LighthouseNFTAddress, Abi] = useMemo(() => {
-    // Change the contract name to match the contract name in the contractsData object by default it is LighthouseNFT
-    const lighthouseContract = Object.entries(contractsData).find(([name]) => name === "LighthouseNFT");
-    return lighthouseContract ? [lighthouseContract[1].address, lighthouseContract[1].abi] : [null, null];
+  // Find the LitEncryptedNFT contract address
+  const [LitEncryptedNFTAddress, Abi] = useMemo(() => {
+    // Change the contract name to match the contract name in the contractsData object by default it is LitEncryptedNFT
+    const nftContract = Object.entries(contractsData).find(([name]) => name === "LitEncryptedNFT");
+    return nftContract ? [nftContract[1].address, nftContract[1].abi] : [null, null];
   }, [contractsData]);
 
   const handleGetCID = (cid: string) => {
@@ -24,11 +24,11 @@ export const MintNFTForm = () => {
     <div className="flex flex-col items-center space-y-4 p-5 w-full bg-base-100 border-base-300 border shadow-md shadow-secondary rounded-3xl px-6 lg:px-8 mb-6  py-4">
       <h2 className="text-2xl font-bold">Mint Your NFT</h2>
       <LighthouseFileUpload handleGetCID={handleGetCID} acceptMimeType="image/*" />
-      {imageCid && LighthouseNFTAddress && (
+      {imageCid && LitEncryptedNFTAddress && (
         <WriteContractFunctionForm
           abi={Abi}
           abiFunction={mintFunction}
-          contractAddress={LighthouseNFTAddress}
+          contractAddress={LitEncryptedNFTAddress}
           onChange={() => void 0}
           functionPropsWithIndexAndValue={[{ index: 0, value: imageCid }]}
         />

packages/nextjs/app/lighthouse/_components/MintPrivateNFTForm.tsx renamed to packages/nextjs/app/lit_lighthouse/_components/MintPrivateNFTForm.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { useMemo, useState } from "react";
-import { getConditions, mintPrivateFunction, useTotalNFTsQuery } from "../utils";
-import { LigthouseEnctyptedFileUpload } from "./LighthouseUpload";
+import { mintPrivateFunction, useTotalNFTsQuery } from "../utils";
+import { LigthouseLitEnctyptedFileUpload } from "./LighthouseUpload";
 import { WriteContractFunctionForm } from "./WriteContractFunctionForm";
 import { Hex } from "viem";
 import { useAccount } from "wagmi";
@@ -12,34 +12,37 @@ export const MintPrivateNFTForm = () => {
   const [imageCid, setImageCid] = useState<string | null>(null);
   const { chainId } = useAccount();
   const contractsData = useAllContracts();
-  // Find the LighthouseNFT contract address
-  const [LighthouseNFTAddress, Abi] = useMemo(() => {
-    // Change the contract name to match the contract name in the contractsData object by default it is LighthouseNFT
-    const lighthouseContract = Object.entries(contractsData).find(([name]) => name === "LighthouseNFT");
-    return lighthouseContract ? [lighthouseContract[1].address, lighthouseContract[1].abi] : [null, null];
+  // Find the LitEncryptedNFT contract address
+  const [LitEncryptedNFTAddress, Abi] = useMemo(() => {
+    // Change the contract name to match the contract name in the contractsData object by default it is LitEncryptedNFT
+    const nftContract = Object.entries(contractsData).find(([name]) => name === "LitEncryptedNFT");
+    return nftContract ? [nftContract[1].address, nftContract[1].abi] : [null, null];
   }, [contractsData]);
 
   const handleGetCID = (cid: string) => {
     setImageCid(cid);
   };
 
   // Fetch total supply
-  const { totalNFTs } = useTotalNFTsQuery(LighthouseNFTAddress as Hex, Abi as any);
+  const { totalNFTs } = useTotalNFTsQuery(LitEncryptedNFTAddress as Hex, Abi as any);
   const nextToken = totalNFTs ? Number(totalNFTs) + 1 : 1;
-  const conditions = getConditions(LighthouseNFTAddress as string, chainId as number, nextToken);
+  const chain = chainId === 371 ? "filecoin" : "filecoin";
+  // const conditions = getConditions(LitEncryptedNFTAddress as string, chainId as number, nextToken);
   return (
     <div className="flex flex-col items-center space-y-4 p-5 w-full bg-base-100 border-base-300 border shadow-md shadow-secondary rounded-3xl px-6 lg:px-8 mb-6  py-4">
       <h2 className="text-2xl font-bold">Mint Your Private NFT</h2>
-      <LigthouseEnctyptedFileUpload
+      <LigthouseLitEnctyptedFileUpload
         handleGetCID={handleGetCID}
         acceptMimeType="image/*"
-        accessControlConditions={{ conditions: conditions.conditions, aggregate: conditions.aggregator }}
+        tokenId={nextToken}
+        chain={chain}
+        contractAddress={LitEncryptedNFTAddress as string}
       />
-      {imageCid && LighthouseNFTAddress && (
+      {imageCid && LitEncryptedNFTAddress && (
         <WriteContractFunctionForm
           abi={Abi}
           abiFunction={mintPrivateFunction}
-          contractAddress={LighthouseNFTAddress}
+          contractAddress={LitEncryptedNFTAddress}
           onChange={() => void 0}
           functionPropsWithIndexAndValue={[{ index: 0, value: imageCid }]}
         />