From b7936a66d5a3fc8cc05f3932d2b26613ba7a3b37 Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Thu, 7 Dec 2023 10:20:15 -0600
Subject: [PATCH 01/10] get wallet address and display in Header

---
 .../dash-wind/containers/Header.tsx           | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/packages/nextjs/components/dash-wind/containers/Header.tsx b/packages/nextjs/components/dash-wind/containers/Header.tsx
index d80d64f..e324276 100644
--- a/packages/nextjs/components/dash-wind/containers/Header.tsx
+++ b/packages/nextjs/components/dash-wind/containers/Header.tsx
@@ -5,6 +5,8 @@ import { useRouter } from "next/router";
 import { openRightDrawer } from "../features/common/rightDrawerSlice";
 import { RIGHT_DRAWER_TYPES } from "../utils/globalConstantUtil";
 import { themeChange } from "theme-change";
+import { Address, createWalletClient, custom } from "viem";
+import { polygonMumbai } from "viem/chains";
 import Bars3Icon from "@heroicons/react/24/outline/Bars3Icon";
 import BellIcon from "@heroicons/react/24/outline/BellIcon";
 import MoonIcon from "@heroicons/react/24/outline/MoonIcon";
@@ -13,7 +15,7 @@ import { setIsConnected } from "~~/auth/authSlice";
 import { web3auth } from "~~/auth/web3auth";
 // import UserIcon from "@heroicons/react/24/outline/UserIcon";
 import { MyState, useMyDispatch, useMySelector } from "~~/components/dash-wind/app/store";
