Locks implemented, Some events filters implemented, Updated smart contract artifacts

src/utils/blockchain.ts

@@ -1,14 +1,66 @@
 import { useEtherStore } from "@/store/ether";
 import { BigNumber, ethers } from "ethers";
 
-// smart contract imports
+// Smart contract imports
 import mockToken from "./smart_contract_files/MockToken.json";
 import p2pix from "./smart_contract_files/P2PIX.json";
 import addresses from "./smart_contract_files/localhost.json";
-import p2pEventsAndErrors from "./smart_contract_files/EventAndErrors.json"
-
+// Mock wallets import
 import { wallets } from "./smart_contract_files/wallets.json";
 
+// Provider methods
+const connectProvider = async () => {
+  const etherStore = useEtherStore();
+  const window_ = window as any;
+  const connection = window_.ethereum;
+  let provider: ethers.providers.Web3Provider | null = null;
+
+  if (!connection) return;
+  provider = new ethers.providers.Web3Provider(connection);
+  const signer = provider.getSigner();
+  const tokenContract = new ethers.Contract(addresses.token, mockToken.abi, signer);
+
+  const walletAddress = await provider.send("eth_requestAccounts", []);
+  const balance = await tokenContract.balanceOf(walletAddress[0]);
+
+  etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress[0]));
+  etherStore.setBalance(String(balance));
+
+  const p2pEvents = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
+
+  const filterDeposits = p2pEvents.filters.DepositAdded(null);
+  const eventsDeposits = await p2pEvents.queryFilter(filterDeposits);
+  console.log("Deposits Added: ", eventsDeposits);
+  etherStore.setDepositsAddedList(eventsDeposits);
+
+  const filterLocks = p2pEvents.filters.LockAdded(null);
+  const eventsLocks = await p2pEvents.queryFilter(filterLocks);
+  console.log("Locks Added: ", eventsLocks)
+  etherStore.setLocksAddedList(eventsLocks);
+
+  const filterExpiredLocks = p2pEvents.filters.LockReturned(null);
+  const eventsExpiredLocks = await p2pEvents.queryFilter(filterExpiredLocks);
+  console.log("Expired Locks: ", eventsExpiredLocks);
+  etherStore.setDepositsExpiredList(eventsExpiredLocks);
+
+  // (TO DO) Filter valid deposits
+
+  connection.on("accountsChanged", (accounts: string[]) => {
+    updateWalletStatus(accounts[0]);
+  });
+};
+
+const getProvider = (): ethers.providers.Web3Provider | null => {
+  const window_ = window as any;
+  const connection = window_.ethereum;
+
+  if (!connection) return null;
+
+  return new ethers.providers.Web3Provider(connection);
+};
+
+// Wallet methods
+// Update wallet state (balance and address)
 const updateWalletStatus = async (walletAddress: string) => {
   const etherStore = useEtherStore();
   const provider = getProvider();
@@ -23,36 +75,7 @@ const updateWalletStatus = async (walletAddress: string) => {
   etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress));
 };
 
-const connectProvider = async () => {
-  const etherStore = useEtherStore();
-  const window_ = window as any;
-  const connection = window_.ethereum;
-  let provider: ethers.providers.Web3Provider | null = null;
-
-  if (!connection) return;
-  provider = new ethers.providers.Web3Provider(connection);
-  const signer = provider.getSigner();
-  const contract = new ethers.Contract(addresses.token, mockToken.abi, signer);
-
-  const walletAddress = await provider.send("eth_requestAccounts", []);
-  const balance = await contract.balanceOf(walletAddress[0]);
-
-  etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress[0]));
-  etherStore.setBalance(String(balance));
-
-  const p2pContract = new ethers.Contract(addresses.p2pix, p2pEventsAndErrors.abi, signer);
-
-  const filter = p2pContract.filters.DepositAdded(null);
-  const events = await p2pContract.queryFilter(filter);
-
-  console.log(events);
-  etherStore.setDepositList(events);
-
-  connection.on("accountsChanged", (accounts: string[]) => {
-    updateWalletStatus(accounts[0]);
-  });
-};
-
+//  Split tokens between wallets in wallets.json
 const splitTokens = async () => {
   const etherStore = useEtherStore();
   const provider = getProvider();
@@ -71,13 +94,14 @@ const splitTokens = async () => {
   }
 };
 
-const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
+// Deposit methods
+// Gets value and pix key from user's form to create a deposit in the blockchain
+const addDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
   const etherStore = useEtherStore();
   const provider = getProvider();
+
   if (!provider) return;
-
   const signer = provider.getSigner();
