Merge branch 'develop' into transaction-history

src/utils/blockchain.ts

@@ -221,7 +221,9 @@ const updateDepositAddedEvents = async () => {
 
   const filterDeposits = p2pContract.filters.DepositAdded(null);
   const eventsDeposits = await p2pContract.queryFilter(filterDeposits);
+
   etherStore.setDepositsAddedList(eventsDeposits);
+  console.log("DEPOSITS", eventsDeposits);
 };
 
 const updateLockAddedEvents = async () => {
@@ -239,6 +241,7 @@ const updateLockAddedEvents = async () => {
   const filterLocks = p2pContract.filters.LockAdded(null);
   const eventsLocks = await p2pContract.queryFilter(filterLocks);
   etherStore.setLocksAddedList(eventsLocks);
+  console.log("LOCKS", eventsLocks);
 };
 
 const updateLockReleasedEvents = async () => {
@@ -253,9 +256,10 @@ const updateLockReleasedEvents = async () => {
   const signer = provider.getSigner();
   const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
 
-  const filterLocks = p2pContract.filters.LockReleased(null);
-  const eventsLocks = await p2pContract.queryFilter(filterLocks);
-  etherStore.setLocksReleasedList(eventsLocks);
+  const filterReleases = p2pContract.filters.LockReleased(null);
+  const eventsReleases = await p2pContract.queryFilter(filterReleases);
+  etherStore.setLocksReleasedList(eventsReleases);
+  console.log("RELEASES", eventsReleases);
 };
 
 // Provider methods
@@ -284,8 +288,7 @@ const getProvider = (): ethers.providers.Web3Provider | null => {
 };
 
 // Deposit methods
-// Gets value and pix key from user's form to create a deposit in the blockchain
-const addDeposit = async (tokenQty: Number, pixKey: string) => {
+const approveTokens = async (tokenQty: Number) => {
   const provider = getProvider();
   if (!provider) return;
 
@@ -296,20 +299,61 @@ const addDeposit = async (tokenQty: Number, pixKey: string) => {
     mockToken.abi,
     signer
   );
+
+  const apprv = await tokenContract.approve(
+    addresses.p2pix,
+    formatEther(String(tokenQty))
+  );
+  await apprv.wait();
+  return apprv;
+};
+
+// Gets value and pix key from user's form to create a deposit in the blockchain
+const addDeposit = async (tokenQty: Number, pixKey: String) => {
+  const provider = getProvider();
+  if (!provider) return;
+
+  const signer = provider.getSigner();
   const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
 
-  // First get the approval
+  const deposit = await p2pContract.deposit(
+    addresses.token,
+    formatEther(String(tokenQty)),
+    pixKey,
+    ethers.utils.formatBytes32String("")
+  );
+  await deposit.wait();
+
+  await updateWalletStatus();
+  await updateDepositAddedEvents();
+  await updateValidDeposits();
+};
+
+const mockDeposit = async (tokenQty: Number, pixKey: String) => {
+  const provider = getProvider();
+  if (!provider) return;
+
+  const signer = provider.getSigner();
+
+  const tokenContract = new ethers.Contract(
+    addresses.token,
+    mockToken.abi,
+    signer
+  );
+
   const apprv = await tokenContract.approve(
     addresses.p2pix,
     formatEther(String(tokenQty))
   );
   await apprv.wait();
 
-  // Now we make the deposit
+  const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
+
   const deposit = await p2pContract.deposit(
     addresses.token,
     formatEther(String(tokenQty)),
-    pixKey
+    pixKey,
+    ethers.utils.formatBytes32String("")
   );
   await deposit.wait();
 
@@ -379,6 +423,7 @@ const addLock = async (depositId: BigNumber, amount: Number) => {
     ethers.constants.AddressZero, // String "0x0000000000000000000000000000000000000000"
     0,
     formatEther(String(amount)), // BigNumber
+    [],
     []
   );
   lock.wait();
@@ -419,8 +464,12 @@ const releaseLock = async (
   );
 
   const messageToSign = ethers.utils.solidityKeccak256(
-    ["string", "uint256", "uint256"],
-    [pixKey, formatEther(String(amount)), formatEther(e2eId)]
+    ["string", "uint256", "bytes32"],
+    [
+      pixKey,
+      formatEther(String(amount)),
+      ethers.utils.formatBytes32String(e2eId),
+    ]
   );
 
   const messageHashBytes = ethers.utils.arrayify(messageToSign);
@@ -432,7 +481,8 @@ const releaseLock = async (
 
   const release = await p2pContract.release(
     lockId,
-    formatEther(e2eId),
+    ethers.constants.AddressZero,
+    ethers.utils.formatBytes32String(e2eId),
     sig.r,
     sig.s,
     sig.v
@@ -465,9 +515,11 @@ export default {
   listReleaseTransactionByWalletAddress,
   listDepositTransactionByWalletAddress,
   listLockTransactionByWalletAddress,
+  approveTokens,
   addDeposit,
   cancelDeposit,
   withdrawDeposit,
+  mockDeposit,
   mapDeposits,
   formatBigNumber,
   addLock,

src/utils/smart_contract_files/localhost.json

@@ -3,6 +3,6 @@
     "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
   ],
-  "p2pix": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-  "token": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
+  "p2pix": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
+  "token": "0x5FbDB2315678afecb367f032d93F642f64180aa3"
 }