-import { Address } from "~~/components/web-3-crew/Address";
+import { Address as AddressDisplay } from "~~/components/web-3-crew/Address";
 
 function Header() {
   const dispatch = useMyDispatch();
@@ -21,8 +23,19 @@ function Header() {
   const [currentTheme, setCurrentTheme] = useState(
     typeof window !== "undefined" ? localStorage.getItem("theme") : null,
   );
+  const [address, setAddress] = useState<Address | null>(null);
   const router = useRouter();
 
+  useEffect(() => {
+    async function getAddress() {
+      const address = await getAccounts();
+      if (address) {
+        setAddress(address);
+      }
+    }
+    getAddress();
+  }, []);
+
   useEffect(() => {
     themeChange(false);
     if (currentTheme === null) {
@@ -35,6 +48,22 @@ function Header() {
     // 👆 false parameter is required for react project
   }, [currentTheme]);
 
+  async function getAccounts() {
+    if (!web3auth.provider) {
+      console.log("from login - getAccounts: provider not defined");
+      return;
+    }
+    const client = createWalletClient({
+      // account: privateKeyToAccount('0x...'); // from viem
+      chain: polygonMumbai,
+      transport: custom(web3auth.provider),
+    });
+
+    // Get user's public address
+    const [address] = await client.getAddresses();
+    return address as Address;
+  }
+
   // Opening right sidebar for notification
   const openNotification = () => {
     dispatch(openRightDrawer({ header: "Notifications", bodyType: RIGHT_DRAWER_TYPES.NOTIFICATION }));
@@ -99,12 +128,7 @@ function Header() {
             <label tabIndex={0} className="btn btn-ghost">
               <div className="flex justify-center items-center">
                 {/* Wallet Address Display */}
-                <Address
-                  address="0xB9555E2f3e34aDfDB5d033C5af73de6e2385A770"
-                  disableAddressLink={true}
-                  format="short"
-                  size="base"
-                />
+                <AddressDisplay address={address?.toString()} disableAddressLink={true} format="short" size="base" />
               </div>
             </label>
             <ul

From 786e31922a02f219b429e6728543dffc2c1e9493 Mon Sep 17 00:00:00 2001
From: funkornaut001 <funkornaut@gmail.com>
Date: Fri, 8 Dec 2023 03:17:56 -0600
Subject: [PATCH 02/10] isOwner - login flow - wagmiConnect attempt

---
 NOTES.md                                      |  33 ++++
 package.json                                  |   3 +
 packages/hardhat/contracts/Payroll.sol        |   4 +-
 packages/hardhat/deploy/03_deploy_payroll.ts  |   2 +-
 packages/nextjs/.env                          |   8 +
 packages/nextjs/auth/web3auth.ts              |  17 ++
 .../dash-wind/containers/Header.tsx           |   1 +
 .../dash-wind/features/employees/index.tsx    |   3 +-
 .../dash-wind/features/user/Login.tsx         | 184 +++++++++++++-----
 .../dash-wind/features/user/Register.tsx      |  11 +-
 .../web-3-crew/register-page/DeployForm.tsx   |  71 +++++--
 .../web-3-crew/register-page/form.tsx         |  73 +++++++
 packages/nextjs/scaffold.config.ts            |   2 +-
 yarn.lock                                     |  18 ++
 14 files changed, 350 insertions(+), 80 deletions(-)
 create mode 100644 NOTES.md
 create mode 100644 packages/nextjs/.env
 create mode 100644 packages/nextjs/components/web-3-crew/register-page/form.tsx

diff --git a/NOTES.md b/NOTES.md
new file mode 100644
index 0000000..3ad5d59
--- /dev/null
+++ b/NOTES.md
@@ -0,0 +1,33 @@
+PayrollFactory deployed to: 0xfe44aB0B966E57F126130BE6401546c7351484ad --mumbai
+TokenTransferor deployed to: 0x21d762ab159676d3bd05e12A95699C1d0b043A48 --mumbai
+Payroll deployed to: 0xDBAbe75848c608bDA3382f0D68219542032B3fEa --mumbai
+All deployed from 0x9768818565ED5968fAACC6F66ca02CBf2785dB84
+
+https://api-testnet.polygonscan.com/IEWN9BX92EIKVXR22UKQQ9A4UWEF5J9IRG
+
+There is no log out / wallet modal on Register Deploy
+Need a rundown of how to log in with wallet and connect to mumbai chain without AA
+
+I shouldnt need to change the web3auth client id correct?
+
+deploy contract in register flow is stuck at getting account address...
+
+## 12/7
+Funkornaut@gmail -- 0xBB65877a1207572321dE0ad64A2e196545904a09
+trevfost503@gmail -- 0xfd330177602f092b72a3b65893602067Ab69cE2c
+sign in with funkornaut through gmail -- 0x1aD394b0c57dbC57f16A5A54b4ccee436b678287
+
+deployed new payroll 0xAB34603b0A8c54f9F9Fe9207b98da8ac354dB68e
+- added function isOwner returns bool, owner() func on ownable works but since we then needed to look for bool on front end thought that would simplify from end logic / routing
+- think that the LogIn flow is a little better
+
+Login.tsx
+Web3 modal pops up when you hit login button - should only pop up if there is a contract address in the form
+
+Now logOut if funky
+Cant log in with Metamask
+
+DeployForm
+- just using useContractWrite was able to click button and make action got this error in browser console
+    next-dev.js:20 ConnectorNotFoundError: Connector not found at writeContract (chunk-TSH6VVF4.js:2348:1)
+
diff --git a/package.json b/package.json
index c4d4ea4..7b46570 100644
--- a/package.json
+++ b/package.json
@@ -36,5 +36,8 @@
   },
   "resolutions": {
     "usehooks-ts@^2.7.2": "patch:usehooks-ts@npm:^2.7.2#./.yarn/patches/usehooks-ts-npm-2.7.2-fceffe0e43.patch"
+  },
+  "dependencies": {
+    "@web3auth/web3auth-wagmi-connector": "^5.0.1"
   }
 }
diff --git a/packages/hardhat/contracts/Payroll.sol b/packages/hardhat/contracts/Payroll.sol
index a09a1f8..b4df6d1 100644
--- a/packages/hardhat/contracts/Payroll.sol
+++ b/packages/hardhat/contracts/Payroll.sol
@@ -527,8 +527,8 @@ ITokenTransferor public ccip;
         }
     }
 
-    function getOwner() public view returns (address){
-        return owner();
+    function isOwner(address _address) public view returns (bool){
+        return _address == owner();
     }   
 
     function getEmployeePaymentSplits(address _employeeAddress) public view returns (PaymentSplit memory){
diff --git a/packages/hardhat/deploy/03_deploy_payroll.ts b/packages/hardhat/deploy/03_deploy_payroll.ts
index a0980ad..ca1c6a2 100644
--- a/packages/hardhat/deploy/03_deploy_payroll.ts
+++ b/packages/hardhat/deploy/03_deploy_payroll.ts
@@ -6,7 +6,7 @@ async function main() {
   console.log("Deploying contracts with the account:", deployer.address);
 
   // Add the addresses of the dependencies of your Payroll contract
-  const ccipTokenTransferorAddress = "0xFFc15127eB60C4Ab1a2e5e0319615ca0982952f2"; // deployed via script
+  const ccipTokenTransferorAddress = "0x21d762ab159676d3bd05e12A95699C1d0b043A48"; // deployed via script
   const bnmTokenAddress = "0xf1E3A5842EeEF51F2967b3F05D45DD4f4205FF40"; //BnM Mumbai
 
   // Deploy the Payroll contract
diff --git a/packages/nextjs/.env b/packages/nextjs/.env
new file mode 100644
index 0000000..d27e85a
--- /dev/null
+++ b/packages/nextjs/.env
@@ -0,0 +1,8 @@
+NEXT_PUBLIC_ALCHEMY_API_KEY=NcFZk9kYsJT0zbvxp1BvXdk9PmgJFypJ
+NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=67c39fba49c2101d141cb637137aa160
+# # Polygon Mumbai 
+NEXT_PUBLIC_FACTORY_CONTRACT_ADDRESS=0xfe44aB0B966E57F126130BE6401546c7351484ad
+# # Polygon Mumbai
+NEXT_PUBLIC_PAYROLL_CONTRACT_ADDRESS=0xAB34603b0A8c54f9F9Fe9207b98da8ac354dB68e
+NEXT_PUBLIC_LOCAL_CHAIN_ID=0 # REPLACE WITH LOCAL DEV CHAIN
+NEXT_PUBLIC_TESTNET_CHAIN_ID=80001 # Polygon Mumbaiyar
\ No newline at end of file
diff --git a/packages/nextjs/auth/web3auth.ts b/packages/nextjs/auth/web3auth.ts
index f6da7db..b6713f3 100644
--- a/packages/nextjs/auth/web3auth.ts
+++ b/packages/nextjs/auth/web3auth.ts
@@ -1,11 +1,28 @@
 // import { useEffect, useState } from "react";
 import { Web3Auth } from "@web3auth/modal";
 
+//import { Web3AuthConnector } from "@web3auth/web3auth-wagmi-connector";
+
 // import { createWalletClient, custom } from "viem";
 // import { polygonMumbai } from "viem/chains";
 // import { AuthProvider, setAuthProvider, setIsConnected } from "~~/auth/authSlice";
 // import { MyState, useMyDispatch, useMySelector } from "~~/components/dash-wind/app/store";
 
+// set up your web3auth instance with all the features you want
+// const web3AuthInstance = new Web3Auth({
+//   clientId: "BM0SLNkhMCfIygw0Xi79dG6qbWGMN0o0mEeDjRT0dxlP3BEok9pnu5aqxCNfj2TZ9XT7sQaXm0ltuWbCQ1tsRNI",
+//   chainConfig: {
+//     chainNamespace: "eip155",
+//     chainId: "0x13881", // Mumbai
+//     rpcTarget: "https://rpc.ankr.com/polygon_mumbai",
+//     displayName: "Mumbai Testnet",
+//     blockExplorer: "https://mumbai.polygonscan.com/",
+//     ticker: "MATIC",
+//     tickerName: "Polygon",
+//   },
+//   web3AuthNetwork: "sapphire_mainnet",
+// });
+
 export const web3auth = new Web3Auth({
   clientId: "BM0SLNkhMCfIygw0Xi79dG6qbWGMN0o0mEeDjRT0dxlP3BEok9pnu5aqxCNfj2TZ9XT7sQaXm0ltuWbCQ1tsRNI", // Get your Client ID from the Web3Auth Dashboard
   web3AuthNetwork: "sapphire_devnet", // Web3Auth Network
diff --git a/packages/nextjs/components/dash-wind/containers/Header.tsx b/packages/nextjs/components/dash-wind/containers/Header.tsx
index e324276..018f619 100644
--- a/packages/nextjs/components/dash-wind/containers/Header.tsx
+++ b/packages/nextjs/components/dash-wind/containers/Header.tsx
@@ -61,6 +61,7 @@ function Header() {
 
     // Get user's public address
     const [address] = await client.getAddresses();
+    //console.log("user address: ", address);
     return address as Address;
   }
 
diff --git a/packages/nextjs/components/dash-wind/features/employees/index.tsx b/packages/nextjs/components/dash-wind/features/employees/index.tsx
index f834c21..c517ac2 100644
--- a/packages/nextjs/components/dash-wind/features/employees/index.tsx
+++ b/packages/nextjs/components/dash-wind/features/employees/index.tsx
@@ -10,10 +10,9 @@ import { openModal } from "../common/modalSlice";
 /*-------------------------------------*/
 // Kaz & Trevor
 // uncomment
-// import { useContractRead } from "wagmi";
+//import { useContractRead } from "wagmi";
 
 /*-------------------------------------*/
-
 import TrashIcon from "@heroicons/react/24/outline/TrashIcon";
 import {
   /*MyState,*/
diff --git a/packages/nextjs/components/dash-wind/features/user/Login.tsx b/packages/nextjs/components/dash-wind/features/user/Login.tsx
index e4aa292..858c6ae 100644
--- a/packages/nextjs/components/dash-wind/features/user/Login.tsx
+++ b/packages/nextjs/components/dash-wind/features/user/Login.tsx
@@ -1,6 +1,7 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import Link from "next/link";
 import { useRouter } from "next/router";
+import Payroll from "../../../../../hardhat/artifacts/contracts/Payroll.sol/Payroll.json";
 import InputText from "../../components/Input/InputText";
 import ErrorText from "../../components/Typography/ErrorText";
 import { UpdateFormValues } from "../../types/FormTypes";
@@ -8,71 +9,140 @@ import LandingIntro from "./LandingIntro";
 import { Address, createWalletClient, custom } from "viem";
 import { polygonMumbai } from "viem/chains";
 import { useContractRead } from "wagmi";
-import { setIsAdmin, setIsConnected } from "~~/auth/authSlice";
+import { setIsConnected } from "~~/auth/authSlice";
 import { web3auth } from "~~/auth/web3auth";
 import { MyState, useMyDispatch, useMySelector } from "~~/components/dash-wind/app/store";
 
+//import { get } from "http";
+
 function Login() {
   const INITIAL_LOGIN_OBJ = {
     contractAddress: "",
     emailId: "",
   };
 
-  const chainId = process.env.NEXT_PUBLIC_TARGET_LOCAL_CHAIN
-    ? process.env.NEXT_PUBLIC_LOCAL_CHAIN_ID
-    : process.env.NEXT_PUBLIC_TESTNET_CHAIN_ID;
+  const chainId = //process.env.NEXT_PUBLIC_TARGET_LOCAL_CHAIN ?
+    //process.env.NEXT_PUBLIC_LOCAL_CHAIN_ID
+    //:
+    process.env.NEXT_PUBLIC_TESTNET_CHAIN_ID;
 
   // const [loading, setLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
   const [loginObj, setLoginObj] = useState(INITIAL_LOGIN_OBJ);
   const { isConnected } = useMySelector((state: MyState) => state.auth);
-
   const router = useRouter();
   const dispatch = useMyDispatch();
+  //const userAddress = getAccounts();
+  // state to store user address once it is fetched
+  const [userAddress, setUserAddress] = useState<string | null>(null);
+
+  useEffect(() => {
+    async function fetchAddress() {
+      const address = await getAccounts();
+      if (address) {
+        // not sure what this issue is with this
+        setUserAddress(address);
+      }
+    }
+    fetchAddress();
+  }, []);
+
+  const payrollABI = Payroll.abi;
 
   /*-------------------------------------*/
   // Kaz & Trevor
   // getOwner address to test against user's address
   // need to see what shape `owner` will be on return
+  // contract interaction calls isOwner()
   const {
-    data: owner,
+    data: isOwner,
     // isError,
     // isLoading,
   } = useContractRead({
     address: process.env.NEXT_PUBLIC_PAYROLL_CONTRACT_ADDRESS,
-    // abi: payrollContractAbi,
-    functionName: "getOwner",
+    abi: payrollABI,
+    functionName: "isOwner",
+    args: userAddress ? [userAddress] : [],
     chainId: Number(chainId),
-  });
+  }) as { data: boolean | undefined };
+
+  console.log("is owner: ", isOwner);
+  console.log("user address contract read: ", [getAccounts()]);
+
+  useEffect(() => {
+    if (typeof isOwner !== "undefined") {
+      // Ensure the value is not undefined
+      if (isOwner) {
+        // Redirect to owner's dashboard
+        router.push("/dapp/dashboard");
+      } else {
+        // Redirect to employee or general user dashboard
+        router.push("/dapp/dashboard");
+      }
+    }
+  }, [isOwner, router]);
+
   /*-------------------------------------*/
 
   /*-------------------------------------*/
   // Kaz & Trevor
   //
-  const {
-    data: isEmployee,
-    // isError,
-    // isLoading,
-  } = useContractRead({
-    address: process.env.NEXT_PUBLIC_PAYROLL_CONTRACT_ADDRESS,
-    // abi: payrollContractAbi,
-    functionName: "doesEmployeeExist",
-    args: [
-      /* problem: figure out how to getAccount() address here */
-    ],
-    chainId: Number(chainId),
-  });
+  // const {
+  //   data: isEmployee,
+  //   // isError,
+  //   // isLoading,
+  // } = useContractRead({
+  //   address: process.env.NEXT_PUBLIC_PAYROLL_CONTRACT_ADDRESS,
+  //   abi: payrollABI,
+  //   functionName: "doesEmployeeExist",
+  //   args: [
+  //     /* problem: figure out how to getAccount() address here */
+  //     userAddress
+  //   ],
+  //   chainId: Number(chainId),
+  // });
   /*-------------------------------------*/
 
+  // // Web3Auth
+  // async function login() {
+  //   if (isConnected) {
+  //     // await determineIfAccountIsAdmin();
+  //     // if (!isEmployee) {
+  //     //   //until the hook is working, this is going to prevent us from being directed to the dashboard
+  //     //   return;
+  //     // }
+  //     router.push("/dapp/dashboard");
+  //     return;
+  //   }
+
+  //   try {
+  //     await web3auth.connect();
+  //     if (web3auth.connected) {
+  //       dispatch(setIsConnected({ isConnected: true }));
+  //       //const userAddress = await getAccounts(); // Retrieve user's address
+
+  //      await determineIfAccountIsAdmin();
+  //      if (!isEmployee) {
+  //        // until the hook is working, this is going to prevent us from being directed to the dashboard
+  //         return;
+  //       }
+  //       router.push("/dapp/dashboard");
+  //     }
+  //   } catch (error) {
+  //     console.error(error);
+  //   }
+  // }
+
   // Web3Auth
   async function login() {
     if (isConnected) {
-      await determineIfAccountIsAdmin();
-      if (!isEmployee) {
-        // until the hook is working, this is going to prevent us from being directed to the dashboard
+      // await determineIfAccountIsAdmin();
+      if (!isOwner) {
+        //until the hook is working, this is going to prevent us from being directed to the dashboard
+        router.push("/dapp/dashboard");
+
         return;
       }
-      router.push("/dapp/dashboard");
       return;
     }
 
@@ -80,40 +150,44 @@ function Login() {
       await web3auth.connect();
       if (web3auth.connected) {
         dispatch(setIsConnected({ isConnected: true }));
-        await determineIfAccountIsAdmin();
-        if (!isEmployee) {
+        //const userAddress = await getAccounts(); // Retrieve user's address
+
+        // await determineIfAccountIsAdmin();
+        if (!isOwner) {
           // until the hook is working, this is going to prevent us from being directed to the dashboard
+          router.push("/dapp/dashboard");
+
           return;
         }
-        router.push("/dapp/dashboard");
       }
     } catch (error) {
       console.error(error);
     }
   }
 
-  async function determineIfAccountIsAdmin() {
-    // set loading === true ???
-    const address = await getAccounts();
-    if (!address) {
-      console.error("from determineIfAccountIsAdmin - address is undefined");
-      return;
-    }
+  // async function determineIfAccountIsAdmin() {
+  //   // set loading === true ???
+  //   const userAddress = getAccounts();
+  //   if (!userAddress) {
+  //     console.error("from determineIfAccountIsAdmin - address is undefined");
+  //     return;
+  //   }
 
-    if (!owner) {
-      console.error("From determineIfAccountIsAdmin: ownerData from Payroll Contract is undefined");
-      return;
-    }
+  //   if (!owner) {
+  //     console.error("From determineIfAccountIsAdmin: ownerData from Payroll Contract is undefined");
+  //     return;
+  //   }
 
-    /*-------------------------------------*/
-    // Kaz & Trevor
-    // need to see what shape `owner` will be on return
-    const isAdmin = address === owner ? true : false;
-    dispatch(setIsAdmin({ isAdmin: isAdmin }));
-    /*-------------------------------------*/
-    // set loading === false ???
-  }
+  //   /*-------------------------------------*/
+  //   // Kaz & Trevor
+  //   // need to see what shape `owner` will be on return
+  //   const isAdmin = userAddress === owner ? true : false;
+  //   dispatch(setIsAdmin({ isAdmin: isAdmin }));
+  //   /*-------------------------------------*/
+  //   // set loading === false ???
+  // }
 
+  // func to grab the connected wallet address
   async function getAccounts() {
     if (!web3auth.provider) {
       console.log("from login - getAccounts: provider not defined");
@@ -125,16 +199,18 @@ function Login() {
       transport: custom(web3auth.provider),
     });
 
+    //console.log("web3auth provider: ", web3auth.provider);
     // Get user's public address
-    const [address] = await client.getAddresses();
-    return address as Address;
+    const [userAddress] = await client.getAddresses();
+    console.log("user address: ", userAddress);
+    return userAddress as Address;
   }
 
   const submitForm = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     setErrorMessage("");
 
-    if (loginObj.emailId.trim() === "") return setErrorMessage("Email is required!");
+    // if (loginObj.emailId.trim() === "") return setErrorMessage("Email is required!");
     if (loginObj.contractAddress.trim() === "") return setErrorMessage("Contract Address is required!");
   };
 
@@ -162,14 +238,14 @@ function Login() {
                   updateFormValue={updateFormValue}
                 />
 
-                <InputText
+                {/* <InputText
                   type="emailId"
                   defaultValue={loginObj.emailId}
                   updateType="emailId"
                   containerStyle="mt-4"
                   labelTitle="Email"
                   updateFormValue={updateFormValue}
-                />
+                /> */}
               </div>
 
               <ErrorText styleClass="mt-8">{errorMessage}</ErrorText>
diff --git a/packages/nextjs/components/dash-wind/features/user/Register.tsx b/packages/nextjs/components/dash-wind/features/user/Register.tsx
index 035ba0d..9629106 100644
--- a/packages/nextjs/components/dash-wind/features/user/Register.tsx
+++ b/packages/nextjs/components/dash-wind/features/user/Register.tsx
@@ -24,7 +24,7 @@ function Register() {
   const [walletAddress, setWalletAddress] = useState<Address | null>(null);
 
   const dispatch = useMyDispatch();
-
+  //@note is this working? working for register page?
   async function login() {
     try {
       await web3auth.connect();
@@ -49,6 +49,8 @@ function Register() {
 
     // Get user's public address
     const [address] = await client.getAddresses();
+    console.log("user address: ", address);
+
     return address;
   }
 
@@ -61,9 +63,12 @@ function Register() {
       setRegisterState("loading");
       console.log("logging in company...");
       await login();
-      // Account Abstraction goes here...?
-      console.log("getting account address...");
+      // Account Abstraction goes here...? -- kinda is with login
+      // grab account address
       const address = await getAccounts();
+      console.log("connected address: ", address);
+
+      console.log("getting account address...");
       if (address) {
         // Prompt user to fund wallet?
         setWalletAddress(address);
diff --git a/packages/nextjs/components/web-3-crew/register-page/DeployForm.tsx b/packages/nextjs/components/web-3-crew/register-page/DeployForm.tsx
index acbef6f..84d8ad7 100644
--- a/packages/nextjs/components/web-3-crew/register-page/DeployForm.tsx
+++ b/packages/nextjs/components/web-3-crew/register-page/DeployForm.tsx
@@ -1,36 +1,66 @@
 import React from "react";
 import Link from "next/link";
-import { Abi, Address, parseEther } from "viem";
-import { useContractWrite, usePrepareContractWrite } from "wagmi";
+import PayrollFactory from "../../../../hardhat/artifacts/contracts/PayrollFactory.sol/PayrollFactory.json";
+import { Address, parseEther } from "viem";
+import { useContractWrite } from "wagmi";
+import { web3auth } from "~~/auth/web3auth";
 import ErrorText from "~~/components/dash-wind/components/Typography/ErrorText";
 import { Address as AddressDisplay } from "~~/components/scaffold-eth/Address";
 
+//import { useDeployedContractInfo } from "~~/hooks/scaffold-eth";
+
 interface props {
   ownerAddress: Address | null;
 }
-
-const payrollFactoryAddress = "";
-const payrollFactoryABI: Abi = [];
+// Check if the user is connected
+const isConnected = web3auth.connected;
+const payrollFactoryAddress = "0xfe44aB0B966E57F126130BE6401546c7351484ad";
+const payrollFactoryABI = PayrollFactory.abi;
 
 export default function DeployForm({ ownerAddress }: props) {
+  //const { data: contractData } = useDeployedContractInfo("PayrollFactory");
+
   /*-------------------------------------*/
-  // Kaz & Trevor
+  // Kaz & Trevor -- think this is the right way to do it
+  // but running in browser it seems to always be looking for the connected address
+  // see no action in the terminal when the button is clicked
   // deploy company contract after registration of account
-  const { config } = usePrepareContractWrite({
+  // const { config } = usePrepareContractWrite({
+  //   address: payrollFactoryAddress,
+  //   // abi: contractData?.abi,
+  //   abi: payrollFactoryABI,
+  //   functionName: "deployPayrollAndTokenTransferor",
+  //   value: parseEther("1", "wei"),
+  //   onSuccess(data) {
+  //     console.log("contract deployed! Data: ", data); //will data be the contract addresses?
+  //   },
+  //   onError(error) {
+  //     console.error("contract deploy error!", error); //error message
+  //   },
+  // });
+
+  //console.log("config: ", config);
+
+  const { data, isLoading, isSuccess, write } = useContractWrite({
     address: payrollFactoryAddress,
     abi: payrollFactoryABI,
     functionName: "deployPayrollAndTokenTransferor",
-    value: parseEther("1", "wei"),
-    onSuccess(data) {
-      console.log("contract deployed! Data: ", data);
-    },
-    onError(error) {
-      console.error("contract deploy error!", error);
-    },
   });
+  console.log("write: ", write);
+  console.log("data: ", data);
 
-  const { data, isLoading, isSuccess, write } = useContractWrite(config);
-  /*-------------------------------------*/
+  // Function to handle button click
+  const handleDeployClick = () => {
+    if (isConnected) {
+      write({
+        args: [],
+        //from: ownerAddress,
+        value: parseEther("1", "wei"),
+      });
+    } else {
+      console.log("Wallet not connected");
+    }
+  };
 
   return (
     <div className="py-24 px-10 relative">
@@ -44,7 +74,14 @@ export default function DeployForm({ ownerAddress }: props) {
             </div>
             {/* <button onClick={() => writeAsync()} className="btn mt-2 w-full btn-primary mb-4"> */}
             <button
-              onClick={() => write?.()}
+              // onClick={() =>
+              //   write({
+              //     args: [],
+              //     //from: ownerAddress,
+              //     value: parseEther("1", "wei"),
+              //   })
+              // }
+              onClick={handleDeployClick}
               disabled={isLoading || isSuccess ? true : false}
               className={"btn mt-2 w-full btn-primary mb-4" + (isLoading ? " loading" : "")}
             >
diff --git a/packages/nextjs/components/web-3-crew/register-page/form.tsx b/packages/nextjs/components/web-3-crew/register-page/form.tsx
new file mode 100644
index 0000000..8bb37de
--- /dev/null
+++ b/packages/nextjs/components/web-3-crew/register-page/form.tsx
@@ -0,0 +1,73 @@
+import React from "react";
+import Link from "next/link";
+import PayrollFactory from "../../../../hardhat/artifacts/contracts/PayrollFactory.sol/PayrollFactory.json";
+import { Address, parseEther } from "viem";
+import { useContractWrite, usePrepareContractWrite } from "wagmi";
+import ErrorText from "~~/components/dash-wind/components/Typography/ErrorText";
+import { Address as AddressDisplay } from "~~/components/scaffold-eth/Address";
+
+interface props {
+  ownerAddress: Address | null;
+}
+
+const payrollFactoryAddress = "";
+const payrollFactoryABI = PayrollFactory.abi;
+
+export default function DeployForm({ ownerAddress }: props) {
+  const { config } = usePrepareContractWrite({
+    address: payrollFactoryAddress,
+    abi: payrollFactoryABI,
+    functionName: "deployPayrollAndTokenTransferor",
+    value: parseEther("1", "wei"),
+    onSuccess(data) {
+      console.log("contract deployed! Data: ", data);
+    },
+    onError(error) {
+      console.error("contract deploy error!", error);
+    },
+  });
+
+  const { data, isLoading, isSuccess, write } = useContractWrite(config);
+
+  return (
+    <div className="py-24 px-10 relative">
+      <h2 className="text-2xl font-semibold mb-2 text-center">Deploy Payroll Contract</h2>
+      <div className="space-y-8">
+        {ownerAddress ? (
+          <>
+            <div className="flex flex-col mt-5">
+              <p>Account Owner Address:</p>
+              <AddressDisplay address={ownerAddress} disableAddressLink={true} format="long" size="base" />
+            </div>
+            {/* <button onClick={() => writeAsync()} className="btn mt-2 w-full btn-primary mb-4"> */}
+            <button
+              onClick={() => write?.()}
+              disabled={isLoading || isSuccess ? true : false}
+              className={"btn mt-2 w-full btn-primary mb-4" + (isLoading ? " loading" : "")}
+            >
+              Deploy Contract
+            </button>
+          </>
+        ) : (
+          <ErrorText styleClass="mt-8">Error: Owner Address Not Found</ErrorText>
+        )}
+
+        {data && (
+          <div className="flex flex-col mt-5">
+            <p>Payroll Contract Address:</p>
+            {/* <p>{data}</p> */}
+            {/* <AddressDisplay address={contractAddress} format="long" size="base" /> */}
+          </div>
+        )}
+
+        <div className="text-center mt-4">
+          <Link href="/login">
+            <span className="  inline-block  hover:text-primary hover:underline hover:cursor-pointer transition duration-200">
+              Go Home
+            </span>
+          </Link>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/packages/nextjs/scaffold.config.ts b/packages/nextjs/scaffold.config.ts
index 0af072c..628208e 100644
--- a/packages/nextjs/scaffold.config.ts
+++ b/packages/nextjs/scaffold.config.ts
@@ -11,7 +11,7 @@ export type ScaffoldConfig = {
 
 const scaffoldConfig = {
   // The network where your DApp lives in
-  targetNetwork: chains.hardhat,
+  targetNetwork: chains.polygonMumbai,
 
   // The interval at which your front-end polls the RPC servers for new data
   // it has no effect on the local network
diff --git a/yarn.lock b/yarn.lock
index 4d825c3..e8f5079 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4783,6 +4783,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@web3auth/web3auth-wagmi-connector@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@web3auth/web3auth-wagmi-connector@npm:5.0.1"
+  peerDependencies:
+    "@wagmi/core": ^1.x
+    "@web3auth/base": ^7.x
+    "@web3auth/modal": ^7.x
+    "@web3auth/no-modal": ^7.x
+    "@web3auth/openlogin-adapter": ^7.x
+    viem: ^1.x
+  peerDependenciesMeta:
+    "@web3auth/modal":
+      optional: true
+  checksum: 1c3d39cab0ff298ec10fe1061465f66a794a36b4d62261b5abf63879fef555005b7e44b6c5e7253b2e9d57b777671bef60f6564f9b2cb2399f92ef3bf9519372
+  languageName: node
+  linkType: hard
+
 "JSONStream@npm:1.3.2":
   version: 1.3.2
   resolution: "JSONStream@npm:1.3.2"
@@ -14008,6 +14025,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "se-2@workspace:."
   dependencies:
+    "@web3auth/web3auth-wagmi-connector": ^5.0.1
     husky: ^8.0.1
     lint-staged: ^13.0.3
   languageName: unknown

From ff2e6acf9ca35c420489ee0c781533e08ebc7ec6 Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:11:37 -0600
Subject: [PATCH 03/10] add web3auth-wagmi-connector

---
 packages/nextjs/.env.example                  |  5 +++--
 packages/nextjs/package.json                  |  1 +
 packages/nextjs/services/web3/wagmiConfig.tsx | 12 +++++++++++-
 yarn.lock                                     | 18 ++++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/nextjs/.env.example b/packages/nextjs/.env.example
index 6769588..47c95bd 100644
--- a/packages/nextjs/.env.example
+++ b/packages/nextjs/.env.example
@@ -12,7 +12,8 @@
 NEXT_PUBLIC_ALCHEMY_API_KEY=
 NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=
 
-NEXT_PUBLIC_FACTORY_CONTRACT_ADDRESS="" # Polygon Mumbai 
-NEXT_PUBLIC_PAYROLL_CONTRACT_ADDRESS="" # Polygon Mumbai
+NEXT_PUBLIC_FACTORY_CONTRACT_ADDRESS= # Polygon Mumbai 
+NEXT_PUBLIC_PAYROLL_CONTRACT_ADDRESS= # Polygon Mumbai
+NEXT_PUBLIC_TOKEN_TRANSFEROR_CONTRACT_ADDRESS= # Polygon Mumbai
 NEXT_PUBLIC_LOCAL_CHAIN_ID=0 # REPLACE WITH LOCAL DEV CHAIN
 NEXT_PUBLIC_TESTNET_CHAIN_ID=80001 # Polygon Mumbai
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index e64c44b..6ffb456 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -22,6 +22,7 @@
     "@uniswap/v2-sdk": "^3.0.1",
     "@web3auth/base": "^7.2.0",
     "@web3auth/modal": "^7.2.0",
+    "@web3auth/web3auth-wagmi-connector": "^5.0.1",
     "axios": "^1.6.2",
     "blo": "^1.0.1",
     "chart.js": "^4.4.0",
diff --git a/packages/nextjs/services/web3/wagmiConfig.tsx b/packages/nextjs/services/web3/wagmiConfig.tsx
index 240aea0..00c2a1e 100644
--- a/packages/nextjs/services/web3/wagmiConfig.tsx
+++ b/packages/nextjs/services/web3/wagmiConfig.tsx
@@ -1,8 +1,18 @@
+import { Web3AuthConnector } from "@web3auth/web3auth-wagmi-connector";
 import { createConfig } from "wagmi";
+import { web3auth as web3AuthInstance } from "~~/auth/web3auth";
 import { appChains, wagmiConnectors } from "~~/services/web3/wagmiConnectors";
 
 export const wagmiConfig = createConfig({
   autoConnect: false,
-  connectors: wagmiConnectors,
+  connectors: [
+    ...wagmiConnectors(),
+    new Web3AuthConnector({
+      chains: appChains.chains,
+      options: {
+        web3AuthInstance,
+      },
+    }),
+  ],
   publicClient: appChains.publicClient,
 });
diff --git a/yarn.lock b/yarn.lock
index 4d825c3..458e8cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2290,6 +2290,7 @@ __metadata:
     "@uniswap/v2-sdk": ^3.0.1
     "@web3auth/base": ^7.2.0
     "@web3auth/modal": ^7.2.0
+    "@web3auth/web3auth-wagmi-connector": ^5.0.1
     autoprefixer: ^10.4.12
     axios: ^1.6.2
     blo: ^1.0.1
@@ -4783,6 +4784,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@web3auth/web3auth-wagmi-connector@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@web3auth/web3auth-wagmi-connector@npm:5.0.1"
+  peerDependencies:
+    "@wagmi/core": ^1.x
+    "@web3auth/base": ^7.x
+    "@web3auth/modal": ^7.x
+    "@web3auth/no-modal": ^7.x
+    "@web3auth/openlogin-adapter": ^7.x
+    viem: ^1.x
+  peerDependenciesMeta:
+    "@web3auth/modal":
+      optional: true
+  checksum: 1c3d39cab0ff298ec10fe1061465f66a794a36b4d62261b5abf63879fef555005b7e44b6c5e7253b2e9d57b777671bef60f6564f9b2cb2399f92ef3bf9519372
+  languageName: node
+  linkType: hard
+
 "JSONStream@npm:1.3.2":
   version: 1.3.2
   resolution: "JSONStream@npm:1.3.2"

From fb91d239863eb9349b7775add57d62e4f93a245d Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:22:26 -0600
Subject: [PATCH 04/10] ignore .env

---
 packages/nextjs/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nextjs/.gitignore b/packages/nextjs/.gitignore
index 6985d55..16dad0e 100644
--- a/packages/nextjs/.gitignore
+++ b/packages/nextjs/.gitignore
@@ -26,6 +26,7 @@ yarn-error.log*
 .pnpm-debug.log*
 
 # local env files
+.env
 .env.local
 .env.development.local
 .env.test.local

From ae059952a4ec269d4b1b6a7b8b5d545e414c2910 Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:24:58 -0600
Subject: [PATCH 05/10] remove .env

---
 packages/nextjs/.env | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 packages/nextjs/.env

diff --git a/packages/nextjs/.env b/packages/nextjs/.env
deleted file mode 100644
index d27e85a..0000000
--- a/packages/nextjs/.env
+++ /dev/null
@@ -1,8 +0,0 @@
-NEXT_PUBLIC_ALCHEMY_API_KEY=NcFZk9kYsJT0zbvxp1BvXdk9PmgJFypJ
-NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=67c39fba49c2101d141cb637137aa160
-# # Polygon Mumbai 
-NEXT_PUBLIC_FACTORY_CONTRACT_ADDRESS=0xfe44aB0B966E57F126130BE6401546c7351484ad
-# # Polygon Mumbai
-NEXT_PUBLIC_PAYROLL_CONTRACT_ADDRESS=0xAB34603b0A8c54f9F9Fe9207b98da8ac354dB68e
-NEXT_PUBLIC_LOCAL_CHAIN_ID=0 # REPLACE WITH LOCAL DEV CHAIN
-NEXT_PUBLIC_TESTNET_CHAIN_ID=80001 # Polygon Mumbaiyar
\ No newline at end of file

From fda259283228c27f5d4a33f0b1f823c827e6ce08 Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:28:13 -0600
Subject: [PATCH 06/10] add missing imports

---
 .../nextjs/components/dash-wind/features/user/Login.tsx   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/nextjs/components/dash-wind/features/user/Login.tsx b/packages/nextjs/components/dash-wind/features/user/Login.tsx
index 066e04a..650d4f9 100644
--- a/packages/nextjs/components/dash-wind/features/user/Login.tsx
+++ b/packages/nextjs/components/dash-wind/features/user/Login.tsx
@@ -6,15 +6,15 @@ import InputText from "../../components/Input/InputText";
 import ErrorText from "../../components/Typography/ErrorText";
 import { UpdateFormValues } from "../../types/FormTypes";
 import LandingIntro from "./LandingIntro";
+import { Address, createWalletClient, custom } from "viem";
+import { polygonMumbai } from "viem/chains";
 // import { Address, createWalletClient, custom } from "viem";
 // import { polygonMumbai } from "viem/chains";
 import { useContractRead } from "wagmi";
-
 import {
   /*setIsAdmin,*/
   setIsConnected,
 } from "~~/auth/authSlice";
-
 import { web3auth } from "~~/auth/web3auth";
 import { MyState, useMyDispatch, useMySelector } from "~~/components/dash-wind/app/store";
 
@@ -165,14 +165,12 @@ function Login() {
 
           return;
         }
-
       }
     } catch (error) {
       console.error(error);
     }
   }
 
-
   // async function determineIfAccountIsAdmin() {
   //   // set loading === true ???
   //   const userAddress = getAccounts();
@@ -181,7 +179,6 @@ function Login() {
   //     return;
   //   }
 
-
   //   if (!owner) {
   //     console.error("From determineIfAccountIsAdmin: ownerData from Payroll Contract is undefined");
   //     return;
@@ -215,7 +212,6 @@ function Login() {
     return userAddress as Address;
   }
 
-
   const submitForm = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     setErrorMessage("");

From 4f25ce7f9992bd447e64a887bf7d5a29b0f10147 Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:33:57 -0600
Subject: [PATCH 07/10] fix package issue

---
 packages/hardhat/package.json |   1 +
 yarn.lock                     | 131 +++++++++++++++++++++++++++++++++-
 2 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json
index d630720..ae13a4a 100644
--- a/packages/hardhat/package.json
+++ b/packages/hardhat/package.json
@@ -46,6 +46,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
+    "@chainlink/contracts-ccip": "^1.2.1",
     "@openzeppelin/contracts": "^4.8.1",
     "dotenv": "^16.0.3",
     "envfile": "^6.18.0",
diff --git a/yarn.lock b/yarn.lock
index d1581f7..45ef8ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -248,6 +248,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@chainlink/contracts-ccip@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@chainlink/contracts-ccip@npm:1.2.1"
+  dependencies:
+    "@eth-optimism/contracts": ^0.5.21
+    "@openzeppelin/contracts": ~4.3.3
+    "@openzeppelin/contracts-upgradeable-4.7.3": "npm:@openzeppelin/contracts-upgradeable@v4.7.3"
+    "@openzeppelin/contracts-v0.7": "npm:@openzeppelin/contracts@v3.4.2"
+  checksum: b789c01eeaf0b28c712f9fbc9e42dc60e412f02274074a637fda4919cbf54eacc117036880a4b7a4921835d1a53bbe0b2dd9d9253d98fba167a212faba6899f1
+  languageName: node
+  linkType: hard
+
 "@chainsafe/as-sha256@npm:^0.3.1":
   version: 0.3.1
   resolution: "@chainsafe/as-sha256@npm:0.3.1"
@@ -392,6 +404,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eth-optimism/contracts@npm:^0.5.21":
+  version: 0.5.40
+  resolution: "@eth-optimism/contracts@npm:0.5.40"
+  dependencies:
+    "@eth-optimism/core-utils": 0.12.0
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/abstract-signer": ^5.7.0
+  peerDependencies:
+    ethers: ^5
+  checksum: 11dde466c90b886efe8b5fd123fa5893187a4ff84839213d417f90ae4e45bf00b2f62d56e4ebe23ba5dd7ec33beed22c4c41e206add35fce0db073fe2dbae6ba
+  languageName: node
+  linkType: hard
+
+"@eth-optimism/core-utils@npm:0.12.0":
+  version: 0.12.0
+  resolution: "@eth-optimism/core-utils@npm:0.12.0"
+  dependencies:
+    "@ethersproject/abi": ^5.7.0
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/contracts": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/providers": ^5.7.0
+    "@ethersproject/rlp": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/web": ^5.7.0
+    bufio: ^1.0.7
+    chai: ^4.3.4
+  checksum: 1c820107c44bdbb46becb1b00fd0dabb44f3ac8f54e6da7872a5a134411fad26f53b193225da55e79d6a8d7f0d01cc16a123db5d41ebaf02ca78360249a4b52a
+  languageName: node
+  linkType: hard
+
 "@ethereumjs/common@npm:^3.2.0":
   version: 3.2.0
   resolution: "@ethereumjs/common@npm:3.2.0"
@@ -740,7 +789,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethersproject/providers@npm:^5.7.2":
+"@ethersproject/providers@npm:^5.7.0, @ethersproject/providers@npm:^5.7.2":
   version: 5.7.2
   resolution: "@ethersproject/providers@npm:5.7.2"
   dependencies:
@@ -1892,6 +1941,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@openzeppelin/contracts-upgradeable-4.7.3@npm:@openzeppelin/contracts-upgradeable@v4.7.3":
+  version: 4.7.3
+  resolution: "@openzeppelin/contracts-upgradeable@npm:4.7.3"
+  checksum: c9ffb40cb847a975d440204fc6a811f43af960050242f707332b984d29bd16dc242ffa0935de61867aeb9e0357fadedb16b09b276deda5e9775582face831021
+  languageName: node
+  linkType: hard
+
+"@openzeppelin/contracts-v0.7@npm:@openzeppelin/contracts@v3.4.2":
+  version: 3.4.2
+  resolution: "@openzeppelin/contracts@npm:3.4.2"
+  checksum: 0c90f029fe50a49643588e4c8670dae3bbf31795133a6ddce9bdcbc258486332700bb732287baabf7bf807f39182fe8ea2ffa19aa5caf359b1b9c0f083280748
+  languageName: node
+  linkType: hard
+
 "@openzeppelin/contracts@npm:^4.8.1":
   version: 4.8.1
   resolution: "@openzeppelin/contracts@npm:4.8.1"
@@ -1899,6 +1962,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@openzeppelin/contracts@npm:~4.3.3":
+  version: 4.3.3
+  resolution: "@openzeppelin/contracts@npm:4.3.3"
+  checksum: 73eb23e7acc8531931076d11251629bdc8579c99ef921a3facbd8abf7b860bc214c97a4bd56cd67db7c9d1db837765132640f24987aac8097a13960bb41ca6d1
+  languageName: node
+  linkType: hard
+
 "@parcel/watcher-android-arm64@npm:2.3.0":
   version: 2.3.0
   resolution: "@parcel/watcher-android-arm64@npm:2.3.0"
@@ -2236,6 +2306,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@se-2/hardhat@workspace:packages/hardhat"
   dependencies:
+    "@chainlink/contracts-ccip": ^1.2.1
     "@ethersproject/abi": ^5.7.0
     "@ethersproject/providers": ^5.7.1
     "@matterlabs/hardhat-zksync-solc": ^0.3.17
@@ -5950,6 +6021,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bufio@npm:^1.0.7":
+  version: 1.2.1
+  resolution: "bufio@npm:1.2.1"
+  checksum: b6e1216f4a5877617a3580b83807d8b96c794c015bc2d5eb9e70e152dc79fe923517472bd96df3d5b8feb59a0e25e2aa3cd8a70b8f90905b92d86f2e5719ed68
+  languageName: node
+  linkType: hard
+
 "buildcheck@npm:~0.0.6":
   version: 0.0.6
   resolution: "buildcheck@npm:0.0.6"
@@ -6097,6 +6175,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chai@npm:^4.3.4":
+  version: 4.3.10
+  resolution: "chai@npm:4.3.10"
+  dependencies:
+    assertion-error: ^1.1.0
+    check-error: ^1.0.3
+    deep-eql: ^4.1.3
+    get-func-name: ^2.0.2
+    loupe: ^2.3.6
+    pathval: ^1.1.1
+    type-detect: ^4.0.8
+  checksum: 536668c60a0d985a0fbd94418028e388d243a925d7c5e858c7443e334753511614a3b6a124bac9ca077dfc4c37acc367d62f8c294960f440749536dc181dfc6d
+  languageName: node
+  linkType: hard
+
 "chai@npm:^4.3.6":
   version: 4.3.6
   resolution: "chai@npm:4.3.6"
@@ -6156,6 +6249,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"check-error@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "check-error@npm:1.0.3"
+  dependencies:
+    get-func-name: ^2.0.2
+  checksum: e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399
+  languageName: node
+  linkType: hard
+
 "chokidar@npm:3.3.0":
   version: 3.3.0
   resolution: "chokidar@npm:3.3.0"
@@ -6868,6 +6970,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deep-eql@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "deep-eql@npm:4.1.3"
+  dependencies:
+    type-detect: ^4.0.0
+  checksum: 7f6d30cb41c713973dc07eaadded848b2ab0b835e518a88b91bea72f34e08c4c71d167a722a6f302d3a6108f05afd8e6d7650689a84d5d29ec7fe6220420397f
+  languageName: node
+  linkType: hard
+
 "deep-extend@npm:~0.6.0":
   version: 0.6.0
   resolution: "deep-extend@npm:0.6.0"
@@ -8961,6 +9072,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "get-func-name@npm:2.0.2"
+  checksum: 3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b
+  languageName: node
+  linkType: hard
+
 "get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3":
   version: 1.1.3
   resolution: "get-intrinsic@npm:1.1.3"
@@ -11044,6 +11162,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"loupe@npm:^2.3.6":
+  version: 2.3.7
+  resolution: "loupe@npm:2.3.7"
+  dependencies:
+    get-func-name: ^2.0.1
+  checksum: 96c058ec7167598e238bb7fb9def2f9339215e97d6685d9c1e3e4bdb33d14600e11fe7a812cf0c003dfb73ca2df374f146280b2287cae9e8d989e9d7a69a203b
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^10.0.2":
   version: 10.1.0
   resolution: "lru-cache@npm:10.1.0"
@@ -15432,7 +15559,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-detect@npm:^4.0.0, type-detect@npm:^4.0.5":
+"type-detect@npm:^4.0.0, type-detect@npm:^4.0.5, type-detect@npm:^4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
   checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15

From 41d1cb96dc966d4a97cbafe8d64491e54e723b24 Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:37:07 -0600
Subject: [PATCH 08/10] add another package

---
 packages/hardhat/package.json |  1 +
 yarn.lock                     | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json
index ae13a4a..3b72ce7 100644
--- a/packages/hardhat/package.json
+++ b/packages/hardhat/package.json
@@ -46,6 +46,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
+    "@chainlink/contracts": "^0.8.0",
     "@chainlink/contracts-ccip": "^1.2.1",
     "@openzeppelin/contracts": "^4.8.1",
     "dotenv": "^16.0.3",
diff --git a/yarn.lock b/yarn.lock
index 45ef8ce..3e062d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -260,6 +260,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@chainlink/contracts@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@chainlink/contracts@npm:0.8.0"
+  dependencies:
+    "@eth-optimism/contracts": ^0.5.21
+    "@openzeppelin/contracts": ~4.3.3
+    "@openzeppelin/contracts-upgradeable-4.7.3": "npm:@openzeppelin/contracts-upgradeable@v4.7.3"
+    "@openzeppelin/contracts-v0.7": "npm:@openzeppelin/contracts@v3.4.2"
+  checksum: 4165aa7fa5d28c2ebef4da72e117f78889da292cff03d736d5738e2a3842d5fd162718106c2c04e9acb41298813edc99a27c456217a00bfdd4b0dfb758802cd0
+  languageName: node
+  linkType: hard
+
 "@chainsafe/as-sha256@npm:^0.3.1":
   version: 0.3.1
   resolution: "@chainsafe/as-sha256@npm:0.3.1"
@@ -2306,6 +2318,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@se-2/hardhat@workspace:packages/hardhat"
   dependencies:
+    "@chainlink/contracts": ^0.8.0
     "@chainlink/contracts-ccip": ^1.2.1
     "@ethersproject/abi": ^5.7.0
     "@ethersproject/providers": ^5.7.1

From 9caa61b4bce3a91e5812a2d1c84511ea6bc77c54 Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:42:33 -0600
Subject: [PATCH 09/10] add 'contracts' to IERC20 import path - also format...

---
 packages/hardhat/contracts/PayrollFactory.sol | 207 ++++++++++--------
 1 file changed, 115 insertions(+), 92 deletions(-)

diff --git a/packages/hardhat/contracts/PayrollFactory.sol b/packages/hardhat/contracts/PayrollFactory.sol
index 991e528..a738a9b 100644
--- a/packages/hardhat/contracts/PayrollFactory.sol
+++ b/packages/hardhat/contracts/PayrollFactory.sol
@@ -1,98 +1,121 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {TokenTransferor} from "./TokenTransferor.sol";
-import {Payroll} from "./Payroll.sol";
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {IRouterClient} from "@chainlink/contracts-ccip/src/v0.8/ccip/interfaces/IRouterClient.sol";
-import {OwnerIsCreator} from "@chainlink/contracts-ccip/src/v0.8/shared/access/OwnerIsCreator.sol";
-import {Client} from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Client.sol";
-import {IERC20} from "@chainlink/contracts-ccip/src/v0.8/vendor/openzeppelin-solidity/v4.8.0/token/ERC20/IERC20.sol";
+import { TokenTransferor } from "./TokenTransferor.sol";
+import { Payroll } from "./Payroll.sol";
+import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+import { IRouterClient } from "@chainlink/contracts-ccip/src/v0.8/ccip/interfaces/IRouterClient.sol";
+import { OwnerIsCreator } from "@chainlink/contracts-ccip/src/v0.8/shared/access/OwnerIsCreator.sol";
+import { Client } from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Client.sol";
+import { IERC20 } from "@chainlink/contracts-ccip/src/v0.8/vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
 
 contract PayrollFactory is Ownable {
-    // Set the deployment fee
-    uint256 public deployment_fee = 1 wei; // Example fee
-    
-    IRouterClient public router;
-    IERC20 public linkToken;
-    IERC20 public paymentToken;
-
-    error InvalidAddress();
-    error InsufficientFunds(uint256 amount);
-
-    event TokenTransferorDeployed(address indexed deployer, address contractAddress);
-    event PayrollDeployed(address indexed deployer, address contractAddress, address tokenTransferorAddress);
-
-    ///@param _router The address of the Chainlink Router for local chain
-    ///@param _linkToken The address of the LINK token for local chain
-    ///@param _paymentToken The address of the payment token for Payroll Contract on native chain
-    constructor(address _router, address _linkToken, address _paymentToken) {
-        router = IRouterClient(_router);
-        linkToken = IERC20(_linkToken);
-        paymentToken = IERC20(_paymentToken);
-    }
-
-    ///@dev Deploys TokenTransferor and Payroll contracts
-    function deployPayrollAndTokenTransferor() external payable returns (address payrollAddress, address tokenTransferorAddress) {
-        if(msg.value < deployment_fee){
-            revert InsufficientFunds(msg.value);
-        } 
-
-        tokenTransferorAddress = deployTokenTransferor();
-        payrollAddress = deployPayroll(tokenTransferorAddress);
-        return (payrollAddress, tokenTransferorAddress);
-    }
-
-    // Function to deploy TokenTransferor
-    ///@dev transfers ownership of TokenTransferor to caller of deployPayrollAndTokenTransferor
-    function deployTokenTransferor() internal returns (address) {
-        //require(msg.value >= deployment_fee, "Insufficient funds sent for deployment");
-
-        TokenTransferor newTokenTransferor = new TokenTransferor(address(router), address(linkToken));
-        newTokenTransferor.transferOwnership(msg.sender);  
-        emit TokenTransferorDeployed(msg.sender, address(newTokenTransferor));
-        return address(newTokenTransferor);
-    }
-
-    /// Function to deploy Payroll
-    ///@dev transfers ownership of Payroll to caller of deployPayrollAndTokenTransferor
-    ///@param tokenTransferorAddress The address of the newly deployed TokenTransferor contract
-    function deployPayroll(address tokenTransferorAddress) internal returns (address) {
-        //require(msg.value >= deployment_fee, "Insufficient funds sent for deployment");
-
-        Payroll newPayroll = new Payroll(tokenTransferorAddress, address(paymentToken));
-        newPayroll.transferOwnership(msg.sender);  // Transfer ownership
-        emit PayrollDeployed(msg.sender, address(newPayroll), tokenTransferorAddress);
-        return address(newPayroll);
-    }
-
-    /// Functions to update deployment params so that they can be changed in the future or for deployment on other chains
-    function updateDeploymentFee(uint256 newFee) external onlyOwner {
-        deployment_fee = newFee;
-    }
-
-    function changeRouter(address newRouter) external onlyOwner {
-        router = IRouterClient(newRouter);
-    }
-
-    function changeLinkToken(address newLinkToken) external onlyOwner {
-        linkToken = IERC20(newLinkToken);
-    }
-
-    function changePaymentToken(address newPaymentToken) external onlyOwner {
-        paymentToken = IERC20(newPaymentToken);
-    }
-
-    // Fallback function to receive ETH
-    receive() external payable {}
-
-    // Function to withdraw collected fees
-    function withdrawFees(address payable _beneficiary) public onlyOwner {
-        // Only contract owner should be able to withdraw fees
-        // Implement ownership and access control
-        if (_beneficiary == address(0)) {
-            revert InvalidAddress();
-        }
-        _beneficiary.transfer(address(this).balance);
-    }
+	// Set the deployment fee
+	uint256 public deployment_fee = 1 wei; // Example fee
+
+	IRouterClient public router;
+	IERC20 public linkToken;
+	IERC20 public paymentToken;
+
+	error InvalidAddress();
+	error InsufficientFunds(uint256 amount);
+
+	event TokenTransferorDeployed(
+		address indexed deployer,
+		address contractAddress
+	);
+	event PayrollDeployed(
+		address indexed deployer,
+		address contractAddress,
+		address tokenTransferorAddress
+	);
+
+	///@param _router The address of the Chainlink Router for local chain
+	///@param _linkToken The address of the LINK token for local chain
+	///@param _paymentToken The address of the payment token for Payroll Contract on native chain
+	constructor(address _router, address _linkToken, address _paymentToken) {
+		router = IRouterClient(_router);
+		linkToken = IERC20(_linkToken);
+		paymentToken = IERC20(_paymentToken);
+	}
+
+	///@dev Deploys TokenTransferor and Payroll contracts
+	function deployPayrollAndTokenTransferor()
+		external
+		payable
+		returns (address payrollAddress, address tokenTransferorAddress)
+	{
+		if (msg.value < deployment_fee) {
+			revert InsufficientFunds(msg.value);
+		}
+
+		tokenTransferorAddress = deployTokenTransferor();
+		payrollAddress = deployPayroll(tokenTransferorAddress);
+		return (payrollAddress, tokenTransferorAddress);
+	}
+
+	// Function to deploy TokenTransferor
+	///@dev transfers ownership of TokenTransferor to caller of deployPayrollAndTokenTransferor
+	function deployTokenTransferor() internal returns (address) {
+		//require(msg.value >= deployment_fee, "Insufficient funds sent for deployment");
+
+		TokenTransferor newTokenTransferor = new TokenTransferor(
+			address(router),
+			address(linkToken)
+		);
+		newTokenTransferor.transferOwnership(msg.sender);
+		emit TokenTransferorDeployed(msg.sender, address(newTokenTransferor));
+		return address(newTokenTransferor);
+	}
+
+	/// Function to deploy Payroll
+	///@dev transfers ownership of Payroll to caller of deployPayrollAndTokenTransferor
+	///@param tokenTransferorAddress The address of the newly deployed TokenTransferor contract
+	function deployPayroll(
+		address tokenTransferorAddress
+	) internal returns (address) {
+		//require(msg.value >= deployment_fee, "Insufficient funds sent for deployment");
+
+		Payroll newPayroll = new Payroll(
+			tokenTransferorAddress,
+			address(paymentToken)
+		);
+		newPayroll.transferOwnership(msg.sender); // Transfer ownership
+		emit PayrollDeployed(
+			msg.sender,
+			address(newPayroll),
+			tokenTransferorAddress
+		);
+		return address(newPayroll);
+	}
+
+	/// Functions to update deployment params so that they can be changed in the future or for deployment on other chains
+	function updateDeploymentFee(uint256 newFee) external onlyOwner {
+		deployment_fee = newFee;
+	}
+
+	function changeRouter(address newRouter) external onlyOwner {
+		router = IRouterClient(newRouter);
+	}
+
+	function changeLinkToken(address newLinkToken) external onlyOwner {
+		linkToken = IERC20(newLinkToken);
+	}
+
+	function changePaymentToken(address newPaymentToken) external onlyOwner {
+		paymentToken = IERC20(newPaymentToken);
+	}
+
+	// Fallback function to receive ETH
+	receive() external payable {}
+
+	// Function to withdraw collected fees
+	function withdrawFees(address payable _beneficiary) public onlyOwner {
+		// Only contract owner should be able to withdraw fees
+		// Implement ownership and access control
+		if (_beneficiary == address(0)) {
+			revert InvalidAddress();
+		}
+		_beneficiary.transfer(address(this).balance);
+	}
 }

From c0d5fb311a8fad81d6f26704f14525ebd3fe126c Mon Sep 17 00:00:00 2001
From: Spencer Schoeneman <spencer.schoeneman@gmail.com>
Date: Fri, 8 Dec 2023 11:55:15 -0600
Subject: [PATCH 10/10] fix issue with ccip package

---
 .../hardhat/contracts/TokenTransferor.sol     | 644 +++++++++---------
 1 file changed, 324 insertions(+), 320 deletions(-)

diff --git a/packages/hardhat/contracts/TokenTransferor.sol b/packages/hardhat/contracts/TokenTransferor.sol
index 8b4c70b..5a2738d 100644
--- a/packages/hardhat/contracts/TokenTransferor.sol
+++ b/packages/hardhat/contracts/TokenTransferor.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {IRouterClient} from "@chainlink/contracts-ccip/src/v0.8/ccip/interfaces/IRouterClient.sol";
-import {Client} from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Client.sol";
-import {IERC20} from "@chainlink/contracts-ccip/src/v0.8/vendor/openzeppelin-solidity/v4.8.0/token/ERC20/IERC20.sol";
+import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+import { IRouterClient } from "@chainlink/contracts-ccip/src/v0.8/ccip/interfaces/IRouterClient.sol";
+import { Client } from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Client.sol";
+import { IERC20 } from "@chainlink/contracts-ccip/src/v0.8/vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
 
 /**
  * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY.
@@ -14,236 +14,234 @@ import {IERC20} from "@chainlink/contracts-ccip/src/v0.8/vendor/openzeppelin-sol
 
 /// @title - A simple contract for transferring tokens across chains.
 contract TokenTransferor is Ownable {
-    // Custom errors to provide more descriptive revert messages.
-    error NotEnoughBalance(uint256 currentBalance, uint256 calculatedFees); // Used to make sure contract has enough balance to cover the fees.
-    error NothingToWithdraw(); // Used when trying to withdraw Ether but there's nothing to withdraw.
-    error FailedToWithdrawEth(address owner, address target, uint256 value); // Used when the withdrawal of Ether fails.
-    error DestinationChainNotAllowlisted(uint64 destinationChainSelector); // Used when the destination chain has not been allowlisted by the contract owner.
-    error CallerNotWhiteListed(address caller); // Used when the caller is not whitelisted by the contract owner.
-
-    // Event emitted when the tokens are transferred to an account on another chain.
-    event TokensTransferred(
-        bytes32 indexed messageId, // The unique ID of the message.
-        uint64 indexed destinationChainSelector, // The chain selector of the destination chain.
-        address receiver, // The address of the receiver on the destination chain.
-        address token, // The token address that was transferred.
-        uint256 tokenAmount, // The token amount that was transferred.
-        address feeToken, // the token address used to pay CCIP fees.
-        uint256 fees // The fees paid for sending the message.
-    );
-
-    // Mapping to keep track of allowlisted destination chains.
-    mapping(uint64 => bool) public allowlistedChains;
-
-    // Mapping to keep track of whitelisted addressed that can call functions on this contract
-    mapping(address => bool) public whitelistedAddresses;
-
-    // Mutable extra args
-    struct ExtraArgs {
-        uint256 gasLimit;
-        bool strict;
-    }
-
-    ExtraArgs public currentExtraArgs;
-
-    IRouterClient private s_router;
-
-    IERC20 private s_linkToken;
-
-    // @notice Constructor initializes the contract with the router address.
-    // @param _router The address of the router contract.
-    // @param _link The address of the link contract.
-    // mumbai router 0x70499c328e1e2a3c41108bd3730f6670a44595d1
-    // mumbai LINK 0x326C977E6efc84E512bB9C30f76E30c160eD06FB
-    constructor(address _router, address _link) {
-        s_router = IRouterClient(_router);
-        s_linkToken = IERC20(_link);
-
-        // Initialixe default values for ExtraArgs
-        currentExtraArgs = ExtraArgs ({
-            gasLimit: 0, 
-            strict: false
-        });
-    }
-
-    /// @dev Modifier that checks if the chain with the given destinationChainSelector is allowlisted.
-    /// @param _destinationChainSelector The selector of the destination chain.
-    modifier onlyAllowlistedChain(uint64 _destinationChainSelector) {
-        if (!allowlistedChains[_destinationChainSelector])
-            revert DestinationChainNotAllowlisted(_destinationChainSelector);
-        _;
-    }
-
-    /// @dev Modifier that checks if the caller is allowlisted.
-    modifier onlyAllowlistedAddress() {
-        if (!whitelistedAddresses[msg.sender]) revert CallerNotWhiteListed(msg.sender);
-        _;
-    }
-
-    /// @dev Updates the allowlist status of a destination chain for transactions.
-    /// @notice This function can only be called by the owner.
-    /// @param _destinationChainSelector The selector of the destination chain to be updated.
-    /// @param allowed The allowlist status to be set for the destination chain.
-    function allowlistDestinationChain(
-        uint64 _destinationChainSelector,
-        bool allowed
-    ) external onlyOwner {
-        allowlistedChains[_destinationChainSelector] = allowed;
-    }
-
-    /// @notice Transfer tokens to receiver on the destination chain.
-    /// @notice pay in LINK.
-    /// @notice the token must be in the list of supported tokens.
-    /// @notice This function can only be called by allowlisted addresses.
-    /// @dev Assumes your contract has sufficient LINK tokens to pay for the fees.
-    /// @param _destinationChainSelector The identifier (aka selector) for the destination blockchain.
-    /// @param _receiver The address of the recipient on the destination blockchain.
-    /// @param _token token address.
-    /// @param _amount token amount.
-    /// @return messageId The ID of the message that was sent.
-    function transferTokensPayLINK(
-        uint64 _destinationChainSelector,
-        address _receiver,
-        address _token,
-        uint256 _amount
-    )
-        external
-        onlyAllowlistedAddress
-        onlyAllowlistedChain(_destinationChainSelector)
-        returns (bytes32 messageId)
-    {
-        // Create an EVM2AnyMessage struct in memory with necessary information for sending a cross-chain message
-        //  address(linkToken) means fees are paid in LINK
-        Client.EVM2AnyMessage memory evm2AnyMessage = _buildCCIPMessage(
-            _receiver,
-            _token,
-            _amount,
-            address(s_linkToken)
-        );
-
-        // Get the fee required to send the message
-        uint256 fees = s_router.getFee(
-            _destinationChainSelector,
-            evm2AnyMessage
-        );
-
-        if (fees > s_linkToken.balanceOf(address(this)))
-            revert NotEnoughBalance(s_linkToken.balanceOf(address(this)), fees);
-
-        // approve the Router to transfer LINK tokens on contract's behalf. It will spend the fees in LINK
-        s_linkToken.approve(address(s_router), fees);
-
-        // approve the Router to spend tokens on contract's behalf. It will spend the amount of the given token
-        IERC20(_token).approve(address(s_router), _amount);
-
-        // Send the message through the router and store the returned message ID
-        messageId = s_router.ccipSend(
-            _destinationChainSelector,
-            evm2AnyMessage
-        );
-
-        // Emit an event with message details
-        emit TokensTransferred(
-            messageId,
-            _destinationChainSelector,
-            _receiver,
-            _token,
-            _amount,
-            address(s_linkToken),
-            fees
-        );
-
-        // Return the message ID
-        return messageId;
-    }
-
-    /// @notice Transfer tokens to receiver on the destination chain.
-    /// @notice Pay in native gas such as ETH on Ethereum or MATIC on Polgon.
-    /// @notice the token must be in the list of supported tokens.
-    /// @notice This function can only be called by allowlisted addresses.
-    /// @dev Assumes your contract has sufficient native gas like ETH on Ethereum or MATIC on Polygon.
-    /// @param _destinationChainSelector The identifier (aka selector) for the destination blockchain.
-    /// @param _receiver The address of the recipient on the destination blockchain.
-    /// @param _token token address.
-    /// @param _amount token amount.
-    /// @return messageId The ID of the message that was sent.
-    function transferTokensPayNative(
-        uint64 _destinationChainSelector,
-        address _receiver,
-        address _token,
-        uint256 _amount
-    )
-        external
-        onlyAllowlistedAddress
-        onlyAllowlistedChain(_destinationChainSelector)
-        returns (bytes32 messageId)
-    {
-        // Create an EVM2AnyMessage struct in memory with necessary information for sending a cross-chain message
-        // address(0) means fees are paid in native gas
-        Client.EVM2AnyMessage memory evm2AnyMessage = _buildCCIPMessage(
-            _receiver,
-            _token,
-            _amount,
-            address(0)
-        );
-
-        // Get the fee required to send the message
-        uint256 fees = s_router.getFee(
-            _destinationChainSelector,
-            evm2AnyMessage
-        );
-
-        if (fees > address(this).balance)
-            revert NotEnoughBalance(address(this).balance, fees);
-
-        // approve the Router to spend tokens on contract's behalf. It will spend the amount of the given token
-        IERC20(_token).approve(address(s_router), _amount);
-
-        // Send the message through the router and store the returned message ID
-        messageId = s_router.ccipSend{value: fees}(
-            _destinationChainSelector,
-            evm2AnyMessage
-        );
-
-        // Emit an event with message details
-        emit TokensTransferred(
-            messageId,
-            _destinationChainSelector,
-            _receiver,
-            _token,
-            _amount,
-            address(0),
-            fees
-        );
-
-        // Return the message ID
-        return messageId;
-    }
-
-    /// @notice Construct a CCIP message.
-    /// @dev This function will create an EVM2AnyMessage struct with all the necessary information for tokens transfer.
-    /// @param _receiver The address of the receiver.
-    /// @param _token The token to be transferred.
-    /// @param _amount The amount of the token to be transferred.
-    /// @param _feeTokenAddress The address of the token used for fees. Set address(0) for native gas.
-    /// @return Client.EVM2AnyMessage Returns an EVM2AnyMessage struct which contains information for sending a CCIP message.
-    function _buildCCIPMessage(
-        address _receiver,
-        address _token,
-        uint256 _amount,
-        address _feeTokenAddress
-    ) internal view returns (Client.EVM2AnyMessage memory) {
-        // Set the token amounts
-        Client.EVMTokenAmount[]
-            memory tokenAmounts = new Client.EVMTokenAmount[](1);
-        tokenAmounts[0] = Client.EVMTokenAmount({
-            token: _token,
-            amount: _amount
-        });
-
-        // Create an EVM2AnyMessage struct in memory with necessary information for sending a cross-chain message
-
-        /**
+	// Custom errors to provide more descriptive revert messages.
+	error NotEnoughBalance(uint256 currentBalance, uint256 calculatedFees); // Used to make sure contract has enough balance to cover the fees.
+	error NothingToWithdraw(); // Used when trying to withdraw Ether but there's nothing to withdraw.
+	error FailedToWithdrawEth(address owner, address target, uint256 value); // Used when the withdrawal of Ether fails.
+	error DestinationChainNotAllowlisted(uint64 destinationChainSelector); // Used when the destination chain has not been allowlisted by the contract owner.
+	error CallerNotWhiteListed(address caller); // Used when the caller is not whitelisted by the contract owner.
+
+	// Event emitted when the tokens are transferred to an account on another chain.
+	event TokensTransferred(
+		bytes32 indexed messageId, // The unique ID of the message.
+		uint64 indexed destinationChainSelector, // The chain selector of the destination chain.
+		address receiver, // The address of the receiver on the destination chain.
+		address token, // The token address that was transferred.
+		uint256 tokenAmount, // The token amount that was transferred.
+		address feeToken, // the token address used to pay CCIP fees.
+		uint256 fees // The fees paid for sending the message.
+	);
+
+	// Mapping to keep track of allowlisted destination chains.
+	mapping(uint64 => bool) public allowlistedChains;
+
+	// Mapping to keep track of whitelisted addressed that can call functions on this contract
+	mapping(address => bool) public whitelistedAddresses;
+
+	// Mutable extra args
+	struct ExtraArgs {
+		uint256 gasLimit;
+		bool strict;
+	}
+
+	ExtraArgs public currentExtraArgs;
+
+	IRouterClient private s_router;
+
+	IERC20 private s_linkToken;
+
+	// @notice Constructor initializes the contract with the router address.
+	// @param _router The address of the router contract.
+	// @param _link The address of the link contract.
+	// mumbai router 0x70499c328e1e2a3c41108bd3730f6670a44595d1
+	// mumbai LINK 0x326C977E6efc84E512bB9C30f76E30c160eD06FB
+	constructor(address _router, address _link) {
+		s_router = IRouterClient(_router);
+		s_linkToken = IERC20(_link);
+
+		// Initialixe default values for ExtraArgs
+		currentExtraArgs = ExtraArgs({ gasLimit: 0, strict: false });
+	}
+
+	/// @dev Modifier that checks if the chain with the given destinationChainSelector is allowlisted.
+	/// @param _destinationChainSelector The selector of the destination chain.
+	modifier onlyAllowlistedChain(uint64 _destinationChainSelector) {
+		if (!allowlistedChains[_destinationChainSelector])
+			revert DestinationChainNotAllowlisted(_destinationChainSelector);
+		_;
+	}
+
+	/// @dev Modifier that checks if the caller is allowlisted.
+	modifier onlyAllowlistedAddress() {
+		if (!whitelistedAddresses[msg.sender])
+			revert CallerNotWhiteListed(msg.sender);
+		_;
+	}
+
+	/// @dev Updates the allowlist status of a destination chain for transactions.
+	/// @notice This function can only be called by the owner.
+	/// @param _destinationChainSelector The selector of the destination chain to be updated.
+	/// @param allowed The allowlist status to be set for the destination chain.
+	function allowlistDestinationChain(
+		uint64 _destinationChainSelector,
+		bool allowed
+	) external onlyOwner {
+		allowlistedChains[_destinationChainSelector] = allowed;
+	}
+
+	/// @notice Transfer tokens to receiver on the destination chain.
+	/// @notice pay in LINK.
+	/// @notice the token must be in the list of supported tokens.
+	/// @notice This function can only be called by allowlisted addresses.
+	/// @dev Assumes your contract has sufficient LINK tokens to pay for the fees.
+	/// @param _destinationChainSelector The identifier (aka selector) for the destination blockchain.
+	/// @param _receiver The address of the recipient on the destination blockchain.
+	/// @param _token token address.
+	/// @param _amount token amount.
+	/// @return messageId The ID of the message that was sent.
+	function transferTokensPayLINK(
+		uint64 _destinationChainSelector,
+		address _receiver,
+		address _token,
+		uint256 _amount
+	)
+		external
+		onlyAllowlistedAddress
+		onlyAllowlistedChain(_destinationChainSelector)
+		returns (bytes32 messageId)
+	{
+		// Create an EVM2AnyMessage struct in memory with necessary information for sending a cross-chain message
+		//  address(linkToken) means fees are paid in LINK
+		Client.EVM2AnyMessage memory evm2AnyMessage = _buildCCIPMessage(
+			_receiver,
+			_token,
+			_amount,
+			address(s_linkToken)
+		);
+
+		// Get the fee required to send the message
+		uint256 fees = s_router.getFee(
+			_destinationChainSelector,
+			evm2AnyMessage
+		);
+
+		if (fees > s_linkToken.balanceOf(address(this)))
+			revert NotEnoughBalance(s_linkToken.balanceOf(address(this)), fees);
+
+		// approve the Router to transfer LINK tokens on contract's behalf. It will spend the fees in LINK
+		s_linkToken.approve(address(s_router), fees);
+
+		// approve the Router to spend tokens on contract's behalf. It will spend the amount of the given token
+		IERC20(_token).approve(address(s_router), _amount);
+
+		// Send the message through the router and store the returned message ID
+		messageId = s_router.ccipSend(
+			_destinationChainSelector,
+			evm2AnyMessage
+		);
+
+		// Emit an event with message details
+		emit TokensTransferred(
+			messageId,
+			_destinationChainSelector,
+			_receiver,
+			_token,
+			_amount,
+			address(s_linkToken),
+			fees
+		);
+
+		// Return the message ID
+		return messageId;
+	}
+
+	/// @notice Transfer tokens to receiver on the destination chain.
+	/// @notice Pay in native gas such as ETH on Ethereum or MATIC on Polgon.
+	/// @notice the token must be in the list of supported tokens.
+	/// @notice This function can only be called by allowlisted addresses.
+	/// @dev Assumes your contract has sufficient native gas like ETH on Ethereum or MATIC on Polygon.
+	/// @param _destinationChainSelector The identifier (aka selector) for the destination blockchain.
+	/// @param _receiver The address of the recipient on the destination blockchain.
+	/// @param _token token address.
+	/// @param _amount token amount.
+	/// @return messageId The ID of the message that was sent.
+	function transferTokensPayNative(
+		uint64 _destinationChainSelector,
+		address _receiver,
+		address _token,
+		uint256 _amount
+	)
+		external
+		onlyAllowlistedAddress
+		onlyAllowlistedChain(_destinationChainSelector)
+		returns (bytes32 messageId)
+	{
+		// Create an EVM2AnyMessage struct in memory with necessary information for sending a cross-chain message
+		// address(0) means fees are paid in native gas
+		Client.EVM2AnyMessage memory evm2AnyMessage = _buildCCIPMessage(
+			_receiver,
+			_token,
+			_amount,
+			address(0)
+		);
+
+		// Get the fee required to send the message
+		uint256 fees = s_router.getFee(
+			_destinationChainSelector,
+			evm2AnyMessage
+		);
+
+		if (fees > address(this).balance)
+			revert NotEnoughBalance(address(this).balance, fees);
+
+		// approve the Router to spend tokens on contract's behalf. It will spend the amount of the given token
+		IERC20(_token).approve(address(s_router), _amount);
+
+		// Send the message through the router and store the returned message ID
+		messageId = s_router.ccipSend{ value: fees }(
+			_destinationChainSelector,
+			evm2AnyMessage
+		);
+
+		// Emit an event with message details
+		emit TokensTransferred(
+			messageId,
+			_destinationChainSelector,
+			_receiver,
+			_token,
+			_amount,
+			address(0),
+			fees
+		);
+
+		// Return the message ID
+		return messageId;
+	}
+
+	/// @notice Construct a CCIP message.
+	/// @dev This function will create an EVM2AnyMessage struct with all the necessary information for tokens transfer.
+	/// @param _receiver The address of the receiver.
+	/// @param _token The token to be transferred.
+	/// @param _amount The amount of the token to be transferred.
+	/// @param _feeTokenAddress The address of the token used for fees. Set address(0) for native gas.
+	/// @return Client.EVM2AnyMessage Returns an EVM2AnyMessage struct which contains information for sending a CCIP message.
+	function _buildCCIPMessage(
+		address _receiver,
+		address _token,
+		uint256 _amount,
+		address _feeTokenAddress
+	) internal view returns (Client.EVM2AnyMessage memory) {
+		// Set the token amounts
+		Client.EVMTokenAmount[]
+			memory tokenAmounts = new Client.EVMTokenAmount[](1);
+		tokenAmounts[0] = Client.EVMTokenAmount({
+			token: _token,
+			amount: _amount
+		});
+
+		// Create an EVM2AnyMessage struct in memory with necessary information for sending a cross-chain message
+
+		/**
          * @todo
          * DO NOT HARDCODE EXTRAARGS
 
@@ -251,90 +249,96 @@ contract TokenTransferor is Ownable {
         This allows you to build it off-chain and pass it in a call to a function or store it in a variable that you can update on-demand. 
         This makes extraArgs compatible with future CCIP upgrades.
          */
-        return
-            Client.EVM2AnyMessage({
-                receiver: abi.encode(_receiver), // ABI-encoded receiver address
-                data: "", // No data
-                tokenAmounts: tokenAmounts, // The amount and type of token being transferred
-                extraArgs: Client._argsToBytes(
-                    // Additional arguments, setting gas limit to 0 as we are not sending any data and non-strict sequencing mode
-                    Client.EVMExtraArgsV1({
-                        gasLimit: currentExtraArgs.gasLimit, 
-                        strict: currentExtraArgs.strict
-                    })
-                ),
-                // Set the feeToken to a feeTokenAddress, indicating specific asset will be used for fees
-                feeToken: _feeTokenAddress
-            });
-    }
-
-    /// @notice Fallback function to allow the contract to receive Ether.
-    /// @dev This function has no function body, making it a default function for receiving Ether.
-    /// It is automatically called when Ether is transferred to the contract without any data.
-    receive() external payable {}
-
-    /// @notice Allows the contract owner to withdraw the entire balance of Ether from the contract.
-    /// @dev This function reverts if there are no funds to withdraw or if the transfer fails.
-    /// It should only be callable by the owner of the contract.
-    /// @param _beneficiary The address to which the Ether should be transferred.
-    function withdraw(address _beneficiary) public onlyOwner {
-        // Retrieve the balance of this contract
-        uint256 amount = address(this).balance;
-
-        // Revert if there is nothing to withdraw
-        if (amount == 0) revert NothingToWithdraw();
-
-        // Attempt to send the funds, capturing the success status and discarding any return data
-        (bool sent, ) = _beneficiary.call{value: amount}("");
-
-        // Revert if the send failed, with information about the attempted transfer
-        if (!sent) revert FailedToWithdrawEth(msg.sender, _beneficiary, amount);
-    }
-
-    /// @notice Allows the owner of the contract to withdraw all tokens of a specific ERC20 token.
-    /// @dev This function reverts with a 'NothingToWithdraw' error if there are no tokens to withdraw.
-    /// @param _beneficiary The address to which the tokens will be sent.
-    /// @param _token The contract address of the ERC20 token to be withdrawn.
-    function withdrawToken(
-        address _beneficiary,
-        address _token
-    ) public onlyOwner {
-        // Retrieve the balance of this contract
-        uint256 amount = IERC20(_token).balanceOf(address(this));
-
-        // Revert if there is nothing to withdraw
-        if (amount == 0) revert NothingToWithdraw();
-
-        IERC20(_token).transfer(_beneficiary, amount);
-    }
-
-    function updateExtraArgs(uint256 _gasLimit, bool _strict) public onlyOwner {
-        currentExtraArgs.gasLimit = _gasLimit;
-        currentExtraArgs.strict = _strict;
-    }
-
-    function getExtraArgs() public view returns (uint256, bool) {
-        return (currentExtraArgs.gasLimit, currentExtraArgs.strict);
-    }
-    
-    function addToWhitelist(address _address) public onlyOwner {
-        whitelistedAddresses[_address] = true;
-    }
-
-    function removeFromWhitelist(address _address) public onlyOwner {
-        whitelistedAddresses[_address] = false;
-    }
-
-    function isWhitelisted(address _address) public view returns (bool) {
-        return whitelistedAddresses[_address];
-    }
-
-    function isChainIdAllowed(uint64 _chainId) public view returns (bool) {
-        return allowlistedChains[_chainId];
-    }
-
-    function transferOwnership(address newOwner) public override onlyOwner {
-        require(newOwner != address(0), "Ownable: new owner is the zero address");
-        _transferOwnership(newOwner);
-    }
+		return
+			Client.EVM2AnyMessage({
+				receiver: abi.encode(_receiver), // ABI-encoded receiver address
+				data: "", // No data
+				tokenAmounts: tokenAmounts, // The amount and type of token being transferred
+				extraArgs: Client._argsToBytes(
+					// Additional arguments, setting gas limit to 0 as we are not sending any data and non-strict sequencing mode
+					Client.EVMExtraArgsV1({
+						gasLimit: currentExtraArgs.gasLimit
+					})
+					// Client.EVMExtraArgsV1({
+					// 	gasLimit: currentExtraArgs.gasLimit,
+					// 	strict: currentExtraArgs.strict
+					// })
+				),
+				// Set the feeToken to a feeTokenAddress, indicating specific asset will be used for fees
+				feeToken: _feeTokenAddress
+			});
+	}
+
+	/// @notice Fallback function to allow the contract to receive Ether.
+	/// @dev This function has no function body, making it a default function for receiving Ether.
+	/// It is automatically called when Ether is transferred to the contract without any data.
+	receive() external payable {}
+
+	/// @notice Allows the contract owner to withdraw the entire balance of Ether from the contract.
+	/// @dev This function reverts if there are no funds to withdraw or if the transfer fails.
+	/// It should only be callable by the owner of the contract.
+	/// @param _beneficiary The address to which the Ether should be transferred.
+	function withdraw(address _beneficiary) public onlyOwner {
+		// Retrieve the balance of this contract
+		uint256 amount = address(this).balance;
+
+		// Revert if there is nothing to withdraw
+		if (amount == 0) revert NothingToWithdraw();
+
+		// Attempt to send the funds, capturing the success status and discarding any return data
+		(bool sent, ) = _beneficiary.call{ value: amount }("");
+
+		// Revert if the send failed, with information about the attempted transfer
+		if (!sent) revert FailedToWithdrawEth(msg.sender, _beneficiary, amount);
+	}
+
+	/// @notice Allows the owner of the contract to withdraw all tokens of a specific ERC20 token.
+	/// @dev This function reverts with a 'NothingToWithdraw' error if there are no tokens to withdraw.
+	/// @param _beneficiary The address to which the tokens will be sent.
+	/// @param _token The contract address of the ERC20 token to be withdrawn.
+	function withdrawToken(
+		address _beneficiary,
+		address _token
+	) public onlyOwner {
+		// Retrieve the balance of this contract
+		uint256 amount = IERC20(_token).balanceOf(address(this));
+
+		// Revert if there is nothing to withdraw
+		if (amount == 0) revert NothingToWithdraw();
+
+		IERC20(_token).transfer(_beneficiary, amount);
+	}
+
+	function updateExtraArgs(uint256 _gasLimit, bool _strict) public onlyOwner {
+		currentExtraArgs.gasLimit = _gasLimit;
+		currentExtraArgs.strict = _strict;
+	}
+
+	function getExtraArgs() public view returns (uint256, bool) {
+		return (currentExtraArgs.gasLimit, currentExtraArgs.strict);
+	}
+
+	function addToWhitelist(address _address) public onlyOwner {
+		whitelistedAddresses[_address] = true;
+	}
+
+	function removeFromWhitelist(address _address) public onlyOwner {
+		whitelistedAddresses[_address] = false;
+	}
+
+	function isWhitelisted(address _address) public view returns (bool) {
+		return whitelistedAddresses[_address];
+	}
+
+	function isChainIdAllowed(uint64 _chainId) public view returns (bool) {
+		return allowlistedChains[_chainId];
+	}
+
+	function transferOwnership(address newOwner) public override onlyOwner {
+		require(
+			newOwner != address(0),
+			"Ownable: new owner is the zero address"
+		);
+		_transferOwnership(newOwner);
+	}
 }