-
   const tokenContract = new ethers.Contract(
     addresses.token,
     mockToken.abi,
@@ -85,14 +109,14 @@ const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
   );
   const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
 
-  // first get the approval
+  // First get the approval
   const apprv = await tokenContract.approve(
     addresses.p2pix,
     ethers.utils.parseEther(tokenQty)
   );
   await apprv.wait();
 
-  // deposit
+  // Now we make the deposit
   const deposit = await p2pContract.deposit(
     addresses.token,
     ethers.utils.parseEther(tokenQty),
@@ -102,65 +126,97 @@ const mockDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
 
   updateWalletStatus(etherStore.walletAddress);
 
-  const p2pEvents = new ethers.Contract(addresses.p2pix, p2pEventsAndErrors.abi, signer);
-
+  const p2pEvents = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
   const filter = p2pEvents.filters.DepositAdded(null);
   const events = await p2pEvents.queryFilter(filter);
 
-  console.log(events);
-
-  etherStore.setDepositList(events);
-};
-
-const countDeposit = async () => {
-  const provider = getProvider();
-  if (!provider) return;
-
-  const signer = provider.getSigner();
-  const contract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
-
-  const count = await contract.depositCount();
-
-  console.log(Number(count));
+  etherStore.setDepositsAddedList(events);
 };
 
+// Get specific deposit data by its ID
 const mapDeposits = async (depositId: BigNumber) => {
   const provider = getProvider();
+
   if (!provider) return;
 
   const signer = provider.getSigner();
   const contract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
-
-  const deposit = await contract.mapDeposits(depositId);
+  const deposit = await contract.mapDeposits(depositId.toNumber());
 
   console.log(deposit);
   return deposit;
 };
 
+// Lock methods
+// Gets value from user's form to create a lock in the blockchain
+const addLock = async(depositId: Number, amount: Number) => {
+  const etherStore = useEtherStore();
+  const provider = getProvider();
+
+  if (!provider) return;
+  const signer = provider.getSigner();
+  const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
+
+  // Make lock
+  const lockTx = await p2pContract.lock(
+    depositId,
+    etherStore.walletAddress,
+    ethers.constants.AddressZero,
+    0,
+    ethers.utils.parseEther(amount.toString()),
+    []
+  );
+
+  const filterLocks = p2pContract.filters.LockAdded(null);
+  const eventsLocks = await p2pContract.queryFilter(filterLocks);
+  etherStore.setLocksAddedList(eventsLocks);
+
+  {
+
+    
+  }
+
+};
+
+// Get specific lock data by its ID
+const mapLocks = async (lockId: string) => {
+  const provider = getProvider();
+
+  if (!provider) return;
+
+  const signer = provider.getSigner();
+  const contract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
+  const lock = await contract.mapLocks(lockId);
+
+  console.log(lock);
+  return lock;
+};
+
+// Releases lock by specific ID and other additional data
+// (TO DO)
+const releaseLock = async() => {
+  return;
+};
+
+// Formatting methods
 const formatEther = (balance: string) => {
   const formatted = ethers.utils.formatEther(balance);
   return formatted;
 };
 
-const verifyDepositAmmount = (ammountBigNumber: BigNumber): string => {
-  return ethers.utils.formatEther(ammountBigNumber);
-};
-
-const getProvider = (): ethers.providers.Web3Provider | null => {
-  const window_ = window as any;
-  const connection = window_.ethereum;
-
-  if (!connection) return null;
-
-  return new ethers.providers.Web3Provider(connection);
+const formatBigNumber = (num: BigNumber) => {
+  const formattedNum = ethers.utils.formatEther(num);
+  return formattedNum;
 };
 
 export default {
   connectProvider,
   formatEther,
   splitTokens,
-  mockDeposit,
-  countDeposit,
+  addDeposit,
   mapDeposits,
-  verifyDepositAmmount,
+  formatBigNumber,
+  addLock,
+  mapLocks,
+  releaseLock,
 };

src/utils/smart_contract_files/EventAndErrors.json

@@ -1,219 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "EventAndErrors",
-  "sourceName": "contracts/EventAndErrors.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "name": "AlreadyReleased",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "DepositAlreadyExists",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "InvalidDeposit",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "InvalidSigner",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "LoopOverflow",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "NotEnoughTokens",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "NotExpired",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "OnlySeller",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "TxAlreadyUsed",
-      "type": "error"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "seller",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "DepositAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "seller",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        }
-      ],
-      "name": "DepositClosed",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "seller",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "DepositWithdrawn",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "FundsWithdrawn",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "buyer",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "lockID",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "LockAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "buyer",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "lockId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "LockReleased",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "buyer",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "lockId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "LockReturned",
-      "type": "event"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}